svn commit: r280560 - stable/10/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Wed Mar 25 11:01:03 2015
New Revision: 280560
URL: https://svnweb.freebsd.org/changeset/base/280560

Log:
  MFC: 279096
  
  sfxge: keep fw and driver view of autoneg parameters consistent
  
  Previously the driver's view was the expected outcome of any
  reconfiguration even if that reconfiguration failed.
  
  Submitted by:   Ben Horgan
  Sponsored by:   Solarflare Communications, Inc.
  Approved by:    gnn (mentor)

Modified:
  stable/10/sys/dev/sfxge/common/efx_phy.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/efx_phy.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_phy.c	Wed Mar 25 11:00:09 2015	(r280559)
+++ stable/10/sys/dev/sfxge/common/efx_phy.c	Wed Mar 25 11:01:03 2015	(r280560)
@@ -427,6 +427,7 @@ efx_phy_adv_cap_set(
 {
 	efx_port_t *epp = &(enp->en_port);
 	efx_phy_ops_t *epop = epp->ep_epop;
+	uint32_t old_mask;
 	int rc;
 
 	EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
@@ -440,6 +441,7 @@ efx_phy_adv_cap_set(
 	if (epp->ep_adv_cap_mask == mask)
 		goto done;
 
+	old_mask = epp->ep_adv_cap_mask;
 	epp->ep_adv_cap_mask = mask;
 
 	if ((rc = epop->epo_reconfigure(enp)) != 0)
@@ -450,6 +452,17 @@ done:
 
 fail2:
 	EFSYS_PROBE(fail2);
+
+	epp->ep_adv_cap_mask = old_mask;
+	/* Reconfigure for robustness */
+	if (epop->epo_reconfigure(enp) != 0) {
+		/*
+		 * We may have an inconsistent view of our advertised speed
+		 * capabilities.
+		 */
+		EFSYS_ASSERT(0);
+	}
+
 fail1:
 	EFSYS_PROBE1(fail1, int, rc);