Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 529ed127 authored by Timur Tabi's avatar Timur Tabi Committed by David S. Miller
Browse files

net: phy: phy drivers should not set SUPPORTED_[Asym_]Pause 



Instead of having individual PHY drivers set the SUPPORTED_Pause and
SUPPORTED_Asym_Pause flags, phylib itself should set those flags,
unless there is a hardware erratum or other special case.  During
autonegotiation, the PHYs will determine whether to enable pause
frame support.

Pause frames are a feature that is supported by the MAC.  It is the MAC
that generates the frames and that processes them.  The PHY can only be
configured to allow them to pass through.

This commit also effectively reverts the recently applied c7a61319
("net: phy: dp83848: Support ethernet pause frames").

So the new process is:

1) Unless the PHY driver overrides it, phylib sets the SUPPORTED_Pause
and SUPPORTED_AsymPause bits in phydev->supported.  This indicates that
the PHY supports pause frames.

2) The MAC driver checks phydev->supported before it calls phy_start().
If (SUPPORTED_Pause | SUPPORTED_AsymPause) is set, then the MAC driver
sets those bits in phydev->advertising, if it wants to enable pause
frame support.

3) When the link state changes, the MAC driver checks phydev->pause and
phydev->asym_pause,  If the bits are set, then it enables the corresponding
features in the MAC.  The algorithm is:

	if (phydev->pause)
		The MAC should be programmed to receive and honor
                pause frames it receives, i.e. enable receive flow control.

	if (phydev->pause != phydev->asym_pause)
		The MAC should be programmed to transmit pause
		frames when needed, i.e. enable transmit flow control.

Signed-off-by: default avatarTimur Tabi <timur@codeaurora.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fba40c63

drivers/net/phy/bcm-cygnus.c

