| 1 |
From 15f8ea7f32b6a18896090ebfff26282d08575634 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Arend van Spriel <arend.vanspriel@broadcom.com> |
| 3 |
Date: Wed, 5 Sep 2018 09:48:58 +0200 |
| 4 |
Subject: [PATCH 053/145] brcmfmac: fix for proper support of 160MHz bandwidth |
| 5 |
|
| 6 |
[ Upstream commit 330994e8e8ec5d0b269a5265e6032b37e29aa336 ] |
| 7 |
|
| 8 |
Decoding of firmware channel information was not complete for 160MHz |
| 9 |
support. This resulted in the following warning: |
| 10 |
|
| 11 |
WARNING: CPU: 2 PID: 2222 at .../broadcom/brcm80211/brcmutil/d11.c:196 |
| 12 |
brcmu_d11ac_decchspec+0x2e/0x100 [brcmutil] |
| 13 |
Modules linked in: brcmfmac(O) brcmutil(O) sha256_generic cfg80211 ... |
| 14 |
CPU: 2 PID: 2222 Comm: kworker/2:0 Tainted: G O |
| 15 |
4.17.0-wt-testing-x64-00002-gf1bed50 #1 |
| 16 |
Hardware name: Dell Inc. Latitude E6410/07XJP9, BIOS A07 02/15/2011 |
| 17 |
Workqueue: events request_firmware_work_func |
| 18 |
RIP: 0010:brcmu_d11ac_decchspec+0x2e/0x100 [brcmutil] |
| 19 |
RSP: 0018:ffffc90000047bd0 EFLAGS: 00010206 |
| 20 |
RAX: 000000000000e832 RBX: ffff8801146fe910 RCX: ffff8801146fd3c0 |
| 21 |
RDX: 0000000000002800 RSI: 0000000000000070 RDI: ffffc90000047c30 |
| 22 |
RBP: ffffc90000047bd0 R08: 0000000000000000 R09: ffffffffa0798c80 |
| 23 |
R10: ffff88012bca55e0 R11: ffff880110a4ea00 R12: ffff8801146f8000 |
| 24 |
R13: ffffc90000047c30 R14: ffff8801146fe930 R15: ffff8801138e02e0 |
| 25 |
FS: 0000000000000000(0000) GS:ffff88012bc80000(0000) knlGS:0000000000000000 |
| 26 |
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 |
| 27 |
CR2: 00007f18ce8b8070 CR3: 000000000200a003 CR4: 00000000000206e0 |
| 28 |
Call Trace: |
| 29 |
brcmf_setup_wiphybands+0x212/0x780 [brcmfmac] |
| 30 |
brcmf_cfg80211_attach+0xae2/0x11a0 [brcmfmac] |
| 31 |
brcmf_attach+0x1fc/0x4b0 [brcmfmac] |
| 32 |
? __kmalloc+0x13c/0x1c0 |
| 33 |
brcmf_pcie_setup+0x99b/0xe00 [brcmfmac] |
| 34 |
brcmf_fw_request_done+0x16a/0x1f0 [brcmfmac] |
| 35 |
request_firmware_work_func+0x36/0x60 |
| 36 |
process_one_work+0x146/0x350 |
| 37 |
worker_thread+0x4a/0x3b0 |
| 38 |
kthread+0x102/0x140 |
| 39 |
? process_one_work+0x350/0x350 |
| 40 |
? kthread_bind+0x20/0x20 |
| 41 |
ret_from_fork+0x35/0x40 |
| 42 |
Code: 66 90 0f b7 07 55 48 89 e5 89 c2 88 47 02 88 47 03 66 81 e2 00 38 |
| 43 |
66 81 fa 00 18 74 6e 66 81 fa 00 20 74 39 66 81 fa 00 10 74 14 <0f> |
| 44 |
0b 66 25 00 c0 74 20 66 3d 00 c0 75 20 c6 47 04 01 5d c3 66 |
| 45 |
---[ end trace 550c46682415b26d ]--- |
| 46 |
brcmfmac: brcmf_construct_chaninfo: Ignoring unexpected firmware channel 50 |
| 47 |
|
| 48 |
This patch adds the missing stuff to properly handle this. |
| 49 |
|
| 50 |
Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com> |
| 51 |
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com> |
| 52 |
Reviewed-by: Franky Lin <franky.lin@broadcom.com> |
| 53 |
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> |
| 54 |
Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| 55 |
Signed-off-by: Sasha Levin <sashal@kernel.org> |
| 56 |
--- |
| 57 |
.../broadcom/brcm80211/brcmutil/d11.c | 34 ++++++++++++++++++- |
| 58 |
.../broadcom/brcm80211/include/brcmu_wifi.h | 2 ++ |
| 59 |
2 files changed, 35 insertions(+), 1 deletion(-) |
| 60 |
|
| 61 |
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c b/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c |
| 62 |
index d8b79cb72b58..e7584b842dce 100644 |
| 63 |
--- a/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c |
| 64 |
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c |
| 65 |
@@ -77,6 +77,8 @@ static u16 d11ac_bw(enum brcmu_chan_bw bw) |
| 66 |
return BRCMU_CHSPEC_D11AC_BW_40; |
| 67 |
case BRCMU_CHAN_BW_80: |
| 68 |
return BRCMU_CHSPEC_D11AC_BW_80; |
| 69 |
+ case BRCMU_CHAN_BW_160: |
| 70 |
+ return BRCMU_CHSPEC_D11AC_BW_160; |
| 71 |
default: |
| 72 |
WARN_ON(1); |
| 73 |
} |
| 74 |
@@ -190,8 +192,38 @@ static void brcmu_d11ac_decchspec(struct brcmu_chan *ch) |
| 75 |
break; |
| 76 |
} |
| 77 |
break; |
| 78 |
- case BRCMU_CHSPEC_D11AC_BW_8080: |
| 79 |
case BRCMU_CHSPEC_D11AC_BW_160: |
| 80 |
+ switch (ch->sb) { |
| 81 |
+ case BRCMU_CHAN_SB_LLL: |
| 82 |
+ ch->control_ch_num -= CH_70MHZ_APART; |
| 83 |
+ break; |
| 84 |
+ case BRCMU_CHAN_SB_LLU: |
| 85 |
+ ch->control_ch_num -= CH_50MHZ_APART; |
| 86 |
+ break; |
| 87 |
+ case BRCMU_CHAN_SB_LUL: |
| 88 |
+ ch->control_ch_num -= CH_30MHZ_APART; |
| 89 |
+ break; |
| 90 |
+ case BRCMU_CHAN_SB_LUU: |
| 91 |
+ ch->control_ch_num -= CH_10MHZ_APART; |
| 92 |
+ break; |
| 93 |
+ case BRCMU_CHAN_SB_ULL: |
| 94 |
+ ch->control_ch_num += CH_10MHZ_APART; |
| 95 |
+ break; |
| 96 |
+ case BRCMU_CHAN_SB_ULU: |
| 97 |
+ ch->control_ch_num += CH_30MHZ_APART; |
| 98 |
+ break; |
| 99 |
+ case BRCMU_CHAN_SB_UUL: |
| 100 |
+ ch->control_ch_num += CH_50MHZ_APART; |
| 101 |
+ break; |
| 102 |
+ case BRCMU_CHAN_SB_UUU: |
| 103 |
+ ch->control_ch_num += CH_70MHZ_APART; |
| 104 |
+ break; |
| 105 |
+ default: |
| 106 |
+ WARN_ON_ONCE(1); |
| 107 |
+ break; |
| 108 |
+ } |
| 109 |
+ break; |
| 110 |
+ case BRCMU_CHSPEC_D11AC_BW_8080: |
| 111 |
default: |
| 112 |
WARN_ON_ONCE(1); |
| 113 |
break; |
| 114 |
diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h |
| 115 |
index 7b9a77981df1..75b2a0438cfa 100644 |
| 116 |
--- a/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h |
| 117 |
+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h |
| 118 |
@@ -29,6 +29,8 @@ |
| 119 |
#define CH_UPPER_SB 0x01 |
| 120 |
#define CH_LOWER_SB 0x02 |
| 121 |
#define CH_EWA_VALID 0x04 |
| 122 |
+#define CH_70MHZ_APART 14 |
| 123 |
+#define CH_50MHZ_APART 10 |
| 124 |
#define CH_30MHZ_APART 6 |
| 125 |
#define CH_20MHZ_APART 4 |
| 126 |
#define CH_10MHZ_APART 2 |
| 127 |
-- |
| 128 |
2.19.1 |
| 129 |
|
Parent Directory
| 
Revision Log