Commit 7f52c81d authored by Arend van Spriel's avatar Arend van Spriel Committed by Kalle Valo
Browse files

brcmfmac: store revinfo retrieval result 



When revinfo retrieval fails we can not show the firmware version
in ethtool driver info. Store the result to be used when handling
ethtool driver info callback.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent e749c7d4

drivers/net/wireless/brcm80211/brcmfmac/common.c

+2 −1
Original line number Diff line number Diff line
@@ -57,10 +57,10 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 


	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_REVINFO,

				     &revinfo, sizeof(revinfo));

	ri = &ifp->drvr->revinfo;

	if (err < 0) {

		brcmf_err("retrieving revision info failed, %d\n", err);

	} else {

		ri = &ifp->drvr->revinfo;

		ri->vendorid = le32_to_cpu(revinfo.vendorid);

		ri->deviceid = le32_to_cpu(revinfo.deviceid);

		ri->radiorev = le32_to_cpu(revinfo.radiorev);
@@ -79,6 +79,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
		ri->chippkg = le32_to_cpu(revinfo.chippkg);

		ri->nvramrev = le32_to_cpu(revinfo.nvramrev);

	}

	ri->result = err;



	/* query for 'ver' to get version info from firmware */

	memset(buf, 0, sizeof(buf));

drivers/net/wireless/brcm80211/brcmfmac/core.c

+4 −3
Original line number Diff line number Diff line
@@ -601,11 +601,12 @@ 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];

	char drev[BRCMU_DOTREV_LEN] = "n/a";



	if (drvr->revinfo.result == 0)

		brcmu_dotrev_str(drvr->revinfo.driverrev, drev);

	strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));

	strlcpy(info->version, brcmu_dotrev_str(drvr->revinfo.driverrev, drev),

		sizeof(info->version));

	strlcpy(info->version, 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));

drivers/net/wireless/brcm80211/brcmfmac/core.h

+9 −1
Original line number Diff line number Diff line
@@ -71,8 +71,16 @@ struct brcmf_proto; /* device communication protocol info */ 
struct brcmf_cfg80211_dev; /* cfg80211 device info */

struct brcmf_fws_info; /* firmware signalling info */



/* see struct brcmf_rev_info_le in fwil_types.h */

/*

 * struct brcmf_rev_info

 *

 * The result field stores the error code of the

 * revision info request from firmware. For the

 * other fields see struct brcmf_rev_info_le in

 * fwil_types.h

 */

struct brcmf_rev_info {

	int result;

	u32 vendorid;

	u32 deviceid;

	u32 radiorev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE