Commit 6dd7f1a1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rework-phylink-interface-for-split-MAC-PCS-support' 



Russell King says:

====================
rework phylink interface for split MAC/PCS support

The following series changes the phylink interface to allow us to
better support split MAC / MAC PCS setups.  The fundamental change
required for this turns out to be quite simple.

Today, mac_config() is used for everything to do with setting the
parameters for the MAC, and mac_link_up() is used to inform the
MAC driver that the link is now up (and so to allow packet flow.)
mac_config() also has had a few implementation issues, with folk
who believe that members such as "speed" and "duplex" are always
valid, where "link" gets used inappropriately, etc.

With the proposed patches, all this changes subtly - but in a
backwards compatible way at this stage.

We pass the the full resolved link state (speed, duplex, pause) to
mac_link_up(), and it is now guaranteed that these parameters to
this function will always be valid (no more SPEED_UNKNOWN or
DUPLEX_UNKNOWN here - unless phylink is fed with such things.)

Drivers should convert over to using the state in mac_link_up()
rather than configuring the speed, duplex and pause in the
mac_config() method. The patch series includes a number of MAC
drivers which I've thought have been easy targets - I've left the
remainder as I think they need maintainer input. However, *all*
drivers will need conversion for future phylink development.

v2: add ocelot/felix and qca/ar9331 DSA drivers to patch 2, add
  received tested-by so far.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2e6af0f3 24cb72df

Documentation/networking/sfp-phylink.rst

+14 −3
Original line number Diff line number Diff line
@@ -74,10 +74,13 @@ phylib to the sfp/phylink support. Please send patches to improve 
this documentation.



1. Optionally split the network driver's phylib update function into

   three parts dealing with link-down, link-up and reconfiguring the

   MAC settings. This can be done as a separate preparation commit.

   two parts dealing with link-down and link-up. This can be done as

   a separate preparation commit.



   An example of this preparation can be found in git commit fc548b991fb0.

   An older example of this preparation can be found in git commit

   fc548b991fb0, although this was splitting into three parts; the

   link-up part now includes configuring the MAC for the link settings.

   Please see :c:func:`mac_link_up` for more information on this.



2. Replace::
@@ -207,6 +210,14 @@ this documentation. 
   using. This is particularly important for in-band negotiation

   methods such as 1000base-X and SGMII.



   The :c:func:`mac_link_up` method is used to inform the MAC that the

   link has come up. The call includes the negotiation mode and interface

   for reference only. The finalised link parameters are also supplied

   (speed, duplex and flow control/pause enablement settings) which

   should be used to configure the MAC when the MAC and PCS are not

   tightly integrated, or when the settings are not coming from in-band

   negotiation.



   The :c:func:`mac_config` method is used to update the MAC with the

   requested state, and must avoid unnecessarily taking the link down

   when making changes to the MAC configuration.  This means the

drivers/net/dsa/b53/b53_common.c

+3 −1
Original line number Diff line number Diff line
@@ -1289,7 +1289,9 @@ EXPORT_SYMBOL(b53_phylink_mac_link_down); 
void b53_phylink_mac_link_up(struct dsa_switch *ds, int port,

			     unsigned int mode,

			     phy_interface_t interface,

			     struct phy_device *phydev)

			     struct phy_device *phydev,

			     int speed, int duplex,

			     bool tx_pause, bool rx_pause)

{

	struct b53_device *dev = ds->priv;

drivers/net/dsa/b53/b53_priv.h

+3 −1
Original line number Diff line number Diff line
@@ -338,7 +338,9 @@ void b53_phylink_mac_link_down(struct dsa_switch *ds, int port, 
void b53_phylink_mac_link_up(struct dsa_switch *ds, int port,

			     unsigned int mode,

			     phy_interface_t interface,

			     struct phy_device *phydev);

			     struct phy_device *phydev,

			     int speed, int duplex,

			     bool tx_pause, bool rx_pause);

int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering);

int b53_vlan_prepare(struct dsa_switch *ds, int port,

		     const struct switchdev_obj_port_vlan *vlan);

drivers/net/dsa/bcm_sf2.c

+3 −1
Original line number Diff line number Diff line
@@ -649,7 +649,9 @@ static void bcm_sf2_sw_mac_link_down(struct dsa_switch *ds, int port, 
static void bcm_sf2_sw_mac_link_up(struct dsa_switch *ds, int port,

				   unsigned int mode,

				   phy_interface_t interface,

				   struct phy_device *phydev)

				   struct phy_device *phydev,

				   int speed, int duplex,

				   bool tx_pause, bool rx_pause)

{

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	struct ethtool_eee *p = &priv->dev->ports[port].eee;

drivers/net/dsa/lantiq_gswip.c

+3 −1
Original line number Diff line number Diff line
@@ -1517,7 +1517,9 @@ static void gswip_phylink_mac_link_down(struct dsa_switch *ds, int port, 
static void gswip_phylink_mac_link_up(struct dsa_switch *ds, int port,

				      unsigned int mode,

				      phy_interface_t interface,

				      struct phy_device *phydev)

				      struct phy_device *phydev,

				      int speed, int duplex,

				      bool tx_pause, bool rx_pause)

{

	struct gswip_priv *priv = ds->priv;

CRA Git | Maintained and supported by SUSTech CRA and CCSE