hinic: add fw version query

This patch adds firmware version query in ethtool -i.

Signed-off-by: Xue Chaojing <xuechaojing@huawei.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c
index 73a20f01ad4cb6ad4b3e339f17c81a10cb1301de..60ec48fe4144693fb005ff6c16c00437369aaa9a 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c
@@ -117,11 +117,19 @@ static void hinic_get_drvinfo(struct net_device *netdev,
                              struct ethtool_drvinfo *info)
 {
        struct hinic_dev *nic_dev = netdev_priv(netdev);
+       u8 mgmt_ver[HINIC_MGMT_VERSION_MAX_LEN] = {0};
        struct hinic_hwdev *hwdev = nic_dev->hwdev;
        struct hinic_hwif *hwif = hwdev->hwif;
+       int err;
 
        strlcpy(info->driver, HINIC_DRV_NAME, sizeof(info->driver));
        strlcpy(info->bus_info, pci_name(hwif->pdev), sizeof(info->bus_info));
+
+       err = hinic_get_mgmt_version(nic_dev, mgmt_ver);
+       if (err)
+               return;
+
+       snprintf(info->fw_version, sizeof(info->fw_version), "%s", mgmt_ver);
 }
 
 static void hinic_get_ringparam(struct net_device *netdev,

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h b/drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h
index 984c98f332589d5558669c16f5c82a862b241fd9..b069045de416c582660e06b5f98db3869e09478b 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h
+++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h
@@ -77,6 +77,8 @@ enum hinic_port_cmd {
 
        HINIC_PORT_CMD_FWCTXT_INIT      = 69,
 
+       HINIC_PORT_CMD_GET_MGMT_VERSION = 88,
+
        HINIC_PORT_CMD_SET_FUNC_STATE   = 93,
 
        HINIC_PORT_CMD_GET_GLOBAL_QPN   = 102,

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_port.c b/drivers/net/ethernet/huawei/hinic/hinic_port.c
index 1bbeb91be808aad3adec3b2c84b101227c4d2940..1e389a004e505af6bc6ae384e3c7b4118049453d 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic/hinic_port.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_port.c
@@ -1038,3 +1038,33 @@ out:
 
        return err;
 }
+
+int hinic_get_mgmt_version(struct hinic_dev *nic_dev, u8 *mgmt_ver)
+{
+       struct hinic_hwdev *hwdev = nic_dev->hwdev;
+       struct hinic_version_info up_ver = {0};
+       struct hinic_hwif *hwif;
+       struct pci_dev *pdev;
+       u16 out_size;
+       int err;
+
+       if (!hwdev)
+               return -EINVAL;
+
+       hwif = hwdev->hwif;
+       pdev = hwif->pdev;
+
+       err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_GET_MGMT_VERSION,
+                                &up_ver, sizeof(up_ver), &up_ver,
+                                &out_size);
+       if (err || !out_size || up_ver.status) {
+               dev_err(&pdev->dev,
+                       "Failed to get mgmt version, err: %d, status: 0x%x, out size: 0x%x\n",
+                       err, up_ver.status, out_size);
+               return -EINVAL;
+       }
+
+       snprintf(mgmt_ver, HINIC_MGMT_VERSION_MAX_LEN, "%s", up_ver.ver);
+
+       return 0;
+}

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_port.h b/drivers/net/ethernet/huawei/hinic/hinic_port.h
index 1bc47c7a5c002080fe031a22e17cb508bd0d276a..44772fd47fc1e14c954ed0348dc98eca98483c1d 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic/hinic_port.h
+++ b/drivers/net/ethernet/huawei/hinic/hinic_port.h
@@ -16,6 +16,18 @@
 #define HINIC_RSS_KEY_SIZE     40
 #define HINIC_RSS_INDIR_SIZE   256
 #define HINIC_PORT_STATS_VERSION       0
+#define HINIC_FW_VERSION_NAME  16
+#define HINIC_COMPILE_TIME_LEN 20
+#define HINIC_MGMT_VERSION_MAX_LEN     32
+
+struct hinic_version_info {
+       u8 status;
+       u8 version;
+       u8 rsvd[6];
+
+       u8 ver[HINIC_FW_VERSION_NAME];
+       u8 time[HINIC_COMPILE_TIME_LEN];
+};
 
 enum hinic_rx_mode {
        HINIC_RX_MODE_UC        = BIT(0),
@@ -571,4 +583,6 @@ int hinic_get_vport_stats(struct hinic_dev *nic_dev,
 
 int hinic_set_rx_vlan_offload(struct hinic_dev *nic_dev, u8 en);
 
+int hinic_get_mgmt_version(struct hinic_dev *nic_dev, u8 *mgmt_ver);
+
 #endif