[Patch net v2] net: phy: LAN87xx: remove genphy_softreset in config_aneg

Arun Ramadoss posted 1 patch 4 years, 2 months ago
drivers/net/phy/microchip_t1.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
[Patch net v2] net: phy: LAN87xx: remove genphy_softreset in config_aneg
Posted by Arun Ramadoss 4 years, 2 months ago
When the T1 phy master/slave state is changed, at the end of config_aneg
function genphy_softreset is called. After the reset all the registers
configured during the config_init are restored to default value.
To avoid this, removed the genphy_softreset call.

v1->v2
------
Added the author in cc

Fixes: 8a1b415d70b7 ("net: phy: added ethtool master-slave configuration support")
Signed-off-by: Arun Ramadoss <arun.ramadoss@microchip.com>
---
 drivers/net/phy/microchip_t1.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/net/phy/microchip_t1.c b/drivers/net/phy/microchip_t1.c
index 389df3f4293c..3f79bbbe62d3 100644
--- a/drivers/net/phy/microchip_t1.c
+++ b/drivers/net/phy/microchip_t1.c
@@ -706,7 +706,6 @@ static int lan87xx_read_status(struct phy_device *phydev)
 static int lan87xx_config_aneg(struct phy_device *phydev)
 {
 	u16 ctl = 0;
-	int rc;
 
 	switch (phydev->master_slave_set) {
 	case MASTER_SLAVE_CFG_MASTER_FORCE:
@@ -722,11 +721,7 @@ static int lan87xx_config_aneg(struct phy_device *phydev)
 		return -EOPNOTSUPP;
 	}
 
-	rc = phy_modify_changed(phydev, MII_CTRL1000, CTL1000_AS_MASTER, ctl);
-	if (rc == 1)
-		rc = genphy_soft_reset(phydev);
-
-	return rc;
+	return phy_modify_changed(phydev, MII_CTRL1000, CTL1000_AS_MASTER, ctl);
 }
 
 static struct phy_driver microchip_t1_phy_driver[] = {
-- 
2.33.0
Re: [Patch net v2] net: phy: LAN87xx: remove genphy_softreset in config_aneg
Posted by patchwork-bot+netdevbpf@kernel.org 4 years, 2 months ago
Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:

On Thu, 7 Apr 2022 10:16:10 +0530 you wrote:
> When the T1 phy master/slave state is changed, at the end of config_aneg
> function genphy_softreset is called. After the reset all the registers
> configured during the config_init are restored to default value.
> To avoid this, removed the genphy_softreset call.
> 
> v1->v2
> 
> [...]

Here is the summary with links:
  - [net,v2] net: phy: LAN87xx: remove genphy_softreset in config_aneg
    https://git.kernel.org/netdev/net/c/b2cd2cde7d69

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