+1 −2
Original line number Diff line number Diff line
@@ -134,8 +134,7 @@ static struct phy_driver bcm_cygnus_phy_driver[] = { 
	.phy_id        = PHY_ID_BCM_CYGNUS,

	.phy_id_mask   = 0xfffffff0,

	.name          = "Broadcom Cygnus PHY",

	.features      = PHY_GBIT_FEATURES |

			SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features      = PHY_GBIT_FEATURES,

	.config_init   = bcm_cygnus_config_init,

	.config_aneg   = genphy_config_aneg,

	.read_status   = genphy_read_status,

drivers/net/phy/bcm7xxx.c

+2 −4
Original line number Diff line number Diff line
@@ -386,8 +386,7 @@ static int bcm7xxx_28nm_probe(struct phy_device *phydev) 
	.phy_id		= (_oui),					\

	.phy_id_mask	= 0xfffffff0,					\

	.name		= _name,					\

	.features	= PHY_GBIT_FEATURES |				\

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,	\

	.features	= PHY_GBIT_FEATURES,				\

	.flags		= PHY_IS_INTERNAL,				\

	.config_init	= bcm7xxx_28nm_config_init,			\

	.config_aneg	= genphy_config_aneg,				\
@@ -406,8 +405,7 @@ static int bcm7xxx_28nm_probe(struct phy_device *phydev) 
	.phy_id         = (_oui),					\

	.phy_id_mask    = 0xfffffff0,					\

	.name           = _name,					\

	.features       = PHY_BASIC_FEATURES |				\

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,	\

	.features       = PHY_BASIC_FEATURES,				\

	.flags          = PHY_IS_INTERNAL,				\

	.config_init    = bcm7xxx_config_init,				\

	.config_aneg    = genphy_config_aneg,				\

drivers/net/phy/broadcom.c

+14 −28
Original line number Diff line number Diff line
@@ -525,8 +525,7 @@ static struct phy_driver broadcom_drivers[] = { 
	.phy_id		= PHY_ID_BCM5411,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom BCM5411",

	.features	= PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features	= PHY_GBIT_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= bcm54xx_config_init,

	.config_aneg	= genphy_config_aneg,
@@ -537,8 +536,7 @@ static struct phy_driver broadcom_drivers[] = { 
	.phy_id		= PHY_ID_BCM5421,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom BCM5421",

	.features	= PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features	= PHY_GBIT_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= bcm54xx_config_init,

	.config_aneg	= genphy_config_aneg,
@@ -549,8 +547,7 @@ static struct phy_driver broadcom_drivers[] = { 
	.phy_id		= PHY_ID_BCM5461,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom BCM5461",

	.features	= PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features	= PHY_GBIT_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= bcm54xx_config_init,

	.config_aneg	= genphy_config_aneg,
@@ -561,8 +558,7 @@ static struct phy_driver broadcom_drivers[] = { 
	.phy_id		= PHY_ID_BCM54612E,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom BCM54612E",

	.features	= PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features	= PHY_GBIT_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= bcm54xx_config_init,

	.config_aneg	= bcm54612e_config_aneg,
@@ -573,8 +569,7 @@ static struct phy_driver broadcom_drivers[] = { 
	.phy_id		= PHY_ID_BCM54616S,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom BCM54616S",

	.features	= PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features	= PHY_GBIT_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= bcm54xx_config_init,

	.config_aneg	= genphy_config_aneg,
@@ -585,8 +580,7 @@ static struct phy_driver broadcom_drivers[] = { 
	.phy_id		= PHY_ID_BCM5464,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom BCM5464",

	.features	= PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features	= PHY_GBIT_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= bcm54xx_config_init,

	.config_aneg	= genphy_config_aneg,
@@ -597,8 +591,7 @@ static struct phy_driver broadcom_drivers[] = { 
	.phy_id		= PHY_ID_BCM5481,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom BCM5481",

	.features	= PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features	= PHY_GBIT_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= bcm54xx_config_init,

	.config_aneg	= bcm5481_config_aneg,
@@ -609,8 +602,7 @@ static struct phy_driver broadcom_drivers[] = { 
	.phy_id         = PHY_ID_BCM54810,

	.phy_id_mask    = 0xfffffff0,

	.name           = "Broadcom BCM54810",

	.features       = PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features       = PHY_GBIT_FEATURES,

	.flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init    = bcm54xx_config_init,

	.config_aneg    = bcm5481_config_aneg,
@@ -621,8 +613,7 @@ static struct phy_driver broadcom_drivers[] = { 
	.phy_id		= PHY_ID_BCM5482,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom BCM5482",

	.features	= PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features	= PHY_GBIT_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= bcm5482_config_init,

	.config_aneg	= genphy_config_aneg,
@@ -633,8 +624,7 @@ static struct phy_driver broadcom_drivers[] = { 
	.phy_id		= PHY_ID_BCM50610,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom BCM50610",

	.features	= PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features	= PHY_GBIT_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= bcm54xx_config_init,

	.config_aneg	= genphy_config_aneg,
@@ -645,8 +635,7 @@ static struct phy_driver broadcom_drivers[] = { 
	.phy_id		= PHY_ID_BCM50610M,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom BCM50610M",

	.features	= PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features	= PHY_GBIT_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= bcm54xx_config_init,

	.config_aneg	= genphy_config_aneg,
@@ -657,8 +646,7 @@ static struct phy_driver broadcom_drivers[] = { 
	.phy_id		= PHY_ID_BCM57780,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom BCM57780",

	.features	= PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features	= PHY_GBIT_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= bcm54xx_config_init,

	.config_aneg	= genphy_config_aneg,
@@ -669,8 +657,7 @@ static struct phy_driver broadcom_drivers[] = { 
	.phy_id		= PHY_ID_BCMAC131,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom BCMAC131",

	.features	= PHY_BASIC_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features	= PHY_BASIC_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= brcm_fet_config_init,

	.config_aneg	= genphy_config_aneg,
@@ -681,8 +668,7 @@ static struct phy_driver broadcom_drivers[] = { 
	.phy_id		= PHY_ID_BCM5241,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom BCM5241",

	.features	= PHY_BASIC_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.features	= PHY_BASIC_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= brcm_fet_config_init,

	.config_aneg	= genphy_config_aneg,

drivers/net/phy/dp83848.c

+1 −3
Original line number Diff line number Diff line
@@ -88,9 +88,7 @@ MODULE_DEVICE_TABLE(mdio, dp83848_tbl); 
		.phy_id		= _id,				\

		.phy_id_mask	= 0xfffffff0,			\

		.name		= _name,			\

		.features	= (PHY_BASIC_FEATURES |		\

				   SUPPORTED_Pause |		\

				   SUPPORTED_Asym_Pause),	\

		.features	= PHY_BASIC_FEATURES,		\

		.flags		= PHY_HAS_INTERRUPT,		\

								\

		.soft_reset	= genphy_soft_reset,		\

drivers/net/phy/icplus.c

+2 −4
Original line number Diff line number Diff line
@@ -225,8 +225,7 @@ static struct phy_driver icplus_driver[] = { 
	.phy_id		= 0x02430d90,

	.name		= "ICPlus IP1001",

	.phy_id_mask	= 0x0ffffff0,

	.features	= PHY_GBIT_FEATURES | SUPPORTED_Pause |

			  SUPPORTED_Asym_Pause,

	.features	= PHY_GBIT_FEATURES,

	.config_init	= &ip1001_config_init,

	.config_aneg	= &genphy_config_aneg,

	.read_status	= &genphy_read_status,
@@ -236,8 +235,7 @@ static struct phy_driver icplus_driver[] = { 
	.phy_id		= 0x02430c54,

	.name		= "ICPlus IP101A/G",

	.phy_id_mask	= 0x0ffffff0,

	.features	= PHY_BASIC_FEATURES | SUPPORTED_Pause |

			  SUPPORTED_Asym_Pause,

	.features	= PHY_BASIC_FEATURES,

	.flags		= PHY_HAS_INTERRUPT,

	.ack_interrupt	= ip101a_g_ack_interrupt,

	.config_init	= &ip101a_g_config_init,