Commit c1c4f453 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Remove static PHY data and enumerations 



New NICs have firmware managing the PHY, and we will discover the PHY
capabilities at run-time.  Replace the static data with probe() and
test_name() operations.

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

drivers/net/sfc/ethtool.c

+15 −3
Original line number Diff line number Diff line
@@ -365,9 +365,21 @@ static int efx_ethtool_fill_self_tests(struct efx_nic *efx, 
	efx_fill_test(n++, strings, data, &tests->registers,

		      "core", 0, "registers", NULL);



	for (i = 0; i < efx->phy_op->num_tests; i++)

	if (efx->phy_op->run_tests != NULL) {

		EFX_BUG_ON_PARANOID(efx->phy_op->test_name == NULL);



		for (i = 0; true; ++i) {

			const char *name;



			EFX_BUG_ON_PARANOID(i >= EFX_MAX_PHY_TESTS);

			name = efx->phy_op->test_name(efx, i);

			if (name == NULL)

				break;



			efx_fill_test(n++, strings, data, &tests->phy[i],

			      "phy", 0, efx->phy_op->test_names[i], NULL);

				      "phy", 0, name, NULL);

		}

	}



	/* Loopback tests */

	for (mode = LOOPBACK_NONE; mode <= LOOPBACK_TEST_MAX; mode++) {

drivers/net/sfc/falcon.c

+4 −11
Original line number Diff line number Diff line
@@ -2291,19 +2291,12 @@ static int falcon_probe_port(struct efx_nic *efx) 
		return -ENODEV;

	}



	if (efx->phy_op->macs & EFX_XMAC)

		efx->loopback_modes |= ((1 << LOOPBACK_XGMII) |

					(1 << LOOPBACK_XGXS) |

					(1 << LOOPBACK_XAUI));

	if (efx->phy_op->macs & EFX_GMAC)

		efx->loopback_modes |= (1 << LOOPBACK_GMAC);

	efx->loopback_modes |= efx->phy_op->loopbacks;



	/* Set up MDIO structure for PHY */

	efx->mdio.mmds = efx->phy_op->mmds;

	efx->mdio.mode_support = MDIO_SUPPORTS_C45 | MDIO_EMULATE_C22;

	/* Fill out MDIO structure and loopback modes */

	efx->mdio.mdio_read = falcon_mdio_read;

	efx->mdio.mdio_write = falcon_mdio_write;

	rc = efx->phy_op->probe(efx);

	if (rc != 0)

		return rc;



	/* Initial assumption */

	efx->link_state.speed = 10000;

drivers/net/sfc/falcon.h

+20 −0
Original line number Diff line number Diff line
@@ -38,6 +38,26 @@ static inline bool efx_nic_is_dual_func(struct efx_nic *efx) 
	return efx_nic_rev(efx) < EFX_REV_FALCON_B0;

}



enum {

	PHY_TYPE_NONE = 0,

	PHY_TYPE_TXC43128 = 1,

	PHY_TYPE_88E1111 = 2,

	PHY_TYPE_SFX7101 = 3,

	PHY_TYPE_QT2022C2 = 4,

	PHY_TYPE_PM8358 = 6,

	PHY_TYPE_SFT9001A = 8,

	PHY_TYPE_QT2025C = 9,

	PHY_TYPE_SFT9001B = 10,

};



#define FALCON_XMAC_LOOPBACKS			\

	((1 << LOOPBACK_XGMII) |		\

	 (1 << LOOPBACK_XGXS) |			\

	 (1 << LOOPBACK_XAUI))



#define FALCON_GMAC_LOOPBACKS			\

	(1 << LOOPBACK_GMAC)



/**

 * struct falcon_board_type - board operations and type information

 * @id: Board type id, as found in NVRAM

drivers/net/sfc/falcon_xmac.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static bool falcon_xaui_link_ok(struct efx_nic *efx) 


	/* If the link is up, then check the phy side of the xaui link */

	if (efx->link_state.up && link_ok)

		if (efx->phy_op->mmds & (1 << MDIO_MMD_PHYXS))

		if (efx->mdio.mmds & (1 << MDIO_MMD_PHYXS))

			link_ok = efx_mdio_phyxgxs_lane_sync(efx);



	return link_ok;

drivers/net/sfc/mdio_10g.c

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

#include "mdio_10g.h"

#include "workarounds.h"

#include "falcon.h"



unsigned efx_mdio_id_oui(u32 id)

{
@@ -312,8 +313,7 @@ void efx_mdio_an_reconfigure(struct efx_nic *efx) 
	/* Enable and restart AN */

	reg = efx_mdio_read(efx, MDIO_MMD_AN, MDIO_CTRL1);

	reg |= MDIO_AN_CTRL1_ENABLE;

	if (!(EFX_WORKAROUND_15195(efx) &&

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

	if (!(EFX_WORKAROUND_15195(efx) && LOOPBACK_EXTERNAL(efx)))

		reg |= MDIO_AN_CTRL1_RESTART;

	if (xnp)

		reg |= MDIO_AN_CTRL1_XNP;