Commit bf3d0156 authored by Daniel Pieczko's avatar Daniel Pieczko Committed by David S. Miller

sfc: Move and rename efx_vf struct to siena_vf

The efx_vf struct contains Siena-specific fields for VFs,
so rename to siena_vf.
Also move it into the siena_nic_data struct, as EF10 will
track its VFs in its own ef10_nic_data, storing much less
information about them since VFDI is no longer used.
Signed-off-by: default avatarShradha Shah <sshah@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7fa8d547
...@@ -793,7 +793,6 @@ union efx_multicast_hash { ...@@ -793,7 +793,6 @@ union efx_multicast_hash {
efx_oword_t oword[EFX_MCAST_HASH_ENTRIES / sizeof(efx_oword_t) / 8]; efx_oword_t oword[EFX_MCAST_HASH_ENTRIES / sizeof(efx_oword_t) / 8];
}; };
struct efx_vf;
struct vfdi_status; struct vfdi_status;
/** /**
...@@ -909,7 +908,6 @@ struct vfdi_status; ...@@ -909,7 +908,6 @@ struct vfdi_status;
* completed (either success or failure). Not used when MCDI is used to * completed (either success or failure). Not used when MCDI is used to
* flush receive queues. * flush receive queues.
* @flush_wq: wait queue used by efx_nic_flush_queues() to wait for flush completions. * @flush_wq: wait queue used by efx_nic_flush_queues() to wait for flush completions.
* @vf: Array of &struct efx_vf objects.
* @vf_count: Number of VFs intended to be enabled. * @vf_count: Number of VFs intended to be enabled.
* @vf_init_count: Number of VFs that have been fully initialised. * @vf_init_count: Number of VFs that have been fully initialised.
* @vi_scale: log2 number of vnics per VF. * @vi_scale: log2 number of vnics per VF.
...@@ -1053,7 +1051,6 @@ struct efx_nic { ...@@ -1053,7 +1051,6 @@ struct efx_nic {
wait_queue_head_t flush_wq; wait_queue_head_t flush_wq;
#ifdef CONFIG_SFC_SRIOV #ifdef CONFIG_SFC_SRIOV
struct efx_vf *vf;
unsigned vf_count; unsigned vf_count;
unsigned vf_init_count; unsigned vf_init_count;
unsigned vi_scale; unsigned vi_scale;
......
...@@ -381,6 +381,7 @@ enum { ...@@ -381,6 +381,7 @@ enum {
* @efx: Pointer back to main interface structure * @efx: Pointer back to main interface structure
* @wol_filter_id: Wake-on-LAN packet filter id * @wol_filter_id: Wake-on-LAN packet filter id
* @stats: Hardware statistics * @stats: Hardware statistics
* @vf: Array of &struct siena_vf objects
* @vf_buftbl_base: The zeroth buffer table index used to back VF queues. * @vf_buftbl_base: The zeroth buffer table index used to back VF queues.
* @vfdi_status: Common VFDI status page to be dmad to VF address space. * @vfdi_status: Common VFDI status page to be dmad to VF address space.
* @local_addr_list: List of local addresses. Protected by %local_lock. * @local_addr_list: List of local addresses. Protected by %local_lock.
...@@ -394,6 +395,7 @@ struct siena_nic_data { ...@@ -394,6 +395,7 @@ struct siena_nic_data {
int wol_filter_id; int wol_filter_id;
u64 stats[SIENA_STAT_COUNT]; u64 stats[SIENA_STAT_COUNT];
#ifdef CONFIG_SFC_SRIOV #ifdef CONFIG_SFC_SRIOV
struct siena_vf *vf;
struct efx_channel *vfdi_channel; struct efx_channel *vfdi_channel;
unsigned vf_buftbl_base; unsigned vf_buftbl_base;
struct efx_buffer vfdi_status; struct efx_buffer vfdi_status;
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment