diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-08-26 09:21:19 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-08-26 09:21:19 -0700 |
| commit | f086d18db11724f55e70e001ce5cc29fdf47bb55 (patch) | |
| tree | 2be39a7d6fb034e424af3a076c5ebcb0bbed5dba /drivers/net/phy/phy.c | |
| parent | e540e3bcf2a26e02cf2d6295a38773c1e415e375 (diff) | |
| parent | 0941c83282349859e736b279908fd958f23e281a (diff) | |
Merge branch 'adds-support-for-lan887x-phy'
Divya Koppera says:
====================
Adds support for lan887x phy
Adds support for lan887x phy and accept autoneg configuration in
phy driver only when feature is enabled in supported list.
v2: https://lore.kernel.org/20240813181515.863208-1-divya.koppera@microchip.com
v1: https://lore.kernel.org/20240808145916.26006-1-Divya.Koppera@microchip.com
====================
Link: https://patch.msgid.link/20240821055906.27717-1-Divya.Koppera@microchip.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 785182fa5fe0..cba3af926429 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -1089,7 +1089,10 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev, if (autoneg != AUTONEG_ENABLE && autoneg != AUTONEG_DISABLE) return -EINVAL; - if (autoneg == AUTONEG_ENABLE && linkmode_empty(advertising)) + if (autoneg == AUTONEG_ENABLE && + (linkmode_empty(advertising) || + !linkmode_test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, + phydev->supported))) return -EINVAL; if (autoneg == AUTONEG_DISABLE && |