Commit c77289b4 authored by Edward Cree's avatar Edward Cree Committed by Jakub Kicinski
Browse files

sfc: remove phy_op indirection 



Originally there were several implementations of PHY operations for the
 several different PHYs used on Falcon boards.  But Falcon is now in a
 separate driver, and all sfc NICs since then have had MCDI-managed PHYs.
Thus, there is no need to indirect through function pointers in
 efx->phy_op; we can simply call the efx_mcdi_phy_* functions directly.

This also hooks up these functions for EF100, which was previously using
 the dummy_phy_ops.

Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7dcc9d8a

drivers/net/ethernet/sfc/efx.c

+5 −12
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "selftest.h"

#include "sriov.h"



#include "mcdi.h"

#include "mcdi_port_common.h"

#include "mcdi_pcol.h"

#include "workarounds.h"
@@ -149,23 +149,17 @@ static int efx_init_port(struct efx_nic *efx) 


	mutex_lock(&efx->mac_lock);



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

	if (rc)

		goto fail1;



	efx->port_initialized = true;



	/* Ensure the PHY advertises the correct flow control settings */

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

	rc = efx_mcdi_port_reconfigure(efx);

	if (rc && rc != -EPERM)

		goto fail2;

		goto fail;



	mutex_unlock(&efx->mac_lock);

	return 0;



fail2:

	efx->phy_op->fini(efx);

fail1:

fail:

	mutex_unlock(&efx->mac_lock);

	return rc;

}
@@ -177,7 +171,6 @@ static void efx_fini_port(struct efx_nic *efx) 
	if (!efx->port_initialized)

		return;



	efx->phy_op->fini(efx);

	efx->port_initialized = false;



	efx->link_state.up = false;
@@ -1229,7 +1222,7 @@ static int efx_pm_thaw(struct device *dev) 
			goto fail;



		mutex_lock(&efx->mac_lock);

		efx->phy_op->reconfigure(efx);

		efx_mcdi_port_reconfigure(efx);

		mutex_unlock(&efx->mac_lock);



		efx_start_all(efx);

drivers/net/ethernet/sfc/efx_common.c

+4 −22
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "rx_common.h"

#include "tx_common.h"

#include "nic.h"

#include "mcdi_port_common.h"

#include "io.h"

#include "mcdi_pcol.h"
@@ -544,7 +545,7 @@ void efx_start_all(struct efx_nic *efx) 
	 * to poll now because we could have missed a change

	 */

	mutex_lock(&efx->mac_lock);

	if (efx->phy_op->poll(efx))

	if (efx_mcdi_phy_poll(efx))

		efx_link_status_changed(efx);

	mutex_unlock(&efx->mac_lock);
