[v5.4] iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW version 36

Commit Message

Luca Coelho Sept. 24, 2019, 10:30 a.m. UTC

From: Luca Coelho <[e-mail]>

The intention was to have the GEO_TX_POWER_LIMIT command in FW version
36 as well, but not all 8000 family got this feature enabled.  The
8000 family is the only one using version 36, so skip this version
entirely.  If we try to send this command to the firmwares that do not
support it, we get a BAD_COMMAND response from the firmware.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=204151.

Cc: [e-mail] # 4.19+
Signed-off-by: Luca Coelho <[e-mail]>
---
 drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Kalle Valo Sept. 24, 2019, 2:47 p.m. UTC | #1

Luca Coelho <[e-mail]> wrote:

> From: Luca Coelho <[e-mail]>
> 
> The intention was to have the GEO_TX_POWER_LIMIT command in FW version
> 36 as well, but not all 8000 family got this feature enabled.  The
> 8000 family is the only one using version 36, so skip this version
> entirely.  If we try to send this command to the firmwares that do not
> support it, we get a BAD_COMMAND response from the firmware.
> 
> This fixes https://bugzilla.kernel.org/show_bug.cgi?id=204151.
> 
> Cc: [e-mail] # 4.19+
> Signed-off-by: Luca Coelho <[e-mail]>

Patch applied to wireless-drivers.git, thanks.

fddbfeece9c7 iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW version 36

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 014eca6596e2..32a5e4e5461f 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -889,11 +889,13 @@  static bool iwl_mvm_sar_geo_support(struct iwl_mvm *mvm)
 	 * firmware versions.  Unfortunately, we don't have a TLV API
 	 * flag to rely on, so rely on the major version which is in
 	 * the first byte of ucode_ver.  This was implemented
-	 * initially on version 38 and then backported to 36, 29 and
-	 * 17.
+	 * initially on version 38 and then backported to29 and 17.
+	 * The intention was to have it in 36 as well, but not all
+	 * 8000 family got this feature enabled.  The 8000 family is
+	 * the only one using version 36, so skip this version
+	 * entirely.
 	 */
 	return IWL_UCODE_SERIAL(mvm->fw->ucode_ver) >= 38 ||
-	       IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 36 ||
 	       IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 ||
 	       IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17;
 }