From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 62C4DA04DB; Wed, 14 Oct 2020 22:19:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 33C211DA56; Wed, 14 Oct 2020 22:19:45 +0200 (CEST) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 243951BFC6; Wed, 14 Oct 2020 22:19:43 +0200 (CEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id CB1C45C01C8; Wed, 14 Oct 2020 16:19:42 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 14 Oct 2020 16:19:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=ywHINySlePambG8ffHnaYbh9GI mElUG+LJ0XeiUEQxA=; b=KK5aVkQCCKlREc4MpeWoccXImMh67oLAjcOlKCIIWF jyhvaNa3G1AZXrNAgD4xdNenBFld1WwiJE1mFJgBIKDEkRjy+4TgW9KerPqw54BD OwQa9i/RHLluroBh60njxg1eeEev7n6VwE+jm3IxBQztym4yi67+e50FzzkV3Ihd dnXaUauJBPM3bUjpnBrbUtrp9DQuajRgM9EtUX0K/tdw6Zm7M53vZW4WK7x3CUXt /aeBXxK4Jn3/yI3nDkZ8xdKoNgN2/Hs56nSKfE5RPF4LIzNVXht/E2N378Y3OWBp tINQxEhhPpQlGdJKxZylEbTdJ7TJFm49ZSQWZMPVSYUQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=ywHINySlePambG8ff HnaYbh9GImElUG+LJ0XeiUEQxA=; b=pMqwAYxmTHkc3ijNWDoaprjV/OlFw1yLE aRZdZIHVY+XTco1JEeqqcXfd5cid6d/NwCPsmWu/tc2g/QF3QsZxH46wOEI+Upc1 va9pwGbq6IZN95livy+1w2ZNEdjAwGNYoR6gdf7BhjUBZQ8jpXsiVGBYtLMK+dpA W0afZVADbsC/xAo4x/EP+wlNGOdgFpFYCfDw9NdOUnMSMJIQ3BwYckYlHxfmzoOO QaPmLJK9j+xl3SXgP1PhIg1HREaZ1ksOsxqlXZFQmNmZUaspqODuoCMdy/3CTYA9 n+Q32AXrd/pohucR5mp3qdIILtYY4vexWIwa8WnZVjP/Jdj3JbAMw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedriedugddugeekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgrshcu ofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecuggftrf grthhtvghrnhepvdelvdduhedvudduveeuvdevheegudelgeeigfejheduhedttdegudff jeeihffgnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghlohhn rdhnvght X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id D5D5F3280059; Wed, 14 Oct 2020 16:19:41 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: stable@dpdk.org, Stephen Hemminger Date: Wed, 14 Oct 2020 22:18:13 +0200 Message-Id: <20201014201813.4075613-1-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] bus/pci: remove unused scan by address 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" The function pci_update_device was used to scan a device for probing by PCI address. This private function (and implementations) are unused since such probing is removed. Fixes: f3bac43b60da ("bus/pci: remove unused function to probe by address") Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon --- drivers/bus/pci/bsd/pci.c | 49 ----------------------------------- drivers/bus/pci/linux/pci.c | 12 --------- drivers/bus/pci/private.h | 13 ---------- drivers/bus/pci/windows/pci.c | 11 -------- 4 files changed, 85 deletions(-) diff --git a/drivers/bus/pci/bsd/pci.c b/drivers/bus/pci/bsd/pci.c index 97c611737a..4b8a208781 100644 --- a/drivers/bus/pci/bsd/pci.c +++ b/drivers/bus/pci/bsd/pci.c @@ -401,55 +401,6 @@ pci_device_iova_mode(const struct rte_pci_driver *pdrv __rte_unused, return RTE_IOVA_PA; } -int -pci_update_device(const struct rte_pci_addr *addr) -{ - int fd; - struct pci_conf matches[2]; - struct pci_match_conf match = { - .pc_sel = { - .pc_domain = addr->domain, - .pc_bus = addr->bus, - .pc_dev = addr->devid, - .pc_func = addr->function, - }, - }; - struct pci_conf_io conf_io = { - .pat_buf_len = 0, - .num_patterns = 1, - .patterns = &match, - .match_buf_len = sizeof(matches), - .matches = &matches[0], - }; - - fd = open("/dev/pci", O_RDONLY); - if (fd < 0) { - RTE_LOG(ERR, EAL, "%s(): error opening /dev/pci\n", __func__); - goto error; - } - - if (ioctl(fd, PCIOCGETCONF, &conf_io) < 0) { - RTE_LOG(ERR, EAL, "%s(): error with ioctl on /dev/pci: %s\n", - __func__, strerror(errno)); - goto error; - } - - if (conf_io.num_matches != 1) - goto error; - - if (pci_scan_one(fd, &matches[0]) < 0) - goto error; - - close(fd); - - return 0; - -error: - if (fd >= 0) - close(fd); - return -1; -} - /* Read PCI config space. */ int rte_pci_read_config(const struct rte_pci_device *dev, void *buf, size_t len, off_t offset) diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index 619d209ad2..2e1808b902 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -397,18 +397,6 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr) return 0; } -int -pci_update_device(const struct rte_pci_addr *addr) -{ - char filename[PATH_MAX]; - - snprintf(filename, sizeof(filename), "%s/" PCI_PRI_FMT, - rte_pci_get_sysfs_path(), addr->domain, addr->bus, addr->devid, - addr->function); - - return pci_scan_one(filename, addr); -} - /* * split up a pci address into its constituent parts. */ diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h index 16f997c701..f566943f5e 100644 --- a/drivers/bus/pci/private.h +++ b/drivers/bus/pci/private.h @@ -66,19 +66,6 @@ void rte_pci_add_device(struct rte_pci_device *pci_dev); void rte_pci_insert_device(struct rte_pci_device *exist_pci_dev, struct rte_pci_device *new_pci_dev); -/** - * 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); - /** * A structure describing a PCI mapping. */ diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c index 2cd010a09b..09db65456b 100644 --- a/drivers/bus/pci/windows/pci.c +++ b/drivers/bus/pci/windows/pci.c @@ -49,17 +49,6 @@ rte_pci_unmap_device(struct rte_pci_device *dev __rte_unused) */ } -int -pci_update_device(const struct rte_pci_addr *addr __rte_unused) -{ - /* This function is not implemented on Windows. - * We really should short-circuit the call to these functions by - * clearing the RTE_PCI_DRV_NEED_MAPPING flag - * in the rte_pci_driver flags. - */ - return 0; -} - /* Read PCI config space. */ int rte_pci_read_config(const struct rte_pci_device *dev __rte_unused, -- 2.28.0