@@ -714,9 +715,6 @@ void efx_reset_down(struct efx_nic *efx, enum reset_type method) 
	mutex_lock(&efx->mac_lock);

	down_write(&efx->filter_sem);

	mutex_lock(&efx->rss_lock);

	if (efx->port_initialized && method != RESET_TYPE_INVISIBLE &&

	    method != RESET_TYPE_DATAPATH)

		efx->phy_op->fini(efx);

	efx->type->fini(efx);

}
@@ -759,10 +757,7 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method, bool ok) 


	if (efx->port_initialized && method != RESET_TYPE_INVISIBLE &&

	    method != RESET_TYPE_DATAPATH) {

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

		if (rc)

			goto fail;

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

		rc = efx_mcdi_port_reconfigure(efx);

		if (rc && rc != -EPERM)

			netif_err(efx, drv, efx->net_dev,

				  "could not restore PHY settings\n");
@@ -959,7 +954,7 @@ void efx_schedule_reset(struct efx_nic *efx, enum reset_type type) 


/**************************************************************************

 *

 * Dummy PHY/MAC operations

 * Dummy NIC operations

 *

 * Can be used for some unimplemented operations

 * Needed so all function pointers are valid and do not have to be tested
@@ -972,18 +967,6 @@ int efx_port_dummy_op_int(struct efx_nic *efx) 
}

void efx_port_dummy_op_void(struct efx_nic *efx) {}



static bool efx_port_dummy_op_poll(struct efx_nic *efx)

{

	return false;

}



static const struct efx_phy_operations efx_dummy_phy_operations = {

	.init		 = efx_port_dummy_op_int,

	.reconfigure	 = efx_port_dummy_op_int,

	.poll		 = efx_port_dummy_op_poll,

	.fini		 = efx_port_dummy_op_void,

};



/**************************************************************************

 *

 * Data housekeeping
@@ -1037,7 +1020,6 @@ int efx_init_struct(struct efx_nic *efx, 
	efx->rps_hash_table = kcalloc(EFX_ARFS_HASH_TABLE_SIZE,

				      sizeof(*efx->rps_hash_table), GFP_KERNEL);

#endif

	efx->phy_op = &efx_dummy_phy_operations;

	efx->mdio.dev = net_dev;

	INIT_WORK(&efx->mac_work, efx_mac_work);

	init_waitqueue_head(&efx->flush_wq);

drivers/net/ethernet/sfc/ethtool_common.c

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

#include "rx_common.h"

#include "ethtool_common.h"

#include "mcdi_port_common.h"



struct efx_sw_stat_desc {

	const char *name;
@@ -221,7 +222,7 @@ int efx_ethtool_set_pauseparam(struct net_device *net_dev, 
	efx_link_set_wanted_fc(efx, wanted_fc);

	if (efx->link_advertising[0] != old_adv ||

	    (efx->wanted_fc ^ old_fc) & EFX_FC_AUTO) {

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

		rc = efx_mcdi_port_reconfigure(efx);

		if (rc) {

			netif_err(efx, drv, efx->net_dev,

				  "Unable to advertise requested flow "
@@ -372,20 +373,15 @@ int efx_ethtool_fill_self_tests(struct efx_nic *efx, 
	efx_fill_test(n++, strings, data, &tests->registers,

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



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

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



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

		const char *name;



		EFX_WARN_ON_PARANOID(i >= EFX_MAX_PHY_TESTS);

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

		name = efx_mcdi_phy_test_name(efx, i);

		if (name == NULL)

			break;



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

				      "phy", 0, name, NULL);

		}

		efx_fill_test(n++, strings, data, &tests->phy_ext[i], "phy", 0, name, NULL);

	}



	/* Loopback tests */
@@ -571,7 +567,7 @@ int efx_ethtool_get_link_ksettings(struct net_device *net_dev, 
	u32 supported;



	mutex_lock(&efx->mac_lock);

	efx->phy_op->get_link_ksettings(efx, cmd);

	efx_mcdi_phy_get_link_ksettings(efx, cmd);

	mutex_unlock(&efx->mac_lock);



	/* Both MACs support pause frames (bidirectional and respond-only) */
@@ -607,7 +603,7 @@ int efx_ethtool_set_link_ksettings(struct net_device *net_dev, 
	}



	mutex_lock(&efx->mac_lock);

	rc = efx->phy_op->set_link_ksettings(efx, cmd);

	rc = efx_mcdi_phy_set_link_ksettings(efx, cmd);

	mutex_unlock(&efx->mac_lock);

	return rc;

}
@@ -618,10 +614,8 @@ int efx_ethtool_get_fecparam(struct net_device *net_dev, 
	struct efx_nic *efx = netdev_priv(net_dev);

	int rc;



	if (!efx->phy_op || !efx->phy_op->get_fecparam)

		return -EOPNOTSUPP;

	mutex_lock(&efx->mac_lock);

	rc = efx->phy_op->get_fecparam(efx, fecparam);

	rc = efx_mcdi_phy_get_fecparam(efx, fecparam);

	mutex_unlock(&efx->mac_lock);



	return rc;
@@ -633,10 +627,8 @@ int efx_ethtool_set_fecparam(struct net_device *net_dev, 
	struct efx_nic *efx = netdev_priv(net_dev);

	int rc;



	if (!efx->phy_op || !efx->phy_op->get_fecparam)

		return -EOPNOTSUPP;

	mutex_lock(&efx->mac_lock);

	rc = efx->phy_op->set_fecparam(efx, fecparam);

	rc = efx_mcdi_phy_set_fecparam(efx, fecparam);

	mutex_unlock(&efx->mac_lock);



	return rc;
@@ -1332,11 +1324,8 @@ int efx_ethtool_get_module_eeprom(struct net_device *net_dev, 
	struct efx_nic *efx = netdev_priv(net_dev);

	int ret;



	if (!efx->phy_op || !efx->phy_op->get_module_eeprom)

		return -EOPNOTSUPP;



	mutex_lock(&efx->mac_lock);

	ret = efx->phy_op->get_module_eeprom(efx, ee, data);

	ret = efx_mcdi_phy_get_module_eeprom(efx, ee, data);

	mutex_unlock(&efx->mac_lock);



	return ret;
@@ -1348,11 +1337,8 @@ int efx_ethtool_get_module_info(struct net_device *net_dev, 
	struct efx_nic *efx = netdev_priv(net_dev);

	int ret;



	if (!efx->phy_op || !efx->phy_op->get_module_info)

		return -EOPNOTSUPP;



	mutex_lock(&efx->mac_lock);

	ret = efx->phy_op->get_module_info(efx, modinfo);

	ret = efx_mcdi_phy_get_module_info(efx, modinfo);

	mutex_unlock(&efx->mac_lock);



	return ret;

drivers/net/ethernet/sfc/mcdi.h

+0 −1
Original line number Diff line number Diff line
@@ -355,7 +355,6 @@ int efx_mcdi_wol_filter_get_magic(struct efx_nic *efx, int *id_out); 
int efx_mcdi_wol_filter_remove(struct efx_nic *efx, int id);

int efx_mcdi_wol_filter_reset(struct efx_nic *efx);

int efx_mcdi_flush_rxqs(struct efx_nic *efx);

int efx_mcdi_port_reconfigure(struct efx_nic *efx);

void efx_mcdi_process_link_change(struct efx_nic *efx, efx_qword_t *ev);

void efx_mcdi_mac_start_stats(struct efx_nic *efx);

void efx_mcdi_mac_stop_stats(struct efx_nic *efx);

drivers/net/ethernet/sfc/mcdi_port.c

+2 −591
Original line number Diff line number Diff line
@@ -70,592 +70,6 @@ static int efx_mcdi_mdio_write(struct net_device *net_dev, 
	return 0;

}



static int efx_mcdi_phy_probe(struct efx_nic *efx)

{

	struct efx_mcdi_phy_data *phy_data;

	MCDI_DECLARE_BUF(outbuf, MC_CMD_GET_LINK_OUT_LEN);

	u32 caps;

	int rc;



	/* Initialise and populate phy_data */

	phy_data = kzalloc(sizeof(*phy_data), GFP_KERNEL);

	if (phy_data == NULL)

		return -ENOMEM;



	rc = efx_mcdi_get_phy_cfg(efx, phy_data);

	if (rc != 0)

		goto fail;



	/* Read initial link advertisement */

	BUILD_BUG_ON(MC_CMD_GET_LINK_IN_LEN != 0);

	rc = efx_mcdi_rpc(efx, MC_CMD_GET_LINK, NULL, 0,

			  outbuf, sizeof(outbuf), NULL);

	if (rc)

		goto fail;



	/* Fill out nic state */

	efx->phy_data = phy_data;

	efx->phy_type = phy_data->type;



	efx->mdio_bus = phy_data->channel;

	efx->mdio.prtad = phy_data->port;

	efx->mdio.mmds = phy_data->mmd_mask & ~(1 << MC_CMD_MMD_CLAUSE22);

	efx->mdio.mode_support = 0;

	if (phy_data->mmd_mask & (1 << MC_CMD_MMD_CLAUSE22))

		efx->mdio.mode_support |= MDIO_SUPPORTS_C22;

	if (phy_data->mmd_mask & ~(1 << MC_CMD_MMD_CLAUSE22))

		efx->mdio.mode_support |= MDIO_SUPPORTS_C45 | MDIO_EMULATE_C22;



	caps = MCDI_DWORD(outbuf, GET_LINK_OUT_CAP);

	if (caps & (1 << MC_CMD_PHY_CAP_AN_LBN))

		mcdi_to_ethtool_linkset(phy_data->media, caps,

					efx->link_advertising);

	else

		phy_data->forced_cap = caps;



	/* Assert that we can map efx -> mcdi loopback modes */

	BUILD_BUG_ON(LOOPBACK_NONE != MC_CMD_LOOPBACK_NONE);

	BUILD_BUG_ON(LOOPBACK_DATA != MC_CMD_LOOPBACK_DATA);

	BUILD_BUG_ON(LOOPBACK_GMAC != MC_CMD_LOOPBACK_GMAC);

	BUILD_BUG_ON(LOOPBACK_XGMII != MC_CMD_LOOPBACK_XGMII);

	BUILD_BUG_ON(LOOPBACK_XGXS != MC_CMD_LOOPBACK_XGXS);

	BUILD_BUG_ON(LOOPBACK_XAUI != MC_CMD_LOOPBACK_XAUI);

	BUILD_BUG_ON(LOOPBACK_GMII != MC_CMD_LOOPBACK_GMII);

	BUILD_BUG_ON(LOOPBACK_SGMII != MC_CMD_LOOPBACK_SGMII);

	BUILD_BUG_ON(LOOPBACK_XGBR != MC_CMD_LOOPBACK_XGBR);

	BUILD_BUG_ON(LOOPBACK_XFI != MC_CMD_LOOPBACK_XFI);

	BUILD_BUG_ON(LOOPBACK_XAUI_FAR != MC_CMD_LOOPBACK_XAUI_FAR);

	BUILD_BUG_ON(LOOPBACK_GMII_FAR != MC_CMD_LOOPBACK_GMII_FAR);

	BUILD_BUG_ON(LOOPBACK_SGMII_FAR != MC_CMD_LOOPBACK_SGMII_FAR);

	BUILD_BUG_ON(LOOPBACK_XFI_FAR != MC_CMD_LOOPBACK_XFI_FAR);

	BUILD_BUG_ON(LOOPBACK_GPHY != MC_CMD_LOOPBACK_GPHY);

	BUILD_BUG_ON(LOOPBACK_PHYXS != MC_CMD_LOOPBACK_PHYXS);

	BUILD_BUG_ON(LOOPBACK_PCS != MC_CMD_LOOPBACK_PCS);

	BUILD_BUG_ON(LOOPBACK_PMAPMD != MC_CMD_LOOPBACK_PMAPMD);

	BUILD_BUG_ON(LOOPBACK_XPORT != MC_CMD_LOOPBACK_XPORT);

	BUILD_BUG_ON(LOOPBACK_XGMII_WS != MC_CMD_LOOPBACK_XGMII_WS);

	BUILD_BUG_ON(LOOPBACK_XAUI_WS != MC_CMD_LOOPBACK_XAUI_WS);

	BUILD_BUG_ON(LOOPBACK_XAUI_WS_FAR != MC_CMD_LOOPBACK_XAUI_WS_FAR);

	BUILD_BUG_ON(LOOPBACK_XAUI_WS_NEAR != MC_CMD_LOOPBACK_XAUI_WS_NEAR);

	BUILD_BUG_ON(LOOPBACK_GMII_WS != MC_CMD_LOOPBACK_GMII_WS);

	BUILD_BUG_ON(LOOPBACK_XFI_WS != MC_CMD_LOOPBACK_XFI_WS);

	BUILD_BUG_ON(LOOPBACK_XFI_WS_FAR != MC_CMD_LOOPBACK_XFI_WS_FAR);

	BUILD_BUG_ON(LOOPBACK_PHYXS_WS != MC_CMD_LOOPBACK_PHYXS_WS);



	rc = efx_mcdi_loopback_modes(efx, &efx->loopback_modes);

	if (rc != 0)

		goto fail;

	/* The MC indicates that LOOPBACK_NONE is a valid loopback mode,

	 * but by convention we don't */

	efx->loopback_modes &= ~(1 << LOOPBACK_NONE);



	/* Set the initial link mode */

	efx_mcdi_phy_decode_link(

		efx, &efx->link_state,

		MCDI_DWORD(outbuf, GET_LINK_OUT_LINK_SPEED),

		MCDI_DWORD(outbuf, GET_LINK_OUT_FLAGS),

		MCDI_DWORD(outbuf, GET_LINK_OUT_FCNTL));



	/* Record the initial FEC configuration (or nearest approximation

	 * representable in the ethtool configuration space)

	 */

	efx->fec_config = mcdi_fec_caps_to_ethtool(caps,

						   efx->link_state.speed == 25000 ||

						   efx->link_state.speed == 50000);



	/* Default to Autonegotiated flow control if the PHY supports it */

	efx->wanted_fc = EFX_FC_RX | EFX_FC_TX;

	if (phy_data->supported_cap & (1 << MC_CMD_PHY_CAP_AN_LBN))

		efx->wanted_fc |= EFX_FC_AUTO;

	efx_link_set_wanted_fc(efx, efx->wanted_fc);



	return 0;



fail:

	kfree(phy_data);

	return rc;

}



static void efx_mcdi_phy_remove(struct efx_nic *efx)

{

	struct efx_mcdi_phy_data *phy_data = efx->phy_data;



	efx->phy_data = NULL;

	kfree(phy_data);

}



static void efx_mcdi_phy_get_link_ksettings(struct efx_nic *efx,

					    struct ethtool_link_ksettings *cmd)

{

	struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;

	MCDI_DECLARE_BUF(outbuf, MC_CMD_GET_LINK_OUT_LEN);

	int rc;



	cmd->base.speed = efx->link_state.speed;

	cmd->base.duplex = efx->link_state.fd;

	cmd->base.port = mcdi_to_ethtool_media(phy_cfg->media);

	cmd->base.phy_address = phy_cfg->port;

	cmd->base.autoneg = !!(efx->link_advertising[0] & ADVERTISED_Autoneg);

	cmd->base.mdio_support = (efx->mdio.mode_support &

			      (MDIO_SUPPORTS_C45 | MDIO_SUPPORTS_C22));



	mcdi_to_ethtool_linkset(phy_cfg->media, phy_cfg->supported_cap,

				cmd->link_modes.supported);

	memcpy(cmd->link_modes.advertising, efx->link_advertising,

	       sizeof(__ETHTOOL_DECLARE_LINK_MODE_MASK()));



	BUILD_BUG_ON(MC_CMD_GET_LINK_IN_LEN != 0);

	rc = efx_mcdi_rpc(efx, MC_CMD_GET_LINK, NULL, 0,

			  outbuf, sizeof(outbuf), NULL);

	if (rc)

		return;

	mcdi_to_ethtool_linkset(phy_cfg->media,

				MCDI_DWORD(outbuf, GET_LINK_OUT_LP_CAP),

				cmd->link_modes.lp_advertising);

}



static int

efx_mcdi_phy_set_link_ksettings(struct efx_nic *efx,

				const struct ethtool_link_ksettings *cmd)

{

	struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;

	u32 caps;

	int rc;



	if (cmd->base.autoneg) {

		caps = (ethtool_linkset_to_mcdi_cap(cmd->link_modes.advertising) |

			1 << MC_CMD_PHY_CAP_AN_LBN);

	} else if (cmd->base.duplex) {

		switch (cmd->base.speed) {

		case 10:     caps = 1 << MC_CMD_PHY_CAP_10FDX_LBN;     break;

		case 100:    caps = 1 << MC_CMD_PHY_CAP_100FDX_LBN;    break;

		case 1000:   caps = 1 << MC_CMD_PHY_CAP_1000FDX_LBN;   break;

		case 10000:  caps = 1 << MC_CMD_PHY_CAP_10000FDX_LBN;  break;

		case 40000:  caps = 1 << MC_CMD_PHY_CAP_40000FDX_LBN;  break;

		case 100000: caps = 1 << MC_CMD_PHY_CAP_100000FDX_LBN; break;

		case 25000:  caps = 1 << MC_CMD_PHY_CAP_25000FDX_LBN;  break;

		case 50000:  caps = 1 << MC_CMD_PHY_CAP_50000FDX_LBN;  break;

		default:     return -EINVAL;

		}

	} else {

		switch (cmd->base.speed) {

		case 10:     caps = 1 << MC_CMD_PHY_CAP_10HDX_LBN;     break;

		case 100:    caps = 1 << MC_CMD_PHY_CAP_100HDX_LBN;    break;

		case 1000:   caps = 1 << MC_CMD_PHY_CAP_1000HDX_LBN;   break;

		default:     return -EINVAL;

		}

	}



	caps |= ethtool_fec_caps_to_mcdi(efx->fec_config);



	rc = efx_mcdi_set_link(efx, caps, efx_get_mcdi_phy_flags(efx),

			       efx->loopback_mode, 0);

	if (rc)

		return rc;



	if (cmd->base.autoneg) {

		efx_link_set_advertising(efx, cmd->link_modes.advertising);

		phy_cfg->forced_cap = 0;

	} else {

		efx_link_clear_advertising(efx);

		phy_cfg->forced_cap = caps;

	}

	return 0;

}



static int efx_mcdi_phy_set_fecparam(struct efx_nic *efx,

				     const struct ethtool_fecparam *fec)

{

	struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;

	u32 caps;

	int rc;



	/* Work out what efx_mcdi_phy_set_link_ksettings() would produce from

	 * saved advertising bits

	 */

	if (test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, efx->link_advertising))

		caps = (ethtool_linkset_to_mcdi_cap(efx->link_advertising) |

			1 << MC_CMD_PHY_CAP_AN_LBN);

	else

		caps = phy_cfg->forced_cap;



	caps |= ethtool_fec_caps_to_mcdi(fec->fec);

	rc = efx_mcdi_set_link(efx, caps, efx_get_mcdi_phy_flags(efx),

			       efx->loopback_mode, 0);

	if (rc)

		return rc;



	/* Record the new FEC setting for subsequent set_link calls */

	efx->fec_config = fec->fec;

	return 0;

}



static const char *const mcdi_sft9001_cable_diag_names[] = {

	"cable.pairA.length",

	"cable.pairB.length",

	"cable.pairC.length",

	"cable.pairD.length",

	"cable.pairA.status",

	"cable.pairB.status",

	"cable.pairC.status",

	"cable.pairD.status",

};



static int efx_mcdi_bist(struct efx_nic *efx, unsigned int bist_mode,

			 int *results)

{

	unsigned int retry, i, count = 0;

	size_t outlen;

	u32 status;

	MCDI_DECLARE_BUF(inbuf, MC_CMD_START_BIST_IN_LEN);

	MCDI_DECLARE_BUF(outbuf, MC_CMD_POLL_BIST_OUT_SFT9001_LEN);

	u8 *ptr;

	int rc;



	BUILD_BUG_ON(MC_CMD_START_BIST_OUT_LEN != 0);

	MCDI_SET_DWORD(inbuf, START_BIST_IN_TYPE, bist_mode);

	rc = efx_mcdi_rpc(efx, MC_CMD_START_BIST,

			  inbuf, MC_CMD_START_BIST_IN_LEN, NULL, 0, NULL);

	if (rc)

		goto out;



	/* Wait up to 10s for BIST to finish */

	for (retry = 0; retry < 100; ++retry) {

		BUILD_BUG_ON(MC_CMD_POLL_BIST_IN_LEN != 0);

		rc = efx_mcdi_rpc(efx, MC_CMD_POLL_BIST, NULL, 0,

				  outbuf, sizeof(outbuf), &outlen);

		if (rc)

			goto out;



		status = MCDI_DWORD(outbuf, POLL_BIST_OUT_RESULT);

		if (status != MC_CMD_POLL_BIST_RUNNING)

			goto finished;



		msleep(100);

	}



	rc = -ETIMEDOUT;

	goto out;



finished:

	results[count++] = (status == MC_CMD_POLL_BIST_PASSED) ? 1 : -1;



	/* SFT9001 specific cable diagnostics output */

	if (efx->phy_type == PHY_TYPE_SFT9001B &&

	    (bist_mode == MC_CMD_PHY_BIST_CABLE_SHORT ||

	     bist_mode == MC_CMD_PHY_BIST_CABLE_LONG)) {

		ptr = MCDI_PTR(outbuf, POLL_BIST_OUT_SFT9001_CABLE_LENGTH_A);

		if (status == MC_CMD_POLL_BIST_PASSED &&

		    outlen >= MC_CMD_POLL_BIST_OUT_SFT9001_LEN) {

			for (i = 0; i < 8; i++) {

				results[count + i] =

					EFX_DWORD_FIELD(((efx_dword_t *)ptr)[i],

							EFX_DWORD_0);

			}

		}

		count += 8;

	}

	rc = count;



out:

	return rc;

}



static int efx_mcdi_phy_run_tests(struct efx_nic *efx, int *results,

				  unsigned flags)

{

	struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;

	u32 mode;

	int rc;



	if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_OUT_BIST_LBN)) {

		rc = efx_mcdi_bist(efx, MC_CMD_PHY_BIST, results);

		if (rc < 0)

			return rc;



		results += rc;

	}



	/* If we support both LONG and SHORT, then run each in response to

	 * break or not. Otherwise, run the one we support */

	mode = 0;

	if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_OUT_BIST_CABLE_SHORT_LBN)) {

		if ((flags & ETH_TEST_FL_OFFLINE) &&

		    (phy_cfg->flags &

		     (1 << MC_CMD_GET_PHY_CFG_OUT_BIST_CABLE_LONG_LBN)))

			mode = MC_CMD_PHY_BIST_CABLE_LONG;

		else

			mode = MC_CMD_PHY_BIST_CABLE_SHORT;

	} else if (phy_cfg->flags &

		   (1 << MC_CMD_GET_PHY_CFG_OUT_BIST_CABLE_LONG_LBN))

		mode = MC_CMD_PHY_BIST_CABLE_LONG;



	if (mode != 0) {

		rc = efx_mcdi_bist(efx, mode, results);

		if (rc < 0)

			return rc;

		results += rc;

	}



	return 0;

}



