* [dpdk-stable] [PATCH] bus/pci: remove unused scan by address
@ 2020-10-14 20:18 Thomas Monjalon
2020-10-20 9:10 ` David Marchand
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Monjalon @ 2020-10-14 20:18 UTC (permalink / raw)
To: dev; +Cc: stable, Stephen Hemminger
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 <thomas@monjalon.net>
---
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-stable] [PATCH] bus/pci: remove unused scan by address
2020-10-14 20:18 [dpdk-stable] [PATCH] bus/pci: remove unused scan by address Thomas Monjalon
@ 2020-10-20 9:10 ` David Marchand
2020-10-20 11:58 ` Thomas Monjalon
0 siblings, 1 reply; 3+ messages in thread
From: David Marchand @ 2020-10-20 9:10 UTC (permalink / raw)
To: Thomas Monjalon; +Cc: dev, dpdk stable, Stephen Hemminger, Gaetan Rivet
On Wed, Oct 14, 2020 at 10:20 PM Thomas Monjalon <thomas@monjalon.net> wrote:
>
> 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 <thomas@monjalon.net>
LGTM.
Acked-by: David Marchand <david.marchand@redhat.com>
--
David Marchand
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-stable] [PATCH] bus/pci: remove unused scan by address
2020-10-20 9:10 ` David Marchand
@ 2020-10-20 11:58 ` Thomas Monjalon
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Monjalon @ 2020-10-20 11:58 UTC (permalink / raw)
To: dev; +Cc: stable, Stephen Hemminger, Gaetan Rivet, David Marchand
20/10/2020 11:10, David Marchand:
> On Wed, Oct 14, 2020 at 10:20 PM Thomas Monjalon <thomas@monjalon.net> wrote:
> >
> > 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 <thomas@monjalon.net>
>
> LGTM.
> Acked-by: David Marchand <david.marchand@redhat.com>
Applied
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-20 11:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-14 20:18 [dpdk-stable] [PATCH] bus/pci: remove unused scan by address Thomas Monjalon
2020-10-20 9:10 ` David Marchand
2020-10-20 11:58 ` Thomas Monjalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).