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

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

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

Yongseok

---
>From c191f9e0a6f99d30476acc91346797d65503b7ac 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 fc4981038..f955ede21 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -708,6 +708,7 @@ 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
 	case RTE_KDRV_VFIO:
@@ -731,6 +732,7 @@ 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
 	case RTE_KDRV_VFIO:
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 15:01:49.429296423 -0800
+++ 0096-bus-pci-fix-config-r-w-access.patch	2018-11-29 15:01:45.254960000 -0800
@@ -1,13 +1,14 @@
-From a38eafedda1de14c9fd7219e769e89e4aec92a45 Mon Sep 17 00:00:00 2001
+From c191f9e0a6f99d30476acc91346797d65503b7ac 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,10 +17,10 @@
  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 fc4981038..f955ede21 100644
 --- a/drivers/bus/pci/linux/pci.c
 +++ b/drivers/bus/pci/linux/pci.c
-@@ -713,6 +713,7 @@ int rte_pci_read_config(const struct rte_pci_device *device,
+@@ -708,6 +708,7 @@ int rte_pci_read_config(const struct rte_pci_device *device,
  
  	switch (device->kdrv) {
  	case RTE_KDRV_IGB_UIO:
@@ -27,7 +28,7 @@
  		return pci_uio_read_config(intr_handle, buf, len, offset);
  #ifdef VFIO_PRESENT
  	case RTE_KDRV_VFIO:
-@@ -736,6 +737,7 @@ int rte_pci_write_config(const struct rte_pci_device *device,
+@@ -731,6 +732,7 @@ int rte_pci_write_config(const struct rte_pci_device *device,
  
  	switch (device->kdrv) {
  	case RTE_KDRV_IGB_UIO: