[dpdk-stable] patch 'net/dpaa: fix headroom in VSP case' has been queued to stable release 20.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.3

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/28/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/4b44020ca7ad0bc5874f4a4f97bcaaa50662a47d

Thanks.

Luca Boccassi

---
>From 4b44020ca7ad0bc5874f4a4f97bcaaa50662a47d Mon Sep 17 00:00:00 2001
From: Nipun Gupta <nipun.gupta at nxp.com>
Date: Mon, 19 Jul 2021 19:29:12 +0530
Subject: [PATCH] net/dpaa: fix headroom in VSP case

[ upstream commit 8d2bf7c1d5b93becd8b4649e0c628eec94be1799 ]

This patch fixes providing the correct headroom size when
VSP is enabled.

Fixes: e4abd4ff183c ("net/dpaa: support virtual storage profile")

Signed-off-by: Nipun Gupta <nipun.gupta at nxp.com>
---
 drivers/net/dpaa/dpaa_flow.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/dpaa/dpaa_flow.c b/drivers/net/dpaa/dpaa_flow.c
index a0087df670..c5b5ec8695 100644
--- a/drivers/net/dpaa/dpaa_flow.c
+++ b/drivers/net/dpaa/dpaa_flow.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2017-2019 NXP
+ * Copyright 2017-2019,2021 NXP
  */
 
 /* System headers */
@@ -999,6 +999,9 @@ static int dpaa_port_vsp_configure(struct dpaa_if *dpaa_intf,
 	buf_prefix_cont.pass_time_stamp = true;
 	buf_prefix_cont.pass_hash_result = false;
 	buf_prefix_cont.pass_all_other_pcdinfo = false;
+	buf_prefix_cont.manip_ext_space =
+		RTE_PKTMBUF_HEADROOM - DPAA_MBUF_HW_ANNOTATION;
+
 	ret = fm_vsp_config_buffer_prefix_content(dpaa_intf->vsp_handle[vsp_id],
 					       &buf_prefix_cont);
 	if (ret != E_OK) {
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-07-26 13:53:18.769305985 +0100
+++ 0050-net-dpaa-fix-headroom-in-VSP-case.patch	2021-07-26 13:53:15.949294725 +0100
@@ -1 +1 @@
-From 8d2bf7c1d5b93becd8b4649e0c628eec94be1799 Mon Sep 17 00:00:00 2001
+From 4b44020ca7ad0bc5874f4a4f97bcaaa50662a47d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8d2bf7c1d5b93becd8b4649e0c628eec94be1799 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org