12 files changed, 73 insertions, 33 deletions

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index ab019b45551b..f89f446e5c8a 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -21,6 +21,7 @@ config IWLWIFI
                 Intel 7260 Wi-Fi Adapter
                 Intel 3160 Wi-Fi Adapter
                 Intel 7265 Wi-Fi Adapter
+                Intel 3165 Wi-Fi Adapter
 
 
           This driver uses the kernel's mac80211 subsystem.
diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
index 36e786f0387b..74ad278116be 100644
--- a/drivers/net/wireless/iwlwifi/iwl-7000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
@@ -70,15 +70,14 @@
 
 /* Highest firmware API version supported */
 #define IWL7260_UCODE_API_MAX   13
-#define IWL3160_UCODE_API_MAX   13
 
 /* Oldest version we won't warn about */
 #define IWL7260_UCODE_API_OK    12
-#define IWL3160_UCODE_API_OK    12
+#define IWL3165_UCODE_API_OK    13
 
 /* Lowest firmware API version supported */
 #define IWL7260_UCODE_API_MIN   10
-#define IWL3160_UCODE_API_MIN   10
+#define IWL3165_UCODE_API_MIN   13
 
 /* NVM versions */
 #define IWL7260_NVM_VERSION             0x0a1d
@@ -104,9 +103,6 @@
 #define IWL3160_FW_PRE "iwlwifi-3160-"
 #define IWL3160_MODULE_FIRMWARE(api) IWL3160_FW_PRE __stringify(api) ".ucode"
 
-#define IWL3165_FW_PRE "iwlwifi-3165-"
-#define IWL3165_MODULE_FIRMWARE(api) IWL3165_FW_PRE __stringify(api) ".ucode"
-
 #define IWL7265_FW_PRE "iwlwifi-7265-"
 #define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"
 
@@ -248,8 +244,13 @@ static const struct iwl_ht_params iwl7265_ht_params = {
 
 const struct iwl_cfg iwl3165_2ac_cfg = {
         .name = "Intel(R) Dual Band Wireless AC 3165",
-        .fw_name_pre = IWL3165_FW_PRE,
+        .fw_name_pre = IWL7265D_FW_PRE,
         IWL_DEVICE_7000,
+        /* sparse doens't like the re-assignment but it is safe */
+#ifndef __CHECKER__
+        .ucode_api_ok = IWL3165_UCODE_API_OK,
+        .ucode_api_min = IWL3165_UCODE_API_MIN,
+#endif
         .ht_params = &iwl7000_ht_params,
         .nvm_ver = IWL3165_NVM_VERSION,
         .nvm_calib_ver = IWL3165_TX_POWER_VERSION,
@@ -325,6 +326,5 @@ const struct iwl_cfg iwl7265d_n_cfg = {
 
 MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
 MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));
-MODULE_FIRMWARE(IWL3165_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));
 MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
 MODULE_FIRMWARE(IWL7265D_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
index 41ff85de7334..21302b6f2bfd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
@@ -6,6 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -31,6 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -748,6 +750,9 @@ void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg,
                 return;
         }
 
+        if (data->sku_cap_mimo_disabled)
+                rx_chains = 1;
+
         ht_info->ht_supported = true;
         ht_info->cap = IEEE80211_HT_CAP_DSSSCCK40;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
