Commit 577ddbee authored by Mordechay Goodstein's avatar Mordechay Goodstein Committed by Kalle Valo

iwlwifi: d3: read all FW CPUs error info

Continue the wakeup flow only if no FW CPUs have an error

If we don't check for error in all FW CPUs the driver can think
based on one CPU that the FW is operational and try to access
and send commands.

Also, handle the error_id endianness correctly as le32
Signed-off-by: default avatarMordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent b5b878e3
...@@ -1897,27 +1897,55 @@ static void iwl_mvm_d3_disconnect_iter(void *data, u8 *mac, ...@@ -1897,27 +1897,55 @@ static void iwl_mvm_d3_disconnect_iter(void *data, u8 *mac,
ieee80211_resume_disconnect(vif); ieee80211_resume_disconnect(vif);
} }
static int iwl_mvm_check_rt_status(struct iwl_mvm *mvm, static bool iwl_mvm_rt_status(struct iwl_trans *trans, u32 base, u32 *err_id)
struct ieee80211_vif *vif)
{ {
u32 base = mvm->trans->dbg.lmac_error_event_table[0];
struct error_table_start { struct error_table_start {
/* cf. struct iwl_error_event_table */ /* cf. struct iwl_error_event_table */
u32 valid; u32 valid;
u32 error_id; __le32 err_id;
} err_info; } err_info;
iwl_trans_read_mem_bytes(mvm->trans, base, if (!base)
return false;
iwl_trans_read_mem_bytes(trans, base,
&err_info, sizeof(err_info)); &err_info, sizeof(err_info));
if (err_info.valid && err_id)
*err_id = le32_to_cpu(err_info.err_id);
return !!err_info.valid;
}
if (err_info.valid && static bool iwl_mvm_check_rt_status(struct iwl_mvm *mvm,
err_info.error_id == RF_KILL_INDICATOR_FOR_WOWLAN) { struct ieee80211_vif *vif)
{
u32 err_id;
/* check for lmac1 error */
if (iwl_mvm_rt_status(mvm->trans,
mvm->trans->dbg.lmac_error_event_table[0],
&err_id)) {
if (err_id == RF_KILL_INDICATOR_FOR_WOWLAN) {
struct cfg80211_wowlan_wakeup wakeup = { struct cfg80211_wowlan_wakeup wakeup = {
.rfkill_release = true, .rfkill_release = true,
}; };
ieee80211_report_wowlan_wakeup(vif, &wakeup, GFP_KERNEL); ieee80211_report_wowlan_wakeup(vif, &wakeup,
GFP_KERNEL);
} }
return err_info.valid; return true;
}
/* check if we have lmac2 set and check for error */
if (iwl_mvm_rt_status(mvm->trans,
mvm->trans->dbg.lmac_error_event_table[1], NULL))
return true;
/* check for umac error */
if (iwl_mvm_rt_status(mvm->trans,
mvm->trans->dbg.umac_error_event_table, NULL))
return true;
return false;
} }
static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test) static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment