[dpdk-stable] patch 'net/ice/base: revert change of first profile mask' has been queued to stable release 19.11.10

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/12/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/ff5c98462cd6787df67a0261d6b5a48ef6591711

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From ff5c98462cd6787df67a0261d6b5a48ef6591711 Mon Sep 17 00:00:00 2001
From: Wenjun Wu <wenjun1.wu at intel.com>
Date: Tue, 13 Jul 2021 09:51:04 +0800
Subject: [PATCH] net/ice/base: revert change of first profile mask

[ upstream commit 0a37b22875d67f37a561012e30456ad51bd79061 ]

Segmentation fault mentioned in below commit is related to
other root cause under investigation.
This reverts patch below since it may have potential
risk and side effect if the first profile mask is set to 0.

Fixes: 148fdf2d3537 ("net/ice/base: fix first profile mask")

Signed-off-by: Wenjun Wu <wenjun1.wu at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/base/ice_flex_pipe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c
index eb0d784745..cc95a2e0d0 100644
--- a/drivers/net/ice/base/ice_flex_pipe.c
+++ b/drivers/net/ice/base/ice_flex_pipe.c
@@ -2953,7 +2953,7 @@ static void ice_init_prof_masks(struct ice_hw *hw, enum ice_block blk)
 	per_pf = ICE_PROF_MASK_COUNT / hw->dev_caps.num_funcs;
 
 	hw->blk[blk].masks.count = per_pf;
-	hw->blk[blk].masks.first = 0;
+	hw->blk[blk].masks.first = hw->pf_id * per_pf;
 
 	ice_memset(hw->blk[blk].masks.masks, 0,
 		   sizeof(hw->blk[blk].masks.masks), ICE_NONDMA_MEM);
-- 
2.32.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-08-10 15:11:15.762784212 +0200
+++ 0071-net-ice-base-revert-change-of-first-profile-mask.patch	2021-08-10 15:11:13.078638532 +0200
@@ -1 +1 @@
-From 0a37b22875d67f37a561012e30456ad51bd79061 Mon Sep 17 00:00:00 2001
+From ff5c98462cd6787df67a0261d6b5a48ef6591711 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0a37b22875d67f37a561012e30456ad51bd79061 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 829d88bba6..b3cea731f3 100644
+index eb0d784745..cc95a2e0d0 100644
@@ -24 +25 @@
-@@ -3432,7 +3432,7 @@ static void ice_init_prof_masks(struct ice_hw *hw, enum ice_block blk)
+@@ -2953,7 +2953,7 @@ static void ice_init_prof_masks(struct ice_hw *hw, enum ice_block blk)