Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-08-16 22:01:45 +0200
committerJiri Slaby <jslaby@suse.cz>2019-08-16 22:25:11 +0200
commit64e66d56f36f1368191ec85cc256ec7ff4813abb (patch)
treec91523ac439e434e9ac7502f912e9a2569b6af09
parenta3fc8da4b7dbd0acd454e80dc2edac7e3044c491 (diff)
iwlwifi: mvm: fix version check for GEO_TX_POWER_LIMIT support
-rw-r--r--patches.kernel.org/5.2.9-144-iwlwifi-mvm-fix-version-check-for-GEO_TX_POWER_.patch49
-rw-r--r--series.conf1
2 files changed, 50 insertions, 0 deletions
diff --git a/patches.kernel.org/5.2.9-144-iwlwifi-mvm-fix-version-check-for-GEO_TX_POWER_.patch b/patches.kernel.org/5.2.9-144-iwlwifi-mvm-fix-version-check-for-GEO_TX_POWER_.patch
new file mode 100644
index 0000000000..5ca3f17383
--- /dev/null
+++ b/patches.kernel.org/5.2.9-144-iwlwifi-mvm-fix-version-check-for-GEO_TX_POWER_.patch
@@ -0,0 +1,49 @@
+From: Luca Coelho <luciano.coelho@intel.com>
+Date: Fri, 19 Jul 2019 12:21:59 +0300
+Subject: [PATCH] iwlwifi: mvm: fix version check for GEO_TX_POWER_LIMIT
+ support
+References: bnc#1012628
+Patch-mainline: 5.2.9
+Git-commit: f5a47fae6aa3eb06f100e701d2342ee56b857bee
+
+commit f5a47fae6aa3eb06f100e701d2342ee56b857bee upstream.
+
+We erroneously added a check for FW API version 41 before sending
+GEO_TX_POWER_LIMIT, but this was already implemented in version 38.
+Additionally, it was cherry-picked to older versions, namely 17, 26
+and 29, so check for those as well.
+
+Cc: stable@vger.kernel.org
+Fixes: eca1e56ceedd ("iwlwifi: mvm: don't send GEO_TX_POWER_LIMIT to old firmwares")
+Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+index 47f23b4816a5..5af9959d05e5 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+@@ -880,9 +880,14 @@ static bool iwl_mvm_sar_geo_support(struct iwl_mvm *mvm)
+ * The GEO_TX_POWER_LIMIT command is not supported on earlier
+ * 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.
++ * the first byte of ucode_ver. This was implemented
++ * initially on version 38 and then backported to 36, 29 and
++ * 17.
+ */
+- return IWL_UCODE_SERIAL(mvm->fw->ucode_ver) >= 41;
++ 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;
+ }
+
+ int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)
+--
+2.22.0
+
diff --git a/series.conf b/series.conf
index 603a8f0b12..ee519b877c 100644
--- a/series.conf
+++ b/series.conf
@@ -1164,6 +1164,7 @@
patches.kernel.org/5.2.9-141-iwlwifi-mvm-fix-an-out-of-bound-access.patch
patches.kernel.org/5.2.9-142-iwlwifi-mvm-fix-a-use-after-free-bug-in-iwl_mvm.patch
patches.kernel.org/5.2.9-143-iwlwifi-mvm-don-t-send-GEO_TX_POWER_LIMIT-on-ve.patch
+ patches.kernel.org/5.2.9-144-iwlwifi-mvm-fix-version-check-for-GEO_TX_POWER_.patch
########################################################
# Build fixes that apply to the vanilla kernel too.