1 files changed, 59 insertions, 20 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c
index c03d39541f9e..7ce20062f32d 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/iwlwifi/mvm/fw.c
@@ -110,18 +110,48 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
                 container_of(notif_wait, struct iwl_mvm, notif_wait);
         struct iwl_mvm_alive_data *alive_data = data;
         struct mvm_alive_resp *palive;
-
-        palive = (void *)pkt->data;
-
-        mvm->error_event_table = le32_to_cpu(palive->error_event_table_ptr);
-        mvm->log_event_table = le32_to_cpu(palive->log_event_table_ptr);
-        alive_data->scd_base_addr = le32_to_cpu(palive->scd_base_ptr);
-
-        alive_data->valid = le16_to_cpu(palive->status) == IWL_ALIVE_STATUS_OK;
-        IWL_DEBUG_FW(mvm,
-                     "Alive ucode status 0x%04x revision 0x%01X 0x%01X flags 0x%01X\n",
-                     le16_to_cpu(palive->status), palive->ver_type,
-                     palive->ver_subtype, palive->flags);
+        struct mvm_alive_resp_ver2 *palive2;
+
+        if (iwl_rx_packet_payload_len(pkt) == sizeof(*palive)) {
+                palive = (void *)pkt->data;
+
+                mvm->support_umac_log = false;
+                mvm->error_event_table =
+                        le32_to_cpu(palive->error_event_table_ptr);
+                mvm->log_event_table = le32_to_cpu(palive->log_event_table_ptr);
+                alive_data->scd_base_addr = le32_to_cpu(palive->scd_base_ptr);
+
+                alive_data->valid = le16_to_cpu(palive->status) ==
+                                    IWL_ALIVE_STATUS_OK;
+                IWL_DEBUG_FW(mvm,
+                             "Alive VER1 ucode status 0x%04x revision 0x%01X 0x%01X flags 0x%01X\n",
+                             le16_to_cpu(palive->status), palive->ver_type,
+                             palive->ver_subtype, palive->flags);
+        } else {
+                palive2 = (void *)pkt->data;
+
+                mvm->error_event_table =
+                        le32_to_cpu(palive2->error_event_table_ptr);
+                mvm->log_event_table =
+                        le32_to_cpu(palive2->log_event_table_ptr);
+                alive_data->scd_base_addr = le32_to_cpu(palive2->scd_base_ptr);
+                mvm->umac_error_event_table =
+                        le32_to_cpu(palive2->error_info_addr);
+
+                alive_data->valid = le16_to_cpu(palive2->status) ==
+                                    IWL_ALIVE_STATUS_OK;
+                if (mvm->umac_error_event_table)
+                        mvm->support_umac_log = true;
+
+                IWL_DEBUG_FW(mvm,
+                             "Alive VER2 ucode status 0x%04x revision 0x%01X 0x%01X flags 0x%01X\n",
+                             le16_to_cpu(palive2->status), palive2->ver_type,
+                             palive2->ver_subtype, palive2->flags);
+
+                IWL_DEBUG_FW(mvm,
+                             "UMAC version: Major - 0x%x, Minor - 0x%x\n",
+                             palive2->umac_major, palive2->umac_minor);
+        }
 
         return true;
 }
@@ -292,7 +322,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
         }
 
         /* Send TX valid antennas before triggering calibrations */
-        ret = iwl_send_tx_ant_cfg(mvm, iwl_fw_valid_tx_ant(mvm->fw));
+        ret = iwl_send_tx_ant_cfg(mvm, mvm->fw->valid_tx_ant);
         if (ret)
                 goto error;
 
@@ -328,8 +358,6 @@ out:
                                         GFP_KERNEL);
                 if (!mvm->nvm_data)
                         return -ENOMEM;
-                mvm->nvm_data->valid_rx_ant = 1;
-                mvm->nvm_data->valid_tx_ant = 1;
                 mvm->nvm_data->bands[0].channels = mvm->nvm_data->channels;
                 mvm->nvm_data->bands[0].n_channels = 1;
                 mvm->nvm_data->bands[0].n_bitrates = 1;
@@ -341,8 +369,6 @@ out:
         return ret;
 }
 
-#define UCODE_CALIB_TIMEOUT     (2*HZ)
-
 int iwl_mvm_up(struct iwl_mvm *mvm)
 {
         int ret, i;
@@ -394,7 +420,7 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
         if (ret)
                 IWL_ERR(mvm, "Failed to initialize Smart Fifo\n");
 
-        ret = iwl_send_tx_ant_cfg(mvm, iwl_fw_valid_tx_ant(mvm->fw));
+        ret = iwl_send_tx_ant_cfg(mvm, mvm->fw->valid_tx_ant);
         if (ret)
                 goto error;
 
@@ -439,10 +465,23 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
                         goto error;
         }
 
-        ret = iwl_mvm_power_update_device_mode(mvm);
+        /* Initialize tx backoffs to the minimal possible */
+        iwl_mvm_tt_tx_backoff(mvm, 0);
+
+        if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT)) {
+                ret = iwl_power_legacy_set_cam_mode(mvm);
+                if (ret)
+                        goto error;
+        }
+
+        ret = iwl_mvm_power_update_device(mvm);
         if (ret)
                 goto error;
 
+        /* allow FW/transport low power modes if not during restart */
+        if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))
+                iwl_mvm_unref(mvm, IWL_MVM_REF_UCODE_DOWN);
+
         IWL_DEBUG_INFO(mvm, "RT uCode started.\n");
         return 0;
  error:
@@ -466,7 +505,7 @@ int iwl_mvm_load_d3_fw(struct iwl_mvm *mvm)
                 goto error;
         }
 
-        ret = iwl_send_tx_ant_cfg(mvm, iwl_fw_valid_tx_ant(mvm->fw));
+        ret = iwl_send_tx_ant_cfg(mvm, mvm->fw->valid_tx_ant);
         if (ret)
                 goto error;