[dpdk-stable] patch 'net/dpaa: fix FD offset data type' has been queued to LTS release 18.11.10

Kevin Traynor ktraynor at redhat.com
Thu Aug 20 17:33:29 CEST 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.10

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/60e0fc57b77bc79fa96a0574962dd88bd86c85b7

Thanks.

Kevin.

---
>From 60e0fc57b77bc79fa96a0574962dd88bd86c85b7 Mon Sep 17 00:00:00 2001
From: Nipun Gupta <nipun.gupta at nxp.com>
Date: Tue, 7 Jul 2020 14:52:17 +0530
Subject: [PATCH] net/dpaa: fix FD offset data type

[ upstream commit 287f4256f9af9291abd1e1f129144cd47eb2d206 ]

On DPAA fd offset is 9 bits, but we are using uint8_t in the
SG case. This patch fixes the same.

Fixes: 8cffdcbe85aa ("net/dpaa: support scattered Rx")

Signed-off-by: Nipun Gupta <nipun.gupta at nxp.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 drivers/net/dpaa/dpaa_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index ba01bd17e6..2089ed5f59 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -305,5 +305,5 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid)
 	void *vaddr, *sg_vaddr;
 	int i = 0;
-	uint8_t fd_offset = fd->offset;
+	uint16_t fd_offset = fd->offset;
 
 	vaddr = DPAA_MEMPOOL_PTOV(bp_info, qm_fd_addr(fd));
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.701438452 +0100
+++ 0024-net-dpaa-fix-FD-offset-data-type.patch	2020-08-20 16:26:15.809324188 +0100
@@ -1 +1 @@
-From 287f4256f9af9291abd1e1f129144cd47eb2d206 Mon Sep 17 00:00:00 2001
+From 60e0fc57b77bc79fa96a0574962dd88bd86c85b7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 287f4256f9af9291abd1e1f129144cd47eb2d206 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 5dba1db8b3..3aeecb7d2e 100644
+index ba01bd17e6..2089ed5f59 100644
@@ -23 +24 @@
-@@ -306,5 +306,5 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid)
+@@ -305,5 +305,5 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid)



More information about the stable mailing list