diff mbox series

[v5,06/27] examples/ethtool: prefer device name

Message ID	20220905083933.2506819-7-david.marchand@redhat.com (mailing list archive)
State	Superseded, archived
Delegated to:	Thomas Monjalon
Headers	From: David Marchand <david.marchand@redhat.com> To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com Subject: [PATCH v5 06/27] examples/ethtool: prefer device name Date: Mon, 5 Sep 2022 10:39:12 +0200 Message-Id: <20220905083933.2506819-7-david.marchand@redhat.com> In-Reply-To: <20220905083933.2506819-1-david.marchand@redhat.com> References: <20220628144643.1213026-1-david.marchand@redhat.com> <20220905083933.2506819-1-david.marchand@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Precedence: list Errors-To: dev-bounces@dpdk.org
Series	[v5,01/27] devtools: forbid inclusions of driver only headers \| [v5,01/27] devtools: forbid inclusions of driver only headers [v5,02/27] common/mlx5: rework check on driver registration [v5,03/27] raw/ifpga: remove PCI bus accessor [v5,04/27] app/testpmd: drop PCI register commands [v5,05/27] kni: stop populating PCI info in examples [v5,06/27] examples/ethtool: prefer device name [v5,07/27] dev: hide debug messages in device iterator [v5,08/27] eal: deprecate RTE_FUNC_PTR_* macros [v5,09/27] devargs: remove dependency on bus header [v5,10/27] build: export drivers headers [v5,11/27] bus/auxiliary: make driver-only headers private [v5,12/27] bus/dpaa: make driver-only headers private [v5,13/27] bus/fslmc: make driver-only headers private [v5,14/27] bus/ifpga: cleanup exported symbols [v5,15/27] bus/ifpga: make driver-only headers private [v5,16/27] bus/pci: make driver-only headers private [v5,17/27] bus/vdev: make driver-only headers private [v5,18/27] bus/vmbus: make driver-only headers private [v5,19/27] bus: move IOVA definition from header [v5,20/27] bus: introduce accessors [v5,21/27] bus: hide bus object [v5,22/27] dev: introduce driver accessors [v5,23/27] dev: hide driver object [v5,24/27] dev: introduce device accessors [v5,25/27] dev: provide bus specific information [v5,26/27] bus/pci: fill bus specific information [v5,27/27] dev: hide device object

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

David Marchand Sept. 5, 2022, 8:39 a.m. UTC

  Rely on the generic device name rather than restrict to only supporting
PCI devices.

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 examples/ethtool/lib/rte_ethtool.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff mbox series

Patch

diff --git a/examples/ethtool/lib/rte_ethtool.c b/examples/ethtool/lib/rte_ethtool.c
index ffaad96498..88dc917b73 100644
--- a/examples/ethtool/lib/rte_ethtool.c
+++ b/examples/ethtool/lib/rte_ethtool.c
@@ -8,7 +8,6 @@ 
 #include <rte_version.h>
 #include <rte_ethdev.h>
 #include <rte_ether.h>
-#include <rte_bus_pci.h>
 #ifdef RTE_NET_IXGBE
 #include <rte_pmd_ixgbe.h>
 #endif
@@ -23,8 +22,6 @@  rte_ethtool_get_drvinfo(uint16_t port_id, struct ethtool_drvinfo *drvinfo)
 {
 	struct rte_eth_dev_info dev_info;
 	struct rte_dev_reg_info reg_info;
-	const struct rte_pci_device *pci_dev;
-	const struct rte_bus *bus = NULL;
 	int n;
 	int ret;
 
@@ -52,18 +49,8 @@  rte_ethtool_get_drvinfo(uint16_t port_id, struct ethtool_drvinfo *drvinfo)
 	strlcpy(drvinfo->driver, dev_info.driver_name,
 		sizeof(drvinfo->driver));
 	strlcpy(drvinfo->version, rte_version(), sizeof(drvinfo->version));
-	/* TODO: replace bus_info by rte_devargs.name */
-	if (dev_info.device)
-		bus = rte_bus_find_by_device(dev_info.device);
-	if (bus && !strcmp(bus->name, "pci")) {
-		pci_dev = RTE_DEV_TO_PCI(dev_info.device);
-		snprintf(drvinfo->bus_info, sizeof(drvinfo->bus_info),
-			"%04x:%02x:%02x.%x",
-			pci_dev->addr.domain, pci_dev->addr.bus,
-			pci_dev->addr.devid, pci_dev->addr.function);
-	} else {
-		snprintf(drvinfo->bus_info, sizeof(drvinfo->bus_info), "N/A");
-	}
+	strlcpy(drvinfo->bus_info, dev_info.device->name,
+		sizeof(drvinfo->bus_info));
 
 	memset(&reg_info, 0, sizeof(reg_info));
 	rte_eth_dev_get_reg_info(port_id, &reg_info);