diff mbox series

[V2,net] net: phy: fix save wrong speed and duplex problem if autoneg is on

Message ID 1614395158-5294-1-git-send-email-tanhuazhong@huawei.com
State New
Headers show
Series [V2,net] net: phy: fix save wrong speed and duplex problem if autoneg is on | expand

Commit Message

Huazhong Tan Feb. 27, 2021, 3:05 a.m. UTC 
From: Guangbin Huang <huangguangbin2@huawei.com>

If phy uses generic driver and autoneg is on, enter command
"ethtool -s eth0 speed 50" will not change phy speed actually, but
command "ethtool eth0" shows speed is 50Mb/s because phydev->speed
has been set to 50 and no update later.

And duplex setting has same problem too.

However, if autoneg is on, phy only changes speed and duplex according to
phydev->advertising, but not phydev->speed and phydev->duplex. So in this
case, phydev->speed and phydev->duplex don't need to be set in function
phy_ethtool_ksettings_set() if autoneg is on.

Fixes: 51e2a3846eab ("PHY: Avoid unnecessary aneg restarts")
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
---
V1->V2: add a Fixes tag
---
 drivers/net/phy/phy.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

patchwork-bot+netdevbpf@kernel.org March 1, 2021, 9:20 p.m. UTC | #1 
Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Sat, 27 Feb 2021 11:05:58 +0800 you wrote:
> From: Guangbin Huang <huangguangbin2@huawei.com>

> 

> If phy uses generic driver and autoneg is on, enter command

> "ethtool -s eth0 speed 50" will not change phy speed actually, but

> command "ethtool eth0" shows speed is 50Mb/s because phydev->speed

> has been set to 50 and no update later.

> 

> [...]


Here is the summary with links:
  - [V2,net] net: phy: fix save wrong speed and duplex problem if autoneg is on
    https://git.kernel.org/netdev/net/c/d9032dba5a2b

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
diff mbox series

Patch

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 1be07e4..fc2e7cb 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -276,14 +276,16 @@  int phy_ethtool_ksettings_set(struct phy_device *phydev,
 
 	phydev->autoneg = autoneg;
 
-	phydev->speed = speed;
+	if (autoneg == AUTONEG_DISABLE) {
+		phydev->speed = speed;
+		phydev->duplex = duplex;
+	}
 
 	linkmode_copy(phydev->advertising, advertising);
 
 	linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
 			 phydev->advertising, autoneg == AUTONEG_ENABLE);
 
-	phydev->duplex = duplex;
 	phydev->master_slave_set = cmd->base.master_slave_cfg;
 	phydev->mdix_ctrl = cmd->base.eth_tp_mdix_ctrl;