diff mbox

[U-Boot,2/2] net: phy: marvell: Fix problem with phy_reset() clearing BMCR

Message ID 1455084366-13147-2-git-send-email-sr@denx.de
State Accepted
Commit a8c3eca43393cffef16a40e683f7a4d45b37e6ed
Delegated to: Joe Hershberger
Headers show

Commit Message

Stefan Roese Feb. 10, 2016, 6:06 a.m. UTC
With commit a058052c [net: phy: do not read configuration register on
reset], phy_reset() will clear the BMCR register. Resulting in bit 12
being cleared (A/N enable). This leads to autonegotiation link problems,
at least on the Marvell Armada ClearFog board. I suspect that other
boards using this driver will be affected as well.

At the of m88e1111s_config(), phy_reset() is called. This is not needed
for the PHY to load the changed configuration, as phy_reset() is called
a few lines before already. So lets call genphy_restart_aneg() here
instead to start the AN correctly.

Tested on clearfog.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Hao Zhang <hzhang@ti.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Andy Fleming <afleming@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
---
 drivers/net/phy/marvell.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Joe Hershberger Feb. 10, 2016, 4:11 p.m. UTC | #1
On Wed, Feb 10, 2016 at 12:06 AM, Stefan Roese <sr@denx.de> wrote:
> With commit a058052c [net: phy: do not read configuration register on
> reset], phy_reset() will clear the BMCR register. Resulting in bit 12
> being cleared (A/N enable). This leads to autonegotiation link problems,
> at least on the Marvell Armada ClearFog board. I suspect that other
> boards using this driver will be affected as well.
>
> At the of m88e1111s_config(), phy_reset() is called. This is not needed
> for the PHY to load the changed configuration, as phy_reset() is called
> a few lines before already. So lets call genphy_restart_aneg() here
> instead to start the AN correctly.
>
> Tested on clearfog.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Hao Zhang <hzhang@ti.com>
> Cc: Michal Simek <monstr@monstr.eu>
> Cc: Andy Fleming <afleming@gmail.com>
> Cc: Joe Hershberger <joe.hershberger@ni.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Joe Hershberger Feb. 18, 2016, 5:39 p.m. UTC | #2
Hi Stefan,

https://patchwork.ozlabs.org/patch/581317/ was applied to u-boot-net.git.

Thanks!
-Joe
diff mbox

Patch

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 6e3dc85..b8b1157 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -251,8 +251,7 @@  static int m88e1111s_config(struct phy_device *phydev)
 	phy_reset(phydev);
 
 	genphy_config_aneg(phydev);
-
-	phy_reset(phydev);
+	genphy_restart_aneg(phydev);
 
 	return 0;
 }