AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

brcmfmac: show firmware release info in ethtool driver info

Browse Source 
The ethtool driver info already contained the unique firmware
identifier. This patch adds the firmware release version.

   $ ethtool -i wlan4
   driver: brcmfmac
   version: 6.10.224.22
   firmware-version: 01-32bd010f

Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Arend van Spriel 2015-01-25 20:31:41 +01:00 committed by Kalle Valo
parent 4862290319
commit e749c7d49c
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/brcm80211/brcmfmac/core.c
View File

@ -601,9 +601,11 @@ static void brcmf_ethtool_get_drvinfo(struct net_device *ndev,
{
struct brcmf_if *ifp = netdev_priv(ndev);
struct brcmf_pub *drvr = ifp->drvr;
char drev[BRCMU_DOTREV_LEN];
strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
snprintf(info->version, sizeof(info->version), "n/a");
strlcpy(info->version, brcmu_dotrev_str(drvr->revinfo.driverrev, drev),
sizeof(info->version));
strlcpy(info->fw_version, drvr->fwver, sizeof(info->fw_version));
strlcpy(info->bus_info, dev_name(drvr->bus_if->dev),
sizeof(info->bus_info));

27
drivers/net/wireless/brcm80211/brcmutil/utils.c
View File

@ -277,6 +277,33 @@ char *brcmu_boardrev_str(u32 brev, char *buf)
}
EXPORT_SYMBOL(brcmu_boardrev_str);
char *brcmu_dotrev_str(u32 dotrev, char *buf)
{
u8 dotval[4];
if (!dotrev) {
snprintf(buf, BRCMU_DOTREV_LEN, "unknown");
return buf;
}
dotval[0] = (dotrev >> 24) & 0xFF;
dotval[1] = (dotrev >> 16) & 0xFF;
dotval[2] = (dotrev >> 8) & 0xFF;
dotval[3] = dotrev & 0xFF;
if (dotval[3])
snprintf(buf, BRCMU_DOTREV_LEN, "%d.%d.%d.%d", dotval[0],
dotval[1], dotval[2], dotval[3]);
else if (dotval[2])
snprintf(buf, BRCMU_DOTREV_LEN, "%d.%d.%d", dotval[0],
dotval[1], dotval[2]);
else
snprintf(buf, BRCMU_DOTREV_LEN, "%d.%d", dotval[0],
dotval[1]);
return buf;
}
EXPORT_SYMBOL(brcmu_dotrev_str);
#if defined(DEBUG)
/* pretty hex print a pkt buffer chain */
void brcmu_prpkt(const char *msg, struct sk_buff *p0)

2
drivers/net/wireless/brcm80211/include/brcmu_utils.h
View File

@ -219,7 +219,9 @@ void brcmu_dbg_hex_dump(const void *data, size_t size, const char *fmt, ...)
#endif
#define BRCMU_BOARDREV_LEN 8
#define BRCMU_DOTREV_LEN 16
char *brcmu_boardrev_str(u32 brev, char *buf);
char *brcmu_dotrev_str(u32 dotrev, char *buf);
#endif /* _BRCMU_UTILS_H_ */