Home| summaryrefslogtreecommitdiff |
diff options
| author | Oliver Neukum <oneukum@suse.com> | 2019-01-16 12:21:48 +0100 |
|---|---|---|
| committer | Oliver Neukum <oneukum@suse.com> | 2019-01-16 17:48:22 +0100 |
| commit | 29e9cde2add8397ffa72198dc5e06af7ea6ebe58 (patch) | |
| tree | fb711841b5dd979787eab6ffa98f8e15d92f6248 | |
| parent | 00c2467f0bec11585ed9e28cc462ece982c6be01 (diff) | |
iwlwifi: mvm: don't send GEO_TX_POWER_LIMIT to old firmwares
(bsc#1119086).
| -rw-r--r-- | patches.fixes/0001-iwlwifi-mvm-don-t-send-GEO_TX_POWER_LIMIT-to-old-fir.patch | 46 | ||||
| -rw-r--r-- | series.conf | 1 |
2 files changed, 47 insertions, 0 deletions
diff --git a/patches.fixes/0001-iwlwifi-mvm-don-t-send-GEO_TX_POWER_LIMIT-to-old-fir.patch b/patches.fixes/0001-iwlwifi-mvm-don-t-send-GEO_TX_POWER_LIMIT-to-old-fir.patch new file mode 100644 index 0000000000..c8449cc247 --- /dev/null +++ b/patches.fixes/0001-iwlwifi-mvm-don-t-send-GEO_TX_POWER_LIMIT-to-old-fir.patch @@ -0,0 +1,46 @@ +From eca1e56ceedd9cc185eb18baf307d3ff2e4af376 Mon Sep 17 00:00:00 2001 +From: Emmanuel Grumbach <emmanuel.grumbach@intel.com> +Date: Fri, 14 Dec 2018 18:30:22 +0200 +Subject: [PATCH] iwlwifi: mvm: don't send GEO_TX_POWER_LIMIT to old firmwares +Git-commit: eca1e56ceedd9cc185eb18baf307d3ff2e4af376 +Patch-mainline: v4.20 +References: bsc#1119086 + +Old firmware versions don't support this command. Sending it +to any firmware before -41.ucode will crash the firmware. + +This fixes https://bugzilla.kernel.org/show_bug.cgi?id=201975 + +Fixes: 66e839030fd6 ("iwlwifi: fix wrong WGDS_WIFI_DATA_SIZE") +CC: <stable@vger.kernel.org> #4.19+ +Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> +Signed-off-by: Luca Coelho <luciano.coelho@intel.com> +Signed-off-by: Kalle Valo <kvalo@codeaurora.org> +Signed-off-by: Oliver Neukum <oneukum@suse.com> +--- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +index 2ba890445c35..1689bead1b4f 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +@@ -881,6 +881,15 @@ static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm) + int ret, i, j; + u16 cmd_wide_id = WIDE_ID(PHY_OPS_GROUP, GEO_TX_POWER_LIMIT); + ++ /* ++ * This 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. ++ */ ++ if (IWL_UCODE_SERIAL(mvm->fw->ucode_ver) < 41) ++ return 0; ++ + ret = iwl_mvm_sar_get_wgds_table(mvm); + if (ret < 0) { + IWL_DEBUG_RADIO(mvm, +-- +2.16.4 + diff --git a/series.conf b/series.conf index 6a2176b41e..7cd69638fe 100644 --- a/series.conf +++ b/series.conf @@ -19571,6 +19571,7 @@ patches.arch/ibmvnic-Fix-non-atomic-memory-allocation-in-IRQ-cont.patch patches.drivers/USB-hso-Fix-OOB-memory-access-in-hso_probe-hso_get_c.patch patches.fixes/0001-xen-netfront-tolerate-frags-with-no-data.patch + patches.fixes/0001-iwlwifi-mvm-don-t-send-GEO_TX_POWER_LIMIT-to-old-fir.patch patches.drivers/mmc-omap_hsmmc-fix-DMA-API-warning.patch patches.drivers/mmc-core-Reset-HPI-enabled-state-during-re-init-and-.patch patches.drivers/mmc-core-Allow-BKOPS-and-CACHE-ctrl-even-if-no-HPI-s.patch |