hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Xue Chaojing 2019-07-05 02:40:28 +00:00 committed by David S. Miller
parent 877cb240f6
commit 61a582be1a
4 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/huawei/hinic/hinic_ethtool.c
View File

@ -117,11 +117,19 @@ static void hinic_get_drvinfo(struct net_device *netdev,
struct ethtool_drvinfo *info) struct ethtool_drvinfo *info)
{ {
struct hinic_dev *nic_dev = netdev_priv(netdev); 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_hwdev *hwdev = nic_dev->hwdev;
struct hinic_hwif *hwif = hwdev->hwif; struct hinic_hwif *hwif = hwdev->hwif;
int err;
strlcpy(info->driver, HINIC_DRV_NAME, sizeof(info->driver)); strlcpy(info->driver, HINIC_DRV_NAME, sizeof(info->driver));
strlcpy(info->bus_info, pci_name(hwif->pdev), sizeof(info->bus_info)); 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, static void hinic_get_ringparam(struct net_device *netdev,

2
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h
View File

@ -77,6 +77,8 @@ enum hinic_port_cmd {
HINIC_PORT_CMD_FWCTXT_INIT = 69, HINIC_PORT_CMD_FWCTXT_INIT = 69,
HINIC_PORT_CMD_GET_MGMT_VERSION = 88,
HINIC_PORT_CMD_SET_FUNC_STATE = 93, HINIC_PORT_CMD_SET_FUNC_STATE = 93,
HINIC_PORT_CMD_GET_GLOBAL_QPN = 102, HINIC_PORT_CMD_GET_GLOBAL_QPN = 102,

30
drivers/net/ethernet/huawei/hinic/hinic_port.c
View File

@ -1038,3 +1038,33 @@ out:
return err; 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;
}

14
drivers/net/ethernet/huawei/hinic/hinic_port.h
View File

@ -16,6 +16,18 @@
#define HINIC_RSS_KEY_SIZE 40 #define HINIC_RSS_KEY_SIZE 40
#define HINIC_RSS_INDIR_SIZE 256 #define HINIC_RSS_INDIR_SIZE 256
#define HINIC_PORT_STATS_VERSION 0 #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 { enum hinic_rx_mode {
HINIC_RX_MODE_UC = BIT(0), 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_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 #endif