Netdev List
 help / color / mirror / Atom feed
From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: davem@davemloft.net
Cc: oss-drivers@netronome.com, netdev@vger.kernel.org,
	Jakub Kicinski <jakub.kicinski@netronome.com>
Subject: [PATCH net-next 5/9] nfp: populate bus-info on representors
Date: Fri, 29 Jun 2018 17:04:38 -0700	[thread overview]
Message-ID: <20180630000442.27353-6-jakub.kicinski@netronome.com> (raw)
In-Reply-To: <20180630000442.27353-1-jakub.kicinski@netronome.com>

We used to leave bus-info in ethtool driver info empty for
representors in case multi-PCIe-to-single-host cards make
the association between PCIe device and NFP many to one.
It seems these attempts are futile, we need to link the
representors to one PCIe device in sysfs to get consistent
naming, plus devlink uses one PCIe as a handle, anyway.
The multi-PCIe-to-single-system support won't be clean,
if it ever comes.

Turns out some user space (RHEL tests) likes to read bus-info
so just populate it.

While at it remove unnecessary app NULL-check, representors
are spawned by an app, so it must exist.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
---
 drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
index 2aeb4622f1ea..6a79c8e4a7a4 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
@@ -233,12 +233,10 @@ nfp_net_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
 static void
 nfp_app_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
 {
-	struct nfp_app *app;
-
-	app = nfp_app_from_netdev(netdev);
-	if (!app)
-		return;
+	struct nfp_app *app = nfp_app_from_netdev(netdev);
 
+	strlcpy(drvinfo->bus_info, pci_name(app->pdev),
+		sizeof(drvinfo->bus_info));
 	nfp_get_drvinfo(app, app->pdev, "*", drvinfo);
 }
 
-- 
2.17.1

  parent reply	other threads:[~2018-06-30  0:19 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-30  0:04 [PATCH net-next 0/9] nfp: flower updates and netconsole Jakub Kicinski
2018-06-30  0:04 ` [PATCH net-next 1/9] nfp: expose ring stats of inactive rings via ethtool Jakub Kicinski
2018-06-30  0:04 ` [PATCH net-next 2/9] nfp: fail probe if serial or interface id is missing Jakub Kicinski
2018-06-30  0:04 ` [PATCH net-next 3/9] nfp: implement netpoll ndo (thus enabling netconsole) Jakub Kicinski
2018-06-30  0:04 ` [PATCH net-next 4/9] nfp: make use of napi_consume_skb() Jakub Kicinski
2018-06-30  0:04 ` Jakub Kicinski [this message]
2018-06-30  0:04 ` [PATCH net-next 6/9] nfp: flower: ignore checksum actions when performing pedit actions Jakub Kicinski
2018-06-30  0:04 ` [PATCH net-next 7/9] nfp: flower: extract ipv4 udp tunnel ttl from route Jakub Kicinski
2018-06-30  0:04 ` [PATCH net-next 8/9] nfp: flower: offload tos and tunnel flags for ipv4 udp tunnels Jakub Kicinski
2018-06-30  0:04 ` [PATCH net-next 9/9] nfp: flower: enabled offloading of Team LAG Jakub Kicinski
2018-06-30 12:32 ` [PATCH net-next 0/9] nfp: flower updates and netconsole David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180630000442.27353-6-jakub.kicinski@netronome.com \
    --to=jakub.kicinski@netronome.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=oss-drivers@netronome.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox