aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/trans.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 49e32060eafb..1ff87677c3d3 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -722,6 +722,11 @@ static int iwl_pcie_load_cpu_sections_8000b(struct iwl_trans *trans,
722 722
723 *first_ucode_section = last_read_idx; 723 *first_ucode_section = last_read_idx;
724 724
725 if (cpu == 1)
726 iwl_write_direct32(trans, FH_UCODE_LOAD_STATUS, 0xFFFF);
727 else
728 iwl_write_direct32(trans, FH_UCODE_LOAD_STATUS, 0xFFFFFFFF);
729
725 return 0; 730 return 0;
726} 731}
727 732
@@ -911,9 +916,6 @@ static int iwl_pcie_load_given_ucode_8000b(struct iwl_trans *trans,
911 if (trans->dbg_dest_tlv) 916 if (trans->dbg_dest_tlv)
912 iwl_pcie_apply_destination(trans); 917 iwl_pcie_apply_destination(trans);
913 918
914 /* Notify FW loading is done */
915 iwl_write_direct32(trans, FH_UCODE_LOAD_STATUS, 0xFFFFFFFF);
916
917 /* wait for image verification to complete */ 919 /* wait for image verification to complete */
918 ret = iwl_poll_prph_bit(trans, LMPM_SECURE_BOOT_CPU1_STATUS_ADDR_B0, 920 ret = iwl_poll_prph_bit(trans, LMPM_SECURE_BOOT_CPU1_STATUS_ADDR_B0,
919 LMPM_SECURE_BOOT_STATUS_SUCCESS, 921 LMPM_SECURE_BOOT_STATUS_SUCCESS,