Re: [PATCH v3] wifi: iwlwifi: fix system commands group ordering

Re: [PATCH v3] wifi: iwlwifi: fix system commands group ordering

[Niklāvs Koļesņikovs]

I have tested the v3 patch and the stack trace is gone. Since I only
use the Bluetooth functionality, I can't test, if the Wi-Fi is
actually working.

Sorry in advance for any mistakes, I do not use e-mail or mailing lists.

Re: [PATCH v3] wifi: iwlwifi: fix system commands group ordering

[Bagas Sanjaya]

[-- Attachment #1: Type: text/plain, Size: 1971 bytes --]

On Sun, Nov 12, 2023 at 12:09:44PM +0200, Emmanuel Grumbach wrote:
> From: Miri Korenblit <miriam.rachel.korenblit@intel.com>
> 
> The commands should be sorted inside the group definition.
> Fix the ordering so we won't get following warning:
> WARN_ON(iwl_cmd_groups_verify_sorted(trans_cfg))
> 
> Fixes: b6e3d1ba4fcf ("wifi: iwlwifi: mvm: implement new firmware API for statistics")
> Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

Hi Emmanuel,

As this fixes a regression tracked by regzbot, let this be known by
regzbot by adding missing tags:

Link: https://lore.kernel.org/regressions/2fa930bb-54dd-4942-a88d-05a47c8e9731@gmail.com/
Link: https://lore.kernel.org/linux-wireless/CAHk-=wix6kqQ5vHZXjOPpZBfM7mMm9bBZxi2Jh7XnaKCqVf94w@mail.gmail.com/

> ---
> v3: remove changeId for real...
> ---
>  drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
> index fef86a8b4163..1627b2f819db 100644
> --- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
> +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
> @@ -550,9 +550,9 @@ static const struct iwl_hcmd_names iwl_mvm_system_names[] = {
>  	HCMD_NAME(RFI_CONFIG_CMD),
>  	HCMD_NAME(RFI_GET_FREQ_TABLE_CMD),
>  	HCMD_NAME(SYSTEM_FEATURES_CONTROL_CMD),
> -	HCMD_NAME(RFI_DEACTIVATE_NOTIF),
>  	HCMD_NAME(SYSTEM_STATISTICS_CMD),
>  	HCMD_NAME(SYSTEM_STATISTICS_END_NOTIF),
> +	HCMD_NAME(RFI_DEACTIVATE_NOTIF),
>  };
>  
>  /* Please keep this array *SORTED* by hex value.

This fix is confirmed by one of original reporter and another tester, so:

Tested-by: Niklāvs Koļesņikovs <pinkflames.linux@gmail.com>
Tested-by: Damian Tometzki <damian@riscv-rocks.de>

Thanks.

-- 
An old man doll... just what I always wanted! - Clara

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[PATCH v3] wifi: iwlwifi: fix system commands group ordering

[Emmanuel Grumbach]

From: Miri Korenblit <miriam.rachel.korenblit@intel.com>

The commands should be sorted inside the group definition.
Fix the ordering so we won't get following warning:
WARN_ON(iwl_cmd_groups_verify_sorted(trans_cfg))

Fixes: b6e3d1ba4fcf ("wifi: iwlwifi: mvm: implement new firmware API for statistics")
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
v3: remove changeId for real...
---
 drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index fef86a8b4163..1627b2f819db 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -550,9 +550,9 @@ static const struct iwl_hcmd_names iwl_mvm_system_names[] = {
 	HCMD_NAME(RFI_CONFIG_CMD),
 	HCMD_NAME(RFI_GET_FREQ_TABLE_CMD),
 	HCMD_NAME(SYSTEM_FEATURES_CONTROL_CMD),
-	HCMD_NAME(RFI_DEACTIVATE_NOTIF),
 	HCMD_NAME(SYSTEM_STATISTICS_CMD),
 	HCMD_NAME(SYSTEM_STATISTICS_END_NOTIF),
+	HCMD_NAME(RFI_DEACTIVATE_NOTIF),
 };
 
 /* Please keep this array *SORTED* by hex value.
-- 
2.41.0