Revert "iwlwifi: mvm: fix scan config command size"
diff mbox series

Message ID 20191213203512.8250-1-makiftasova@gmail.com
State New
Delegated to: Luca Coelho
Headers show
Series
  • Revert "iwlwifi: mvm: fix scan config command size"
Related show

Commit Message

Mehmet Akif Tasova Dec. 13, 2019, 8:35 p.m. UTC
Since Linux 5.4.1 released, iwlwifi could not initialize Intel(R) Dual Band
Wireless AC 9462 firmware, failing with following error in dmesg:

iwlwifi 0000:00:14.3: FW error in SYNC CMD SCAN_CFG_CMD

whole dmesg output of error can be found at:
https://gist.github.com/makiftasova/354e46439338f4ab3fba0b77ad5c19ec

also bug report from ArchLinux bug tracker (contains more info):
https://bugs.archlinux.org/task/64703

Reverting commit 06eb547c4ae4 ("iwlwifi: mvm: fix scan config command
size") seems to fix this issue  until proper solution is found.

This reverts commit 06eb547c4ae4382e70d556ba213d13c95ca1801b.

Signed-off-by: Mehmet Akif Tasova <makiftasova@gmail.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Roman Gilg Dec. 18, 2019, 7:12 p.m. UTC | #1
On Fri, Dec 13, 2019 at 9:36 PM Mehmet Akif Tasova
<makiftasova@gmail.com> wrote:
>
> Since Linux 5.4.1 released, iwlwifi could not initialize Intel(R) Dual Band
> Wireless AC 9462 firmware, failing with following error in dmesg:
>
> iwlwifi 0000:00:14.3: FW error in SYNC CMD SCAN_CFG_CMD
>
> whole dmesg output of error can be found at:
> https://gist.github.com/makiftasova/354e46439338f4ab3fba0b77ad5c19ec
>
> also bug report from ArchLinux bug tracker (contains more info):
> https://bugs.archlinux.org/task/64703

Since this bug report is about the Dell XPS 13 2-in1: I tested your
revert with this device, but the issue persists at least on this
device. So these might be two different issues, one for your device
and another one for the XPS.

> Reverting commit 06eb547c4ae4 ("iwlwifi: mvm: fix scan config command
> size") seems to fix this issue  until proper solution is found.
>
> This reverts commit 06eb547c4ae4382e70d556ba213d13c95ca1801b.
>
> Signed-off-by: Mehmet Akif Tasova <makiftasova@gmail.com>
> ---
>  drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
> index a046ac9fa852..a5af8f4128b1 100644
> --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
> +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
> @@ -1213,7 +1213,7 @@ static int iwl_mvm_legacy_config_scan(struct iwl_mvm *mvm)
>                 cmd_size = sizeof(struct iwl_scan_config_v2);
>         else
>                 cmd_size = sizeof(struct iwl_scan_config_v1);
> -       cmd_size += num_channels;
> +       cmd_size += mvm->fw->ucode_capa.n_scan_channels;
>
>         cfg = kzalloc(cmd_size, GFP_KERNEL);
>         if (!cfg)
> --
> 2.24.1
>
Mehmet Akif Tasova Dec. 19, 2019, 10:15 a.m. UTC | #2
Hello,

Because I used gmail mobile app to response and the app decided that 
always using HTML is a valid choice for every one, my previous mail 
rejected by mailing lists.

Because of that I am (re)sending this mail. You can find contents of my 
previous mail below.

Regards,
Mehmet Akif.

> Hi Roman,
>
> Unfortunately I don't have XPS 13 and tested the patch on Dell Vostro 
> 5481 and this patch is the result of bisection on Vostro.
>
> At first, the Archlinux bug report I shared looked similar thus that 
> bug report contains lots of dmesg outputs from different users. But 
> yes probably there is 2 distinct issue which should be solved separately.
>
> I will update commit message accordingly as soon as possible.
>
> Regards,
> Mehmet Akif
>
>
> On Wed, Dec 18, 2019, 22:12 Roman Gilg <subdiff@gmail.com 
> <mailto:subdiff@gmail.com>> wrote:
>
>     On Fri, Dec 13, 2019 at 9:36 PM Mehmet Akif Tasova
>     <makiftasova@gmail.com <mailto:makiftasova@gmail.com>> wrote:
>     >
>     > Since Linux 5.4.1 released, iwlwifi could not initialize
>     Intel(R) Dual Band
>     > Wireless AC 9462 firmware, failing with following error in dmesg:
>     >
>     > iwlwifi 0000:00:14.3: FW error in SYNC CMD SCAN_CFG_CMD
>     >
>     > whole dmesg output of error can be found at:
>     > https://gist.github.com/makiftasova/354e46439338f4ab3fba0b77ad5c19ec
>     >
>     > also bug report from ArchLinux bug tracker (contains more info):
>     > https://bugs.archlinux.org/task/64703
>
>     Since this bug report is about the Dell XPS 13 2-in1: I tested your
>     revert with this device, but the issue persists at least on this
>     device. So these might be two different issues, one for your device
>     and another one for the XPS.
>
>     > Reverting commit 06eb547c4ae4 ("iwlwifi: mvm: fix scan config
>     command
>     > size") seems to fix this issue  until proper solution is found.
>     >
>     > This reverts commit 06eb547c4ae4382e70d556ba213d13c95ca1801b.
>     >
>     > Signed-off-by: Mehmet Akif Tasova <makiftasova@gmail.com
>     <mailto:makiftasova@gmail.com>>
>     > ---
>     >  drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +-
>     >  1 file changed, 1 insertion(+), 1 deletion(-)
>     >
>     > diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
>     b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
>     > index a046ac9fa852..a5af8f4128b1 100644
>     > --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
>     > +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
>     > @@ -1213,7 +1213,7 @@ static int
>     iwl_mvm_legacy_config_scan(struct iwl_mvm *mvm)
>     >                 cmd_size = sizeof(struct iwl_scan_config_v2);
>     >         else
>     >                 cmd_size = sizeof(struct iwl_scan_config_v1);
>     > -       cmd_size += num_channels;
>     > +       cmd_size += mvm->fw->ucode_capa.n_scan_channels;
>     >
>     >         cfg = kzalloc(cmd_size, GFP_KERNEL);
>     >         if (!cfg)
>     > --
>     > 2.24.1
>     >
>
Thomas Backlund Dec. 23, 2019, 12:24 p.m. UTC | #3
Den 18-12-2019 kl. 21:12, skrev Roman Gilg:
> On Fri, Dec 13, 2019 at 9:36 PM Mehmet Akif Tasova
> <makiftasova@gmail.com> wrote:
>>
>> Since Linux 5.4.1 released, iwlwifi could not initialize Intel(R) Dual Band
>> Wireless AC 9462 firmware, failing with following error in dmesg:
>>
>> iwlwifi 0000:00:14.3: FW error in SYNC CMD SCAN_CFG_CMD
>>
>> whole dmesg output of error can be found at:
>> https://gist.github.com/makiftasova/354e46439338f4ab3fba0b77ad5c19ec
>>
>> also bug report from ArchLinux bug tracker (contains more info):
>> https://bugs.archlinux.org/task/64703
> 
> Since this bug report is about the Dell XPS 13 2-in1: I tested your
> revert with this device, but the issue persists at least on this
> device. So these might be two different issues, one for your device
> and another one for the XPS.


Yeah, to get iwlwifi to work somewhat nicely you need this revert, and 
also theese on top of 5.4.6:

 From db5cce1afc8d2475d2c1c37c2a8267dd0e151526 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 2 Dec 2019 17:09:20 -0500
Subject: Revert "iwlwifi: assign directly to iwl_trans->cfg in QuZ 
detection"

 From 0df36b90c47d93295b7e393da2d961b2f3b6cde4 Mon Sep 17 00:00:00 2001
From: Luca Coelho <luciano.coelho@intel.com>
Date: Thu, 5 Dec 2019 09:03:54 +0200
Subject: iwlwifi: pcie: move power gating workaround earlier in the flow

and atleast v2 of the "iwlwifi: mvm: don't send the 
IWL_MVM_RXQ_NSSN_SYNC notif to Rx queues" patch that is being debated on 
this list.

With theese in place, we seem to have it behaving properly again for 
Mageia users reporting various problems / firmware crashes / ...

Hopefully Intel guys will get this sorted soon-ish and all sent to stable@

> 
>> Reverting commit 06eb547c4ae4 ("iwlwifi: mvm: fix scan config command
>> size") seems to fix this issue  until proper solution is found.
>>
>> This reverts commit 06eb547c4ae4382e70d556ba213d13c95ca1801b.
>>
>> Signed-off-by: Mehmet Akif Tasova <makiftasova@gmail.com>
>> ---
>>   drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
>> index a046ac9fa852..a5af8f4128b1 100644
>> --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
>> +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
>> @@ -1213,7 +1213,7 @@ static int iwl_mvm_legacy_config_scan(struct iwl_mvm *mvm)
>>                  cmd_size = sizeof(struct iwl_scan_config_v2);
>>          else
>>                  cmd_size = sizeof(struct iwl_scan_config_v1);
>> -       cmd_size += num_channels;
>> +       cmd_size += mvm->fw->ucode_capa.n_scan_channels;
>>
>>          cfg = kzalloc(cmd_size, GFP_KERNEL);
>>          if (!cfg)
>> --
>> 2.24.1
>>
> 

--
Thomas
Luciano Coelho Dec. 23, 2019, 1:52 p.m. UTC | #4
On Mon, 2019-12-23 at 14:24 +0200, Thomas Backlund wrote:
> Den 18-12-2019 kl. 21:12, skrev Roman Gilg:
> > On Fri, Dec 13, 2019 at 9:36 PM Mehmet Akif Tasova
> > <makiftasova@gmail.com> wrote:
> > > Since Linux 5.4.1 released, iwlwifi could not initialize Intel(R) Dual Band
> > > Wireless AC 9462 firmware, failing with following error in dmesg:
> > > 
> > > iwlwifi 0000:00:14.3: FW error in SYNC CMD SCAN_CFG_CMD
> > > 
> > > whole dmesg output of error can be found at:
> > > https://gist.github.com/makiftasova/354e46439338f4ab3fba0b77ad5c19ec
> > > 
> > > also bug report from ArchLinux bug tracker (contains more info):
> > > https://bugs.archlinux.org/task/64703
> > 
> > Since this bug report is about the Dell XPS 13 2-in1: I tested your
> > revert with this device, but the issue persists at least on this
> > device. So these might be two different issues, one for your device
> > and another one for the XPS.
> 
> Yeah, to get iwlwifi to work somewhat nicely you need this revert

Indeed the revert is correct.  I'm going to apply it in our internal
tree and send it out for v5.5-rc* (with stable in CC so it goes to
v5.4).  Thanks Mehmet!


> [...]and also theese on top of 5.4.6:
> 
>  From db5cce1afc8d2475d2c1c37c2a8267dd0e151526 Mon Sep 17 00:00:00 2001
> From: Anders Kaseorg <andersk@mit.edu>
> Date: Mon, 2 Dec 2019 17:09:20 -0500
> Subject: Revert "iwlwifi: assign directly to iwl_trans->cfg in QuZ 
> detection"
> 
>  From 0df36b90c47d93295b7e393da2d961b2f3b6cde4 Mon Sep 17 00:00:00 2001
> From: Luca Coelho <luciano.coelho@intel.com>
> Date: Thu, 5 Dec 2019 09:03:54 +0200
> Subject: iwlwifi: pcie: move power gating workaround earlier in the flow

The fixes for these two are already in v5.5-rc3, [1] and [2]
respectively.  They are both marked for v5.4, hopefully they'll be
included in v5.4.7.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=db5cce1afc8d2475d2c1c37c2a8267dd0e151526
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0df36b90c47d93295b7e393da2d961b2f3b6cde4


> and atleast v2 of the "iwlwifi: mvm: don't send the 
> IWL_MVM_RXQ_NSSN_SYNC notif to Rx queues" patch that is being debated on 
> this list.

Kalle is on vacation, but when he gets, back we'll decide what to do
with this.  If he really doesn't like our v4, I'll send out a new
version that satisfies him so we can finally fix this bug.


> With theese in place, we seem to have it behaving properly again for 
> Mageia users reporting various problems / firmware crashes / ...

Thanks, Thomas, for the comprehensive list of fixes needed here!


--
Cheers,
Luca.

Patch
diff mbox series

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index a046ac9fa852..a5af8f4128b1 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -1213,7 +1213,7 @@  static int iwl_mvm_legacy_config_scan(struct iwl_mvm *mvm)
 		cmd_size = sizeof(struct iwl_scan_config_v2);
 	else
 		cmd_size = sizeof(struct iwl_scan_config_v1);
-	cmd_size += num_channels;
+	cmd_size += mvm->fw->ucode_capa.n_scan_channels;
 
 	cfg = kzalloc(cmd_size, GFP_KERNEL);
 	if (!cfg)