diff mbox

[8/8] sfc: If AN is enabled, always read speed/duplex from the AN advertising bits

Message ID 1230176613.3401.54.camel@deadeye.i.decadent.org.uk
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Ben Hutchings Dec. 25, 2008, 3:43 a.m. UTC 
When AN is enabled and the link is down the speed/duplex control bits
will not be meaningful.  Use the advertising bits instead, and mask
them with the LPA bits if and only if AN is complete (as before).

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---
 drivers/net/sfc/mdio_10g.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

Comments

David Miller Dec. 26, 2008, 9:49 p.m. UTC | #1 
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 25 Dec 2008 03:43:33 +0000

> When AN is enabled and the link is down the speed/duplex control bits
> will not be meaningful.  Use the advertising bits instead, and mask
> them with the LPA bits if and only if AN is complete (as before).
> 
> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c
index f131ad2..f6a1642 100644
--- a/drivers/net/sfc/mdio_10g.c
+++ b/drivers/net/sfc/mdio_10g.c
@@ -368,13 +368,16 @@  void mdio_clause45_get_settings_ext(struct efx_nic *efx,
 	} else
 		ecmd->autoneg = AUTONEG_DISABLE;
 
-	/* If AN is enabled and complete, report best common mode */
-	if (ecmd->autoneg &&
-	    (mdio_clause45_read(efx, phy_id, MDIO_MMD_AN, MDIO_MMDREG_STAT1) &
-	     (1 << MDIO_AN_STATUS_AN_DONE_LBN))) {
-		u32 common, lpa;
-		lpa = mdio_clause45_get_an(efx, MDIO_AN_LPA, xnp_lpa);
-		common = ecmd->advertising & lpa;
+	if (ecmd->autoneg) {
+		/* If AN is complete, report best common mode,
+		 * otherwise report best advertised mode. */
+		u32 common = ecmd->advertising;
+		if (mdio_clause45_read(efx, phy_id, MDIO_MMD_AN,
+				       MDIO_MMDREG_STAT1) &
+		    (1 << MDIO_AN_STATUS_AN_DONE_LBN)) {
+			common &= mdio_clause45_get_an(efx, MDIO_AN_LPA,
+						       xnp_lpa);
+		}
 		if (common & ADVERTISED_10000baseT_Full) {
 			ecmd->speed = SPEED_10000;
 			ecmd->duplex = DUPLEX_FULL;