Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7369ca87 authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

i40e: Make VF resets more reliable 



Clear the VFLR bit immediately after triggering a reset instead of
waiting until after cleanup is complete. Make sure to trigger a reset
every time, not just if the PF is up.

These changes fix a problem where VF resets would get lost by the PF,
preventing the VF driver from initializing.

Change-ID: I5945cf2884095b7b0554867c64df8617e71d9d29
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 d6bf58c2

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

+6 −8
Original line number Diff line number Diff line
@@ -937,6 +937,10 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr) 
		wr32(hw, I40E_VPGEN_VFRTRIG(vf->vf_id), reg);

		i40e_flush(hw);

	}

	/* clear the VFLR bit in GLGEN_VFLRSTAT */

	reg_idx = (hw->func_caps.vf_base_id + vf->vf_id) / 32;

	bit_idx = (hw->func_caps.vf_base_id + vf->vf_id) % 32;

	wr32(hw, I40E_GLGEN_VFLRSTAT(reg_idx), BIT(bit_idx));



	if (i40e_quiesce_vf_pci(vf))

		dev_err(&pf->pdev->dev, "VF %d PCI transactions stuck\n",
@@ -989,10 +993,6 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr) 
	/* tell the VF the reset is done */

	wr32(hw, I40E_VFGEN_RSTAT1(vf->vf_id), I40E_VFR_VFACTIVE);



	/* clear the VFLR bit in GLGEN_VFLRSTAT */

	reg_idx = (hw->func_caps.vf_base_id + vf->vf_id) / 32;

	bit_idx = (hw->func_caps.vf_base_id + vf->vf_id) % 32;

	wr32(hw, I40E_GLGEN_VFLRSTAT(reg_idx), BIT(bit_idx));

	i40e_flush(hw);

	clear_bit(__I40E_VF_DISABLE, &pf->state);

}
@@ -2296,12 +2296,10 @@ int i40e_vc_process_vflr_event(struct i40e_pf *pf) 
		/* read GLGEN_VFLRSTAT register to find out the flr VFs */

		vf = &pf->vf[vf_id];

		reg = rd32(hw, I40E_GLGEN_VFLRSTAT(reg_idx));

		if (reg & BIT(bit_idx)) {

		if (reg & BIT(bit_idx))

			/* i40e_reset_vf will clear the bit in GLGEN_VFLRSTAT */

			if (!test_bit(__I40E_DOWN, &pf->state))

			i40e_reset_vf(vf, true);

	}

	}



	return 0;

}