[dpdk-stable] patch 'net/octeontx2: fix PF flow action for Tx' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

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

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 79c6f9e2a5395da0e872ce3007b2508063ee47f0 Mon Sep 17 00:00:00 2001
From: Liron Himi <lironh at marvell.com>
Date: Mon, 18 Jan 2021 12:50:31 +0200
Subject: [PATCH] net/octeontx2: fix PF flow action for Tx

[ upstream commit 701f94a60afbc7c3e28766cc88afa1b5397fdfba ]

pf-func is 16bit but the current reserved location
used in tx action is 8bits. Moved it to bits 63-48.

Fixes: 32e6aaa97c40 ("net/octeontx2: support flow parse actions")

Signed-off-by: Liron Himi <lironh at marvell.com>
Reviewed-by: Kiran Kumar K <kirankumark at marvell.com>
---
 drivers/net/octeontx2/otx2_flow_parse.c | 5 ++++-
 drivers/net/octeontx2/otx2_flow_utils.c | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/octeontx2/otx2_flow_parse.c b/drivers/net/octeontx2/otx2_flow_parse.c
index 2d9a5857c0..7a7cb29fbd 100644
--- a/drivers/net/octeontx2/otx2_flow_parse.c
+++ b/drivers/net/octeontx2/otx2_flow_parse.c
@@ -1034,7 +1034,10 @@ otx2_flow_parse_actions(struct rte_eth_dev *dev,
 
 set_pf_func:
 	/* Ideally AF must ensure that correct pf_func is set */
-	flow->npc_action |= (uint64_t)pf_func << 4;
+	if (attr->egress)
+		flow->npc_action |= (uint64_t)pf_func << 48;
+	else
+		flow->npc_action |= (uint64_t)pf_func << 4;
 
 	return 0;
 
diff --git a/drivers/net/octeontx2/otx2_flow_utils.c b/drivers/net/octeontx2/otx2_flow_utils.c
index 14625c9ad1..1adeff2563 100644
--- a/drivers/net/octeontx2/otx2_flow_utils.c
+++ b/drivers/net/octeontx2/otx2_flow_utils.c
@@ -940,7 +940,7 @@ otx2_flow_mcam_alloc_and_write(struct rte_flow *flow, struct otx2_mbox *mbox,
 		req->entry_data.kw[0] |= flow_info->channel;
 		req->entry_data.kw_mask[0] |=  (BIT_ULL(12) - 1);
 	} else {
-		uint16_t pf_func = (flow->npc_action >> 4) & 0xffff;
+		uint16_t pf_func = (flow->npc_action >> 48) & 0xffff;
 
 		pf_func = htons(pf_func);
 		req->entry_data.kw[0] |= ((uint64_t)pf_func << 32);
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:32.393541580 +0100
+++ 0106-net-octeontx2-fix-PF-flow-action-for-Tx.patch	2021-02-04 12:04:28.126789822 +0100
@@ -1 +1 @@
-From 701f94a60afbc7c3e28766cc88afa1b5397fdfba Mon Sep 17 00:00:00 2001
+From 79c6f9e2a5395da0e872ce3007b2508063ee47f0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 701f94a60afbc7c3e28766cc88afa1b5397fdfba ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 476195d634..e9b940f6c0 100644
+index 2d9a5857c0..7a7cb29fbd 100644
@@ -23 +24 @@
-@@ -1090,7 +1090,10 @@ otx2_flow_parse_actions(struct rte_eth_dev *dev,
+@@ -1034,7 +1034,10 @@ otx2_flow_parse_actions(struct rte_eth_dev *dev,
@@ -36 +37 @@
-index 9a0a5f9fb4..7ed86ba742 100644
+index 14625c9ad1..1adeff2563 100644
@@ -39 +40 @@
-@@ -944,7 +944,7 @@ otx2_flow_mcam_alloc_and_write(struct rte_flow *flow, struct otx2_mbox *mbox,
+@@ -940,7 +940,7 @@ otx2_flow_mcam_alloc_and_write(struct rte_flow *flow, struct otx2_mbox *mbox,