Skip to contentSkip to conversation

net: phy: marvell: Do not reset 88e1310 after autoneg

PATCH In review Nathan Rossi 5 participants 5 messages Jun 3, 2016 – Jun 21, 2016

Subsystems (2)
Network drivers Ethernet PHY
lore
Share & tools
lore

Nathan Rossi

author
#0 lore raw

PATCH 1/1 net: phy: marvell: Do not reset 88e1310 after autoneg

Commit a058052c "net: phy: do not read configuration register on reset", changes the behaviour of the phy_reset function such that the state of the BMCR register is not preserved during reset.

Change the config function for the m88e1310 so that it does not do a reset after configuring auto-negotiation.

Signed-off-by Nathan Rossi <[email protected]>
Cc Joe Hershberger <[email protected]>
Cc Michal Simek <[email protected]>
Cc Stefan Roese <[email protected]>
---
 drivers/net/phy/marvell.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/phy/marvell.c +1 -4
index d2e68d4..58d287b 100644
@@ -476,10 +476,7 @@ static int m88e1310_config(struct phy_device *phydev)
 	/* Ensure to return to page 0 */
 	phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1310_PHY_PAGE, 0x0000);
 
-	genphy_config_aneg(phydev);
-	phy_reset(phydev);
-
-	return 0;
+	return genphy_config_aneg(phydev);
 }
 
 static struct phy_driver M88E1011S_driver = {
Signature · 1 line
2.8.1
#1 lore raw

PATCH 1/1 net: phy: marvell: Do not reset 88e1310 after autoneg

Quoted 22 lines · Nathan Rossi

Commit a058052c "net: phy: do not read configuration register on reset", changes the behaviour of the phy_reset function such that the state of the BMCR register is not preserved during reset.

Change the config function for the m88e1310 so that it does not do a reset after configuring auto-negotiation.

Signed-off-by Nathan Rossi <[email protected]>
Cc Joe Hershberger <[email protected]>
Cc Michal Simek <[email protected]>
Cc Stefan Roese <[email protected]>
---
 drivers/net/phy/marvell.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/phy/marvell.c +0 -0
index d2e68d4..58d287b 100644
@@ -476,10 +476,7 @@ static int m88e1310_config(struct phy_device *phydev)
 	/* Ensure to return to page 0 */

drivers/net/phy/marvell.c static int m88e1310_config(struct phy_device *phydev) · line 482

Quoted 10 lines
drivers/net/phy/marvell.c +1 -4
 	phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1310_PHY_PAGE, 0x0000);
 
-	genphy_config_aneg(phydev);
-	phy_reset(phydev);
-
-	return 0;
+	return genphy_config_aneg(phydev);
 }
 
 static struct phy_driver M88E1011S_driver = {
Acked-by Michal Simek <[email protected]>

Thanks,
Michal

#2 lore raw

PATCH 1/1 net: phy: marvell: Do not reset 88e1310 after autoneg

In reply to Nathan Rossi
Quoted 11 lines · Nathan Rossi

Commit a058052c "net: phy: do not read configuration register on reset", changes the behaviour of the phy_reset function such that the state of the BMCR register is not preserved during reset.

Change the config function for the m88e1310 so that it does not do a reset after configuring auto-negotiation.

Signed-off-by Nathan Rossi <[email protected]>
Cc Joe Hershberger <[email protected]>
Cc Michal Simek <[email protected]>
Cc Stefan Roese <[email protected]>
Acked-by Joe Hershberger <[email protected]>
#3 lore raw

PATCH 1/1 net: phy: marvell: Do not reset 88e1310 after autoneg

In reply to Nathan Rossi
Quoted 11 lines · Nathan Rossi

Commit a058052c "net: phy: do not read configuration register on reset", changes the behaviour of the phy_reset function such that the state of the BMCR register is not preserved during reset.

Change the config function for the m88e1310 so that it does not do a reset after configuring auto-negotiation.

Signed-off-by Nathan Rossi <[email protected]>
Cc Joe Hershberger <[email protected]>
Cc Michal Simek <[email protected]>
Cc Stefan Roese <[email protected]>
Reviewed-by Stefan Roese <[email protected]>

Thanks,
Stefan