aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/349-0003-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-04-16 08:48:43 +0000
committerRafał Miłecki <zajec5@gmail.com>2016-04-16 08:48:43 +0000
commit894aed060ee15dafea19d94157adddf38ff8e2e7 (patch)
treeadb07cf3620b80c16a754594560f7ea942a99620 /package/kernel/mac80211/patches/349-0003-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch
parente920824fdd8488a9659b9839feebe015362de6c2 (diff)
downloadupstream-894aed060ee15dafea19d94157adddf38ff8e2e7.tar.gz
upstream-894aed060ee15dafea19d94157adddf38ff8e2e7.tar.bz2
upstream-894aed060ee15dafea19d94157adddf38ff8e2e7.zip
mac80211: update brcmfmac including missing boardrev workaround
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 49174
Diffstat (limited to 'package/kernel/mac80211/patches/349-0003-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch')
-rw-r--r--package/kernel/mac80211/patches/349-0003-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch114
1 files changed, 114 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/349-0003-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch b/package/kernel/mac80211/patches/349-0003-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch
new file mode 100644
index 0000000000..f293401ca8
--- /dev/null
+++ b/package/kernel/mac80211/patches/349-0003-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch
@@ -0,0 +1,114 @@
+From: Hante Meuleman <hante.meuleman@broadcom.com>
+Date: Mon, 11 Apr 2016 11:35:23 +0200
+Subject: [PATCH] brcmfmac: insert default boardrev in nvram data if
+ missing
+
+Some nvram files/stores come without the boardrev information,
+but firmware requires this to be set. When not found in nvram then
+add a default boardrev string to the nvram data.
+
+Reported-by: Rafal Milecki <zajec5@gmail.com>
+Reviewed-by: Arend Van Spriel <arend@broadcom.com>
+Reviewed-by: Franky (Zhenhui) Lin <franky.lin@broadcom.com>
+Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
+Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
+Signed-off-by: Arend van Spriel <arend@broadcom.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+@@ -29,6 +29,7 @@
+ #define BRCMF_FW_MAX_NVRAM_SIZE 64000
+ #define BRCMF_FW_NVRAM_DEVPATH_LEN 19 /* devpath0=pcie/1/4/ */
+ #define BRCMF_FW_NVRAM_PCIEDEV_LEN 10 /* pcie/1/4/ + \0 */
++#define BRCMF_FW_DEFAULT_BOARDREV "boardrev=0xff"
+
+ enum nvram_parser_state {
+ IDLE,
+@@ -51,6 +52,7 @@ enum nvram_parser_state {
+ * @entry: start position of key,value entry.
+ * @multi_dev_v1: detect pcie multi device v1 (compressed).
+ * @multi_dev_v2: detect pcie multi device v2.
++ * @boardrev_found: nvram contains boardrev information.
+ */
+ struct nvram_parser {
+ enum nvram_parser_state state;
+@@ -63,6 +65,7 @@ struct nvram_parser {
+ u32 entry;
+ bool multi_dev_v1;
+ bool multi_dev_v2;
++ bool boardrev_found;
+ };
+
+ /**
+@@ -125,6 +128,8 @@ static enum nvram_parser_state brcmf_nvr
+ nvp->multi_dev_v1 = true;
+ if (strncmp(&nvp->data[nvp->entry], "pcie/", 5) == 0)
+ nvp->multi_dev_v2 = true;
++ if (strncmp(&nvp->data[nvp->entry], "boardrev", 8) == 0)
++ nvp->boardrev_found = true;
+ } else if (!is_nvram_char(c) || c == ' ') {
+ brcmf_dbg(INFO, "warning: ln=%d:col=%d: '=' expected, skip invalid key entry\n",
+ nvp->line, nvp->column);
+@@ -284,6 +289,8 @@ static void brcmf_fw_strip_multi_v1(stru
+ while (i < nvp->nvram_len) {
+ if ((nvp->nvram[i] - '0' == id) && (nvp->nvram[i + 1] == ':')) {
+ i += 2;
++ if (strncmp(&nvp->nvram[i], "boardrev", 8) == 0)
++ nvp->boardrev_found = true;
+ while (nvp->nvram[i] != 0) {
+ nvram[j] = nvp->nvram[i];
+ i++;
+@@ -335,6 +342,8 @@ static void brcmf_fw_strip_multi_v2(stru
+ while (i < nvp->nvram_len - len) {
+ if (strncmp(&nvp->nvram[i], prefix, len) == 0) {
+ i += len;
++ if (strncmp(&nvp->nvram[i], "boardrev", 8) == 0)
++ nvp->boardrev_found = true;
+ while (nvp->nvram[i] != 0) {
+ nvram[j] = nvp->nvram[i];
+ i++;
+@@ -356,6 +365,18 @@ fail:
+ nvp->nvram_len = 0;
+ }
+
++static void brcmf_fw_add_defaults(struct nvram_parser *nvp)
++{
++ if (nvp->boardrev_found)
++ return;
++
++ memcpy(&nvp->nvram[nvp->nvram_len], &BRCMF_FW_DEFAULT_BOARDREV,
++ strlen(BRCMF_FW_DEFAULT_BOARDREV));
++ nvp->nvram_len += strlen(BRCMF_FW_DEFAULT_BOARDREV);
++ nvp->nvram[nvp->nvram_len] = '\0';
++ nvp->nvram_len++;
++}
++
+ /* brcmf_nvram_strip :Takes a buffer of "<var>=<value>\n" lines read from a fil
+ * and ending in a NUL. Removes carriage returns, empty lines, comment lines,
+ * and converts newlines to NULs. Shortens buffer as needed and pads with NULs.
+@@ -377,16 +398,21 @@ static void *brcmf_fw_nvram_strip(const
+ if (nvp.state == END)
+ break;
+ }
+- if (nvp.multi_dev_v1)
++ if (nvp.multi_dev_v1) {
++ nvp.boardrev_found = false;
+ brcmf_fw_strip_multi_v1(&nvp, domain_nr, bus_nr);
+- else if (nvp.multi_dev_v2)
++ } else if (nvp.multi_dev_v2) {
++ nvp.boardrev_found = false;
+ brcmf_fw_strip_multi_v2(&nvp, domain_nr, bus_nr);
++ }
+
+ if (nvp.nvram_len == 0) {
+ kfree(nvp.nvram);
+ return NULL;
+ }
+
++ brcmf_fw_add_defaults(&nvp);
++
+ pad = nvp.nvram_len;
+ *new_length = roundup(nvp.nvram_len + 1, 4);
+ while (pad != *new_length) {