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

ice: convert ice_reset_vf to take flags

Browse Source 
The ice_reset_vf function takes a boolean parameter which indicates
whether or not the reset is due to a VFLR event.

This is somewhat confusing to read because readers must interpret what
"true" and "false" mean when seeing a line of code like
"ice_reset_vf(vf, false)".

We will want to add another toggle to the ice_reset_vf in a following
change. To avoid proliferating many arguments, convert this function to
take flags instead. ICE_VF_RESET_VFLR will indicate if this is a VFLR
reset. A value of 0 indicates no flags.

One could argue that "ice_reset_vf(vf, 0)" is no more readable than
"ice_reset_vf(vf, false)".. However, this type of flags interface is
somewhat common and using 0 to mean "no flags" makes sense in this
context. We could bother to add a define for "ICE_VF_RESET_PLAIN" or
something similar, but this can be confusing since its not an actual bit
flag.

This paves the way to add another flag to the function in a following
change.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Konrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Jacob Keller 2022-02-22 16:27:07 -08:00 committed by Tony Nguyen
parent 4fe193cc9d
commit 7eb517e434
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/intel/ice/ice_main.c
View File

@ -1824,7 +1824,7 @@ static void ice_handle_mdd_event(struct ice_pf *pf)
*/
ice_print_vf_rx_mdd_event(vf);
mutex_lock(&vf->cfg_lock);
ice_reset_vf(vf, false);
ice_reset_vf(vf, 0);
mutex_unlock(&vf->cfg_lock);
}
}

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

@ -1393,7 +1393,7 @@ void ice_process_vflr_event(struct ice_pf *pf)
if (reg & BIT(bit_idx)) {
/* GLGEN_VFLRSTAT bit will be cleared in ice_reset_vf */
mutex_lock(&vf->cfg_lock);
ice_reset_vf(vf, true);
ice_reset_vf(vf, ICE_VF_RESET_VFLR);
mutex_unlock(&vf->cfg_lock);
}
}
@ -1407,7 +1407,7 @@ void ice_process_vflr_event(struct ice_pf *pf)
static void ice_vc_reset_vf(struct ice_vf *vf)
{
ice_vc_notify_vf_reset(vf);
ice_reset_vf(vf, false);
ice_reset_vf(vf, 0);
}
/**
@ -1724,7 +1724,7 @@ err:
static void ice_vc_reset_vf_msg(struct ice_vf *vf)
{
if (test_bit(ICE_VF_STATE_INIT, vf->vf_states))
ice_reset_vf(vf, false);
ice_reset_vf(vf, 0);
}
/**

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

@ -444,13 +444,16 @@ void ice_reset_all_vfs(struct ice_pf *pf)
/**
* ice_reset_vf - Reset a particular VF
* @vf: pointer to the VF structure
* @is_vflr: true if VFLR was issued, false if not
* @flags: flags controlling behavior of the reset
*
* Flags:
* ICE_VF_RESET_VFLR - Indicates a reset is due to VFLR event
*
* Returns 0 if the VF is currently in reset, if the resets are disabled, or
* if the VF resets successfully. Returns an error code if the VF fails to
* rebuild.
*/
int ice_reset_vf(struct ice_vf *vf, bool is_vflr)
int ice_reset_vf(struct ice_vf *vf, u32 flags)
{
struct ice_pf *pf = vf->pf;
struct ice_vsi *vsi;
@ -478,7 +481,7 @@ int ice_reset_vf(struct ice_vf *vf, bool is_vflr)
/* Set VF disable bit state here, before triggering reset */
set_bit(ICE_VF_STATE_DIS, vf->vf_states);
ice_trigger_vf_reset(vf, is_vflr, false);
ice_trigger_vf_reset(vf, flags & ICE_VF_RESET_VFLR, false);
vsi = ice_get_vf_vsi(vf);

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

@ -133,6 +133,11 @@ struct ice_vf {
struct devlink_port devlink_port;
};
/* Flags for controlling behavior of ice_reset_vf */
enum ice_vf_reset_flags {
ICE_VF_RESET_VFLR = BIT(0), /* Indicate a VFLR reset */
};
static inline u16 ice_vf_get_port_vlan_id(struct ice_vf *vf)
{
return vf->port_vlan_info.vid;
@ -212,7 +217,7 @@ int
ice_vf_set_vsi_promisc(struct ice_vf *vf, struct ice_vsi *vsi, u8 promisc_m);
int
ice_vf_clear_vsi_promisc(struct ice_vf *vf, struct ice_vsi *vsi, u8 promisc_m);
int ice_reset_vf(struct ice_vf *vf, bool is_vflr);
int ice_reset_vf(struct ice_vf *vf, u32 flags);
void ice_reset_all_vfs(struct ice_pf *pf);
#else /* CONFIG_PCI_IOV */
static inline struct ice_vf *ice_get_vf_by_id(struct ice_pf *pf, u16 vf_id)
@ -270,7 +275,7 @@ ice_vf_clear_vsi_promisc(struct ice_vf *vf, struct ice_vsi *vsi, u8 promisc_m)
return -EOPNOTSUPP;
}
static inline int ice_reset_vf(struct ice_vf *vf, bool is_vflr)
static inline int ice_reset_vf(struct ice_vf *vf, u32 flags)
{
return 0;
}