wifi: brcmfmac: add vendor name in revinfo debugfs file

Upon probe the driver determines the vendor supporting the device.
Expose this information in the revinfo debugfs file.

Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221129135446.151065-7-arend.vanspriel@broadcom.com

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
index 5844311..83ea251 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
@@ -1136,7 +1136,8 @@ static int brcmf_revinfo_read(struct seq_file *s, void *data)
        seq_printf(s, "vendorid: 0x%04x\n", ri->vendorid);
        seq_printf(s, "deviceid: 0x%04x\n", ri->deviceid);
        seq_printf(s, "radiorev: %s\n", brcmu_dotrev_str(ri->radiorev, drev));
-       seq_printf(s, "chip: %s\n", ri->chipname);
+       seq_printf(s, "chip: %s (%s)\n", ri->chipname,
+                  brcmf_fwvid_vendor_name(bus_if->drvr));
        seq_printf(s, "chippkg: %u\n", ri->chippkg);
        seq_printf(s, "corerev: %u\n", ri->corerev);
        seq_printf(s, "boardid: 0x%04x\n", ri->boardid);

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c
index 274d512..6f16157 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c
@@ -192,3 +192,8 @@ void brcmf_fwvid_detach_ops(struct brcmf_pub *drvr)
 
        mutex_unlock(&fwvid_list_lock);
 }
+
+const char *brcmf_fwvid_vendor_name(struct brcmf_pub *drvr)
+{
+       return fwvid_list[drvr->bus_if->fwvid].name;
+}

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h
index 6b3aec1..43df58b 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h
@@ -22,6 +22,7 @@ int brcmf_fwvid_unregister_vendor(enum brcmf_fwvendor fwvid, struct module *mod)
 /* core driver functions */
 int brcmf_fwvid_attach_ops(struct brcmf_pub *drvr);
 void brcmf_fwvid_detach_ops(struct brcmf_pub *drvr);
+const char *brcmf_fwvid_vendor_name(struct brcmf_pub *drvr);
 
 static inline int brcmf_fwvid_attach(struct brcmf_pub *drvr)
 {