From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 2DC443238 for ; Fri, 23 Nov 2018 11:30:26 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8BF0AC05001D; Fri, 23 Nov 2018 10:30:25 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14CC56128A; Fri, 23 Nov 2018 10:30:23 +0000 (UTC) From: Kevin Traynor To: Fan Zhang Cc: Thomas Monjalon , dpdk stable Date: Fri, 23 Nov 2018 10:26:56 +0000 Message-Id: <20181123102713.17309-52-ktraynor@redhat.com> In-Reply-To: <20181123102713.17309-1-ktraynor@redhat.com> References: <20181123102713.17309-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 23 Nov 2018 10:30:25 +0000 (UTC) Subject: [dpdk-stable] patch 'bus/pci: fix config r/w access' has been queued to stable release 18.08.1 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: Fri, 23 Nov 2018 10:30:26 -0000 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 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 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 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,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: