patch 'common/cnxk: fix base rule merge' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/06/22. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/e09a0094a6025aed8cbe52b1a7b27280629dbb82

Thanks.

Kevin

---
>From e09a0094a6025aed8cbe52b1a7b27280629dbb82 Mon Sep 17 00:00:00 2001
From: Satheesh Paul <psatheesh at marvell.com>
Date: Tue, 25 Jan 2022 09:47:59 +0530
Subject: [PATCH] common/cnxk: fix base rule merge

[ upstream commit 0fb2b46be79a6558efd39c7a2e1d55402c958081 ]

Egress rules do not have a base steering rule and the
current base steering rule is applicable only for ingress
rules. Hence, when creating a flow rule, merge base steering
rule only for ingress rules.

Fixes: f9af90807466 ("common/cnxk: add mcam utility API")

Signed-off-by: Satheesh Paul <psatheesh at marvell.com>
Reviewed-by: Kiran Kumar K <kirankumark at marvell.com>
---
 drivers/common/cnxk/roc_npc_mcam.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/common/cnxk/roc_npc_mcam.c b/drivers/common/cnxk/roc_npc_mcam.c
index 82014a2ca0..a16ba3f7be 100644
--- a/drivers/common/cnxk/roc_npc_mcam.c
+++ b/drivers/common/cnxk/roc_npc_mcam.c
@@ -671,5 +671,5 @@ npc_program_mcam(struct npc *npc, struct npc_parse_state *pst, bool mcam_alloc)
 	memcpy(pst->flow->mcam_mask, key_mask, key_len);
 
-	if (pst->is_vf) {
+	if (pst->is_vf && pst->flow->nix_intf == NIX_INTF_RX) {
 		(void)mbox_alloc_msg_npc_read_base_steer_rule(npc->mbox);
 		rc = mbox_process_msg(npc->mbox, (void *)&base_rule_rsp);
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-01 10:41:02.572041011 +0000
+++ 0047-common-cnxk-fix-base-rule-merge.patch	2022-03-01 10:41:01.326244102 +0000
@@ -1 +1 @@
-From 0fb2b46be79a6558efd39c7a2e1d55402c958081 Mon Sep 17 00:00:00 2001
+From e09a0094a6025aed8cbe52b1a7b27280629dbb82 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0fb2b46be79a6558efd39c7a2e1d55402c958081 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index b251f643bc..7a3a8944f5 100644
+index 82014a2ca0..a16ba3f7be 100644
@@ -24,2 +25,2 @@
-@@ -753,5 +753,5 @@ npc_program_mcam(struct npc *npc, struct npc_parse_state *pst, bool mcam_alloc)
- 		npc_set_ipv6ext_ltype_mask(pst);
+@@ -671,5 +671,5 @@ npc_program_mcam(struct npc *npc, struct npc_parse_state *pst, bool mcam_alloc)
+ 	memcpy(pst->flow->mcam_mask, key_mask, key_len);