From patchwork Thu Mar 12 10:17:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuya Mukawa X-Patchwork-Id: 3988 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 726259ACF; Thu, 12 Mar 2015 11:18:46 +0100 (CET) Received: from mail-pd0-f170.google.com (mail-pd0-f170.google.com [209.85.192.170]) by dpdk.org (Postfix) with ESMTP id BC1A7594E for ; Thu, 12 Mar 2015 11:18:40 +0100 (CET) Received: by pdbfp1 with SMTP id fp1so19052900pdb.2 for ; Thu, 12 Mar 2015 03:18:40 -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=LnaUEFGPgX4LzaCwpLTA1335/FGCAcVvcYvH8sJNr0s=; b=V9Tub4v/6YMYHaq8E6WlMHJnoIaT3CCIoJQApbFHunwDsxFqrQFTQrdYtqOlVdg4UH uaQt2PT17Lp5PBee4jxzpWUq0DsjA9Puv3QJC+/DTe5nSUI9QH01cSSPK2xP1PGbUM5B 0ufQZc+LX8P0DHbDEWIfSc79XRbG8a9zFQXw+MfRCQ31ryNzn0kY5E4Uj6A8B89OvVk1 WOIQQvwYSmJ9ngk59cYFesL4zn8poaOIVoakNHMqAsu/DvSi61G7P9LmczcIkXL1NbMd 0RHC+6liQKU9fhMVBf1Z5OCfnftKRLyxjv8Tc9T7tzGtWGm7QM/zvxg0cvsfD2KNMJmi 1Mqg== X-Gm-Message-State: ALoCoQmBe3wdYfdT3aZg7ILJe5IpgOVdQ3mXy2bFqkN9aGwNtBqkk6SxDEcCzf+8ONSzuHSbBRac X-Received: by 10.66.66.7 with SMTP id b7mr89668004pat.9.1426155520106; Thu, 12 Mar 2015 03:18:40 -0700 (PDT) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id z4sm10080331pdi.90.2015.03.12.03.18.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Mar 2015 03:18:39 -0700 (PDT) From: Tetsuya Mukawa To: dev@dpdk.org Date: Thu, 12 Mar 2015 19:17:51 +0900 Message-Id: <1426155474-1596-13-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426155474-1596-1-git-send-email-mukawa@igel.co.jp> References: <1425438703-18895-1-git-send-email-mukawa@igel.co.jp> <1426155474-1596-1-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [PATCH v2 12/15] eal: Consolidate pci_map/unmap_device() of linuxapp and bsdapp 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The patch consolidates below functions, and implemented in common eal code. - pci_map_device() - pci_unmap_device() Signed-off-by: Tetsuya Mukawa --- lib/librte_eal/bsdapp/eal/eal_pci.c | 12 +++---- lib/librte_eal/common/eal_common_pci.c | 57 +++++++++++++++++++++++++++++++++ lib/librte_eal/common/eal_private.h | 4 +-- lib/librte_eal/common/include/rte_pci.h | 1 + lib/librte_eal/linuxapp/eal/eal_pci.c | 55 ------------------------------- lib/librte_ether/rte_ethdev.c | 1 + 6 files changed, 65 insertions(+), 65 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c index 3778763..1e42e42 100644 --- a/lib/librte_eal/bsdapp/eal/eal_pci.c +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c @@ -280,7 +280,7 @@ fail: } /* map the PCI resource of a PCI device in virtual memory */ -static int +int pci_uio_map_resource(struct rte_pci_device *dev) { int i, map_idx, ret; @@ -364,6 +364,9 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf) /* FreeBSD has no NUMA support (yet) */ dev->numa_node = 0; + /* FreeBSD has only one pass through driver */ + dev->pt_driver = RTE_PT_NIC_UIO; + /* parse resources */ switch (conf->pc_hdr & PCIM_HDRTYPE) { case PCIM_HDRTYPE_NORMAL: @@ -429,13 +432,6 @@ skipdev: return 0; } -/* Map pci device */ -int -pci_map_device(struct rte_pci_device *dev) -{ - return pci_uio_map_resource(dev); -} - /* * Scan the content of the PCI bus, and add the devices in the devices * list. Call pci_scan_one() for each pci entry found. diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 538b2d9..726026f 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -98,6 +98,63 @@ static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev) return NULL; } +/* Map pci device */ +static int +pci_map_device(struct rte_pci_device *dev) +{ + int ret = -1; + + /* try mapping the NIC resources using VFIO if it exists */ + switch (dev->pt_driver) { + case RTE_PT_VFIO: +#ifdef VFIO_PRESENT + if (pci_vfio_is_enabled()) + ret = pci_vfio_map_resource(dev); +#endif + break; + case RTE_PT_IGB_UIO: + case RTE_PT_UIO_GENERIC: + case RTE_PT_NIC_UIO: + /* map resources for devices that use uio */ + ret = pci_uio_map_resource(dev); + break; + default: + RTE_LOG(DEBUG, EAL, " Not managed by known pt driver," + " skipped\n"); + ret = 1; + break; + } + + return ret; +} + +#ifdef RTE_LIBRTE_EAL_HOTPLUG +/* Unmap pci device */ +static void +pci_unmap_device(struct rte_pci_device *dev) +{ + if (dev == NULL) + return; + + /* try unmapping the NIC resources using VFIO if it exists */ + switch (dev->pt_driver) { + case RTE_PT_VFIO: + RTE_LOG(ERR, EAL, "Hotplug doesn't support vfio yet\n"); + break; + case RTE_PT_IGB_UIO: + case RTE_PT_UIO_GENERIC: + case RTE_PT_NIC_UIO: + /* unmap resources for devices that use uio */ + pci_uio_unmap_resource(dev); + break; + default: + RTE_LOG(DEBUG, EAL, " Not managed by known pt driver," + " skipped\n"); + break; + } +} +#endif /* RTE_LIBRTE_EAL_HOTPLUG */ + /* * If vendor/device ID match, call the devinit() function of the * driver. diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h index fe2c596..badb55c 100644 --- a/lib/librte_eal/common/eal_private.h +++ b/lib/librte_eal/common/eal_private.h @@ -171,14 +171,14 @@ int pci_unbind_kernel_driver(struct rte_pci_device *dev); * @return * 0 on success, negative on error */ -int pci_map_device(struct rte_pci_device *dev); +int pci_uio_map_resource(struct rte_pci_device *dev); /** * Unmap this device * * This function is private to EAL. */ -void pci_unmap_device(struct rte_pci_device *dev); +void pci_uio_unmap_resource(struct rte_pci_device *dev); /** * Init tail queues for non-EAL library structures. This is to allow diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index fc64601..47345b8 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -147,6 +147,7 @@ enum rte_pt_driver { RTE_PT_IGB_UIO = 1, RTE_PT_VFIO = 2, RTE_PT_UIO_GENERIC = 3, + RTE_PT_NIC_UIO = 4, }; /** diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index dbc2548..6a8153c 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -565,61 +565,6 @@ pci_config_space_set(struct rte_pci_device *dev) } #endif -/* Map pci device */ -int -pci_map_device(struct rte_pci_device *dev) -{ - int ret = -1; - - /* try mapping the NIC resources using VFIO if it exists */ - switch (dev->pt_driver) { - case RTE_PT_VFIO: -#ifdef VFIO_PRESENT - if (pci_vfio_is_enabled()) - ret = pci_vfio_map_resource(dev); -#endif - break; - case RTE_PT_IGB_UIO: - case RTE_PT_UIO_GENERIC: - /* map resources for devices that use uio */ - ret = pci_uio_map_resource(dev); - break; - default: - RTE_LOG(DEBUG, EAL, " Not managed by known pt driver," - " skipped\n"); - ret = 1; - break; - } - - return ret; -} - -#ifdef RTE_LIBRTE_EAL_HOTPLUG -/* Unmap pci device */ -void -pci_unmap_device(struct rte_pci_device *dev) -{ - if (dev == NULL) - return; - - /* try unmapping the NIC resources using VFIO if it exists */ - switch (dev->pt_driver) { - case RTE_PT_VFIO: - RTE_LOG(ERR, EAL, "Hotplug doesn't support vfio yet\n"); - break; - case RTE_PT_IGB_UIO: - case RTE_PT_UIO_GENERIC: - /* unmap resources for devices that use uio */ - pci_uio_unmap_resource(dev); - break; - default: - RTE_LOG(DEBUG, EAL, " Not managed by known pt driver," - " skipped\n"); - break; - } -} -#endif /* RTE_LIBRTE_EAL_HOTPLUG */ - /* Init the PCI EAL subsystem */ int rte_eal_pci_init(void) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 03fce08..e23d7da 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -515,6 +515,7 @@ rte_eth_dev_is_detachable(uint8_t port_id) switch (rte_eth_devices[port_id].pci_dev->pt_driver) { case RTE_PT_IGB_UIO: case RTE_PT_UIO_GENERIC: + case RTE_PT_NIC_UIO: break; case RTE_PT_VFIO: default: