Skip to contentSkip to conversation

i40e: Fix for failed to init adminq while VF reset and for sync VF driver reset

PATCH New Karen Sornek 2 participants 2 messages Jun 9, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i40e: Fix for failed to init adminq while VF reset and for sync VF driver reset

Fix for failed to init adminq: -53 while VF is resetting via MAC address changing procedure.
Added sync module to avoid reading deadbeef value in reinit adminq during software reset.
Fix for sync VF driver reset before trigger next one by PF. Change VF in reset state detection from check VFR state register to examination of enable admin queue interrupt. ADMINQ is enabled by VF after completely reinit admin queue.

Fixes b40c82e6ae85 ("i40e: Fix inconsistent use of PF/VF vs pf/vf")
---
 .../net/ethernet/intel/i40e/i40e_register.h   | 10 +++++
 .../ethernet/intel/i40e/i40e_virtchnl_pf.c    | 45 ++++++++++++++++++-
 .../ethernet/intel/i40e/i40e_virtchnl_pf.h    |  1 +
 3 files changed, 54 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_register.h +10 -0
index 8d0588a27..b5c741e76 100644
@@ -371,6 +371,16 @@
 #define I40E_PFINT_ICR0_ENA_VFLR_MASK I40E_MASK(0x1, I40E_PFINT_ICR0_ENA_VFLR_SHIFT)
 #define I40E_PFINT_ICR0_ENA_ADMINQ_SHIFT 30
 #define I40E_PFINT_ICR0_ENA_ADMINQ_MASK I40E_MASK(0x1, I40E_PFINT_ICR0_ENA_ADMINQ_SHIFT)
+#define I40E_VFINT_ICR0_ADMINQ_SHIFT 30
+#define I40E_VFINT_ICR0_ADMINQ_MASK I40E_MASK(0x1, I40E_VFINT_ICR0_ADMINQ_SHIFT)
+#define I40E_VFINT_ICR0_ENA(_VF) (0x0002C000 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: CORER */
+#define I40E_VFINT_ICR0_ENA_MAX_INDEX 127
+#define I40E_VFINT_ICR0_ENA_LINK_STAT_CHANGE_SHIFT 25
+#define I40E_VFINT_ICR0_ENA_LINK_STAT_CHANGE_MASK I40E_MASK(0x1, I40E_VFINT_ICR0_ENA_LINK_STAT_CHANGE_SHIFT)
+#define I40E_VFINT_ICR0_ENA_ADMINQ_SHIFT 30
+#define I40E_VFINT_ICR0_ENA_ADMINQ_MASK I40E_MASK(0x1, I40E_VFINT_ICR0_ENA_ADMINQ_SHIFT)
+#define I40E_VFINT_ICR0_ENA_RSVD_SHIFT 31
+#define I40E_VFINT_ICR0_ENA_RSVD_MASK I40E_MASK(0x1, I40E_VFINT_ICR0_ENA_RSVD_SHIFT)
 #define I40E_PFINT_ITR0(_i) (0x00038000 + ((_i) * 128)) /* _i=0...2 */ /* Reset: PFR */
 #define I40E_PFINT_ITRN(_i, _INTPF) (0x00030000 + ((_i) * 2048 + (_INTPF) * 4)) /* _i=0...2, _INTPF=0...511 */ /* Reset: PFR */
 #define I40E_PFINT_LNKLST0 0x00038500 /* Reset: PFR */
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +43 -2

73 lines not on this page · raw message

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h +1 -0
index 49575a640..03c42fd0f 100644
@@ -19,6 +19,7 @@
 #define I40E_MAX_VF_PROMISC_FLAGS	3
 
 #define I40E_VF_STATE_WAIT_COUNT	20
+#define I40E_VFR_WAIT_COUNT		100
 
 /* Various queue ctrls */
 enum i40e_queue_ctrl {
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/1 i40e: Fix for failed to init adminq while VF reset and for sync VF driver reset

Quoted 44 lines · Karen Sornek

Fix for failed to init adminq: -53 while VF is resetting via MAC address changing procedure.
Added sync module to avoid reading deadbeef value in reinit adminq during software reset.
Fix for sync VF driver reset before trigger next one by PF. Change VF in reset state detection from check VFR state register to examination of enable admin queue interrupt. ADMINQ is enabled by VF after completely reinit admin queue.

Fixes b40c82e6ae85 ("i40e: Fix inconsistent use of PF/VF vs pf/vf")
---
 .../net/ethernet/intel/i40e/i40e_register.h   | 10 +++++
 .../ethernet/intel/i40e/i40e_virtchnl_pf.c    | 45
++++++++++++++++++-
 .../ethernet/intel/i40e/i40e_virtchnl_pf.h    |  1 +
 3 files changed, 54 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_register.h +3 -0
index 8d0588a27..b5c741e76 100644
@@ -371,6 +371,16 @@
 #define I40E_PFINT_ICR0_ENA_VFLR_MASK I40E_MASK(0x1,
 I40E_PFINT_ICR0_ENA_VFLR_SHIFT)
 #define I40E_PFINT_ICR0_ENA_ADMINQ_SHIFT 30
 #define I40E_PFINT_ICR0_ENA_ADMINQ_MASK I40E_MASK(0x1,
 I40E_PFINT_ICR0_ENA_ADMINQ_SHIFT)
+#define I40E_VFINT_ICR0_ADMINQ_SHIFT 30
+#define I40E_VFINT_ICR0_ADMINQ_MASK I40E_MASK(0x1,
 I40E_VFINT_ICR0_ADMINQ_SHIFT)
+#define I40E_VFINT_ICR0_ENA(_VF) (0x0002C000 + ((_VF) * 4)) /*

_i=0...127 */ /* Reset: CORER */

drivers/net/ethernet/intel/i40e/i40e_register.h +3 -0
+#define I40E_VFINT_ICR0_ENA_MAX_INDEX 127
+#define I40E_VFINT_ICR0_ENA_LINK_STAT_CHANGE_SHIFT 25
+#define I40E_VFINT_ICR0_ENA_LINK_STAT_CHANGE_MASK I40E_MASK(0x1,

I40E_VFINT_ICR0_ENA_LINK_STAT_CHANGE_SHIFT)

drivers/net/ethernet/intel/i40e/i40e_register.h +2 -0
+#define I40E_VFINT_ICR0_ENA_ADMINQ_SHIFT 30
+#define I40E_VFINT_ICR0_ENA_ADMINQ_MASK I40E_MASK(0x1,

I40E_VFINT_ICR0_ENA_ADMINQ_SHIFT)

drivers/net/ethernet/intel/i40e/i40e_register.h +2 -0
+#define I40E_VFINT_ICR0_ENA_RSVD_SHIFT 31
+#define I40E_VFINT_ICR0_ENA_RSVD_MASK I40E_MASK(0x1,
Quoted 1 line

I40E_VFINT_ICR0_ENA_RSVD_SHIFT)

I don't see that all the new defines are being used. Can you remove the unused ones?