static const char *efx_mcdi_phy_test_name(struct efx_nic *efx,

					  unsigned int index)

{

	struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;



	if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_OUT_BIST_LBN)) {

		if (index == 0)

			return "bist";

		--index;

	}



	if (phy_cfg->flags & ((1 << MC_CMD_GET_PHY_CFG_OUT_BIST_CABLE_SHORT_LBN) |

			      (1 << MC_CMD_GET_PHY_CFG_OUT_BIST_CABLE_LONG_LBN))) {

		if (index == 0)

			return "cable";

		--index;



		if (efx->phy_type == PHY_TYPE_SFT9001B) {

			if (index < ARRAY_SIZE(mcdi_sft9001_cable_diag_names))

				return mcdi_sft9001_cable_diag_names[index];

			index -= ARRAY_SIZE(mcdi_sft9001_cable_diag_names);

		}

	}



	return NULL;

}



#define SFP_PAGE_SIZE		128

#define SFF_DIAG_TYPE_OFFSET	92

#define SFF_DIAG_ADDR_CHANGE	BIT(2)

#define SFF_8079_NUM_PAGES	2

#define SFF_8472_NUM_PAGES	4

#define SFF_8436_NUM_PAGES	5

#define SFF_DMT_LEVEL_OFFSET	94



