[dpdk-stable] patch 'event/octeontx2: fix sub event type' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

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

Thanks.

Luca Boccassi

---
>From f2e1decce9f0d3fae23a206c587a3cba8485eaa0 Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula at marvell.com>
Date: Mon, 29 Jun 2020 07:03:27 +0530
Subject: [PATCH] event/octeontx2: fix sub event type

[ upstream commit 3c1a1c43cd93fa7c73a460d6f88ca5de7ca1e9c0 ]

In OCTEONTX2 event device we use sub_event_type to store the ethernet
port identifier when we receive work from OCTEONTX2 ethernet device.
This violates the event device spec as sub_event_type should be 0 in
the initial receive stage.
Set sub_event_type to 0 after copying the port id.

Fixes: 0fe4accd8ec8 ("event/octeontx2: add Rx adapter fastpath ops")

Signed-off-by: Pavan Nikhilesh <pbhagavatula at marvell.com>
---
 drivers/event/octeontx2/otx2_worker_dual.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/event/octeontx2/otx2_worker_dual.h b/drivers/event/octeontx2/otx2_worker_dual.h
index 5134e3d52..fb6a8cd0d 100644
--- a/drivers/event/octeontx2/otx2_worker_dual.h
+++ b/drivers/event/octeontx2/otx2_worker_dual.h
@@ -69,8 +69,11 @@ otx2_ssogws_dual_get_work(struct otx2_ssogws_state *ws,
 
 	if (event.sched_type != SSO_TT_EMPTY &&
 	    event.event_type == RTE_EVENT_TYPE_ETHDEV) {
-		otx2_wqe_to_mbuf(get_work1, mbuf, event.sub_event_type,
-				 (uint32_t) event.get_work0, flags, lookup_mem);
+		uint8_t port = event.sub_event_type;
+
+		event.sub_event_type = 0;
+		otx2_wqe_to_mbuf(get_work1, mbuf, port,
+				 event.flow_id, flags, lookup_mem);
 		/* Extracting tstamp, if PTP enabled. CGX will prepend the
 		 * timestamp at starting of packet data and it can be derieved
 		 * from WQE 9 dword which corresponds to SG iova.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:51.501030484 +0100
+++ 0076-event-octeontx2-fix-sub-event-type.patch	2020-07-24 12:53:48.299006683 +0100
@@ -1,8 +1,10 @@
-From 3c1a1c43cd93fa7c73a460d6f88ca5de7ca1e9c0 Mon Sep 17 00:00:00 2001
+From f2e1decce9f0d3fae23a206c587a3cba8485eaa0 Mon Sep 17 00:00:00 2001
 From: Pavan Nikhilesh <pbhagavatula at marvell.com>
 Date: Mon, 29 Jun 2020 07:03:27 +0530
 Subject: [PATCH] event/octeontx2: fix sub event type
 
+[ upstream commit 3c1a1c43cd93fa7c73a460d6f88ca5de7ca1e9c0 ]
+
 In OCTEONTX2 event device we use sub_event_type to store the ethernet
 port identifier when we receive work from OCTEONTX2 ethernet device.
 This violates the event device spec as sub_event_type should be 0 in
@@ -10,7 +12,6 @@
 Set sub_event_type to 0 after copying the port id.
 
 Fixes: 0fe4accd8ec8 ("event/octeontx2: add Rx adapter fastpath ops")
-Cc: stable at dpdk.org
 
 Signed-off-by: Pavan Nikhilesh <pbhagavatula at marvell.com>
 ---
@@ -18,10 +19,10 @@
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/event/octeontx2/otx2_worker_dual.h b/drivers/event/octeontx2/otx2_worker_dual.h
-index c88420eb4..60aa14cca 100644
+index 5134e3d52..fb6a8cd0d 100644
 --- a/drivers/event/octeontx2/otx2_worker_dual.h
 +++ b/drivers/event/octeontx2/otx2_worker_dual.h
-@@ -65,8 +65,11 @@ otx2_ssogws_dual_get_work(struct otx2_ssogws_state *ws,
+@@ -69,8 +69,11 @@ otx2_ssogws_dual_get_work(struct otx2_ssogws_state *ws,
  
  	if (event.sched_type != SSO_TT_EMPTY &&
  	    event.event_type == RTE_EVENT_TYPE_ETHDEV) {