[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1311072604-24840-1-git-send-email-sr@denx.de>
Date: Tue, 19 Jul 2011 12:50:04 +0200
From: Stefan Roese <sr@...x.de>
To: linuxppc-dev@...abs.org, netdev@...r.kernel.org
Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org>
Subject: [PATCH] net: ibm_newemac: Don't start autonegotiation when disabled in BMCR (genmii)
As noticed on a custom 440GX board using the Micrel KSZ8041 PHY in
fiber mode, a strapped fixed PHY configuration will currently restart
the autonegotiation. This patch checks the BMCR_ANENABLE bit and
skips this autonegotiation if its disabled.
Signed-off-by: Stefan Roese <sr@...x.de>
Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org>
---
drivers/net/ibm_newemac/phy.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ibm_newemac/phy.c
index ac9d964..90afc58 100644
--- a/drivers/net/ibm_newemac/phy.c
+++ b/drivers/net/ibm_newemac/phy.c
@@ -116,6 +116,11 @@ static int genmii_setup_aneg(struct mii_phy *phy, u32 advertise)
ctl = phy_read(phy, MII_BMCR);
if (ctl < 0)
return ctl;
+
+ /* Don't start auto negotiation when its disabled in BMCR */
+ if (!(ctl & BMCR_ANENABLE))
+ return 0;
+
ctl &= ~(BMCR_FULLDPLX | BMCR_SPEED100 | BMCR_SPEED1000 | BMCR_ANENABLE);
/* First clear the PHY */
--
1.7.6
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists