diff mbox

[v2] brcmfmac: feature check for multi-scheduled scan fails on bcm4345 devices

Message ID 3cfcb175-8031-f5a8-da51-d81fa2d331c8@gmail.com (mailing list archive)
State Accepted
Commit f957dd3c8db2781c8a334b166800788feb618625
Delegated to: Kalle Valo
Headers show

Commit Message

Ian W MORRISON Aug. 30, 2017, 10:51 p.m. UTC
The firmware feature check introduced for multi-scheduled scan is also
failing for bcm4345 devices resulting in a firmware crash.
The reason for this crash has not yet been root cause so this patch avoids
the feature check for those device as a short-term fix.

Fixes: 9fe929aaace6 ("brcmfmac: add firmware feature detection for gscan feature")
Signed-off-by: Ian W MORRISON <ianwmorrison@gmail.com>
---
v2: Fixed tabs being replaced by spaces in patch submission
Tested on MINIX NEO Z83-4 and MINIX NEO Z83-4 Pro devices.
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Arend van Spriel Sept. 1, 2017, 8:04 p.m. UTC | #1
On 31-08-17 00:51, Ian W MORRISON wrote:
> The firmware feature check introduced for multi-scheduled scan is also
> failing for bcm4345 devices resulting in a firmware crash.
> The reason for this crash has not yet been root cause so this patch avoids
> the feature check for those device as a short-term fix.

Thanks. This is one of the few devices that I actually do not have on my 
desk.

Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> Fixes: 9fe929aaace6 ("brcmfmac: add firmware feature detection for gscan feature")
> Signed-off-by: Ian W MORRISON <ianwmorrison@gmail.com>
> ---
> v2: Fixed tabs being replaced by spaces in patch submission
> Tested on MINIX NEO Z83-4 and MINIX NEO Z83-4 Pro devices.
> ---
>   drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
Ian W MORRISON Sept. 2, 2017, 7:15 a.m. UTC | #2
On 2 September 2017 at 06:04, Arend van Spriel
<arend.vanspriel@broadcom.com> wrote:
> On 31-08-17 00:51, Ian W MORRISON wrote:
>>
>> The firmware feature check introduced for multi-scheduled scan is also
>> failing for bcm4345 devices resulting in a firmware crash.
>> The reason for this crash has not yet been root cause so this patch avoids
>> the feature check for those device as a short-term fix.
>
>
> Thanks. This is one of the few devices that I actually do not have on my
> desk.
>
> Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
>>
>> Fixes: 9fe929aaace6 ("brcmfmac: add firmware feature detection for gscan
>> feature")
>> Signed-off-by: Ian W MORRISON <ianwmorrison@gmail.com>
>> ---
>> v2: Fixed tabs being replaced by spaces in patch submission
>> Tested on MINIX NEO Z83-4 and MINIX NEO Z83-4 Pro devices.
>> ---
>>   drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)

Thanks. This patch of course is required to fix the '4.13 REGRESSION'
for brcm4345 sdio wifi with 4.13-rc1 through 4.13-rc7 as v4.12.10 is
the last working release. If you want me to test anything specific on
this device let me know.
Kalle Valo Sept. 4, 2017, 1:01 p.m. UTC | #3
Ian W MORRISON <ianwmorrison@gmail.com> writes:

> On 2 September 2017 at 06:04, Arend van Spriel
> <arend.vanspriel@broadcom.com> wrote:
>> On 31-08-17 00:51, Ian W MORRISON wrote:
>>>
>>> The firmware feature check introduced for multi-scheduled scan is also
>>> failing for bcm4345 devices resulting in a firmware crash.
>>> The reason for this crash has not yet been root cause so this patch avoids
>>> the feature check for those device as a short-term fix.
>>
>>
>> Thanks. This is one of the few devices that I actually do not have on my
>> desk.
>>
>> Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
>>>
>>> Fixes: 9fe929aaace6 ("brcmfmac: add firmware feature detection for gscan
>>> feature")
>>> Signed-off-by: Ian W MORRISON <ianwmorrison@gmail.com>
>>> ---
>>> v2: Fixed tabs being replaced by spaces in patch submission
>>> Tested on MINIX NEO Z83-4 and MINIX NEO Z83-4 Pro devices.
>>> ---
>>>   drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 ++-
>>>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> Thanks. This patch of course is required to fix the '4.13 REGRESSION'
> for brcm4345 sdio wifi with 4.13-rc1 through 4.13-rc7 as v4.12.10 is
> the last working release. If you want me to test anything specific on
> this device let me know.

I'll queue this for 4.14. And add a stable tag so that I goes to 4.13
stable releases:

Cc: <stable@vger.kernel.org> # v4.13
Ian W MORRISON Sept. 4, 2017, 3:41 p.m. UTC | #4
On 4 September 2017 at 23:01, Kalle Valo <kvalo@codeaurora.org> wrote:
>
> I'll queue this for 4.14. And add a stable tag so that I goes to 4.13
> stable releases:
>
> Cc: <stable@vger.kernel.org> # v4.13
>
> --
> Kalle Valo

Thanks.
Kalle Valo Sept. 8, 2017, 9:15 a.m. UTC | #5
Hi Ian,

please don't send me email privately, instead always send the questions
to the list. You get better answers faster and I get less email :)

Ian W MORRISON <ianwmorrison@gmail.com> writes:

> With the below patch how can I track when it has been merged into 4.13
> so I can check and start using it? For 4.14 I'm assuming I'll get an
> 'applied' email from you so I can track through git but as I've never
> had a patch go backwards into stable I'm unsure of how it works.

So if Greg applies a patch to one of stable his stable releases who
usually sends a private email to the patch author and anyone who has
signed off the patch. So you should get an email about that. You can
also follow the stable trees mentioned here:

https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html

But good that you brought up this as I almost missed your patch from
this week's pull request for 4.14. I'll apply it shortly.
Kalle Valo Sept. 8, 2017, 9:25 a.m. UTC | #6
Ian W MORRISON <ianwmorrison@gmail.com> wrote:

> The firmware feature check introduced for multi-scheduled scan is also
> failing for bcm4345 devices resulting in a firmware crash.
> The reason for this crash has not yet been root cause so this patch avoids
> the feature check for those device as a short-term fix.
> 
> Fixes: 9fe929aaace6 ("brcmfmac: add firmware feature detection for gscan feature")
> Cc: <stable@vger.kernel.org> # v4.13
> Signed-off-by: Ian W MORRISON <ianwmorrison@gmail.com>
> Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>

Patch applied to wireless-drivers.git, thanks.

f957dd3c8db2 brcmfmac: feature check for multi-scheduled scan fails on bcm4345 devices
diff mbox

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
index f1b60740e..53ae302 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
@@ -159,7 +159,8 @@  void brcmf_feat_attach(struct brcmf_pub *drvr)
 
 	brcmf_feat_firmware_capabilities(ifp);
 	memset(&gscan_cfg, 0, sizeof(gscan_cfg));
-	if (drvr->bus_if->chip != BRCM_CC_43430_CHIP_ID)
+	if (drvr->bus_if->chip != BRCM_CC_43430_CHIP_ID &&
+	    drvr->bus_if->chip != BRCM_CC_4345_CHIP_ID)
 		brcmf_feat_iovar_data_set(ifp, BRCMF_FEAT_GSCAN,
 					  "pfn_gscan_cfg",
 					  &gscan_cfg, sizeof(gscan_cfg));