| Message ID | 20210217095705.13806-1-vee.khee.wong@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 20e07e2c3cf310578ef19fb4f1e64dc9832abd9d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,1/1] net: stmmac: Add PCI bus info to ethtool driver query output | expand |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Wed, 17 Feb 2021 17:57:05 +0800 you wrote: > This patch populates the PCI bus info in the ethtool driver query data. > > Users will be able to view PCI bus info using 'ethtool -i <interface>'. > > Signed-off-by: Wong Vee Khee <vee.khee.wong@intel.com> > --- > drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 + > drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 4 ++++ > include/linux/stmmac.h | 1 + > 3 files changed, 6 insertions(+) Here is the summary with links: - [net-next,1/1] net: stmmac: Add PCI bus info to ethtool driver query output https://git.kernel.org/netdev/net-next/c/20e07e2c3cf3 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c index 1c9c67b641a2..751dfdeec41c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c @@ -236,6 +236,7 @@ static int intel_mgbe_common_data(struct pci_dev *pdev, int ret; int i; + plat->pdev = pdev; plat->phy_addr = -1; plat->clk_csr = 5; plat->has_gmac = 0; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c index 9e54f953634b..c5642985ef95 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c @@ -268,6 +268,10 @@ static void stmmac_ethtool_getdrvinfo(struct net_device *dev, strlcpy(info->driver, MAC100_ETHTOOL_NAME, sizeof(info->driver)); + if (priv->plat->pdev) { + strlcpy(info->bus_info, pci_name(priv->plat->pdev), + sizeof(info->bus_info)); + } strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version)); } diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 15ca6b4167cc..a302982de2d7 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -202,5 +202,6 @@ struct plat_stmmacenet_data { bool vlan_fail_q_en; u8 vlan_fail_q; unsigned int eee_usecs_rate; + struct pci_dev *pdev; }; #endif
This patch populates the PCI bus info in the ethtool driver query data. Users will be able to view PCI bus info using 'ethtool -i <interface>'. Signed-off-by: Wong Vee Khee <vee.khee.wong@intel.com> --- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 4 ++++ include/linux/stmmac.h | 1 + 3 files changed, 6 insertions(+)