[dpdk-stable] patch 'net/octeontx2: fix PTP' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 02/29/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 efd0744fc65671224158f87afd1a36b16dcfc25b Mon Sep 17 00:00:00 2001
From: Harman Kalra <hkalra at marvell.com>
Date: Sat, 15 Feb 2020 14:05:03 +0530
Subject: [PATCH] net/octeontx2: fix PTP

[ upstream commit 93a9afdb4b10f02aa06b8e58ffa403e10bc32bba ]

PTP functionality has been broken after a change in kernel
where enum npc_kpu_lc_ltype is change to allow adjustment of
LTYPE_MASK to detect all types of IP headers.
Syncing the required changes in DPDK to fix the issue.

The kernel side changes available in marvell SDK version SDK-10.3.2.x.

Fixes: b5dc3140448e ("net/octeontx2: support base PTP")

Signed-off-by: Harman Kalra <hkalra at marvell.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 drivers/common/octeontx2/hw/otx2_npc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/common/octeontx2/hw/otx2_npc.h b/drivers/common/octeontx2/hw/otx2_npc.h
index a0536e0aed..3dfc137a30 100644
--- a/drivers/common/octeontx2/hw/otx2_npc.h
+++ b/drivers/common/octeontx2/hw/otx2_npc.h
@@ -201,7 +201,8 @@ enum npc_kpu_lb_ltype {
 };
 
 enum npc_kpu_lc_ltype {
-	NPC_LT_LC_IP = 1,
+	NPC_LT_LC_PTP = 1,
+	NPC_LT_LC_IP,
 	NPC_LT_LC_IP_OPT,
 	NPC_LT_LC_IP6,
 	NPC_LT_LC_IP6_EXT,
@@ -209,7 +210,6 @@ enum npc_kpu_lc_ltype {
 	NPC_LT_LC_RARP,
 	NPC_LT_LC_MPLS,
 	NPC_LT_LC_NSH,
-	NPC_LT_LC_PTP,
 	NPC_LT_LC_FCOE,
 };
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-27 09:31:56.081246361 +0000
+++ 0007-net-octeontx2-fix-PTP.patch	2020-02-27 09:31:55.663945346 +0000
@@ -1,8 +1,10 @@
-From 93a9afdb4b10f02aa06b8e58ffa403e10bc32bba Mon Sep 17 00:00:00 2001
+From efd0744fc65671224158f87afd1a36b16dcfc25b Mon Sep 17 00:00:00 2001
 From: Harman Kalra <hkalra at marvell.com>
 Date: Sat, 15 Feb 2020 14:05:03 +0530
 Subject: [PATCH] net/octeontx2: fix PTP
 
+[ upstream commit 93a9afdb4b10f02aa06b8e58ffa403e10bc32bba ]
+
 PTP functionality has been broken after a change in kernel
 where enum npc_kpu_lc_ltype is change to allow adjustment of
 LTYPE_MASK to detect all types of IP headers.
@@ -11,7 +13,6 @@
 The kernel side changes available in marvell SDK version SDK-10.3.2.x.
 
 Fixes: b5dc3140448e ("net/octeontx2: support base PTP")
-Cc: stable at dpdk.org
 
 Signed-off-by: Harman Kalra <hkalra at marvell.com>
 Acked-by: Jerin Jacob <jerinj at marvell.com>