iwlwifi: mvm: read new secure boot registers

Addresses were changed for a000 devices.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
index bb7e0d642981d521e023832f95c1b643a943e8f5..e1aa1f7836fc161858b545d575b00186d9f8b13d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
@@ -400,6 +400,8 @@ enum aux_misc_master1_en {
 #define PREG_AUX_BUS_WPROT_0           0xA04CC0
 #define SB_CPU_1_STATUS                        0xA01E30
 #define SB_CPU_2_STATUS                        0xA01E34
+#define UMAG_SB_CPU_1_STATUS           0xA038C0
+#define UMAG_SB_CPU_2_STATUS           0xA038C4
 
 /* FW chicken bits */
 #define LMPM_CHICK                     0xA01FF8

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index e481bb050c6e7357a59fa4a49d2bad62bdd977e3..6adbd4bcb40a33e30a33af8af4b6f5d99df4aed6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -639,11 +639,18 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
        ret = iwl_wait_notification(&mvm->notif_wait, &alive_wait,
                                    MVM_UCODE_ALIVE_TIMEOUT);
        if (ret) {
-               if (mvm->trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
+               struct iwl_trans *trans = mvm->trans;
+
+               if (trans->cfg->gen2)
+                       IWL_ERR(mvm,
+                               "SecBoot CPU1 Status: 0x%x, CPU2 Status: 0x%x\n",
+                               iwl_read_prph(trans, UMAG_SB_CPU_1_STATUS),
+                               iwl_read_prph(trans, UMAG_SB_CPU_2_STATUS));
+               else if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
                        IWL_ERR(mvm,
                                "SecBoot CPU1 Status: 0x%x, CPU2 Status: 0x%x\n",
-                               iwl_read_prph(mvm->trans, SB_CPU_1_STATUS),
-                               iwl_read_prph(mvm->trans, SB_CPU_2_STATUS));
+                               iwl_read_prph(trans, SB_CPU_1_STATUS),
+                               iwl_read_prph(trans, SB_CPU_2_STATUS));
                mvm->cur_ucode = old_type;
                return ret;
        }