patch 'common/cnxk: fix mbuf data offset for VF' has been queued to stable release 21.11.1

[Kevin Traynor <ktraynor@redhat.com>]

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/14/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/c22759e121fb0d1cf8c3ea3b67e3616289c4066e

Thanks.

Kevin

---
From c22759e121fb0d1cf8c3ea3b67e3616289c4066e Mon Sep 17 00:00:00 2001
From: Harman Kalra <hkalra@marvell.com>
Date: Thu, 3 Mar 2022 12:30:42 +0530
Subject: [PATCH] common/cnxk: fix mbuf data offset for VF

[ upstream commit 8f98e3ecc55e02234f8bec7213b0b6a69c086949 ]

If PF has PTP enabled the data offset should be adjusted for VF to
skip extra 8 bytes of timestamp as the MAC inserts 8 bytes before
the ethernet header.

Fixes: c443e0d326e1 ("common/cnxk: support NIX PTP")

Signed-off-by: Harman Kalra <hkalra@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
 drivers/common/cnxk/roc_nix.h     | 1 +
 drivers/common/cnxk/roc_nix_ptp.c | 8 ++++++++
 drivers/common/cnxk/version.map   | 1 +
 drivers/net/cnxk/cnxk_ethdev.c    | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/drivers/common/cnxk/roc_nix.h b/drivers/common/cnxk/roc_nix.h
index 69a5e8e7b4..986aac9e57 100644
--- a/drivers/common/cnxk/roc_nix.h
+++ b/drivers/common/cnxk/roc_nix.h
@@ -809,4 +809,5 @@ int __roc_api roc_nix_ptp_info_cb_register(struct roc_nix *roc_nix,
 					   ptp_info_update_t ptp_update);
 void __roc_api roc_nix_ptp_info_cb_unregister(struct roc_nix *roc_nix);
+bool __roc_api roc_nix_ptp_is_enable(struct roc_nix *roc_nix);
 
 /* VLAN */
diff --git a/drivers/common/cnxk/roc_nix_ptp.c b/drivers/common/cnxk/roc_nix_ptp.c
index 03c4c6e5fd..05e4211de9 100644
--- a/drivers/common/cnxk/roc_nix_ptp.c
+++ b/drivers/common/cnxk/roc_nix_ptp.c
@@ -121,2 +121,10 @@ roc_nix_ptp_info_cb_unregister(struct roc_nix *roc_nix)
 	dev->ops->ptp_info_update = NULL;
 }
+
+bool
+roc_nix_ptp_is_enable(struct roc_nix *roc_nix)
+{
+	struct nix *nix = roc_nix_to_nix_priv(roc_nix);
+
+	return nix->ptp_en;
+}
diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
index 07c6720f0c..556369bc02 100644
--- a/drivers/common/cnxk/version.map
+++ b/drivers/common/cnxk/version.map
@@ -199,4 +199,5 @@ INTERNAL {
 	roc_nix_ptp_info_cb_register;
 	roc_nix_ptp_info_cb_unregister;
+	roc_nix_ptp_is_enable;
 	roc_nix_ptp_rx_ena_dis;
 	roc_nix_ptp_sync_time_adjust;
diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c
index 0c38f013c2..a1da90be57 100644
--- a/drivers/net/cnxk/cnxk_ethdev.c
+++ b/drivers/net/cnxk/cnxk_ethdev.c
@@ -1132,4 +1132,8 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev)
 	}
 
+	/* Check if ptp is enable in PF owning this VF*/
+	if (!roc_nix_is_pf(nix) && (!roc_nix_is_sdp(nix)))
+		dev->ptp_en = roc_nix_ptp_is_enable(nix);
+
 	dev->npc.channel = roc_nix_get_base_chan(nix);
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-08 13:55:29.169231799 +0000
+++ 0030-common-cnxk-fix-mbuf-data-offset-for-VF.patch	2022-03-08 13:55:28.501315177 +0000
@@ -1 +1 @@
-From 8f98e3ecc55e02234f8bec7213b0b6a69c086949 Mon Sep 17 00:00:00 2001
+From c22759e121fb0d1cf8c3ea3b67e3616289c4066e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8f98e3ecc55e02234f8bec7213b0b6a69c086949 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 5e6eb58c0c..dbb816d961 100644
+index 69a5e8e7b4..986aac9e57 100644
@@ -26 +27 @@
-@@ -865,4 +865,5 @@ int __roc_api roc_nix_ptp_info_cb_register(struct roc_nix *roc_nix,
+@@ -809,4 +809,5 @@ int __roc_api roc_nix_ptp_info_cb_register(struct roc_nix *roc_nix,
@@ -48 +49 @@
-index d346e6f650..2a122e544d 100644
+index 07c6720f0c..556369bc02 100644
@@ -51 +52 @@
-@@ -207,4 +207,5 @@ INTERNAL {
+@@ -199,4 +199,5 @@ INTERNAL {
@@ -58 +59 @@
-index deb95ae4c4..1fa4131907 100644
+index 0c38f013c2..a1da90be57 100644
@@ -61 +62 @@
-@@ -1124,4 +1124,8 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev)
+@@ -1132,4 +1132,8 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev)