[dpdk-stable] patch 'bus/pci: fix config r/w access' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.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 11/29/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From bc4816f2aa5cfc0fd35782a95e62d42eaa842766 Mon Sep 17 00:00:00 2001
From: Fan Zhang <roy.fan.zhang at intel.com>
Date: Thu, 1 Nov 2018 12:10:09 +0000
Subject: [PATCH] bus/pci: fix config r/w access

[ upstream commit a38eafedda1de14c9fd7219e769e89e4aec92a45 ]

The recent change to rte_pci_read/write_config() missed
uio_pci_generic case.

Fixes: 630deed612ca ("bus/pci: compare kernel driver instead of interrupt handler")

Signed-off-by: Fan Zhang <roy.fan.zhang at intel.com>
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
---
 drivers/bus/pci/linux/pci.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index 58b615a47..563e36c46 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -678,4 +678,5 @@ int rte_pci_read_config(const struct rte_pci_device *device,
 	switch (device->kdrv) {
 	case RTE_KDRV_IGB_UIO:
+	case RTE_KDRV_UIO_GENERIC:
 		return pci_uio_read_config(intr_handle, buf, len, offset);
 #ifdef VFIO_PRESENT
@@ -701,4 +702,5 @@ int rte_pci_write_config(const struct rte_pci_device *device,
 	switch (device->kdrv) {
 	case RTE_KDRV_IGB_UIO:
+	case RTE_KDRV_UIO_GENERIC:
 		return pci_uio_write_config(intr_handle, buf, len, offset);
 #ifdef VFIO_PRESENT
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-23 10:22:55.605832009 +0000
+++ 0052-bus-pci-fix-config-r-w-access.patch	2018-11-23 10:22:54.000000000 +0000
@@ -1,13 +1,14 @@
-From a38eafedda1de14c9fd7219e769e89e4aec92a45 Mon Sep 17 00:00:00 2001
+From bc4816f2aa5cfc0fd35782a95e62d42eaa842766 Mon Sep 17 00:00:00 2001
 From: Fan Zhang <roy.fan.zhang at intel.com>
 Date: Thu, 1 Nov 2018 12:10:09 +0000
 Subject: [PATCH] bus/pci: fix config r/w access
 
+[ upstream commit a38eafedda1de14c9fd7219e769e89e4aec92a45 ]
+
 The recent change to rte_pci_read/write_config() missed
 uio_pci_generic case.
 
 Fixes: 630deed612ca ("bus/pci: compare kernel driver instead of interrupt handler")
-Cc: stable at dpdk.org
 
 Signed-off-by: Fan Zhang <roy.fan.zhang at intel.com>
 Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
@@ -16,16 +17,16 @@
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
-index f87533c5c..c99d523f0 100644
+index 58b615a47..563e36c46 100644
 --- a/drivers/bus/pci/linux/pci.c
 +++ b/drivers/bus/pci/linux/pci.c
-@@ -714,4 +714,5 @@ int rte_pci_read_config(const struct rte_pci_device *device,
+@@ -678,4 +678,5 @@ int rte_pci_read_config(const struct rte_pci_device *device,
  	switch (device->kdrv) {
  	case RTE_KDRV_IGB_UIO:
 +	case RTE_KDRV_UIO_GENERIC:
  		return pci_uio_read_config(intr_handle, buf, len, offset);
  #ifdef VFIO_PRESENT
-@@ -737,4 +738,5 @@ int rte_pci_write_config(const struct rte_pci_device *device,
+@@ -701,4 +702,5 @@ int rte_pci_write_config(const struct rte_pci_device *device,
  	switch (device->kdrv) {
  	case RTE_KDRV_IGB_UIO:
 +	case RTE_KDRV_UIO_GENERIC: