Fixes for 6.12

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.12/series b/queue-6.12/series
index eb3d61aa22b0e5dca43aea6bea04add7d92d5284..2d282df5053b1c5da8b9dbe593ef36d6c3359420 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -75,3 +75,4 @@ spi-omap2-mcspi-fix-the-is_err-bug-for-devm_clk_get_.patch
 drm-dp_mst-ensure-mst_primary-pointer-is-valid-in-dr.patch
 virtio-blk-don-t-keep-queue-frozen-during-system-sus.patch
 blk-mq-register-cpuhp-callback-after-hctx-is-added-t.patch
+wifi-iwlwifi-be-less-noisy-if-the-nic-is-dead-in-s3.patch

diff --git a/queue-6.12/wifi-iwlwifi-be-less-noisy-if-the-nic-is-dead-in-s3.patch b/queue-6.12/wifi-iwlwifi-be-less-noisy-if-the-nic-is-dead-in-s3.patch
new file mode 100644 (file)
index 0000000..6cd7d83
--- /dev/null
+++ b/queue-6.12/wifi-iwlwifi-be-less-noisy-if-the-nic-is-dead-in-s3.patch
@@ -0,0 +1,127 @@
+From a60ce21b69759cc4d8b5c086a4b62ed1eff48e22 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 23 Dec 2024 14:13:59 +0200
+Subject: wifi: iwlwifi: be less noisy if the NIC is dead in S3
+
+From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+
+commit 0572b7715ffd2cac20aac00333706f3094028180 upstream
+
+If the NIC is dead upon resume, try to catch the error earlier and exit
+earlier. We'll print less error messages and get to the same recovery
+path as before: reload the firmware.
+
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
+Link: https://patch.msgid.link/20241028135215.3a18682261e5.I18f336a4537378a4c1a8537d7246cee1fc82b42c@changeid
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219597
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ .../net/wireless/intel/iwlwifi/iwl-trans.h    | 13 +++++----
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c   | 28 ++++++++++++++-----
+ .../net/wireless/intel/iwlwifi/pcie/trans.c   |  2 ++
+ 3 files changed, 30 insertions(+), 13 deletions(-)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+index e95ffe303547..c70da7281551 100644
+--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
++++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+@@ -1074,12 +1074,13 @@ int iwl_trans_read_config32(struct iwl_trans *trans, u32 ofs,
+ void iwl_trans_debugfs_cleanup(struct iwl_trans *trans);
+ #endif
+ 
+-#define iwl_trans_read_mem_bytes(trans, addr, buf, bufsize)                 \
+-      do {                                                                  \
+-              if (__builtin_constant_p(bufsize))                            \
+-                      BUILD_BUG_ON((bufsize) % sizeof(u32));                \
+-              iwl_trans_read_mem(trans, addr, buf, (bufsize) / sizeof(u32));\
+-      } while (0)
++#define iwl_trans_read_mem_bytes(trans, addr, buf, bufsize)   \
++      ({                                                      \
++              if (__builtin_constant_p(bufsize))              \
++                      BUILD_BUG_ON((bufsize) % sizeof(u32));  \
++              iwl_trans_read_mem(trans, addr, buf,            \
++                                 (bufsize) / sizeof(u32));    \
++      })
+ 
+ int iwl_trans_write_imr_mem(struct iwl_trans *trans, u32 dst_addr,
+                           u64 src_addr, u32 byte_cnt);
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+index 244ca8cab9d1..1a814eb6743e 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+@@ -3032,13 +3032,18 @@ static bool iwl_mvm_rt_status(struct iwl_trans *trans, u32 base, u32 *err_id)
+               /* cf. struct iwl_error_event_table */
+               u32 valid;
+               __le32 err_id;
+-      } err_info;
++      } err_info = {};
++      int ret;
+ 
+       if (!base)
+               return false;
+ 
+-      iwl_trans_read_mem_bytes(trans, base,
+-                               &err_info, sizeof(err_info));
++      ret = iwl_trans_read_mem_bytes(trans, base,
++                                     &err_info, sizeof(err_info));
++
++      if (ret)
++              return true;
++
+       if (err_info.valid && err_id)
+               *err_id = le32_to_cpu(err_info.err_id);
+ 
+@@ -3635,22 +3640,31 @@ int iwl_mvm_fast_resume(struct iwl_mvm *mvm)
+       iwl_fw_dbg_read_d3_debug_data(&mvm->fwrt);
+ 
+       if (iwl_mvm_check_rt_status(mvm, NULL)) {
++              IWL_ERR(mvm,
++                      "iwl_mvm_check_rt_status failed, device is gone during suspend\n");
+               set_bit(STATUS_FW_ERROR, &mvm->trans->status);
+               iwl_mvm_dump_nic_error_log(mvm);
+               iwl_dbg_tlv_time_point(&mvm->fwrt,
+                                      IWL_FW_INI_TIME_POINT_FW_ASSERT, NULL);
+               iwl_fw_dbg_collect_desc(&mvm->fwrt, &iwl_dump_desc_assert,
+                                       false, 0);
+-              return -ENODEV;
++              mvm->trans->state = IWL_TRANS_NO_FW;
++              ret = -ENODEV;
++
++              goto out;
+       }
+       ret = iwl_mvm_d3_notif_wait(mvm, &d3_data);
++
++      if (ret) {
++              IWL_ERR(mvm, "Couldn't get the d3 notif %d\n", ret);
++              mvm->trans->state = IWL_TRANS_NO_FW;
++      }
++
++out:
+       clear_bit(IWL_MVM_STATUS_IN_D3, &mvm->status);
+       mvm->trans->system_pm_mode = IWL_PLAT_PM_MODE_DISABLED;
+       mvm->fast_resume = false;
+ 
+-      if (ret)
+-              IWL_ERR(mvm, "Couldn't get the d3 notif %d\n", ret);
+-
+       return ret;
+ }
+ 
+diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+index 3b9943eb6934..d19b3bd0866b 100644
+--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
++++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+@@ -1643,6 +1643,8 @@ int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,
+ out:
+       if (*status == IWL_D3_STATUS_ALIVE)
+               ret = iwl_pcie_d3_handshake(trans, false);
++      else
++              trans->state = IWL_TRANS_NO_FW;
+ 
+       return ret;
+ }
+-- 
+2.39.5
+