wifi: iwlwifi: mld: remove special FW error resume handling

The (applicable) firmware versions will send an error interrupt as
part of the resume process, so there's no need now to check for it
explicitly. Simplify the code. This also fixes an issue where any
dump taken during the resume isn't able to do the reset handshake
as part of the dump (since interrupts are disabled) and then there
isn't all the correct data and we get more errors later.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250611222325.9e778f1bae0c.I96483b5236ab23141b45079464c73f93e0164e65@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/d3.c b/drivers/net/wireless/intel/iwlwifi/mld/d3.c
index d450d24689f62b8cc748c2f87526bfc66824fee9..b156cf56a30d631509a9ba50924e3145dcd806df 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/d3.c
@@ -204,66 +204,6 @@ void iwl_mld_ipv6_addr_change(struct ieee80211_hw *hw,
 }
 #endif
 
-enum rt_status {
-       FW_ALIVE,
-       FW_NEEDS_RESET,
-       FW_ERROR,
-};
-
-static enum rt_status iwl_mld_check_err_tables(struct iwl_mld *mld,
-                                              struct ieee80211_vif *vif)
-{
-       u32 err_id;
-
-       /* check for lmac1 error */
-       if (iwl_fwrt_read_err_table(mld->trans,
-                                   mld->trans->dbg.lmac_error_event_table[0],
-                                   &err_id)) {
-               if (err_id == RF_KILL_INDICATOR_FOR_WOWLAN && vif) {
-                       struct cfg80211_wowlan_wakeup wakeup = {
-                               .rfkill_release = true,
-                       };
-                       ieee80211_report_wowlan_wakeup(vif, &wakeup,
-                                                      GFP_KERNEL);
-
-                       return FW_NEEDS_RESET;
-               }
-               return FW_ERROR;
-       }
-
-       /* check if we have lmac2 set and check for error */
-       if (iwl_fwrt_read_err_table(mld->trans,
-                                   mld->trans->dbg.lmac_error_event_table[1],
-                                   NULL))
-               return FW_ERROR;
-
-       /* check for umac error */
-       if (iwl_fwrt_read_err_table(mld->trans,
-                                   mld->trans->dbg.umac_error_event_table,
-                                   NULL))
-               return FW_ERROR;
-
-       return FW_ALIVE;
-}
-
-static bool iwl_mld_fw_needs_restart(struct iwl_mld *mld,
-                                    struct ieee80211_vif *vif)
-{
-       enum rt_status rt_status = iwl_mld_check_err_tables(mld, vif);
-
-       if (rt_status == FW_ALIVE)
-               return false;
-
-       if (rt_status == FW_ERROR) {
-               IWL_ERR(mld, "FW Error occurred during suspend\n");
-               iwl_fwrt_dump_error_logs(&mld->fwrt);
-               iwl_dbg_tlv_time_point(&mld->fwrt,
-                                      IWL_FW_INI_TIME_POINT_FW_ASSERT, NULL);
-       }
-
-       return true;
-}
-
 static int
 iwl_mld_netdetect_config(struct iwl_mld *mld,
                         struct ieee80211_vif *vif,
@@ -1383,10 +1323,7 @@ int iwl_mld_no_wowlan_resume(struct iwl_mld *mld)
        mld->fw_status.in_d3 = false;
        iwl_fw_dbg_read_d3_debug_data(&mld->fwrt);
 
-       if (iwl_mld_fw_needs_restart(mld, NULL))
-               ret = -ENODEV;
-       else
-               ret = iwl_mld_wait_d3_notif(mld, &resume_data, false);
+       ret = iwl_mld_wait_d3_notif(mld, &resume_data, false);
 
        if (!ret && (resume_data.d3_end_flags & IWL_D0I3_RESET_REQUIRE))
                return -ENODEV;
@@ -1935,15 +1872,10 @@ int iwl_mld_wowlan_resume(struct iwl_mld *mld)
 
        iwl_fw_dbg_read_d3_debug_data(&mld->fwrt);
 
-       if (iwl_mld_fw_needs_restart(mld, bss_vif)) {
-               fw_err = true;
-               goto err;
-       }
-
        resume_data.wowlan_status = kzalloc(sizeof(*resume_data.wowlan_status),
                                            GFP_KERNEL);
        if (!resume_data.wowlan_status)
-               return -1;
+               return -ENOMEM;
 
        if (mld->netdetect)
                resume_data.notifs_expected |= IWL_D3_ND_MATCH_INFO;

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
index 9b4bdbf40d4dd02189aa0f5333d16e8750403b6a..0f156e8685047495702455c43a09b9a3819e8ae7 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
@@ -508,8 +508,15 @@ int iwl_mld_mac80211_start(struct ieee80211_hw *hw)
        if (in_d3) {
                /* mac80211 already cleaned up the state, no need for cleanup */
                ret = iwl_mld_no_wowlan_resume(mld);
-               if (ret)
+               if (ret) {
                        iwl_mld_stop_fw(mld);
+                       /* We're not really restarting in the sense of
+                        * in_hw_restart even if we got an error during
+                        * this. We'll just start again below and have
+                        * nothing to recover, mac80211 will do anyway.
+                        */
+                       mld->fw_status.in_hw_restart = false;
+               }
        }
 #endif /* CONFIG_PM_SLEEP */