diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-07-07 10:20:02 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-07-08 20:19:19 -0700 |
| commit | 6d1ce9c03880c28a4a48f94d4a2dcb2e57c1b88e (patch) | |
| tree | e9a54ae41457093f0387abe39846002c20ad8d47 /drivers | |
| parent | 40ad0a52ef5d2c3379bb9b6af06c8029ac6c875d (diff) | |
| download | linux-stable-6d1ce9c03880c28a4a48f94d4a2dcb2e57c1b88e.tar.gz linux-stable-6d1ce9c03880c28a4a48f94d4a2dcb2e57c1b88e.tar.bz2 linux-stable-6d1ce9c03880c28a4a48f94d4a2dcb2e57c1b88e.zip | |
net: phylink: fix SGMII inband autoneg enable
When we are operating in SGMII inband mode, it implies that there is a
PHY connected, and the ethtool advertisement for autoneg applies to
the PHY, not the SGMII link. When in 1000base-X mode, then this applies
to the 802.3z link and needs to be applied to the PCS.
Fix this.
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1o9Ng2-005Qbe-3H@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/phylink.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 48f0b9b39491..9bd69328dc4d 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -3040,7 +3040,9 @@ int phylink_mii_c22_pcs_config(struct mdio_device *pcs, unsigned int mode, /* Ensure ISOLATE bit is disabled */ if (mode == MLO_AN_INBAND && - linkmode_test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, advertising)) + (interface == PHY_INTERFACE_MODE_SGMII || + interface == PHY_INTERFACE_MODE_QSGMII || + linkmode_test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, advertising))) bmcr = BMCR_ANENABLE; else bmcr = 0; |