/** efx_mcdi_phy_get_module_eeprom_page() - Get a single page of module eeprom

 * @efx:	NIC context

 * @page:	EEPROM page number

 * @data:	Destination data pointer

 * @offset:	Offset in page to copy from in to data

 * @space:	Space available in data

 *

 * Return:

 *   >=0 - amount of data copied

 *   <0  - error

 */

static int efx_mcdi_phy_get_module_eeprom_page(struct efx_nic *efx,

					       unsigned int page,

					       u8 *data, ssize_t offset,

					       ssize_t space)

{

	MCDI_DECLARE_BUF(outbuf, MC_CMD_GET_PHY_MEDIA_INFO_OUT_LENMAX);

	MCDI_DECLARE_BUF(inbuf, MC_CMD_GET_PHY_MEDIA_INFO_IN_LEN);

	size_t outlen;

	unsigned int payload_len;

	unsigned int to_copy;

	int rc;



	if (offset > SFP_PAGE_SIZE)

		return -EINVAL;



	to_copy = min(space, SFP_PAGE_SIZE - offset);



	MCDI_SET_DWORD(inbuf, GET_PHY_MEDIA_INFO_IN_PAGE, page);

	rc = efx_mcdi_rpc_quiet(efx, MC_CMD_GET_PHY_MEDIA_INFO,

				inbuf, sizeof(inbuf),

				outbuf, sizeof(outbuf),

				&outlen);



	if (rc)

		return rc;



	if (outlen < (MC_CMD_GET_PHY_MEDIA_INFO_OUT_DATA_OFST +

			SFP_PAGE_SIZE))

		return -EIO;



	payload_len = MCDI_DWORD(outbuf, GET_PHY_MEDIA_INFO_OUT_DATALEN);

	if (payload_len != SFP_PAGE_SIZE)

		return -EIO;



	memcpy(data, MCDI_PTR(outbuf, GET_PHY_MEDIA_INFO_OUT_DATA) + offset,

	       to_copy);



	return to_copy;

}



