Commit 88a37de6 authored by Shradha Shah's avatar Shradha Shah Committed by David S. Miller
Browse files

sfc: Store vf_index in nic_data for Ef10. 



Added function efx_ef10_get_vf_index to store the vf_index
in nic_data during probe

vf_index is needed in future patches to access a particular
VF in the VF data structure.

Moved efx_ef10_probe_pf and efx_ef10_probe_vf in order to
used efx_ef10_remove

Signed-off-by: default avatarShradha Shah <sshah@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 862f894c

drivers/net/ethernet/sfc/ef10.c

+51 −17
Original line number Diff line number Diff line
@@ -119,6 +119,26 @@ static int efx_ef10_get_pf_index(struct efx_nic *efx) 
	return 0;

}



#ifdef CONFIG_SFC_SRIOV

static int efx_ef10_get_vf_index(struct efx_nic *efx)

{

	MCDI_DECLARE_BUF(outbuf, MC_CMD_GET_FUNCTION_INFO_OUT_LEN);

	struct efx_ef10_nic_data *nic_data = efx->nic_data;

	size_t outlen;

	int rc;



	rc = efx_mcdi_rpc(efx, MC_CMD_GET_FUNCTION_INFO, NULL, 0, outbuf,

			  sizeof(outbuf), &outlen);

	if (rc)

		return rc;

	if (outlen < sizeof(outbuf))

		return -EIO;



	nic_data->vf_index = MCDI_DWORD(outbuf, GET_FUNCTION_INFO_OUT_VF);

	return 0;

}

#endif



static int efx_ef10_init_datapath_caps(struct efx_nic *efx)

{

	MCDI_DECLARE_BUF(outbuf, MC_CMD_GET_CAPABILITIES_OUT_LEN);
@@ -328,23 +348,6 @@ static int efx_ef10_probe(struct efx_nic *efx) 
	return rc;

}



static int efx_ef10_probe_pf(struct efx_nic *efx)

{

	return efx_ef10_probe(efx);

}



#ifdef CONFIG_SFC_SRIOV

static int efx_ef10_probe_vf(struct efx_nic *efx)

{

	return efx_ef10_probe(efx);

}

#else

static int efx_ef10_probe_vf(struct efx_nic *efx __attribute__ ((unused)))

{

	return 0;

}

#endif



static int efx_ef10_free_vis(struct efx_nic *efx)

{

	MCDI_DECLARE_BUF_OUT_OR_ERR(outbuf, 0);
@@ -561,6 +564,37 @@ static void efx_ef10_remove(struct efx_nic *efx) 
	kfree(nic_data);

}



static int efx_ef10_probe_pf(struct efx_nic *efx)

{

	return efx_ef10_probe(efx);

}



#ifdef CONFIG_SFC_SRIOV

static int efx_ef10_probe_vf(struct efx_nic *efx)

{

	int rc;



	rc = efx_ef10_probe(efx);

	if (rc)

		return rc;



	rc = efx_ef10_get_vf_index(efx);

	if (rc)

		goto fail;



	return 0;



fail:

	efx_ef10_remove(efx);

	return rc;

}

#else

static int efx_ef10_probe_vf(struct efx_nic *efx __attribute__ ((unused)))

{

	return 0;

}

#endif



static int efx_ef10_alloc_vis(struct efx_nic *efx,

			      unsigned int min_vis, unsigned int max_vis)

{

drivers/net/ethernet/sfc/nic.h

+1 −0
Original line number Diff line number Diff line
@@ -525,6 +525,7 @@ struct efx_ef10_nic_data { 
	bool must_probe_vswitching;

	unsigned int pf_index;

#ifdef CONFIG_SFC_SRIOV

	unsigned int vf_index;

	struct ef10_vf *vf;

#endif

	u8 vport_mac[ETH_ALEN];