From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com [74.125.82.47]) by dpdk.org (Postfix) with ESMTP id EB905AF80 for ; Mon, 14 Apr 2014 14:52:01 +0200 (CEST) Received: by mail-wg0-f47.google.com with SMTP id x12so7997080wgg.6 for ; Mon, 14 Apr 2014 05:52:02 -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=6xBDTSuFI7Hc98U9/1jRVFoTs0Dh+ptRq4J1Rz6Fo70=; b=Sm5rFpw/1zYoD0AS9hYUjiw1RqHpeMnOhGzTaG1pkm6guYQrLYI+ZvHmkTDi2kPVD4 fsosQsyOtWe58yX5hngYbgW8MRPmbugEjbWA/IETuXvaJXUWmvYI5cKlVO5KO22Zlv2y hXFXtqMzY7TUN1ngXaub08Yqgz9oewpfmuxW4uzZNTJrwmAaJyXa+ONyge8LUJu1ehmb qIjGmCcfG2QtwXA5ndo7ftuPJDpIXMtZd1OJ7VSFD2rvVyzeS2OEPB/lnHkOG4aOKhds TVFE6HhUUQjv6i3grIwCkhMAvTWsa+j//i65/GQohQfVVb7+A2F4nbTU/S39R3a1Ykkh LxPQ== X-Gm-Message-State: ALoCoQmPLhG3TgAo5kFB2c1vG/RlAMraBr69d11/RnLnyrpjdQEaWx4WeU7VFJG4yeXOAvAdllpV X-Received: by 10.180.105.132 with SMTP id gm4mr9527356wib.39.1397479921928; Mon, 14 Apr 2014 05:52:01 -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.52.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Apr 2014 05:52:01 -0700 (PDT) From: David Marchand To: anatoly.burakov@intel.com Date: Mon, 14 Apr 2014 14:51:51 +0200 Message-Id: <1397479912-4906-3-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 2/3] pci: move RTE_PCI_DRV_FORCE_UNBIND handling out of #ifdef 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:02 -0000 Move RTE_PCI_DRV_FORCE_UNBIND flag handling out of RTE_EAL_UNBIND_PORTS section. This had nothing to do with RTE_EAL_UNBIND_PORTS anyway. Signed-off-by: David Marchand --- lib/librte_eal/linuxapp/eal/eal_pci.c | 92 ++++++++++++++++----------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index 8e0922d..6b57a9f 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -107,6 +107,45 @@ 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); +/* unbind kernel driver for this device */ +static int +pci_unbind_kernel_driver(struct rte_pci_device *dev) +{ + int n; + FILE *f; + char filename[PATH_MAX]; + char buf[BUFSIZ]; + struct rte_pci_addr *loc = &dev->addr; + + /* open /sys/bus/pci/devices/AAAA:BB:CC.D/driver */ + rte_snprintf(filename, sizeof(filename), + SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/driver/unbind", + loc->domain, loc->bus, loc->devid, loc->function); + + f = fopen(filename, "w"); + if (f == NULL) /* device was not bound */ + return 0; + + n = rte_snprintf(buf, sizeof(buf), PCI_PRI_FMT "\n", + loc->domain, loc->bus, loc->devid, loc->function); + if ((n < 0) || (n >= (int)sizeof(buf))) { + RTE_LOG(ERR, EAL, "%s(): rte_snprintf failed\n", __func__); + goto error; + } + if (fwrite(buf, n, 1, f) == 0) { + RTE_LOG(ERR, EAL, "%s(): could not write to %s\n", __func__, + filename); + goto error; + } + + fclose(f); + return 0; + +error: + fclose(f); + return -1; +} + #ifdef RTE_EAL_UNBIND_PORTS #define PROC_MODULES "/proc/modules" @@ -234,46 +273,6 @@ pci_uio_bind_device(struct rte_pci_device *dev, const char *module_name) return 0; } -/* unbind kernel driver for this device */ -static int -pci_unbind_kernel_driver(struct rte_pci_device *dev) -{ - int n; - FILE *f; - char filename[PATH_MAX]; - char buf[BUFSIZ]; - struct rte_pci_addr *loc = &dev->addr; - - /* open /sys/bus/pci/devices/AAAA:BB:CC.D/driver */ - rte_snprintf(filename, sizeof(filename), - SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/driver/unbind", - loc->domain, loc->bus, loc->devid, loc->function); - - f = fopen(filename, "w"); - if (f == NULL) /* device was not bound */ - return 0; - - n = rte_snprintf(buf, sizeof(buf), PCI_PRI_FMT "\n", - loc->domain, loc->bus, loc->devid, loc->function); - if ((n < 0) || (n >= (int)sizeof(buf))) { - RTE_LOG(ERR, EAL, "%s(): rte_snprintf failed\n", __func__); - goto error; - } - if (fwrite(buf, n, 1, f) == 0) { - RTE_LOG(ERR, EAL, "%s(): could not write to %s\n", __func__, - filename); - goto error; - } - - fclose(f); - return 0; - -error: - fclose(f); - return -1; -} - - static int pci_switch_module(struct rte_pci_driver *dr, struct rte_pci_device *dev, const char *module_name) @@ -1036,18 +1035,19 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d /* 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) { - /* unbind current driver */ - if (pci_unbind_kernel_driver(dev) < 0) - return -1; } #endif - if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO) + 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; + } else if (dr->drv_flags & RTE_PCI_DRV_FORCE_UNBIND && + rte_eal_process_type() == RTE_PROC_PRIMARY) { + /* unbind current driver */ + if (pci_unbind_kernel_driver(dev) < 0) + return -1; + } /* reference driver structure */ dev->driver = dr; -- 1.7.10.4