Commit 8b9dc8dd authored by Steve Hodgson's avatar Steve Hodgson Committed by David S. Miller
Browse files

sfc: SFT9001: Fix speed reporting in 1G PHY loopback 



Instead of disabling AN in loopback, just prevent restarting AN and
override the speed in sft9001_get_settings().

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d18835d

drivers/net/sfc/mdio_10g.c

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "net_driver.h"

#include "mdio_10g.h"

#include "boards.h"

#include "workarounds.h"



int mdio_clause45_reset_mmd(struct efx_nic *port, int mmd,

			    int spins, int spintime)
@@ -517,6 +518,9 @@ int mdio_clause45_set_settings(struct efx_nic *efx, 
			reg |= BMCR_ANENABLE | BMCR_ANRESTART;

		else

			reg &= ~BMCR_ANENABLE;

		if (EFX_WORKAROUND_15195(efx)

		    && LOOPBACK_MASK(efx) & efx->phy_op->loopbacks)

			reg &= ~BMCR_ANRESTART;

		if (xnp)

			reg |= 1 << MDIO_AN_CTRL_XNP_LBN;

		else

drivers/net/sfc/tenxpress.c

+9 −18
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx) 
{

	struct tenxpress_phy_data *phy_data = efx->phy_data;

	struct ethtool_cmd ecmd;

	bool phy_mode_change, loop_reset, loop_toggle, loopback;

	bool phy_mode_change, loop_reset;



	if (efx->phy_mode & (PHY_MODE_OFF | PHY_MODE_SPECIAL)) {

		phy_data->phy_mode = efx->phy_mode;
@@ -522,12 +522,10 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx) 


	phy_mode_change = (efx->phy_mode == PHY_MODE_NORMAL &&

			   phy_data->phy_mode != PHY_MODE_NORMAL);

	loopback = LOOPBACK_MASK(efx) & efx->phy_op->loopbacks;

	loop_toggle = LOOPBACK_CHANGED(phy_data, efx, efx->phy_op->loopbacks);

	loop_reset = (LOOPBACK_OUT_OF(phy_data, efx, efx->phy_op->loopbacks) ||

		      LOOPBACK_CHANGED(phy_data, efx, 1 << LOOPBACK_GPHY));



	if (loop_reset || loop_toggle || loopback || phy_mode_change) {

	if (loop_reset || phy_mode_change) {

		int rc;



		efx->phy_op->get_settings(efx, &ecmd);
@@ -542,20 +540,6 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx) 
				falcon_reset_xaui(efx);

		}



		if (efx->phy_type != PHY_TYPE_SFX7101) {

			/* Only change autoneg once, on coming out or

			 * going into loopback */

			if (loop_toggle)

				ecmd.autoneg = !loopback;

			if (loopback) {

				ecmd.duplex = DUPLEX_FULL;

				if (efx->loopback_mode == LOOPBACK_GPHY)

					ecmd.speed = SPEED_1000;

				else

					ecmd.speed = SPEED_10000;

			}

		}



		rc = efx->phy_op->set_settings(efx, &ecmd);

		WARN_ON(rc);

	}
@@ -813,6 +797,13 @@ static void sft9001_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd) 
		ecmd->duplex = (reg & (1 << GPHY_DUPLEX_LBN) ?

				DUPLEX_FULL : DUPLEX_HALF);

	}



	/* In loopback, the PHY automatically brings up the correct interface,

	 * but doesn't advertise the correct speed. So override it */

	if (efx->loopback_mode == LOOPBACK_GPHY)

		ecmd->speed = SPEED_1000;

	else if (LOOPBACK_MASK(efx) & SFT9001_LOOPBACKS)

		ecmd->speed = SPEED_10000;

}



static int sft9001_set_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)

drivers/net/sfc/workarounds.h

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#define EFX_WORKAROUND_FALCON_A(efx) (falcon_rev(efx) <= FALCON_REV_A1)

#define EFX_WORKAROUND_10G(efx) EFX_IS10G(efx)

#define EFX_WORKAROUND_SFT9001A(efx) ((efx)->phy_type == PHY_TYPE_SFT9001A)

#define EFX_WORKAROUND_SFT9001(efx) ((efx)->phy_type == PHY_TYPE_SFT9001A || \

				     (efx)->phy_type == PHY_TYPE_SFT9001B)



/* XAUI resets if link not detected */

#define EFX_WORKAROUND_5147 EFX_WORKAROUND_ALWAYS
@@ -56,4 +58,7 @@ 
/* Need to keep AN enabled */

#define EFX_WORKAROUND_13963 EFX_WORKAROUND_SFT9001A



/* Don't restart AN in near-side loopback */

#define EFX_WORKAROUND_15195 EFX_WORKAROUND_SFT9001



#endif /* EFX_WORKAROUNDS_H */