diff options
| author | Johannes Berg <[email protected]> | 2018-12-10 08:27:47 +0000 |
|---|---|---|
| committer | Luca Coelho <[email protected]> | 2019-02-04 10:28:09 +0000 |
| commit | c96b5eec2105ccb6a956c8da6bb6deb670ebaf43 (patch) | |
| tree | 927b2e81d2ca901bbe6fd10bc7c7b73169bcc32c /drivers/net/wireless/intel/iwlwifi/mvm/utils.c | |
| parent | iwlwifi: fix send hcmd timeout recovery flow (diff) | |
| download | kernel-c96b5eec2105ccb6a956c8da6bb6deb670ebaf43.tar.gz kernel-c96b5eec2105ccb6a956c8da6bb6deb670ebaf43.zip | |
iwlwifi: refactor NIC init sequence
The typical sequence of setting INIT_DONE and then waiting
for clock stabilisation is going to need a new workarounds,
so first of all refactor it.
Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: Luca Coelho <[email protected]>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/utils.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c index 92f61e8a6284..4a18997fb48a 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c @@ -523,23 +523,9 @@ static void iwl_mvm_dump_lmac_error_log(struct iwl_mvm *mvm, u8 lmac_num) /* reset the device */ iwl_trans_sw_reset(trans); - /* set INIT_DONE flag */ - iwl_set_bit(trans, CSR_GP_CNTRL, - BIT(trans->cfg->csr->flag_init_done)); - - /* and wait for clock stabilization */ - if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) - udelay(2); - - err = iwl_poll_bit(trans, CSR_GP_CNTRL, - BIT(trans->cfg->csr->flag_mac_clock_ready), - BIT(trans->cfg->csr->flag_mac_clock_ready), - 25000); - if (err < 0) { - IWL_DEBUG_INFO(trans, - "Failed to reset the card for the dump\n"); + err = iwl_finish_nic_init(trans); + if (err) return; - } } iwl_trans_read_mem_bytes(trans, base, &table, sizeof(table)); |