mac80211: backport more brcmfmac changes queued for the 5.1

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / brcm / 349-v5.1-0006-brcmfmac-use-chipname-in-brcmf_fw_alloc_request-for-.patch

diff --git a/package/kernel/mac80211/patches/brcm/349-v5.1-0006-brcmfmac-use-chipname-in-brcmf_fw_alloc_request-for-.patch b/package/kernel/mac80211/patches/brcm/349-v5.1-0006-brcmfmac-use-chipname-in-brcmf_fw_alloc_request-for-.patch
new file mode 100644 (file)
index 0000000..23180c7
--- /dev/null
+++ b/package/kernel/mac80211/patches/brcm/349-v5.1-0006-brcmfmac-use-chipname-in-brcmf_fw_alloc_request-for-.patch
@@ -0,0 +1,42 @@
+From a250c91c1762e85c736e67cb4a9a95ebae72e62d Mon Sep 17 00:00:00 2001
+From: Arend van Spriel <arend.vanspriel@broadcom.com>
+Date: Thu, 14 Feb 2019 13:43:52 +0100
+Subject: [PATCH] brcmfmac: use chipname in brcmf_fw_alloc_request() for error
+ path as well
+
+The local variable chipname is string representation of chip id and revision
+which is printed in the good flow of brcmf_fw_alloc_request(). Also use it
+for the error path, ie. for unknown/unsupported devices.
+
+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@codeaurora.org>
+---
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+@@ -719,8 +719,10 @@ brcmf_fw_alloc_request(u32 chip, u32 chi
+                       break;
+       }
+ 
++      brcmf_chip_name(chip, chiprev, chipname, sizeof(chipname));
++
+       if (i == table_size) {
+-              brcmf_err("Unknown chipid %d [%d]\n", chip, chiprev);
++              brcmf_err("Unknown chip %s\n", chipname);
+               return NULL;
+       }
+ 
+@@ -729,8 +731,6 @@ brcmf_fw_alloc_request(u32 chip, u32 chi
+       if (!fwreq)
+               return NULL;
+ 
+-      brcmf_chip_name(chip, chiprev, chipname, sizeof(chipname));
+-
+       brcmf_info("using %s for chip %s\n",
+                  mapping_table[i].fw_base, chipname);
+