From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Marchand Subject: [PATCH 3/4] pci: align ioport special case for x86 in read/write/unmap Date: Tue, 15 Mar 2016 07:29:12 +0100 Message-ID: <1458023353-22268-4-git-send-email-david.marchand@6wind.com> References: <1458023353-22268-1-git-send-email-david.marchand@6wind.com> Cc: mauricio.vasquezbernal@studenti.polito.it, yuanhan.liu@linux.intel.com, huawei.xie@intel.com To: dev@dpdk.org Return-path: Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by dpdk.org (Postfix) with ESMTP id 55BD15591 for ; Tue, 15 Mar 2016 07:29:49 +0100 (CET) Received: by mail-wm0-f44.google.com with SMTP id p65so129630500wmp.1 for ; Mon, 14 Mar 2016 23:29:49 -0700 (PDT) In-Reply-To: <1458023353-22268-1-git-send-email-david.marchand@6wind.com> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Commit b8eb345378bd ("pci: ignore devices already managed in Linux when mapping x86 ioport") did not update other parts of the ioport api. The application is not supposed to call these read/write/unmap ioport functions if map call failed but I prefer aligning the code for the sake of consistency. Signed-off-by: David Marchand --- lib/librte_eal/linuxapp/eal/eal_pci.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index 7707292..74c6919 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -653,12 +653,13 @@ rte_eal_pci_ioport_read(struct rte_pci_ioport *p, case RTE_KDRV_UIO_GENERIC: pci_uio_ioport_read(p, data, len, offset); break; - default: + case RTE_KDRV_NONE: #if defined(RTE_ARCH_X86) - /* special case for x86 ... */ pci_uio_ioport_read(p, data, len, offset); #endif break; + default: + break; } } @@ -678,12 +679,13 @@ rte_eal_pci_ioport_write(struct rte_pci_ioport *p, case RTE_KDRV_UIO_GENERIC: pci_uio_ioport_write(p, data, len, offset); break; - default: + case RTE_KDRV_NONE: #if defined(RTE_ARCH_X86) - /* special case for x86 ... */ pci_uio_ioport_write(p, data, len, offset); #endif break; + default: + break; } } @@ -705,12 +707,13 @@ rte_eal_pci_ioport_unmap(struct rte_pci_ioport *p) case RTE_KDRV_UIO_GENERIC: ret = pci_uio_ioport_unmap(p); break; - default: + case RTE_KDRV_NONE: #if defined(RTE_ARCH_X86) - /* special case for x86 ... nothing to do */ ret = 0; #endif break; + default: + break; } return ret; -- 1.9.1