index 5234a0bf11e4..750c8c9ee70d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
@@ -6,6 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -31,6 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -84,6 +86,7 @@ struct iwl_nvm_data {
         bool sku_cap_11ac_enable;
         bool sku_cap_amt_enable;
         bool sku_cap_ipan_enable;
+        bool sku_cap_mimo_disabled;
 
         u16 radio_cfg_type;
         u8 radio_cfg_step;
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
index 83903a5025c2..75e96db6626b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -116,10 +116,11 @@ enum family_8000_nvm_offsets {
 
 /* SKU Capabilities (actual values from NVM definition) */
 enum nvm_sku_bits {
-        NVM_SKU_CAP_BAND_24GHZ  = BIT(0),
-        NVM_SKU_CAP_BAND_52GHZ  = BIT(1),
-        NVM_SKU_CAP_11N_ENABLE  = BIT(2),
-        NVM_SKU_CAP_11AC_ENABLE = BIT(3),
+        NVM_SKU_CAP_BAND_24GHZ          = BIT(0),
+        NVM_SKU_CAP_BAND_52GHZ          = BIT(1),
+        NVM_SKU_CAP_11N_ENABLE          = BIT(2),
+        NVM_SKU_CAP_11AC_ENABLE         = BIT(3),
+        NVM_SKU_CAP_MIMO_DISABLE        = BIT(5),
 };
 
 /*
@@ -368,6 +369,11 @@ static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg,
         if (cfg->ht_params->ldpc)
                 vht_cap->cap |= IEEE80211_VHT_CAP_RXLDPC;
 
+        if (data->sku_cap_mimo_disabled) {
+                num_rx_ants = 1;
+                num_tx_ants = 1;
+        }
+
         if (num_tx_ants > 1)
                 vht_cap->cap |= IEEE80211_VHT_CAP_TXSTBC;
         else
@@ -527,6 +533,10 @@ static void iwl_set_hw_address_family_8000(struct device *dev,
         const u8 *hw_addr;
 
         if (mac_override) {
+                static const u8 reserved_mac[] = {
+                        0x02, 0xcc, 0xaa, 0xff, 0xee, 0x00
+                };
+
                 hw_addr = (const u8 *)(mac_override +
                                  MAC_ADDRESS_OVERRIDE_FAMILY_8000);
 
@@ -538,7 +548,12 @@ static void iwl_set_hw_address_family_8000(struct device *dev,
                 data->hw_addr[4] = hw_addr[5];
                 data->hw_addr[5] = hw_addr[4];
 
-                if (is_valid_ether_addr(data->hw_addr))
+                /*
+                 * Force the use of the OTP MAC address in case of reserved MAC
+                 * address in the NVM, or if address is given but invalid.
+                 */
+                if (is_valid_ether_addr(data->hw_addr) &&
+                    memcmp(reserved_mac, hw_addr, ETH_ALEN) != 0)
                         return;
 
                 IWL_ERR_DEV(dev,
@@ -610,6 +625,7 @@ iwl_parse_nvm_data(struct device *dev, const struct iwl_cfg *cfg,
                 data->sku_cap_11n_enable = false;
         data->sku_cap_11ac_enable = data->sku_cap_11n_enable &&
                                     (sku & NVM_SKU_CAP_11AC_ENABLE);
+        data->sku_cap_mimo_disabled = sku & NVM_SKU_CAP_MIMO_DISABLE;
 
         data->n_hw_addrs = iwl_get_n_hw_addrs(cfg, nvm_sw);
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/coex_legacy.c b/drivers/net/wireless/iwlwifi/mvm/coex_legacy.c
index d954591e0be5..6ac6de2af977 100644
--- a/drivers/net/wireless/iwlwifi/mvm/coex_legacy.c
+++ b/drivers/net/wireless/iwlwifi/mvm/coex_legacy.c
@@ -776,7 +776,7 @@ static int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id,
         struct iwl_host_cmd cmd = {
                 .id = BT_CONFIG,
                 .len = { sizeof(*bt_cmd), },
-                .dataflags = { IWL_HCMD_DFL_NOCOPY, },
+                .dataflags = { IWL_HCMD_DFL_DUP, },
                 .flags = CMD_ASYNC,
         };
         struct iwl_mvm_sta *mvmsta;
diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c
index 1b1b2bf26819..4310cf102d78 100644
--- a/drivers/net/wireless/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/iwlwifi/mvm/d3.c
@@ -1750,8 +1750,10 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,
         int i, j, n_matches, ret;
 
         fw_status = iwl_mvm_get_wakeup_status(mvm, vif);
-        if (!IS_ERR_OR_NULL(fw_status))
+        if (!IS_ERR_OR_NULL(fw_status)) {
                 reasons = le32_to_cpu(fw_status->wakeup_reasons);
+                kfree(fw_status);
+        }
 
         if (reasons & IWL_WOWLAN_WAKEUP_BY_RFKILL_DEASSERTED)
                 wakeup.rfkill_release = true;
@@ -1868,15 +1870,15 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test)
         /* get the BSS vif pointer again */
         vif = iwl_mvm_get_bss_vif(mvm);
         if (IS_ERR_OR_NULL(vif))
-                goto out_unlock;
+                goto err;
 
         ret = iwl_trans_d3_resume(mvm->trans, &d3_status, test);
         if (ret)
-                goto out_unlock;
+                goto err;
 
         if (d3_status != IWL_D3_STATUS_ALIVE) {
                 IWL_INFO(mvm, "Device was reset during suspend\n");
-                goto out_unlock;
+                goto err;
         }
 
         /* query SRAM first in case we want event logging */
@@ -1902,7 +1904,8 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test)
                 goto out_iterate;
         }
 
- out_unlock:
+err:
+        iwl_mvm_free_nd(mvm);
         mutex_unlock(&mvm->mutex);
 
 out_iterate:
@@ -1915,6 +1918,14 @@ out:
         /* return 1 to reconfigure the device */
         set_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status);
         set_bit(IWL_MVM_STATUS_D3_RECONFIG, &mvm->status);
