aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/pcie/trans.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-02-04 09:35:03 -0500
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-03-01 09:55:08 -0500
commita2227ce2a32cf9faeab1299894fe09d03e6a12b7 (patch)
tree11f54dd68b4fdb822176786a25832a1232282342 /drivers/net/wireless/iwlwifi/pcie/trans.c
parent295ca6d3ed5611577e7b057c0d191e9f72d9daea (diff)
iwlwifi: pcie: apply destination before releasing reset
This allows to use the firmware debugging system even when the configuration values are set hard coded in the firmware. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/trans.c')
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/trans.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 69935aa5a1b3..f31a94160771 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -898,6 +898,9 @@ static int iwl_pcie_load_given_ucode_8000b(struct iwl_trans *trans,
898 IWL_DEBUG_FW(trans, "working with %s CPU\n", 898 IWL_DEBUG_FW(trans, "working with %s CPU\n",
899 image->is_dual_cpus ? "Dual" : "Single"); 899 image->is_dual_cpus ? "Dual" : "Single");
900 900
901 if (trans->dbg_dest_tlv)
902 iwl_pcie_apply_destination(trans);
903
901 /* configure the ucode to be ready to get the secured image */ 904 /* configure the ucode to be ready to get the secured image */
902 /* release CPU reset */ 905 /* release CPU reset */
903 iwl_write_prph(trans, RELEASE_CPU_RESET, RELEASE_CPU_RESET_BIT); 906 iwl_write_prph(trans, RELEASE_CPU_RESET, RELEASE_CPU_RESET_BIT);
@@ -914,9 +917,6 @@ static int iwl_pcie_load_given_ucode_8000b(struct iwl_trans *trans,
914 if (ret) 917 if (ret)
915 return ret; 918 return ret;
916 919
917 if (trans->dbg_dest_tlv)
918 iwl_pcie_apply_destination(trans);
919
920 /* wait for image verification to complete */ 920 /* wait for image verification to complete */
921 ret = iwl_poll_prph_bit(trans, LMPM_SECURE_BOOT_CPU1_STATUS_ADDR_B0, 921 ret = iwl_poll_prph_bit(trans, LMPM_SECURE_BOOT_CPU1_STATUS_ADDR_B0,
922 LMPM_SECURE_BOOT_STATUS_SUCCESS, 922 LMPM_SECURE_BOOT_STATUS_SUCCESS,