Decoding of firmware channel information was not complete for 160MHz support. This resulted in the following warning: WARNING: CPU: 2 PID: 2222 at .../broadcom/brcm80211/brcmutil/d11.c:196 brcmu_d11ac_decchspec+0x2e/0x100 [brcmutil] Modules linked in: brcmfmac(O) brcmutil(O) sha256_generic cfg80211 ... CPU: 2 PID: 2222 Comm: kworker/2:0 Tainted: G O 4.17.0-wt-testing-x64-00002-gf1bed50 #1 Hardware name: Dell Inc. Latitude E6410/07XJP9, BIOS A07 02/15/2011 Workqueue: events request_firmware_work_func RIP: 0010:brcmu_d11ac_decchspec+0x2e/0x100 [brcmutil] RSP: 0018:ffffc90000047bd0 EFLAGS: 00010206 RAX: 000000000000e832 RBX: ffff8801146fe910 RCX: ffff8801146fd3c0 RDX: 0000000000002800 RSI: 0000000000000070 RDI: ffffc90000047c30 RBP: ffffc90000047bd0 R08: 0000000000000000 R09: ffffffffa0798c80 R10: ffff88012bca55e0 R11: ffff880110a4ea00 R12: ffff8801146f8000 R13: ffffc90000047c30 R14: ffff8801146fe930 R15: ffff8801138e02e0 FS: 0000000000000000(0000) GS:ffff88012bc80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f18ce8b8070 CR3: 000000000200a003 CR4: 00000000000206e0 Call Trace: brcmf_setup_wiphybands+0x212/0x780 [brcmfmac] brcmf_cfg80211_attach+0xae2/0x11a0 [brcmfmac] brcmf_attach+0x1fc/0x4b0 [brcmfmac] ? __kmalloc+0x13c/0x1c0 brcmf_pcie_setup+0x99b/0xe00 [brcmfmac] brcmf_fw_request_done+0x16a/0x1f0 [brcmfmac] request_firmware_work_func+0x36/0x60 process_one_work+0x146/0x350 worker_thread+0x4a/0x3b0 kthread+0x102/0x140 ? process_one_work+0x350/0x350 ? kthread_bind+0x20/0x20 ret_from_fork+0x35/0x40 Code: 66 90 0f b7 07 55 48 89 e5 89 c2 88 47 02 88 47 03 66 81 e2 00 38 66 81 fa 00 18 74 6e 66 81 fa 00 20 74 39 66 81 fa 00 10 74 14 <0f> 0b 66 25 00 c0 74 20 66 3d 00 c0 75 20 c6 47 04 01 5d c3 66 ---[ end trace 550c46682415b26d ]--- brcmfmac: brcmf_construct_chaninfo: Ignoring unexpected firmware channel 50 This patch adds the missing stuff to properly handle this. 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>
256 lines
6.3 KiB
C
256 lines
6.3 KiB
C
/*
|
|
* Copyright (c) 2013 Broadcom Corporation
|
|
*
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
|
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
|
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
/*********************channel spec common functions*********************/
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <brcmu_utils.h>
|
|
#include <brcmu_wifi.h>
|
|
#include <brcmu_d11.h>
|
|
|
|
static u16 d11n_sb(enum brcmu_chan_sb sb)
|
|
{
|
|
switch (sb) {
|
|
case BRCMU_CHAN_SB_NONE:
|
|
return BRCMU_CHSPEC_D11N_SB_N;
|
|
case BRCMU_CHAN_SB_L:
|
|
return BRCMU_CHSPEC_D11N_SB_L;
|
|
case BRCMU_CHAN_SB_U:
|
|
return BRCMU_CHSPEC_D11N_SB_U;
|
|
default:
|
|
WARN_ON(1);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static u16 d11n_bw(enum brcmu_chan_bw bw)
|
|
{
|
|
switch (bw) {
|
|
case BRCMU_CHAN_BW_20:
|
|
return BRCMU_CHSPEC_D11N_BW_20;
|
|
case BRCMU_CHAN_BW_40:
|
|
return BRCMU_CHSPEC_D11N_BW_40;
|
|
default:
|
|
WARN_ON(1);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static void brcmu_d11n_encchspec(struct brcmu_chan *ch)
|
|
{
|
|
if (ch->bw == BRCMU_CHAN_BW_20)
|
|
ch->sb = BRCMU_CHAN_SB_NONE;
|
|
|
|
ch->chspec = 0;
|
|
brcmu_maskset16(&ch->chspec, BRCMU_CHSPEC_CH_MASK,
|
|
BRCMU_CHSPEC_CH_SHIFT, ch->chnum);
|
|
brcmu_maskset16(&ch->chspec, BRCMU_CHSPEC_D11N_SB_MASK,
|
|
0, d11n_sb(ch->sb));
|
|
brcmu_maskset16(&ch->chspec, BRCMU_CHSPEC_D11N_BW_MASK,
|
|
0, d11n_bw(ch->bw));
|
|
|
|
if (ch->chnum <= CH_MAX_2G_CHANNEL)
|
|
ch->chspec |= BRCMU_CHSPEC_D11N_BND_2G;
|
|
else
|
|
ch->chspec |= BRCMU_CHSPEC_D11N_BND_5G;
|
|
}
|
|
|
|
static u16 d11ac_bw(enum brcmu_chan_bw bw)
|
|
{
|
|
switch (bw) {
|
|
case BRCMU_CHAN_BW_20:
|
|
return BRCMU_CHSPEC_D11AC_BW_20;
|
|
case BRCMU_CHAN_BW_40:
|
|
return BRCMU_CHSPEC_D11AC_BW_40;
|
|
case BRCMU_CHAN_BW_80:
|
|
return BRCMU_CHSPEC_D11AC_BW_80;
|
|
case BRCMU_CHAN_BW_160:
|
|
return BRCMU_CHSPEC_D11AC_BW_160;
|
|
default:
|
|
WARN_ON(1);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static void brcmu_d11ac_encchspec(struct brcmu_chan *ch)
|
|
{
|
|
if (ch->bw == BRCMU_CHAN_BW_20 || ch->sb == BRCMU_CHAN_SB_NONE)
|
|
ch->sb = BRCMU_CHAN_SB_L;
|
|
|
|
brcmu_maskset16(&ch->chspec, BRCMU_CHSPEC_CH_MASK,
|
|
BRCMU_CHSPEC_CH_SHIFT, ch->chnum);
|
|
brcmu_maskset16(&ch->chspec, BRCMU_CHSPEC_D11AC_SB_MASK,
|
|
BRCMU_CHSPEC_D11AC_SB_SHIFT, ch->sb);
|
|
brcmu_maskset16(&ch->chspec, BRCMU_CHSPEC_D11AC_BW_MASK,
|
|
0, d11ac_bw(ch->bw));
|
|
|
|
ch->chspec &= ~BRCMU_CHSPEC_D11AC_BND_MASK;
|
|
if (ch->chnum <= CH_MAX_2G_CHANNEL)
|
|
ch->chspec |= BRCMU_CHSPEC_D11AC_BND_2G;
|
|
else
|
|
ch->chspec |= BRCMU_CHSPEC_D11AC_BND_5G;
|
|
}
|
|
|
|
static void brcmu_d11n_decchspec(struct brcmu_chan *ch)
|
|
{
|
|
u16 val;
|
|
|
|
ch->chnum = (u8)(ch->chspec & BRCMU_CHSPEC_CH_MASK);
|
|
ch->control_ch_num = ch->chnum;
|
|
|
|
switch (ch->chspec & BRCMU_CHSPEC_D11N_BW_MASK) {
|
|
case BRCMU_CHSPEC_D11N_BW_20:
|
|
ch->bw = BRCMU_CHAN_BW_20;
|
|
ch->sb = BRCMU_CHAN_SB_NONE;
|
|
break;
|
|
case BRCMU_CHSPEC_D11N_BW_40:
|
|
ch->bw = BRCMU_CHAN_BW_40;
|
|
val = ch->chspec & BRCMU_CHSPEC_D11N_SB_MASK;
|
|
if (val == BRCMU_CHSPEC_D11N_SB_L) {
|
|
ch->sb = BRCMU_CHAN_SB_L;
|
|
ch->control_ch_num -= CH_10MHZ_APART;
|
|
} else {
|
|
ch->sb = BRCMU_CHAN_SB_U;
|
|
ch->control_ch_num += CH_10MHZ_APART;
|
|
}
|
|
break;
|
|
default:
|
|
WARN_ON_ONCE(1);
|
|
break;
|
|
}
|
|
|
|
switch (ch->chspec & BRCMU_CHSPEC_D11N_BND_MASK) {
|
|
case BRCMU_CHSPEC_D11N_BND_5G:
|
|
ch->band = BRCMU_CHAN_BAND_5G;
|
|
break;
|
|
case BRCMU_CHSPEC_D11N_BND_2G:
|
|
ch->band = BRCMU_CHAN_BAND_2G;
|
|
break;
|
|
default:
|
|
WARN_ON_ONCE(1);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void brcmu_d11ac_decchspec(struct brcmu_chan *ch)
|
|
{
|
|
u16 val;
|
|
|
|
ch->chnum = (u8)(ch->chspec & BRCMU_CHSPEC_CH_MASK);
|
|
ch->control_ch_num = ch->chnum;
|
|
|
|
switch (ch->chspec & BRCMU_CHSPEC_D11AC_BW_MASK) {
|
|
case BRCMU_CHSPEC_D11AC_BW_20:
|
|
ch->bw = BRCMU_CHAN_BW_20;
|
|
ch->sb = BRCMU_CHAN_SB_NONE;
|
|
break;
|
|
case BRCMU_CHSPEC_D11AC_BW_40:
|
|
ch->bw = BRCMU_CHAN_BW_40;
|
|
val = ch->chspec & BRCMU_CHSPEC_D11AC_SB_MASK;
|
|
if (val == BRCMU_CHSPEC_D11AC_SB_L) {
|
|
ch->sb = BRCMU_CHAN_SB_L;
|
|
ch->control_ch_num -= CH_10MHZ_APART;
|
|
} else if (val == BRCMU_CHSPEC_D11AC_SB_U) {
|
|
ch->sb = BRCMU_CHAN_SB_U;
|
|
ch->control_ch_num += CH_10MHZ_APART;
|
|
} else {
|
|
WARN_ON_ONCE(1);
|
|
}
|
|
break;
|
|
case BRCMU_CHSPEC_D11AC_BW_80:
|
|
ch->bw = BRCMU_CHAN_BW_80;
|
|
ch->sb = brcmu_maskget16(ch->chspec, BRCMU_CHSPEC_D11AC_SB_MASK,
|
|
BRCMU_CHSPEC_D11AC_SB_SHIFT);
|
|
switch (ch->sb) {
|
|
case BRCMU_CHAN_SB_LL:
|
|
ch->control_ch_num -= CH_30MHZ_APART;
|
|
break;
|
|
case BRCMU_CHAN_SB_LU:
|
|
ch->control_ch_num -= CH_10MHZ_APART;
|
|
break;
|
|
case BRCMU_CHAN_SB_UL:
|
|
ch->control_ch_num += CH_10MHZ_APART;
|
|
break;
|
|
case BRCMU_CHAN_SB_UU:
|
|
ch->control_ch_num += CH_30MHZ_APART;
|
|
break;
|
|
default:
|
|
WARN_ON_ONCE(1);
|
|
break;
|
|
}
|
|
break;
|
|
case BRCMU_CHSPEC_D11AC_BW_160:
|
|
switch (ch->sb) {
|
|
case BRCMU_CHAN_SB_LLL:
|
|
ch->control_ch_num -= CH_70MHZ_APART;
|
|
break;
|
|
case BRCMU_CHAN_SB_LLU:
|
|
ch->control_ch_num -= CH_50MHZ_APART;
|
|
break;
|
|
case BRCMU_CHAN_SB_LUL:
|
|
ch->control_ch_num -= CH_30MHZ_APART;
|
|
break;
|
|
case BRCMU_CHAN_SB_LUU:
|
|
ch->control_ch_num -= CH_10MHZ_APART;
|
|
break;
|
|
case BRCMU_CHAN_SB_ULL:
|
|
ch->control_ch_num += CH_10MHZ_APART;
|
|
break;
|
|
case BRCMU_CHAN_SB_ULU:
|
|
ch->control_ch_num += CH_30MHZ_APART;
|
|
break;
|
|
case BRCMU_CHAN_SB_UUL:
|
|
ch->control_ch_num += CH_50MHZ_APART;
|
|
break;
|
|
case BRCMU_CHAN_SB_UUU:
|
|
ch->control_ch_num += CH_70MHZ_APART;
|
|
break;
|
|
default:
|
|
WARN_ON_ONCE(1);
|
|
break;
|
|
}
|
|
break;
|
|
case BRCMU_CHSPEC_D11AC_BW_8080:
|
|
default:
|
|
WARN_ON_ONCE(1);
|
|
break;
|
|
}
|
|
|
|
switch (ch->chspec & BRCMU_CHSPEC_D11AC_BND_MASK) {
|
|
case BRCMU_CHSPEC_D11AC_BND_5G:
|
|
ch->band = BRCMU_CHAN_BAND_5G;
|
|
break;
|
|
case BRCMU_CHSPEC_D11AC_BND_2G:
|
|
ch->band = BRCMU_CHAN_BAND_2G;
|
|
break;
|
|
default:
|
|
WARN_ON_ONCE(1);
|
|
break;
|
|
}
|
|
}
|
|
|
|
void brcmu_d11_attach(struct brcmu_d11inf *d11inf)
|
|
{
|
|
if (d11inf->io_type == BRCMU_D11N_IOTYPE) {
|
|
d11inf->encchspec = brcmu_d11n_encchspec;
|
|
d11inf->decchspec = brcmu_d11n_decchspec;
|
|
} else {
|
|
d11inf->encchspec = brcmu_d11ac_encchspec;
|
|
d11inf->decchspec = brcmu_d11ac_decchspec;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(brcmu_d11_attach);
|