static int efx_mcdi_phy_get_module_eeprom_byte(struct efx_nic *efx,

					       unsigned int page,

					       u8 byte)

{

	int rc;

	u8 data;



	rc = efx_mcdi_phy_get_module_eeprom_page(efx, page, &data, byte, 1);

	if (rc == 1)

		return data;



	return rc;

}



static int efx_mcdi_phy_diag_type(struct efx_nic *efx)

{

	/* Page zero of the EEPROM includes the diagnostic type at byte 92. */

	return efx_mcdi_phy_get_module_eeprom_byte(efx, 0,

						   SFF_DIAG_TYPE_OFFSET);

}



static int efx_mcdi_phy_sff_8472_level(struct efx_nic *efx)

{

	/* Page zero of the EEPROM includes the DMT level at byte 94. */

	return efx_mcdi_phy_get_module_eeprom_byte(efx, 0,

						   SFF_DMT_LEVEL_OFFSET);

}



static u32 efx_mcdi_phy_module_type(struct efx_nic *efx)

{

	struct efx_mcdi_phy_data *phy_data = efx->phy_data;



	if (phy_data->media != MC_CMD_MEDIA_QSFP_PLUS)

		return phy_data->media;



	/* A QSFP+ NIC may actually have an SFP+ module attached.

	 * The ID is page 0, byte 0.

	 */

	switch (efx_mcdi_phy_get_module_eeprom_byte(efx, 0, 0)) {

	case 0x3:

		return MC_CMD_MEDIA_SFP_PLUS;

	case 0xc:

	case 0xd:

		return MC_CMD_MEDIA_QSFP_PLUS;

	default:

		return 0;

	}

}



