Skip to contentSkip to conversation

i40e: Fix pf-flags overwrite bug introduced in hw_disabled_flags removal patch.

PATCH New Sridhar Samudrala 3 participants 4 messages May 4, 2017

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

PATCH 1/1 i40e: Fix pf-flags overwrite bug introduced in hw_disabled_flags removal patch.

Commit 47994c119a36 (i40e: remove hw_disabled_flags in favor of
using separate flag bits) causes pf->flags overwrite when setting I40E_FLAG_HW_ATR_EVICT_CAPABLE flag.

---
 drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +2 -2
index e4eb978..c05221c 100644
@@ -8822,9 +8822,9 @@ static int i40e_sw_init(struct i40e_pf *pf)
 		    (pf->hw.aq.api_min_ver > 4))) {
 		/* Supported in FW API version higher than 1.4 */
 		pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;
-		pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
+		pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
 	} else {
-		pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
+		pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
 	}
 
 	pf->eeprom_version = 0xDEAD;
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/1 i40e: Fix pf-flags overwrite bug introduced in hw_disabled_flags removal patch.

This needs to be pushed ASAP for Dave's net tree as without it we are losing MSI, MSI-X and all basic offloads for the X710 and XL710 parts.

Feel free to add the following:

Fixes 47994c119a36 ("i40e: remove hw_disabled_flags in favor of using

separate flag bits")

Quoted 32 lines · Sridhar Samudrala

Commit 47994c119a36 (i40e: remove hw_disabled_flags in favor of using separate flag bits) causes pf->flags overwrite when setting I40E_FLAG_HW_ATR_EVICT_CAPABLE flag.

---
 drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +2 -3
index e4eb978..c05221c 100644
@@ -8822,9 +8822,9 @@ static int i40e_sw_init(struct i40e_pf *pf)
                    (pf->hw.aq.api_min_ver > 4))) {
                /* Supported in FW API version higher than 1.4 */
                pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;
-               pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
+               pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
        } else {
-               pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
+               pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
        }
 
        pf->eeprom_version = 0xDEAD;
--

1.8.3.1

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan

#2 lore raw

PATCH 1/1 i40e: Fix pf-flags overwrite bug introduced in hw_disabled_flags removal patch.

Quoted 11 lines

-----Original Message-----
From: Alexander Duyck [mailto:alexander.duyck at gmail.com]
Sent: Thursday, May 04, 2017 12:53 PM
To: Samudrala, Sridhar <[email protected]>
Cc: intel-wired-lan <[email protected]>; Keller, Jacob E <[email protected]>
Subject: Re: [Intel-wired-lan] [PATCH] i40e: Fix pf-flags overwrite bug introduced in hw_disabled_flags removal patch.

Quoted 8 lines

This needs to be pushed ASAP for Dave's net tree as without it we are losing MSI, MSI-X and all basic offloads for the X710 and XL710 parts.

Feel free to add the following:

Fixes 47994c119a36 ("i40e: remove hw_disabled_flags in favor of using

separate flag bits")

Please add

This regression was introduced because the upstream code base was not identical and some of the code changes did not get properly redone for the upstream. Thanks for catching this and I apologize that I failed to catch this during review.

Thanks,
Jake

#3 lore raw

PATCH 1/1 i40e: Fix pf-flags overwrite bug introduced in hw_disabled_flags removal patch.

In reply to Sridhar Samudrala
Quoted 7 lines

-----Original Message-----
From: Samudrala, Sridhar
Sent: Thursday, May 04, 2017 11:47 AM
To: intel-wired-lan at lists.osuosl.org; Keller, Jacob E <[email protected]>
Subject: [PATCH] i40e: Fix pf-flags overwrite bug introduced in hw_disabled_flags removal patch.

Quoted 5 lines

Commit 47994c119a36 (i40e: remove hw_disabled_flags in favor of
using separate flag bits) causes pf->flags overwrite when setting I40E_FLAG_HW_ATR_EVICT_CAPABLE flag.

This doesn't match what's out of tree. I will send a patch in a few minutes to match what we do out-of-tree, which resolves this.

Thanks,
Jake

Quoted 23 lines
---
 drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +2 -3
index e4eb978..c05221c 100644
@@ -8822,9 +8822,9 @@ static int i40e_sw_init(struct i40e_pf *pf)
 		    (pf->hw.aq.api_min_ver > 4))) {
 		/* Supported in FW API version higher than 1.4 */
 		pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;
-		pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
+		pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
 	} else {
-		pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
+		pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
 	}
 
 	pf->eeprom_version = 0xDEAD;
--

1.8.3.1