Commit 21be99ec authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher

i40e: don't panic on VSI allocation failure

In some circumstances, the firmware may fail to allocate a VSI for a VF.
When this happens, the driver does not react well to the bad news and
has a panic attack.

To fix this problem, check the return value from i40e_alloc_vf_res and
don't try to configure the device further if it failed. Additionally,
explicitly clear the INIT bit when we free VF resources, so that this
bit will be in the proper state in the failure case, and won't blow up
elsewhere.

Change-ID: I6a20ce2b59c3458fd832032e88fa28cd42500189
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e7e6cfce
...@@ -703,6 +703,7 @@ static void i40e_free_vf_res(struct i40e_vf *vf) ...@@ -703,6 +703,7 @@ static void i40e_free_vf_res(struct i40e_vf *vf)
*/ */
vf->num_queue_pairs = 0; vf->num_queue_pairs = 0;
vf->vf_states = 0; vf->vf_states = 0;
clear_bit(I40E_VF_STAT_INIT, &vf->vf_states);
} }
/** /**
...@@ -841,11 +842,11 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr) ...@@ -841,11 +842,11 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr)
complete_reset: complete_reset:
/* reallocate VF resources to reset the VSI state */ /* reallocate VF resources to reset the VSI state */
i40e_free_vf_res(vf); i40e_free_vf_res(vf);
i40e_alloc_vf_res(vf); if (!i40e_alloc_vf_res(vf)) {
i40e_enable_vf_mappings(vf); i40e_enable_vf_mappings(vf);
set_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states); set_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states);
clear_bit(I40E_VF_STAT_DISABLED, &vf->vf_states); clear_bit(I40E_VF_STAT_DISABLED, &vf->vf_states);
}
/* tell the VF the reset is done */ /* tell the VF the reset is done */
wr32(hw, I40E_VFGEN_RSTAT1(vf->vf_id), I40E_VFR_VFACTIVE); wr32(hw, I40E_VFGEN_RSTAT1(vf->vf_id), I40E_VFR_VFACTIVE);
i40e_flush(hw); i40e_flush(hw);
......
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