iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bnx2x-Popoulate-firmware-versions-in-driver-info-query'

Browse Source 
Sudarsana Reddy Kalluru says:

====================
bnx2x: Popoulate firmware versions in driver info query.

The patch series populates MBI and storm firware versions in the ethtool
driver info query.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2018-11-27 16:41:19 -08:00
commit 2c30aac50d
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
View File

@ -1105,11 +1105,39 @@ static void bnx2x_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
struct bnx2x *bp = netdev_priv(dev);
char version[ETHTOOL_FWVERS_LEN];
int ext_dev_info_offset;
u32 mbi;
strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version));
bnx2x_fill_fw_str(bp, info->fw_version, sizeof(info->fw_version));
memset(version, 0, sizeof(version));
snprintf(version, ETHTOOL_FWVERS_LEN, " storm %d.%d.%d.%d",
BCM_5710_FW_MAJOR_VERSION, BCM_5710_FW_MINOR_VERSION,
BCM_5710_FW_REVISION_VERSION, BCM_5710_FW_ENGINEERING_VERSION);
strlcat(info->version, version, sizeof(info->version));
if (SHMEM2_HAS(bp, extended_dev_info_shared_addr)) {
ext_dev_info_offset = SHMEM2_RD(bp,
extended_dev_info_shared_addr);
mbi = REG_RD(bp, ext_dev_info_offset +
offsetof(struct extended_dev_info_shared_cfg,
mbi_version));
if (mbi) {
memset(version, 0, sizeof(version));
snprintf(version, ETHTOOL_FWVERS_LEN, "mbi %d.%d.%d ",
(mbi & 0xff000000) >> 24,
(mbi & 0x00ff0000) >> 16,
(mbi & 0x0000ff00) >> 8);
strlcpy(info->fw_version, version,
sizeof(info->fw_version));
}
}
memset(version, 0, sizeof(version));
bnx2x_fill_fw_str(bp, version, ETHTOOL_FWVERS_LEN);
strlcat(info->fw_version, version, sizeof(info->fw_version));
strlcpy(info->bus_info, pci_name(bp->pdev), sizeof(info->bus_info));
}

5
drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
View File

@ -1140,6 +1140,11 @@ struct shm_dev_info { /* size */
};
struct extended_dev_info_shared_cfg {
u32 reserved[18];
u32 mbi_version;
u32 mbi_date;
};
#if !defined(__LITTLE_ENDIAN) && !defined(__BIG_ENDIAN)
#error "Missing either LITTLE_ENDIAN or BIG_ENDIAN definition."