iwlwifi: mvm: support alive notification api version2

Alive notification ver2 support error table information
for 2 CPUs.
This is useful to fetch the error information in case of
firmware assert.

Signed-off-by: Eran Harary <eran.harary@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

1 files changed, 40 insertions, 12 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c
index 155bb20519c2..bae75b308fc0 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/iwlwifi/mvm/fw.c
@@ -110,18 +110,46 @@ 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->support_umac_log = true;
+                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;
+                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;
 }