Commit 9b89f07f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'SFP-phylink-updates' 



Russell King says:

====================
SFP/phylink updates

This series, which follows on from the fixes posted earlier, improves
the phylink/sfp support.  Changes included here are:

- Merge 802.3z and SGMII modes into one "in-band" mode, using the
  PHY_INTERFACE_MODE_xxx definition to determine which should be used.
  This allows more flexibility as more interface modes become
  available.

- Allow 2500base-X and 10GBASE-KR to be requested from SFP.

- Remove unused and unnecessary phylink_init_eee()

- Restart 802.3z autonegotiation when starting the network device to
  ensure that the negotiated parameters are always correct.  It has
  been observed on mvneta that this is not always the case without
  this change.

- Add kerneldoc documentation for phylink and sfp upstream facing APIs
  and link it in to the networking documentation.

- Resolve a sparse warning in sfp-bus.c

- Convert phylink/sfp to use fwnode rather than DT so that other firmware
  systems can take advantage of this - I have received a request for it
  to be usable with ACPI.  The exception to this is our interactions with
  phylib, as phylib itself does not yet support fwnode.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b0e9fe1b 8fa7b9b6

Documentation/networking/kapi.rst

+24 −0
Original line number Diff line number Diff line
@@ -145,3 +145,27 @@ PHY Support 


.. kernel-doc:: drivers/net/phy/mdio_bus.c

   :internal:



PHYLINK

-------



  PHYLINK interfaces traditional network drivers with PHYLIB, fixed-links,

  and SFF modules (eg, hot-pluggable SFP) that may contain PHYs.  PHYLINK

  provides management of the link state and link modes.



.. kernel-doc:: include/linux/phylink.h

   :internal:



.. kernel-doc:: drivers/net/phy/phylink.c



SFP support

-----------



.. kernel-doc:: drivers/net/phy/sfp-bus.c

   :internal:



.. kernel-doc:: include/linux/sfp.h

   :internal:



.. kernel-doc:: drivers/net/phy/sfp-bus.c

   :export:

drivers/net/phy/phylink.c

+262 −79

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/phy/sfp-bus.c

+112 −8

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/phy.h

+14 −0
Original line number Diff line number Diff line
@@ -761,6 +761,20 @@ static inline bool phy_interface_mode_is_rgmii(phy_interface_t mode) 
		mode <= PHY_INTERFACE_MODE_RGMII_TXID;

};



/**

 * phy_interface_mode_is_8023z() - does the phy interface mode use 802.3z

 *   negotiation

 * @mode: one of &enum phy_interface_t

 *

 * Returns true if the phy interface mode uses the 16-bit negotiation

 * word as defined in 802.3z. (See 802.3-2015 37.2.1 Config_Reg encoding)

 */

static inline bool phy_interface_mode_is_8023z(phy_interface_t mode)

{

	return mode == PHY_INTERFACE_MODE_1000BASEX ||

	       mode == PHY_INTERFACE_MODE_2500BASEX;

}



/**

 * phy_interface_is_rgmii - Convenience function for testing if a PHY interface

 * is RGMII (all variants)

include/linux/phylink.h

+139 −57

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE