From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id D8C96A0547;
Mon, 5 Sep 2022 10:36:39 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 290E142B6F;
Mon, 5 Sep 2022 10:36:13 +0200 (CEST)
Received: from us-smtp-delivery-124.mimecast.com
(us-smtp-delivery-124.mimecast.com [170.10.129.124])
by mails.dpdk.org (Postfix) with ESMTP id DBE714281E
for <dev@dpdk.org>; Mon, 5 Sep 2022 10:36:09 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1662366969;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=7ppVe9gXX6tpk+d6Zh5/dhx/pla8ivJhmHutM4G+Cw8=;
b=AookxLdS6uV38NvmtftFHdT2R9IAvesf+tSz9yc1TbM2neET8IQ1RUVJPlBFHqGw7pLzqw
t+cegxwfX9jaoTeEUZfNatJ2/S8TxiNNkZOOXu/OblNCPuczYxYoyBhcmuDahWac7kFyKO
i8AMDiNjQBcKF6VbZbsjzY5z8tf4cg8=
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
[66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
(version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
us-mta-477-KiefMiyzPnqr-3gYeg8JdQ-1; Mon, 05 Sep 2022 04:36:06 -0400
X-MC-Unique: KiefMiyzPnqr-3gYeg8JdQ-1
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com
[10.11.54.2])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CB388811E81;
Mon, 5 Sep 2022 08:36:05 +0000 (UTC)
Received: from fchome.redhat.com (unknown [10.40.193.251])
by smtp.corp.redhat.com (Postfix) with ESMTP id 1386D40C124A;
Mon, 5 Sep 2022 08:36:04 +0000 (UTC)
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:35:19 +0200
Message-Id: <20220905083540.2506490-7-david.marchand@redhat.com>
In-Reply-To: <20220905083540.2506490-1-david.marchand@redhat.com>
References: <20220628144643.1213026-1-david.marchand@redhat.com>
<20220905083540.2506490-1-david.marchand@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"; x-default=true
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
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 --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(®_info, 0, sizeof(reg_info));
rte_eth_dev_get_reg_info(port_id, ®_info);
--
2.37.2