Add get_drvinfo and get_link callbacks to report the driver name, PCI bus address, firmware version and carrier state through ethtool. Signed-off-by: Dong Yibo Reviewed-by: Andrew Lunn --- drivers/net/ethernet/mucse/rnpgbe/Makefile | 1 + drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h | 3 +++ .../ethernet/mucse/rnpgbe/rnpgbe_ethtool.c | 25 +++++++++++++++++++ .../net/ethernet/mucse/rnpgbe/rnpgbe_main.c | 1 + .../net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.c | 4 ++- 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ethernet/mucse/rnpgbe/rnpgbe_ethtool.c diff --git a/drivers/net/ethernet/mucse/rnpgbe/Makefile b/drivers/net/ethernet/mucse/rnpgbe/Makefile index 17574cad392a..4d768324a82c 100644 --- a/drivers/net/ethernet/mucse/rnpgbe/Makefile +++ b/drivers/net/ethernet/mucse/rnpgbe/Makefile @@ -9,4 +9,5 @@ rnpgbe-objs := rnpgbe_main.o\ rnpgbe_chip.o\ rnpgbe_mbx.o\ rnpgbe_mbx_fw.o\ + rnpgbe_ethtool.o\ rnpgbe_lib.o diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h index 4e9776b28bfb..2fe76c95da7c 100644 --- a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h @@ -46,6 +46,7 @@ struct mucse_hw { struct mucse_mbx_info mbx; int port; int speed; + u32 fw_version; bool link; u16 cycles_per_us; u8 pfvfnum; @@ -257,6 +258,8 @@ int rnpgbe_set_rx_mode(struct net_device *netdev, struct netdev_hw_addr_list *mc); void rnpgbe_set_link(struct mucse_hw *hw, bool linkup); +extern const struct ethtool_ops rnpgbe_ethtool_ops; + /* Device IDs */ #define PCI_VENDOR_ID_MUCSE 0x8848 #define RNPGBE_DEVICE_ID_N500_QUAD_PORT 0x8308 diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_ethtool.c b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_ethtool.c new file mode 100644 index 000000000000..506233f62698 --- /dev/null +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_ethtool.c @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 - 2026 Mucse Corporation. */ + +#include +#include + +#include "rnpgbe.h" + +static void rnpgbe_get_drvinfo(struct net_device *netdev, + struct ethtool_drvinfo *info) +{ + struct mucse *mucse = netdev_priv(netdev); + u32 version = mucse->hw.fw_version; + + strscpy(info->driver, KBUILD_MODNAME); + strscpy(info->bus_info, pci_name(mucse->pdev)); + snprintf(info->fw_version, sizeof(info->fw_version), "%u.%u.%u.%u", + version >> 24, (version >> 16) & 0xff, + (version >> 8) & 0xff, version & 0xff); +} + +const struct ethtool_ops rnpgbe_ethtool_ops = { + .get_drvinfo = rnpgbe_get_drvinfo, + .get_link = ethtool_op_get_link, +}; diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c index 708a7297233e..46981ef2542a 100644 --- a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c @@ -250,6 +250,7 @@ static int rnpgbe_add_adapter(struct pci_dev *pdev, } netdev->netdev_ops = &rnpgbe_netdev_ops; + netdev->ethtool_ops = &rnpgbe_ethtool_ops; netdev->priv_flags |= IFF_UNICAST_FLT; rnpgbe_sw_init(mucse); err = rnpgbe_reset_hw(hw); diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.c b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.c index c6ce9dbee3d0..4a1893792751 100644 --- a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.c +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.c @@ -72,9 +72,11 @@ static int mucse_mbx_get_info(struct mucse_hw *hw) int err; err = mucse_fw_send_cmd_wait_resp(hw, &req, &reply); - if (!err) + if (!err) { hw->pfvfnum = FIELD_GET(GENMASK_U16(7, 0), le16_to_cpu(reply.r.hw_info.pfnum)); + hw->fw_version = le32_to_cpu(reply.r.hw_info.fw_version); + } return err; } -- 2.50.1