3.10-stable patches

added patches:
	iwlwifi-mvm-bt-coex-disable-bt-when-txing-probe-request-in-scan.patch
	iwlwifi-mvm-don-t-allow-a-band-if-sku-forbids-it.patch
	iwlwifi-mvm-print-the-version-of-the-firmware-when-it-asserts.patch

diff --git a/queue-3.10/iwlwifi-mvm-bt-coex-disable-bt-when-txing-probe-request-in-scan.patch b/queue-3.10/iwlwifi-mvm-bt-coex-disable-bt-when-txing-probe-request-in-scan.patch
new file mode 100644 (file)
index 0000000..60b13a4
--- /dev/null
+++ b/queue-3.10/iwlwifi-mvm-bt-coex-disable-bt-when-txing-probe-request-in-scan.patch
@@ -0,0 +1,32 @@
+From 8e2a866ef214af4e104ec8d593e3269d8fe66d19 Mon Sep 17 00:00:00 2001
+From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Date: Tue, 28 Jan 2014 12:27:31 +0200
+Subject: iwlwifi: mvm: BT Coex - disable BT when TXing probe request in scan
+
+From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+
+commit 8e2a866ef214af4e104ec8d593e3269d8fe66d19 upstream.
+
+Not doing so will let BT kill our probe requests leading to
+failures in scan.
+
+Reviewed-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/iwlwifi/mvm/scan.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
++++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
+@@ -313,7 +313,8 @@ int iwl_mvm_scan_request(struct iwl_mvm
+ 
+       iwl_mvm_scan_fill_ssids(cmd, req);
+ 
+-      cmd->tx_cmd.tx_flags = cpu_to_le32(TX_CMD_FLG_SEQ_CTL);
++      cmd->tx_cmd.tx_flags = cpu_to_le32(TX_CMD_FLG_SEQ_CTL |
++                                         TX_CMD_FLG_BT_DIS);
+       cmd->tx_cmd.sta_id = mvm->aux_sta.sta_id;
+       cmd->tx_cmd.life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);
+       cmd->tx_cmd.rate_n_flags =

diff --git a/queue-3.10/iwlwifi-mvm-don-t-allow-a-band-if-sku-forbids-it.patch b/queue-3.10/iwlwifi-mvm-don-t-allow-a-band-if-sku-forbids-it.patch
new file mode 100644 (file)
index 0000000..db480b2
--- /dev/null
+++ b/queue-3.10/iwlwifi-mvm-don-t-allow-a-band-if-sku-forbids-it.patch
@@ -0,0 +1,41 @@
+From c512865446e6dd5b6e91e81187e75b734ad7cfc7 Mon Sep 17 00:00:00 2001
+From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Date: Thu, 5 Dec 2013 22:42:55 +0200
+Subject: iwlwifi: mvm: don't allow A band if SKU forbids it
+
+From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+
+commit c512865446e6dd5b6e91e81187e75b734ad7cfc7 upstream.
+
+The driver wasn't reading the NVM properly. While this
+didn't lead to any issue until now, it seems that there
+is an old version of the NVM in the wild.
+In this version, the A band channels appear to be valid
+but the SKU capabilities (another field of the NVM) says
+that A band isn't supported at all.
+With this specific version of the NVM, the driver would
+think that A band is supported while the HW / firmware
+don't. This leads to asserts.
+
+Reviewed-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/iwlwifi/iwl-nvm-parse.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
++++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
+@@ -180,6 +180,11 @@ static int iwl_init_channel_map(struct d
+ 
+       for (ch_idx = 0; ch_idx < IWL_NUM_CHANNELS; ch_idx++) {
+               ch_flags = __le16_to_cpup(nvm_ch_flags + ch_idx);
++
++              if (ch_idx >= NUM_2GHZ_CHANNELS &&
++                  !data->sku_cap_band_52GHz_enable)
++                      ch_flags &= ~NVM_CHANNEL_VALID;
++
+               if (!(ch_flags & NVM_CHANNEL_VALID)) {
+                       IWL_DEBUG_EEPROM(dev,
+                                        "Ch. %d Flags %x [%sGHz] - No traffic\n",

diff --git a/queue-3.10/iwlwifi-mvm-print-the-version-of-the-firmware-when-it-asserts.patch b/queue-3.10/iwlwifi-mvm-print-the-version-of-the-firmware-when-it-asserts.patch
new file mode 100644 (file)
index 0000000..53a21d6
--- /dev/null
+++ b/queue-3.10/iwlwifi-mvm-print-the-version-of-the-firmware-when-it-asserts.patch
@@ -0,0 +1,33 @@
+From b900a87b2eb90c0b9586496c82a323a1b8832d73 Mon Sep 17 00:00:00 2001
+From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Date: Thu, 23 Jan 2014 11:55:16 +0200
+Subject: iwlwifi: mvm: print the version of the firmware when it asserts
+
+From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+
+commit b900a87b2eb90c0b9586496c82a323a1b8832d73 upstream.
+
+This can be useful to be able to spot the firmware version
+from the error reports without needing to fetch it from
+another place.
+
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Reviewed-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/iwlwifi/mvm/utils.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/net/wireless/iwlwifi/mvm/utils.c
++++ b/drivers/net/wireless/iwlwifi/mvm/utils.c
+@@ -401,6 +401,8 @@ void iwl_mvm_dump_nic_error_log(struct i
+                       mvm->status, table.valid);
+       }
+ 
++      IWL_ERR(mvm, "Loaded firmware version: %s\n", mvm->fw->fw_version);
++
+       trace_iwlwifi_dev_ucode_error(trans->dev, table.error_id, table.tsf_low,
+                                     table.data1, table.data2, table.data3,
+                                     table.blink1, table.blink2, table.ilink1,

diff --git a/queue-3.10/series b/queue-3.10/series
index a0dce473d88b40c342905741fffde41b82c47641..646d7e1f192185bd5e73f418882f2a05846b6938 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -14,3 +14,6 @@ ar5523-fix-usb-id-for-gigaset.patch
 s390-dump-fix-dump-memory-detection.patch
 s390-fix-kernel-crash-due-to-linkage-stack-instructions.patch
 spi-fix-crash-with-double-message-finalisation-on-error-handling.patch
+iwlwifi-mvm-don-t-allow-a-band-if-sku-forbids-it.patch
+iwlwifi-mvm-print-the-version-of-the-firmware-when-it-asserts.patch
+iwlwifi-mvm-bt-coex-disable-bt-when-txing-probe-request-in-scan.patch