From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id B1EB31B50A for ; Fri, 30 Nov 2018 00:15:20 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:21:09 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW8a032075; Fri, 30 Nov 2018 01:15:14 +0200 From: Yongseok Koh To: Fan Zhang Cc: Thomas Monjalon , dpdk stable Date: Thu, 29 Nov 2018 15:11:30 -0800 Message-Id: <20181129231202.30436-96-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'bus/pci: fix config r/w access' has been queued to LTS release 17.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2018 23:15:21 -0000 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 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 Signed-off-by: Thomas Monjalon --- 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 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@dpdk.org Signed-off-by: Fan Zhang Signed-off-by: Thomas Monjalon @@ -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: