[dpdk-stable] patch 'raw/octeontx2_dma: assign PCI device in DPI VF' has been queued to stable release 20.11.2

Xueming Li xuemingl at nvidia.com
Mon May 10 18:01:59 CEST 2021


Hi,

FYI, your patch has been queued to stable release 20.11.2

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

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/45b58e4ac4426b2eab23d3e8a7a9dd1ae65ff33c

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 45b58e4ac4426b2eab23d3e8a7a9dd1ae65ff33c Mon Sep 17 00:00:00 2001
From: Radha Mohan Chintakuntla <radhac at marvell.com>
Date: Fri, 9 Apr 2021 01:06:27 -0700
Subject: [PATCH] raw/octeontx2_dma: assign PCI device in DPI VF
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 692c0e78a52e62c31ed44d31eb66dafd439e5446 ]

The PCI device address is being used for sending mailbox which was
introduced in previous commit which replaced the macros so that
multiple DPI blocks in the hardware can be supported.

This patch fixes a NULL pointer access by assigning the PCI device
structure to dpivf.

Fixes: 4495bd887d38 ("raw/octeontx2_dma: support multiple DPI blocks")

Signed-off-by: Radha Mohan Chintakuntla <radhac at marvell.com>
---
 drivers/raw/octeontx2_dma/otx2_dpi_rawdev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/raw/octeontx2_dma/otx2_dpi_rawdev.c b/drivers/raw/octeontx2_dma/otx2_dpi_rawdev.c
index efdba2779b..8c01f25ec7 100644
--- a/drivers/raw/octeontx2_dma/otx2_dpi_rawdev.c
+++ b/drivers/raw/octeontx2_dma/otx2_dpi_rawdev.c
@@ -389,6 +389,7 @@ otx2_dpi_rawdev_probe(struct rte_pci_driver *pci_drv __rte_unused,
 	vf_id = ((pci_dev->addr.devid & 0x1F) << 3) |
 		 (pci_dev->addr.function & 0x7);
 	vf_id -= 1;
+	dpivf->dev = pci_dev;
 	dpivf->state = DPI_QUEUE_START;
 	dpivf->vf_id = vf_id;
 	dpivf->vf_bar0 = (uintptr_t)pci_dev->mem_resource[0].addr;
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-10 23:59:30.999514900 +0800
+++ 0171-raw-octeontx2_dma-assign-PCI-device-in-DPI-VF.patch	2021-05-10 23:59:26.610000000 +0800
@@ -1 +1 @@
-From 692c0e78a52e62c31ed44d31eb66dafd439e5446 Mon Sep 17 00:00:00 2001
+From 45b58e4ac4426b2eab23d3e8a7a9dd1ae65ff33c Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 692c0e78a52e62c31ed44d31eb66dafd439e5446 ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org


More information about the stable mailing list