From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by dpdk.org (Postfix) with ESMTP id 1E83D312 for ; Fri, 9 May 2014 15:16:09 +0200 (CEST) Received: by mail-wi0-f181.google.com with SMTP id n15so1296309wiw.14 for ; Fri, 09 May 2014 06:16:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=syKWxfnIarlVbn+TeKHs9HKyybccN+CXObZQzq7uItU=; b=VkyYuWsvLQdK6Sv9wv9mbIGrWGIPq2mPkN/eC7/3Nl/0LdSkWXlWWRdYGJbDJCHYZJ JcwtlsGxLVeQG0x+vawLI4dLwU4hPY/ISsVkFbHio4CZp5R6H04u/2ya8GGjL2r/tbvD OEl4L78BUenhzko+Jd6zTR+stMeen0NrYHVHqTseHMXgd57BPGaeflsNKGF9n9Pooxb2 myh5bZRKe0blBssNCjtcxPK/pdt9G8AkH9B6W9MWruL8uOEe04BDgvl0UEOg56Ijq3AT B/XXzv6Ged01MedYALPwvFbbgoTovi3vdCSh8oayhAlUmpT5xJ8W7eaIM3nxE/URTfYU EGAg== X-Gm-Message-State: ALoCoQljB4g/xQ7l03jMWHBS7qtw2/znY5seUBFRMWI1B9sJAxXiHPh8DEHDlJK6xtqzGJ/wQVia X-Received: by 10.180.85.163 with SMTP id i3mr3428494wiz.14.1399641375443; Fri, 09 May 2014 06:16:15 -0700 (PDT) Received: from alcyon.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id go1sm5086560wib.7.2014.05.09.06.16.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 May 2014 06:16:14 -0700 (PDT) From: David Marchand To: dev@dpdk.org Date: Fri, 9 May 2014 15:15:57 +0200 Message-Id: <1399641359-11267-6-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1399641359-11267-1-git-send-email-david.marchand@6wind.com> References: <1399641359-11267-1-git-send-email-david.marchand@6wind.com> Subject: [dpdk-dev] [PATCH v2 5/7] pci: pci_switch_module cleanup X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2014 13:16:10 -0000 The pci_switch_module() function should only do what its name tells: unbind pci devices and rebind them on the specified kernel driver. Hence, it can not call pci_uio_map_resource(). Call to pci_uio_map_resource() should be moved to rte_eal_pci_probe_one_driver() so that we can factorize code. Signed-off-by: David Marchand --- lib/librte_eal/linuxapp/eal/eal_pci.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index 451fbd2..dadb198 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -107,9 +107,6 @@ TAILQ_HEAD(uio_res_list, uio_resource); static struct uio_res_list *uio_res_list = NULL; static int pci_parse_sysfs_value(const char *filename, uint64_t *val); -/* forward prototype of function called in pci_switch_module below */ -static int pci_uio_map_resource(struct rte_pci_device *dev); - #ifdef RTE_EAL_UNBIND_PORTS #define PROC_MODULES "/proc/modules" @@ -279,12 +276,11 @@ error: static int pci_switch_module(struct rte_pci_driver *dr, struct rte_pci_device *dev, - int uio_status, const char *module_name) + const char *module_name) { if (rte_eal_process_type() == RTE_PROC_PRIMARY) { /* check that our driver is loaded */ - if (uio_status != 0 && - (uio_status = pci_uio_check_module(module_name)) != 0) + if (pci_uio_check_module(module_name) != 0) rte_exit(EXIT_FAILURE, "The %s module is required by the " "%s driver\n", module_name, dr->name); @@ -294,9 +290,6 @@ pci_switch_module(struct rte_pci_driver *dr, struct rte_pci_device *dev, if (pci_uio_bind_device(dev, module_name) < 0) return -1; } - /* map the NIC resources */ - if (pci_uio_map_resource(dev) < 0) - return -1; return 0; } @@ -1012,8 +1005,8 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d #ifdef RTE_EAL_UNBIND_PORTS if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO) { - /* unbind driver and load uio resources for Intel NICs */ - if (pci_switch_module(dr, dev, 1, IGB_UIO_NAME) < 0) + /* unbind current driver and bind on igb_uio */ + if (pci_switch_module(dr, dev, IGB_UIO_NAME) < 0) return -1; } else if (dr->drv_flags & RTE_PCI_DRV_FORCE_UNBIND && rte_eal_process_type() == RTE_PROC_PRIMARY) { @@ -1021,12 +1014,13 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d if (pci_unbind_kernel_driver(dev) < 0) return -1; } -#else - if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO) - /* just map resources for Intel NICs */ +#endif + + if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO) { + /* map resources for devices that use igb_uio */ if (pci_uio_map_resource(dev) < 0) return -1; -#endif + } /* reference driver structure */ dev->driver = dr; -- 1.7.10.4