patch 'bus/pci: assign driver pointer before mapping' has been queued to stable release 21.11.1

[Kevin Traynor]

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/06/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/86598c1b6ff6f92be28ca692d4c75bd0e74a74d2

Thanks.

Kevin

---
>From 86598c1b6ff6f92be28ca692d4c75bd0e74a74d2 Mon Sep 17 00:00:00 2001
From: Michal Krawczyk <mk at semihalf.com>
Date: Wed, 19 Jan 2022 15:50:37 +0100
Subject: [PATCH] bus/pci: assign driver pointer before mapping

[ upstream commit 6b92f184680283b4b3da4ebc722b5feb7ef280fb ]

Patch changing the way of accessing interrupt handle also changed order
of the rte_pci_map_device() call and rte_pci_device:driver assignment.
It was causing issues with Write Combine mapping on the Linux platform
if it was used with the igb_uio module.

Linux implementation of pci_uio_map_resource_by_index(), which is called
by rte_pci_map_device(), needs access to the device's driver. Otherwise
it won't be able to check the driver's flags and won't respect them.

Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle")

Signed-off-by: Michal Krawczyk <mk at semihalf.com>
---
 drivers/bus/pci/pci_common.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 4a3a87f24f..def372b67e 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -248,7 +248,10 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
 		}
 
+		dev->driver = dr;
+
 		if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) {
 			ret = rte_pci_map_device(dev);
 			if (ret != 0) {
+				dev->driver = NULL;
 				rte_intr_instance_free(dev->vfio_req_intr_handle);
 				dev->vfio_req_intr_handle = NULL;
@@ -258,6 +261,4 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
 			}
 		}
-
-		dev->driver = dr;
 	}
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-01 10:41:04.157113135 +0000
+++ 0103-bus-pci-assign-driver-pointer-before-mapping.patch	2022-03-01 10:41:01.485244135 +0000
@@ -1 +1 @@
-From 6b92f184680283b4b3da4ebc722b5feb7ef280fb Mon Sep 17 00:00:00 2001
+From 86598c1b6ff6f92be28ca692d4c75bd0e74a74d2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6b92f184680283b4b3da4ebc722b5feb7ef280fb ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org