From patchwork Wed Jun 7 23:59:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 25166 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 9367A7D57; Thu, 8 Jun 2017 01:59:33 +0200 (CEST) Received: from mail-wr0-f173.google.com (mail-wr0-f173.google.com [209.85.128.173]) by dpdk.org (Postfix) with ESMTP id 9DF2F37A2 for ; Thu, 8 Jun 2017 01:59:24 +0200 (CEST) Received: by mail-wr0-f173.google.com with SMTP id v111so11998149wrc.3 for ; Wed, 07 Jun 2017 16:59:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=ipWYOPNLWBaT3F0OjJmvcapC4QLXofQ05IxZgvJ1TFs=; b=X6EclHPLq4vyvj3T3FrubK2FVYxSii39yx9Hnh9kuGk2WMtyLE+r7zPH9xkdpwVMdQ UHkWEvyCTZTaPQ5uuheKgxF8AtW8CMLpQDRsIa0JiSEFH2NddVB0hFM9PjM8Q7SjVD1n bBVdT74HiL/aE9C68KDeEtn6hxC1+fBc6i5zo70NXzRjB6y14dkOWSjBU/ln6bNZLLfN 6TQA/Bybh0l5eim8vmJDs2srOCyiEwnfXo/eO8bmgzczjuV0/P/jlAIlntKUyzZecSx0 4/AlMYWI9vqW6RV0KzMe+yUiXSGr53rbE1SOA0pDIn7XdDqh4sCFJz7wH0WiYwF+DOGa pjzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=ipWYOPNLWBaT3F0OjJmvcapC4QLXofQ05IxZgvJ1TFs=; b=Q5EB0eRyP7erJYZtv3/GLvCauG1RYuv6a+ZjUv29ZjmSUaA1cGwAOIJpY2ZU7aD9Ay fl/9KHjqWfZVrAUzQ7DQJsdD3SkcS2toxL2oT5JBkOVvKZNO1HCiJEgQGv+xB/eqIgnt noE9T6VOGD/ZMt4sjImfoqqSdUJgI1ho2IDRT8xIhqaThpfovG45rIJnsODjuPmlNHyU p7CqAyYlURJNkn0RathbRLOvUMgW0kj+LP6+pFP44n3JBDHk4h84dHxHk6Vkxo2oBI16 RMfOaHq+v9WuWdmTRQw2sIWRGNCEmjkb60nrjL4OfaBd2Vh3dpsCHUZ3b2Evufy3z2uH Dnmg== X-Gm-Message-State: AODbwcARlh6zr3fmLcvU5ilhPvz/gNtDdK6fiWj85gC0/tUpv7UdaZie cmN7+2gxpRpht1YqkCA= X-Received: by 10.223.174.180 with SMTP id y49mr22183358wrc.133.1496879964048; Wed, 07 Jun 2017 16:59:24 -0700 (PDT) Received: from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id p78sm3035416wmg.5.2017.06.07.16.59.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 16:59:23 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Thu, 8 Jun 2017 01:59:00 +0200 Message-Id: <881564d608e133d477ec676a1fea2c5b752fca71.1496877060.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 04/12] eal: remove references to PCI X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Gaetan Rivet --- lib/librte_eal/bsdapp/eal/eal.c | 1 - lib/librte_eal/bsdapp/eal/eal_pci.c | 2 +- lib/librte_eal/common/eal_common_pci.c | 2 +- lib/librte_eal/common/eal_common_pci_uio.c | 3 +- lib/librte_eal/common/eal_private.h | 127 --------------------------- lib/librte_eal/linuxapp/eal/eal.c | 1 - lib/librte_eal/linuxapp/eal/eal_interrupts.c | 1 - 7 files changed, 4 insertions(+), 133 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index 05f0c1f..d84e4f1 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c index e321461..74b0172 100644 --- a/lib/librte_eal/bsdapp/eal/eal_pci.c +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c @@ -73,7 +73,7 @@ #include #include "eal_filesystem.h" -#include "eal_private.h" +#include "private.h" /** * @file diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 6049b49..3fe9e7e 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -54,7 +54,7 @@ #include #include -#include "eal_private.h" +#include "private.h" extern struct rte_pci_bus rte_pci_bus; diff --git a/lib/librte_eal/common/eal_common_pci_uio.c b/lib/librte_eal/common/eal_common_pci_uio.c index 367a681..4365660 100644 --- a/lib/librte_eal/common/eal_common_pci_uio.c +++ b/lib/librte_eal/common/eal_common_pci_uio.c @@ -39,11 +39,12 @@ #include #include +#include #include #include #include -#include "eal_private.h" +#include "private.h" static struct rte_tailq_elem rte_uio_tailq = { .name = "UIO_RESOURCE_LIST", diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h index b7e4cc6..3da2ef7 100644 --- a/lib/librte_eal/common/eal_private.h +++ b/lib/librte_eal/common/eal_private.h @@ -36,7 +36,6 @@ #include #include -#include /** * Initialize the memzone subsystem (private to eal). @@ -109,132 +108,6 @@ int rte_eal_timer_init(void); */ int rte_eal_log_init(const char *id, int facility); -struct rte_pci_driver; -struct rte_pci_device; - -/** - * Add a PCI device to the PCI Bus (append to PCI Device list). This function - * also updates the bus references of the PCI Device (and the generic device - * object embedded within. - * - * @param pci_dev - * PCI device to add - * @return void - */ -void rte_pci_add_device(struct rte_pci_device *pci_dev); - -/** - * Insert a PCI device in the PCI Bus at a particular location in the device - * list. It also updates the PCI Bus reference of the new devices to be - * inserted. - * - * @param exist_pci_dev - * Existing PCI device in PCI Bus - * @param new_pci_dev - * PCI device to be added before exist_pci_dev - * @return void - */ -void rte_pci_insert_device(struct rte_pci_device *exist_pci_dev, - struct rte_pci_device *new_pci_dev); - -/** - * Remove a PCI device from the PCI Bus. This sets to NULL the bus references - * in the PCI device object as well as the generic device object. - * - * @param pci_device - * PCI device to be removed from PCI Bus - * @return void - */ -void rte_pci_remove_device(struct rte_pci_device *pci_device); - -/** - * Update a pci device object by asking the kernel for the latest information. - * - * This function is private to EAL. - * - * @param addr - * The PCI Bus-Device-Function address to look for - * @return - * - 0 on success. - * - negative on error. - */ -int pci_update_device(const struct rte_pci_addr *addr); - -/** - * Unbind kernel driver for this device - * - * This function is private to EAL. - * - * @return - * 0 on success, negative on error - */ -int pci_unbind_kernel_driver(struct rte_pci_device *dev); - -/** - * Map the PCI resource of a PCI device in virtual memory - * - * This function is private to EAL. - * - * @return - * 0 on success, negative on error - */ -int pci_uio_map_resource(struct rte_pci_device *dev); - -/** - * Unmap the PCI resource of a PCI device - * - * This function is private to EAL. - */ -void pci_uio_unmap_resource(struct rte_pci_device *dev); - -/** - * Allocate uio resource for PCI device - * - * This function is private to EAL. - * - * @param dev - * PCI device to allocate uio resource - * @param uio_res - * Pointer to uio resource. - * If the function returns 0, the pointer will be filled. - * @return - * 0 on success, negative on error - */ -int pci_uio_alloc_resource(struct rte_pci_device *dev, - struct mapped_pci_resource **uio_res); - -/** - * Free uio resource for PCI device - * - * This function is private to EAL. - * - * @param dev - * PCI device to free uio resource - * @param uio_res - * Pointer to uio resource. - */ -void pci_uio_free_resource(struct rte_pci_device *dev, - struct mapped_pci_resource *uio_res); - -/** - * Map device memory to uio resource - * - * This function is private to EAL. - * - * @param dev - * PCI device that has memory information. - * @param res_idx - * Memory resource index of the PCI device. - * @param uio_res - * uio resource that will keep mapping information. - * @param map_idx - * Mapping information index of the uio resource. - * @return - * 0 on success, negative on error - */ -int pci_uio_map_resource_by_index(struct rte_pci_device *dev, int res_idx, - struct mapped_pci_resource *uio_res, int map_idx); - /** * Init tail queues for non-EAL library structures. This is to allow * the rings, mempools, etc. lists to be shared among multiple processes diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index 7c78f2d..cd4e757 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -71,7 +71,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c index 2e3bd12..613804d 100644 --- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c +++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c @@ -60,7 +60,6 @@ #include #include #include -#include #include #include #include