From patchwork Tue Dec 9 03:42:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuya Mukawa X-Patchwork-Id: 1849 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 6D6C980A8; Tue, 9 Dec 2014 04:44:15 +0100 (CET) Received: from mail-pd0-f174.google.com (mail-pd0-f174.google.com [209.85.192.174]) by dpdk.org (Postfix) with ESMTP id BEEED80A6 for ; Tue, 9 Dec 2014 04:44:09 +0100 (CET) Received: by mail-pd0-f174.google.com with SMTP id fp1so6087883pdb.19 for ; Mon, 08 Dec 2014 19:44:09 -0800 (PST) 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=YNVRM+ohsF0d7YusJkMjy/mYxnrkUjj1kduS57Jw6eA=; b=JeV9jf/Ky3IF1qYHG4Ond778oLU0u1SJIFadA91VlLfIkO7vUYWcRiLwDBJ/WgZwxk /82Ac94PG7zO0MMHmZS/8LIHvCwjMGzVwhyyn9egqmr6/PtJE0AByGUM6D+1DaovvWbZ W2x8ty4DLVvG/92KZRryUYZC6qnzbB1oCKhyvidQYcJEGnxEBd0C1+fk19x3A8vutFtB Ll43Fc3ric5NPpUi2RrBXxWGxMaleEeKvi7vh0tAS9YFQXfWzw/Z4yJnre8S/TIbKFkC CEOWxdZ+8bzv6c8qG5x/JJte3JnNLb76LRbJWuVrlSNOidksQXRPs1FGfJO/w1P1AgLd vRBA== X-Gm-Message-State: ALoCoQlvz2WqJYWVHbZEmaeU1RleEhsxdBafIeZab3amhJqBhZqXD49O/BCIeyX2N2c5b+a3EBda X-Received: by 10.70.91.142 with SMTP id ce14mr26959313pdb.138.1418096648993; Mon, 08 Dec 2014 19:44:08 -0800 (PST) Received: from eris.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id xx2sm2185pab.17.2014.12.08.19.44.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Dec 2014 19:44:08 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Tue, 9 Dec 2014 12:42:46 +0900 Message-Id: <1418096571-27531-24-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418096571-27531-1-git-send-email-mukawa@igel.co.jp> References: <1416474399-16851-1-git-send-email-mukawa@igel.co.jp> <1418096571-27531-1-git-send-email-mukawa@igel.co.jp> Cc: nakajima.yoshihiro@lab.ntt.co.jp, menrigh@brocade.com, masutani.hitoshi@lab.ntt.co.jp Subject: [dpdk-dev] [PATCH v2 23/28] eal/pci: Add rte_eal_pci_probe_one and rte_eal_pci_close_one 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 functions are used for probe and close a device. First the function tries to find a device that has the specfied PCI address. Then, probe or close the device. Signed-off-by: Tetsuya Mukawa --- lib/librte_eal/common/eal_common_pci.c | 58 +++++++++++++++++++++++++++++++++ lib/librte_eal/common/include/rte_pci.h | 26 +++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index b404ee0..5ff7b49 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -152,6 +152,64 @@ pci_close_all_drivers(struct rte_pci_device *dev) { return pci_invoke_all_drivers(dev, INVOKE_CLOSE); } + +static int +rte_eal_pci_invoke_one(struct rte_pci_addr *addr, int type) +{ + struct rte_pci_device *dev = NULL; + int ret = 0; + + TAILQ_FOREACH(dev, &pci_device_list, next) { + if (eal_compare_pci_addr(&dev->addr, addr)) + continue; + + switch (type) { + case INVOKE_PROBE: + ret = pci_probe_all_drivers(dev); + break; + case INVOKE_CLOSE: + ret = pci_close_all_drivers(dev); + break; + } + if (ret < 0) + goto invoke_err_return; + if (type == INVOKE_CLOSE) + goto remove_dev; + return 0; + } + + return -1; + +invoke_err_return: + RTE_LOG(WARNING, EAL, "Requested device " PCI_PRI_FMT + " cannot be used\n", dev->addr.domain, dev->addr.bus, + dev->addr.devid, dev->addr.function); + return -1; + +remove_dev: + TAILQ_REMOVE(&pci_device_list, dev, next); + return 0; +} + +/* + * Find the pci device specified by pci address, then invoke probe function of + * the driver of the devive. + */ +int +rte_eal_pci_probe_one(struct rte_pci_addr *addr) +{ + return rte_eal_pci_invoke_one(addr, INVOKE_PROBE); +} + +/* + * Find the pci device specified by pci address, then invoke close function of + * the driver of the devive. + */ +int +rte_eal_pci_close_one(struct rte_pci_addr *addr) +{ + return rte_eal_pci_invoke_one(addr, INVOKE_CLOSE); +} #endif /* RTE_LIBRTE_EAL_HOTPLUG & RTE_LIBRTE_EAL_LINUXAPP */ /* diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index 74720d1..5a7e06f 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -311,6 +311,32 @@ eal_compare_pci_addr(struct rte_pci_addr *addr, struct rte_pci_addr *addr2) int rte_eal_pci_probe(void); /** + * Probe the single PCI device. + * + * Scan the content of the PCI bus, and find the pci device specified by pci + * address, then call the probe() function for registered driver that has a + * matching entry in its id_table for discovered device. + * + * @return + * - 0 on success. + * - Negative on error. + */ +int rte_eal_pci_probe_one(struct rte_pci_addr *addr); + +/** + * Close the single PCI device. + * + * Scan the content of the PCI bus, and find the pci device specified by pci + * address, then call the close() function for registered driver that has a + * matching entry in its id_table for discovered device. + * + * @return + * - 0 on success. + * - Negative on error. + */ +int rte_eal_pci_close_one(struct rte_pci_addr *addr); + +/** * Dump the content of the PCI bus. * * @param f