Merge tag 'iwlwifi-next-for-kalle-2015-04-02' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* some more work on LAR
* fixes for UMAC scan
* more work on debugging framework
* more work for 8000 devices
* cleanups and small bugfixes

38 files changed, 712 insertions, 310 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-8000.c b/drivers/net/wireless/iwlwifi/iwl-8000.c
index 9c396a42aec8..ce6321b7d241 100644
--- a/drivers/net/wireless/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-8000.c
@@ -94,8 +94,8 @@
         IWL8000_FW_PRE "-" __stringify(api) ".ucode"
 
 #define NVM_HW_SECTION_NUM_FAMILY_8000          10
-#define DEFAULT_NVM_FILE_FAMILY_8000A           "iwl_nvm_8000.bin"
-#define DEFAULT_NVM_FILE_FAMILY_8000            "iwl_nvm_8000B.bin"
+#define DEFAULT_NVM_FILE_FAMILY_8000B           "nvmData-8000B"
+#define DEFAULT_NVM_FILE_FAMILY_8000C           "nvmData-8000C"
 
 /* Max SDIO RX aggregation size of the ADDBA request/response */
 #define MAX_RX_AGG_SIZE_8260_SDIO       28
@@ -177,8 +177,8 @@ const struct iwl_cfg iwl8260_2ac_sdio_cfg = {
         .ht_params = &iwl8000_ht_params,
         .nvm_ver = IWL8000_NVM_VERSION,
         .nvm_calib_ver = IWL8000_TX_POWER_VERSION,
-        .default_nvm_file = DEFAULT_NVM_FILE_FAMILY_8000,
-        .default_nvm_file_8000A = DEFAULT_NVM_FILE_FAMILY_8000A,
+        .default_nvm_file_B_step = DEFAULT_NVM_FILE_FAMILY_8000B,
+        .default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,
         .max_rx_agg_size = MAX_RX_AGG_SIZE_8260_SDIO,
         .disable_dummy_notification = true,
         .max_ht_ampdu_exponent  = MAX_HT_AMPDU_EXPONENT_8260_SDIO,
@@ -192,8 +192,8 @@ const struct iwl_cfg iwl4165_2ac_sdio_cfg = {
         .ht_params = &iwl8000_ht_params,
         .nvm_ver = IWL8000_NVM_VERSION,
         .nvm_calib_ver = IWL8000_TX_POWER_VERSION,
-        .default_nvm_file = DEFAULT_NVM_FILE_FAMILY_8000,
-        .default_nvm_file_8000A = DEFAULT_NVM_FILE_FAMILY_8000A,
+        .default_nvm_file_B_step = DEFAULT_NVM_FILE_FAMILY_8000B,
+        .default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,
         .max_rx_agg_size = MAX_RX_AGG_SIZE_8260_SDIO,
         .bt_shared_single_ant = true,
         .disable_dummy_notification = true,
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h
index 4b190d98a1ec..07e999a32a7f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/iwlwifi/iwl-config.h
@@ -228,7 +228,7 @@ struct iwl_pwr_tx_backoff {
 
 /**
  * struct iwl_cfg
- * @name: Offical name of the device
+ * @name: Official name of the device
  * @fw_name_pre: Firmware filename prefix. The api version and extension
  *      (.ucode) will be added to filename before loading from disk. The
  *      filename is constructed as fw_name_pre<api>.ucode.
@@ -303,8 +303,8 @@ struct iwl_cfg {
         bool lp_xtal_workaround;
         const struct iwl_pwr_tx_backoff *pwr_tx_backoffs;
         bool no_power_up_nic_in_init;
-        const char *default_nvm_file;
-        const char *default_nvm_file_8000A;
+        const char *default_nvm_file_B_step;
+        const char *default_nvm_file_C_step;
         unsigned int max_rx_agg_size;
         bool disable_dummy_notification;
         unsigned int max_tx_agg_size;
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index aefdd9b7c105..7267152e7dc7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -145,7 +145,7 @@ static struct iwlwifi_opmode_table {
 #define IWL_DEFAULT_SCAN_CHANNELS 40
 
 /*
- * struct fw_sec: Just for the image parsing proccess.
+ * struct fw_sec: Just for the image parsing process.
  * For the fw storage we are using struct fw_desc.
  */
 struct fw_sec {
@@ -241,16 +241,10 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)
          * previous name and uses the new format.
          */
         if (drv->trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) {
-                char rev_step[2] = {
-                        'A' + CSR_HW_REV_STEP(drv->trans->hw_rev), 0
-                };
-
-                /* A-step doesn't have an indication */
-                if (CSR_HW_REV_STEP(drv->trans->hw_rev) == SILICON_A_STEP)
-                        rev_step[0] = 0;
+                char rev_step = 'A' + CSR_HW_REV_STEP(drv->trans->hw_rev);
 
                 snprintf(drv->firmware_name, sizeof(drv->firmware_name),
-                         "%s%s-%s.ucode", name_pre, rev_step, tag);
+                         "%s%c-%s.ucode", name_pre, rev_step, tag);
         }
 
         IWL_DEBUG_INFO(drv, "attempting to load firmware %s'%s'\n",
@@ -1108,6 +1102,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
         const unsigned int api_max = drv->cfg->ucode_api_max;
         unsigned int api_ok = drv->cfg->ucode_api_ok;
         const unsigned int api_min = drv->cfg->ucode_api_min;
+        size_t trigger_tlv_sz[FW_DBG_TRIGGER_MAX];
         u32 api_ver;
         int i;
         bool load_module = false;
@@ -1227,8 +1222,37 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)