Re: [PATCH] Revert "iwlwifi: mvm: fix scan config command size"

From: Roman Gilg
Date: Wed Dec 18 2019 - 14:12:38 EST


On Fri, Dec 13, 2019 at 9:36 PM Mehmet Akif Tasova
<makiftasova@xxxxxxxxx> 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@xxxxxxxxx>
> ---
> 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
>