static int efx_mcdi_phy_get_module_eeprom(struct efx_nic *efx,

					  struct ethtool_eeprom *ee, u8 *data)

{

	int rc;

	ssize_t space_remaining = ee->len;

	unsigned int page_off;

	bool ignore_missing;

	int num_pages;

	int page;



	switch (efx_mcdi_phy_module_type(efx)) {

	case MC_CMD_MEDIA_SFP_PLUS:

		num_pages = efx_mcdi_phy_sff_8472_level(efx) > 0 ?

				SFF_8472_NUM_PAGES : SFF_8079_NUM_PAGES;

		page = 0;

		ignore_missing = false;

		break;

	case MC_CMD_MEDIA_QSFP_PLUS:

		num_pages = SFF_8436_NUM_PAGES;

		page = -1; /* We obtain the lower page by asking for -1. */

		ignore_missing = true; /* Ignore missing pages after page 0. */

		break;

	default:

		return -EOPNOTSUPP;

	}



	page_off = ee->offset % SFP_PAGE_SIZE;

	page += ee->offset / SFP_PAGE_SIZE;



	while (space_remaining && (page < num_pages)) {

		rc = efx_mcdi_phy_get_module_eeprom_page(efx, page,

							 data, page_off,

							 space_remaining);



		if (rc > 0) {

			space_remaining -= rc;

			data += rc;

			page_off = 0;

			page++;

		} else if (rc == 0) {

			space_remaining = 0;

		} else if (ignore_missing && (page > 0)) {

			int intended_size = SFP_PAGE_SIZE - page_off;



			space_remaining -= intended_size;

			if (space_remaining < 0) {

				space_remaining = 0;

			} else {

				memset(data, 0, intended_size);

				data += intended_size;

				page_off = 0;

				page++;

				rc = 0;

			}

		} else {

			return rc;

		}

	}



