mac80211: backport brcmfmac data structure rework

It backports brcmfmac commits from kernel 4.17.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

1 files changed, 69 insertions, 0 deletions

diff --git a/package/kernel/mac80211/patches/327-v4.17-0003-brcmfmac-use-brcmf_chip_name-for-consistency.patch b/package/kernel/mac80211/patches/327-v4.17-0003-brcmfmac-use-brcmf_chip_name-for-consistency.patch
new file mode 100644
index 0000000000..e3d06f32cc
--- /dev/null
+++ b/package/kernel/mac80211/patches/327-v4.17-0003-brcmfmac-use-brcmf_chip_name-for-consistency.patch
@@ -0,0 +1,69 @@
+From c88cfa075de356ddf40c668896b2126340f19ba4 Mon Sep 17 00:00:00 2001
+From: Arend Van Spriel <arend.vanspriel@broadcom.com>
+Date: Thu, 22 Mar 2018 21:28:22 +0100
+Subject: [PATCH] brcmfmac: use brcmf_chip_name() for consistency
+
+When logging the chip id/revision information make use of
+brcmf_chip_name() so it is always the same.
+
+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/chip.c     | 5 ++---
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 7 +++++--
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+@@ -926,9 +926,8 @@ static int brcmf_chip_recognition(struct
+ 
+ 	brcmf_chip_name(ci->pub.chip, ci->pub.chiprev,
+ 			ci->pub.name, sizeof(ci->pub.name));
+-	brcmf_dbg(INFO, "found %s chip: BCM%s, rev=%d\n",
+-		  socitype == SOCI_SB ? "SB" : "AXI", ci->pub.name,
+-		  ci->pub.chiprev);
++	brcmf_dbg(INFO, "found %s chip: %s\n",
++		  socitype == SOCI_SB ? "SB" : "AXI", ci->pub.name);
+ 
+ 	if (socitype == SOCI_SB) {
+ 		if (ci->pub.chip != BRCM_CC_4329_CHIP_ID) {
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+@@ -25,6 +25,7 @@
+ #include "firmware.h"
+ #include "core.h"
+ #include "common.h"
++#include "chip.h"
+ 
+ #define BRCMF_FW_MAX_NVRAM_SIZE			64000
+ #define BRCMF_FW_NVRAM_DEVPATH_LEN		19	/* devpath0=pcie/1/4/ */
+@@ -567,6 +568,7 @@ int brcmf_fw_map_chip_to_name(u32 chip,
+ 			      u32 table_size, char fw_name[BRCMF_FW_NAME_LEN],
+ 			      char nvram_name[BRCMF_FW_NAME_LEN])
+ {
++	char chipname[12];
+ 	u32 i;
+ 	char end;
+ 
+@@ -581,6 +583,8 @@ int brcmf_fw_map_chip_to_name(u32 chip,
+ 		return -ENODEV;
+ 	}
+ 
++	brcmf_chip_name(chip, chiprev, chipname, sizeof(chipname));
++
+ 	/* check if firmware path is provided by module parameter */
+ 	if (brcmf_mp_global.firmware_path[0] != '\0') {
+ 		strlcpy(fw_name, brcmf_mp_global.firmware_path,
+@@ -601,8 +605,7 @@ int brcmf_fw_map_chip_to_name(u32 chip,
+ 	if ((nvram_name) && (mapping_table[i].nvram))
+ 		strlcat(nvram_name, mapping_table[i].nvram, BRCMF_FW_NAME_LEN);
+ 
+-	brcmf_info("using %s for chip %#08x(%d) rev %#08x\n",
+-		   fw_name, chip, chip, chiprev);
++	brcmf_info("using %s for chip %s\n", fw_name, chipname);
+ 
+ 	return 0;
+ }