From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by dpdk.org (Postfix) with ESMTP id CA70DAB08 for ; Mon, 14 Apr 2014 14:52:00 +0200 (CEST) Received: by mail-wi0-f172.google.com with SMTP id hi2so3947778wib.17 for ; Mon, 14 Apr 2014 05:52:00 -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:cc:subject:date:message-id:in-reply-to :references; bh=YNIDaVS5kBjKc+Ge0dKngvLRyqFO14vK/yTrxORLS8M=; b=E7WaZLWtQ0RExUAidUsSj/UvFywPXRn/cj8mHXgEFD3rbjsULyGMmIug+xNEvMeQll 9UPm9LOuVcSeRVHKQEht+gyrL/kTp8GkvWIQvxo2lgp7JI2lGCx1Cx4WeQUfkWH/tLy0 vXHJScMjrMyzjZ7MfAhytQ7+UDMtYFWVaeMIvIw8Icwt4oKxupUVRgEgKe2GYOsDMGLw 0aNiZhNeCLMFQaNRZjzji8Z3uWGFdErZfPDHO9RYZJGGxut7ck7fZFJGt0sWIR9lOrrL u+KKW/D+Gmjg6Yr/hViW/HKfrOUqidNgDALS6jF2uaA6Twlt8XJyNZ6eH/LKYvY2PYCT 9Tow== X-Gm-Message-State: ALoCoQndxFBk7U3qGViPDskjq+U8tObkyb4wvUdrPOdF5rTjhLIfCjvrpt1rnNd0VCBbwbF88v5E X-Received: by 10.194.192.132 with SMTP id hg4mr32820246wjc.28.1397479920682; Mon, 14 Apr 2014 05:52:00 -0700 (PDT) Received: from alcyon.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id ed10sm22198097wib.7.2014.04.14.05.51.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Apr 2014 05:51:59 -0700 (PDT) From: David Marchand To: anatoly.burakov@intel.com Date: Mon, 14 Apr 2014 14:51:50 +0200 Message-Id: <1397479912-4906-2-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1397479912-4906-1-git-send-email-david.marchand@6wind.com> References: <1397479912-4906-1-git-send-email-david.marchand@6wind.com> Cc: dev@dpdk.org Subject: [dpdk-dev] [PATCH 1/3] 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: Mon, 14 Apr 2014 12:52:01 -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 | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index 9538efe..8e0922d 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; } @@ -1040,8 +1033,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) { @@ -1049,12 +1042,12 @@ 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 +#endif + if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO) - /* just map resources for Intel NICs */ + /* 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