	return 0;

}



static int efx_mcdi_phy_get_module_info(struct efx_nic *efx,

					struct ethtool_modinfo *modinfo)

{

	int sff_8472_level;

	int diag_type;



	switch (efx_mcdi_phy_module_type(efx)) {

	case MC_CMD_MEDIA_SFP_PLUS:

		sff_8472_level = efx_mcdi_phy_sff_8472_level(efx);



		/* If we can't read the diagnostics level we have none. */

		if (sff_8472_level < 0)

			return -EOPNOTSUPP;



		/* Check if this module requires the (unsupported) address

		 * change operation.

		 */

		diag_type = efx_mcdi_phy_diag_type(efx);



		if ((sff_8472_level == 0) ||

		    (diag_type & SFF_DIAG_ADDR_CHANGE)) {

			modinfo->type = ETH_MODULE_SFF_8079;

			modinfo->eeprom_len = ETH_MODULE_SFF_8079_LEN;

		} else {

			modinfo->type = ETH_MODULE_SFF_8472;

			modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN;

		}

		break;



	case MC_CMD_MEDIA_QSFP_PLUS:

		modinfo->type = ETH_MODULE_SFF_8436;

		modinfo->eeprom_len = ETH_MODULE_SFF_8436_LEN;

		break;



	default:

		return -EOPNOTSUPP;

	}



