broadcom: Fix slow link problem

PATCH In review Matt Carlson 1 participant 1 message Nov 3, 2009

Subsystems (4)

Networking Network drivers Ethernet PHY Broadcom Ethernet PHY drivers

lore

Share & tools

lore

Matt Carlson

author

2009-11-03 01:33 UTC #0 lore raw

PATCH 12/20 broadcom: Fix slow link problem

When a 50610 or 50610M is paired against particular remote partners, link is slow to come up. This patch works around the problem.

Signed-off-by Matt Carlson <[email protected]>

Reviewed-by Michael Chan <[email protected]>

---
 drivers/net/phy/broadcom.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

drivers/net/phy/broadcom.c +14 -8

index 9e574ce..1a2b2f2 100644
@@ -242,12 +242,6 @@ static int bcm50610_a0_workaround(struct phy_device *phydev)
 {
 	int err;
 
-	err = bcm54xx_exp_write(phydev, MII_BCM54XX_EXP_EXP08,
-				MII_BCM54XX_EXP_EXP08_RJCT_2MHZ	|
-				MII_BCM54XX_EXP_EXP08_EARLY_DAC_WAKE);
-	if (err < 0)
-		return err;
-
 	err = bcm54xx_exp_write(phydev, MII_BCM54XX_EXP_AADJ1CH0,
 				MII_BCM54XX_EXP_AADJ1CH0_SWP_ABCD_OEN |
 				MII_BCM54XX_EXP_AADJ1CH0_SWSEL_THPF);

@@ -287,8 +281,20 @@ static int bcm54xx_phydsp_config(struct phy_device *phydev)
 	if (err < 0)
 		return err;
 
-	if (phydev->drv->phy_id == PHY_ID_BCM50610)
-		err = bcm50610_a0_workaround(phydev);
+	if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM50610 ||
+	    BRCM_PHY_MODEL(phydev) == PHY_ID_BCM50610M) {
+		/* Clear bit 9 to fix a phy interop issue. */
+		err = bcm54xx_exp_write(phydev, MII_BCM54XX_EXP_EXP08,
+					MII_BCM54XX_EXP_EXP08_RJCT_2MHZ);
+		if (err < 0)
+			goto error;
+
+		if (phydev->drv->phy_id == PHY_ID_BCM50610) {
+			err = bcm50610_a0_workaround(phydev);
+			if (err < 0)
+				goto error;
+		}
+	}
 
 	if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM57780) {
 		int val;

Signature · 1 line

1.6.4.4