Commit a1bcaf02 authored by Sudarsana Reddy Kalluru's avatar Sudarsana Reddy Kalluru Committed by David S. Miller
Browse files

bnx2x: Add MBI version to ethtool driver query output. 



The patch populates the MBI version in the ethtool driver query data.
Adding 'extended_dev_info_shared_cfg' structure describing the nvram
structure, this is required to access the mbi version string.

Signed-off-by: default avatarSudarsana Reddy Kalluru <Sudarsana.Kalluru@cavium.com>
Signed-off-by: default avatarAriel Elior <Ariel.Elior@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e7395f1f

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+23 −1
Original line number Diff line number Diff line
@@ -1105,11 +1105,33 @@ 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));

	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));

}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h

+5 −0
Original line number Diff line number Diff line
@@ -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."

CRA Git | Maintained and supported by SUSTech CRA and CCSE