Commit 3ac874fa authored by Sylwester Dziedziuch's avatar Sylwester Dziedziuch Committed by Tony Nguyen
Browse files

i40e: Fix Error I40E_AQ_RC_EINVAL when removing VFs 



When removing VFs for PF added to bridge there was
an error I40E_AQ_RC_EINVAL. It was caused by not properly
resetting and reinitializing PF when adding/removing VFs.
Changed how reset is performed when adding/removing VFs
to properly reinitialize PFs VSI.

Fixes: fc60861e ("i40e: start up in VEPA mode by default")
Signed-off-by: default avatarSylwester Dziedziuch <sylwesterx.dziedziuch@intel.com>
Tested-by: default avatarKonrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 44d4775c

drivers/net/ethernet/intel/i40e/i40e.h

+3 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ enum i40e_state_t { 
	__I40E_RESET_INTR_RECEIVED,

	__I40E_REINIT_REQUESTED,

	__I40E_PF_RESET_REQUESTED,

	__I40E_PF_RESET_AND_REBUILD_REQUESTED,

	__I40E_CORE_RESET_REQUESTED,

	__I40E_GLOBAL_RESET_REQUESTED,

	__I40E_EMP_RESET_INTR_RECEIVED,
@@ -146,6 +147,8 @@ enum i40e_state_t { 
};



#define I40E_PF_RESET_FLAG	BIT_ULL(__I40E_PF_RESET_REQUESTED)

#define I40E_PF_RESET_AND_REBUILD_FLAG	\

	BIT_ULL(__I40E_PF_RESET_AND_REBUILD_REQUESTED)



/* VSI state flags */

enum i40e_vsi_state_t {

drivers/net/ethernet/intel/i40e/i40e_main.c

+10 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ static int i40e_setup_misc_vector(struct i40e_pf *pf); 
static void i40e_determine_queue_usage(struct i40e_pf *pf);

static int i40e_setup_pf_filter_control(struct i40e_pf *pf);

static void i40e_prep_for_reset(struct i40e_pf *pf, bool lock_acquired);

static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit,

				   bool lock_acquired);

static int i40e_reset(struct i40e_pf *pf);

static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired);

static int i40e_setup_misc_vector_for_recovery_mode(struct i40e_pf *pf);
@@ -8536,6 +8538,14 @@ void i40e_do_reset(struct i40e_pf *pf, u32 reset_flags, bool lock_acquired) 
			 "FW LLDP is disabled\n" :

			 "FW LLDP is enabled\n");



	} else if (reset_flags & I40E_PF_RESET_AND_REBUILD_FLAG) {

		/* Request a PF Reset

		 *

		 * Resets PF and reinitializes PFs VSI.

		 */

		i40e_prep_for_reset(pf, lock_acquired);

		i40e_reset_and_rebuild(pf, true, lock_acquired);



	} else if (reset_flags & BIT_ULL(__I40E_REINIT_REQUESTED)) {

		int v;

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+2 −2
Original line number Diff line number Diff line
@@ -1772,7 +1772,7 @@ int i40e_pci_sriov_configure(struct pci_dev *pdev, int num_vfs) 
	if (num_vfs) {

		if (!(pf->flags & I40E_FLAG_VEB_MODE_ENABLED)) {

			pf->flags |= I40E_FLAG_VEB_MODE_ENABLED;

			i40e_do_reset_safe(pf, I40E_PF_RESET_FLAG);

			i40e_do_reset_safe(pf, I40E_PF_RESET_AND_REBUILD_FLAG);

		}

		ret = i40e_pci_sriov_enable(pdev, num_vfs);

		goto sriov_configure_out;
@@ -1781,7 +1781,7 @@ int i40e_pci_sriov_configure(struct pci_dev *pdev, int num_vfs) 
	if (!pci_vfs_assigned(pf->pdev)) {

		i40e_free_vfs(pf);

		pf->flags &= ~I40E_FLAG_VEB_MODE_ENABLED;

		i40e_do_reset_safe(pf, I40E_PF_RESET_FLAG);

		i40e_do_reset_safe(pf, I40E_PF_RESET_AND_REBUILD_FLAG);

	} else {

		dev_warn(&pdev->dev, "Unable to free VFs because some are assigned to VMs.\n");

		ret = -EINVAL;