| From 51f723acb0b89de4b2d1bdfa8bda859ebe5051fa Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 24 Mar 2026 11:33:25 +0200 |
| Subject: wifi: iwlwifi: mvm: don't send a 6E related command when not |
| supported |
| |
| From: Emmanuel Grumbach <emmanuel.grumbach@intel.com> |
| |
| [ Upstream commit 323156c3541e23da7e582008a7ac30cd51b60acd ] |
| |
| MCC_ALLOWED_AP_TYPE_CMD is related to 6E support. Do not send it if the |
| device doesn't support 6E. |
| Apparently, the firmware is mistakenly advertising support for this |
| command even on AX201 which does not support 6E and then the firmware |
| crashes. |
| |
| Fixes: 0d2fc8821a7d ("wifi: iwlwifi: nvm: parse the VLP/AFC bit from regulatory") |
| Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220804 |
| Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> |
| Reviewed-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> |
| Link: https://patch.msgid.link/20260324113316.e171f0163f2a.I0c444d1f82d1773054e7ffc391ad49697d58f44e@changeid |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c |
| index edae13755ee61..b9c9ee30272ec 100644 |
| --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c |
| @@ -470,7 +470,8 @@ static void iwl_mvm_uats_init(struct iwl_mvm *mvm) |
| .dataflags[0] = IWL_HCMD_DFL_NOCOPY, |
| }; |
| |
| - if (mvm->trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210) { |
| + if (mvm->trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210 || |
| + !mvm->trans->cfg->uhb_supported) { |
| IWL_DEBUG_RADIO(mvm, "UATS feature is not supported\n"); |
| return; |
| } |
| -- |
| 2.53.0 |
| |
