ice: Fix VFR issues for AVF drivers that expect ATQLEN cleared

Some AVF drivers expect the VF_MBX_ATQLEN register to be cleared for any
type of VFR/VFLR. Fix this by clearing the VF_MBX_ATQLEN register at the
same time as VF_MBX_ARQLEN.

Fixes: 82ba01282c ("ice: clear VF ARQLEN register on reset")
Signed-off-by: Brett Creeley <brett.creeley@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:
Brett Creeley 2021-02-26 13:19:21 -08:00 коммит произвёл Tony Nguyen
Родитель f0457690af
Коммит 8679f07a99
2 изменённых файлов: 8 добавлений и 5 удалений

Просмотреть файл

@ -31,6 +31,7 @@
#define PF_FW_ATQLEN_ATQOVFL_M BIT(29) #define PF_FW_ATQLEN_ATQOVFL_M BIT(29)
#define PF_FW_ATQLEN_ATQCRIT_M BIT(30) #define PF_FW_ATQLEN_ATQCRIT_M BIT(30)
#define VF_MBX_ARQLEN(_VF) (0x0022BC00 + ((_VF) * 4)) #define VF_MBX_ARQLEN(_VF) (0x0022BC00 + ((_VF) * 4))
#define VF_MBX_ATQLEN(_VF) (0x0022A800 + ((_VF) * 4))
#define PF_FW_ATQLEN_ATQENABLE_M BIT(31) #define PF_FW_ATQLEN_ATQENABLE_M BIT(31)
#define PF_FW_ATQT 0x00080400 #define PF_FW_ATQT 0x00080400
#define PF_MBX_ARQBAH 0x0022E400 #define PF_MBX_ARQBAH 0x0022E400

Просмотреть файл

@ -713,13 +713,15 @@ static void ice_trigger_vf_reset(struct ice_vf *vf, bool is_vflr, bool is_pfr)
*/ */
clear_bit(ICE_VF_STATE_INIT, vf->vf_states); clear_bit(ICE_VF_STATE_INIT, vf->vf_states);
/* VF_MBX_ARQLEN is cleared by PFR, so the driver needs to clear it /* VF_MBX_ARQLEN and VF_MBX_ATQLEN are cleared by PFR, so the driver
* in the case of VFR. If this is done for PFR, it can mess up VF * needs to clear them in the case of VFR/VFLR. If this is done for
* resets because the VF driver may already have started cleanup * PFR, it can mess up VF resets because the VF driver may already
* by the time we get here. * have started cleanup by the time we get here.
*/ */
if (!is_pfr) if (!is_pfr) {
wr32(hw, VF_MBX_ARQLEN(vf->vf_id), 0); wr32(hw, VF_MBX_ARQLEN(vf->vf_id), 0);
wr32(hw, VF_MBX_ATQLEN(vf->vf_id), 0);
}
/* In the case of a VFLR, the HW has already reset the VF and we /* In the case of a VFLR, the HW has already reset the VF and we
* just need to clean up, so don't hit the VFRTRIG register. * just need to clean up, so don't hit the VFRTRIG register.