+
+        /* We always return 1, which causes mac80211 to do a reconfig
+         * with IEEE80211_RECONFIG_TYPE_RESTART.  This type of
+         * reconfig calls iwl_mvm_restart_complete(), where we unref
+         * the IWL_MVM_REF_UCODE_DOWN, so we need to take the
+         * reference here.
+         */
+        iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);
         return 1;
 }
 
@@ -2021,7 +2032,6 @@ static int iwl_mvm_d3_test_release(struct inode *inode, struct file *file)
         __iwl_mvm_resume(mvm, true);
         rtnl_unlock();
         iwl_abort_notification_waits(&mvm->notif_wait);
-        iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);
         ieee80211_restart_hw(mvm->hw);
 
         /* wait for restart and disconnect all interfaces */
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 40265b9c66ae..dda9f7b5f342 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -3995,9 +3995,6 @@ static void iwl_mvm_mac_event_callback(struct ieee80211_hw *hw,
         if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_MLME))
                 return;
 
-        if (event->u.mlme.status == MLME_SUCCESS)
-                return;
-
         trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_MLME);
         trig_mlme = (void *)trig->data;
         if (!iwl_fw_dbg_trigger_check_stop(mvm, vif, trig))
diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c
index 1c66297d82c0..2ea01238754e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@ -1263,11 +1263,13 @@ static void iwl_mvm_d0i3_exit_work(struct work_struct *wk)
                 ieee80211_iterate_active_interfaces(
                         mvm->hw, IEEE80211_IFACE_ITER_NORMAL,
                         iwl_mvm_d0i3_disconnect_iter, mvm);
-
-        iwl_free_resp(&get_status_cmd);
 out:
         iwl_mvm_d0i3_enable_tx(mvm, qos_seq);
 
+        /* qos_seq might point inside resp_pkt, so free it only now */
+        if (get_status_cmd.resp_pkt)
+                iwl_free_resp(&get_status_cmd);
+
         /* the FW might have updated the regdomain */
         iwl_mvm_update_changed_regdom(mvm);
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c
index f9928f2c125f..33cd68ae7bf9 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.c
@@ -180,6 +180,9 @@ static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
         if (iwl_mvm_vif_low_latency(mvmvif) && mvmsta->vif->p2p)
                 return false;
 
+        if (mvm->nvm_data->sku_cap_mimo_disabled)
+                return false;
+
         return true;
 }
 
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 47bbf573fdc8..d6f6515fe663 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -1049,9 +1049,11 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool low_power)
                 iwl_pcie_rx_stop(trans);
 
                 /* Power-down device's busmaster DMA clocks */
-                iwl_write_prph(trans, APMG_CLK_DIS_REG,
-                               APMG_CLK_VAL_DMA_CLK_RQT);
-                udelay(5);
+                if (trans->cfg->device_family != IWL_DEVICE_FAMILY_8000) {
+                        iwl_write_prph(trans, APMG_CLK_DIS_REG,
+                                       APMG_CLK_VAL_DMA_CLK_RQT);
+                        udelay(5);
+                }
         }
 
         /* Make sure (redundant) we've released our request to stay awake */
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c
index 15a7ee3859dd..5fe1c22e289b 100644
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -359,12 +359,13 @@ static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
 
         /*
          * Accessing PCI config without a proper delay after devices reset (not
-         * GPIO reset) was causing reboots on WRT300N v1.0.
+         * GPIO reset) was causing reboots on WRT300N v1.0 (BCM4704).
          * Tested delay 850 us lowered reboot chance to 50-80%, 1000 us fixed it
          * completely. Flushing all writes was also tested but with no luck.
+         * The same problem was reported for WRT350N v1 (BCM4705), so we just
+         * sleep here unconditionally.
          */
-        if (pc->dev->bus->chip_id == 0x4704)
-                usleep_range(1000, 2000);
+        usleep_range(1000, 2000);
 
         /* Enable PCI bridge BAR0 prefetch and burst */
         val = PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;