p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Shradha Shah <sshah@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Shradha Shah 2015-05-20 11:09:15 +01:00 committed by David S. Miller
parent 862f894cb9
commit 88a37de674
2 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
drivers/net/ethernet/sfc/ef10.c
View File

@ -119,6 +119,26 @@ static int efx_ef10_get_pf_index(struct efx_nic *efx)
return 0; 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) static int efx_ef10_init_datapath_caps(struct efx_nic *efx)
{ {
MCDI_DECLARE_BUF(outbuf, MC_CMD_GET_CAPABILITIES_OUT_LEN); 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; 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) static int efx_ef10_free_vis(struct efx_nic *efx)
{ {
MCDI_DECLARE_BUF_OUT_OR_ERR(outbuf, 0); MCDI_DECLARE_BUF_OUT_OR_ERR(outbuf, 0);
@ -561,6 +564,37 @@ static void efx_ef10_remove(struct efx_nic *efx)
kfree(nic_data); 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, static int efx_ef10_alloc_vis(struct efx_nic *efx,
unsigned int min_vis, unsigned int max_vis) unsigned int min_vis, unsigned int max_vis)
{ {

1
drivers/net/ethernet/sfc/nic.h
View File

@ -525,6 +525,7 @@ struct efx_ef10_nic_data {
bool must_probe_vswitching; bool must_probe_vswitching;
unsigned int pf_index; unsigned int pf_index;
#ifdef CONFIG_SFC_SRIOV #ifdef CONFIG_SFC_SRIOV
unsigned int vf_index;
struct ef10_vf *vf; struct ef10_vf *vf;
#endif #endif
u8 vport_mac[ETH_ALEN]; u8 vport_mac[ETH_ALEN];