iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ice: remove vf->lan_vsi_num field

Browse Source 
The lan_vsi_num field of the VF structure is no longer used for any
purpose. Remove it.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Jacob Keller
2024-02-16 14:06:38 -08:00
committed by Tony Nguyen
parent 11fbb1bfb5
commit 1cf94cbfc6
3 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/intel/ice/ice_sriov.c
View File

@@ -240,7 +240,6 @@ static struct ice_vsi *ice_vf_vsi_setup(struct ice_vf *vf)
} }
vf->lan_vsi_idx = vsi->idx; vf->lan_vsi_idx = vsi->idx;
vf->lan_vsi_num = vsi->vsi_num;
return vsi; return vsi;
} }

10
drivers/net/ethernet/intel/ice/ice_vf_lib.c
View File

@@ -280,12 +280,6 @@ int ice_vf_reconfig_vsi(struct ice_vf *vf)
return err; return err;
} }
/* Update the lan_vsi_num field since it might have been changed. The
* PF lan_vsi_idx number remains the same so we don't need to change
* that.
*/
vf->lan_vsi_num = vsi->vsi_num;
return 0; return 0;
} }
@@ -315,7 +309,6 @@ static int ice_vf_rebuild_vsi(struct ice_vf *vf)
* vf->lan_vsi_idx * vf->lan_vsi_idx
*/ */
vsi->vsi_num = ice_get_hw_vsi_num(&pf->hw, vsi->idx); vsi->vsi_num = ice_get_hw_vsi_num(&pf->hw, vsi->idx);
vf->lan_vsi_num = vsi->vsi_num;
return 0; return 0;
} }
@@ -1315,13 +1308,12 @@ int ice_vf_init_host_cfg(struct ice_vf *vf, struct ice_vsi *vsi)
} }
/** /**
* ice_vf_invalidate_vsi - invalidate vsi_idx/vsi_num to remove VSI access * ice_vf_invalidate_vsi - invalidate vsi_idx to remove VSI access
* @vf: VF to remove access to VSI for * @vf: VF to remove access to VSI for
*/ */
void ice_vf_invalidate_vsi(struct ice_vf *vf) void ice_vf_invalidate_vsi(struct ice_vf *vf)
{ {
vf->lan_vsi_idx = ICE_NO_VSI; vf->lan_vsi_idx = ICE_NO_VSI;
vf->lan_vsi_num = ICE_NO_VSI;
} }
/** /**

5
drivers/net/ethernet/intel/ice/ice_vf_lib.h
View File

@@ -109,11 +109,6 @@ struct ice_vf {
u8 spoofchk:1; u8 spoofchk:1;
u8 link_forced:1; u8 link_forced:1;
u8 link_up:1; /* only valid if VF link is forced */ u8 link_up:1; /* only valid if VF link is forced */
/* VSI indices - actual VSI pointers are maintained in the PF structure
* When assigned, these will be non-zero, because VSI 0 is always
* the main LAN VSI for the PF.
*/
u16 lan_vsi_num; /* ID as used by firmware */
unsigned int min_tx_rate; /* Minimum Tx bandwidth limit in Mbps */ unsigned int min_tx_rate; /* Minimum Tx bandwidth limit in Mbps */
unsigned int max_tx_rate; /* Maximum Tx bandwidth limit in Mbps */ unsigned int max_tx_rate; /* Maximum Tx bandwidth limit in Mbps */
DECLARE_BITMAP(vf_states, ICE_VF_STATES_NBITS); /* VF runtime states */ DECLARE_BITMAP(vf_states, ICE_VF_STATES_NBITS); /* VF runtime states */