	return 0;

}



static const struct efx_phy_operations efx_mcdi_phy_ops = {

	.probe		= efx_mcdi_phy_probe,

	.init		= efx_port_dummy_op_int,

	.reconfigure	= efx_mcdi_port_reconfigure,

	.poll		= efx_mcdi_phy_poll,

	.fini		= efx_port_dummy_op_void,

	.remove		= efx_mcdi_phy_remove,

	.get_link_ksettings = efx_mcdi_phy_get_link_ksettings,

	.set_link_ksettings = efx_mcdi_phy_set_link_ksettings,

	.get_fecparam	= efx_mcdi_phy_get_fecparam,

	.set_fecparam	= efx_mcdi_phy_set_fecparam,

	.test_alive	= efx_mcdi_phy_test_alive,

	.run_tests	= efx_mcdi_phy_run_tests,

	.test_name	= efx_mcdi_phy_test_name,

	.get_module_eeprom = efx_mcdi_phy_get_module_eeprom,

	.get_module_info = efx_mcdi_phy_get_module_info,

};



u32 efx_mcdi_phy_get_caps(struct efx_nic *efx)

{

	struct efx_mcdi_phy_data *phy_data = efx->phy_data;
@@ -683,16 +97,13 @@ int efx_mcdi_port_probe(struct efx_nic *efx) 
{

	int rc;



	/* Hook in PHY operations table */

	efx->phy_op = &efx_mcdi_phy_ops;



	/* Set up MDIO structure for PHY */

	efx->mdio.mode_support = MDIO_SUPPORTS_C45 | MDIO_EMULATE_C22;

	efx->mdio.mdio_read = efx_mcdi_mdio_read;

	efx->mdio.mdio_write = efx_mcdi_mdio_write;



	/* Fill out MDIO structure, loopback modes, and initial link state */

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

	rc = efx_mcdi_phy_probe(efx);

	if (rc != 0)

		return rc;
@@ -701,6 +112,6 @@ int efx_mcdi_port_probe(struct efx_nic *efx) 


void efx_mcdi_port_remove(struct efx_nic *efx)

{

	efx->phy_op->remove(efx);

	efx_mcdi_phy_remove(efx);

	efx_mcdi_mac_fini_stats(efx);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE