* [PATCH 6.12] wifi: iwlwifi: be less noisy if the NIC is dead in S3
@ 2024-12-23 12:13 Emmanuel Grumbach
2024-12-23 14:35 ` Sasha Levin
0 siblings, 1 reply; 3+ messages in thread
From: Emmanuel Grumbach @ 2024-12-23 12:13 UTC (permalink / raw)
To: stable; +Cc: Emmanuel Grumbach, Miri Korenblit, Johannes Berg
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
---
.../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.47.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 6.12] wifi: iwlwifi: be less noisy if the NIC is dead in S3
2024-12-23 12:13 [PATCH 6.12] wifi: iwlwifi: be less noisy if the NIC is dead in S3 Emmanuel Grumbach
@ 2024-12-23 14:35 ` Sasha Levin
2024-12-23 15:25 ` Grumbach, Emmanuel
0 siblings, 1 reply; 3+ messages in thread
From: Sasha Levin @ 2024-12-23 14:35 UTC (permalink / raw)
To: stable; +Cc: Emmanuel Grumbach, Sasha Levin
[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 0572b7715ffd2cac20aac00333706f3094028180
Status in newer kernel trees:
6.12.y | Not found
Note: The patch differs from the upstream commit:
---
1: 0572b7715ffd ! 1: b10ffc08e8ba wifi: iwlwifi: be less noisy if the NIC is dead in S3
@@ Metadata
## Commit message ##
wifi: iwlwifi: be less noisy if the NIC is dead in S3
+ 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.
@@ Commit message
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>
-
- ## drivers/net/wireless/intel/iwlwifi/fw/dump.c ##
-@@ drivers/net/wireless/intel/iwlwifi/fw/dump.c: bool iwl_fwrt_read_err_table(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);
-
+ Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219597
## drivers/net/wireless/intel/iwlwifi/iwl-trans.h ##
@@ drivers/net/wireless/intel/iwlwifi/iwl-trans.h: int iwl_trans_read_config32(struct iwl_trans *trans, u32 ofs,
@@ drivers/net/wireless/intel/iwlwifi/iwl-trans.h: int iwl_trans_read_config32(stru
u64 src_addr, u32 byte_cnt);
## drivers/net/wireless/intel/iwlwifi/mvm/d3.c ##
-@@ drivers/net/wireless/intel/iwlwifi/mvm/d3.c: static void iwl_mvm_d3_disconnect_iter(void *data, u8 *mac,
- ieee80211_resume_disconnect(vif);
- }
+@@ drivers/net/wireless/intel/iwlwifi/mvm/d3.c: 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);
--
- static bool iwl_mvm_check_rt_status(struct iwl_mvm *mvm,
- struct ieee80211_vif *vif)
- {
@@ drivers/net/wireless/intel/iwlwifi/mvm/d3.c: int iwl_mvm_fast_resume(struct iwl_mvm *mvm)
iwl_fw_dbg_read_d3_debug_data(&mvm->fwrt);
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.12.y | Success | Success |
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 6.12] wifi: iwlwifi: be less noisy if the NIC is dead in S3
2024-12-23 14:35 ` Sasha Levin
@ 2024-12-23 15:25 ` Grumbach, Emmanuel
0 siblings, 0 replies; 3+ messages in thread
From: Grumbach, Emmanuel @ 2024-12-23 15:25 UTC (permalink / raw)
To: sashal@kernel.org, stable@vger.kernel.org
On Mon, 2024-12-23 at 09:35 -0500, Sasha Levin wrote:
> [ Sasha's backport helper bot ]
>
> Hi,
>
> The upstream commit SHA1 provided is correct:
> 0572b7715ffd2cac20aac00333706f3094028180
>
>
> Status in newer kernel trees:
> 6.12.y | Not found
>
> Note: The patch differs from the upstream commit:
This is true.
The original patch needs a cleanup patch that moves iwl_mvm_rt_status
to another file and renames the function. This explains the different
between both versions of the patch.
I also added the link to the bugzilla that was opened after the patch
was already on its way upstream.
> ---
> 1: 0572b7715ffd ! 1: b10ffc08e8ba wifi: iwlwifi: be less noisy if
> the NIC is dead in S3
> @@ Metadata
> ## Commit message ##
> wifi: iwlwifi: be less noisy if the NIC is dead in S3
>
> + 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.
> @@ Commit message
> 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>
> -
> - ## drivers/net/wireless/intel/iwlwifi/fw/dump.c ##
> -@@ drivers/net/wireless/intel/iwlwifi/fw/dump.c: bool
> iwl_fwrt_read_err_table(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);
> -
> + Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219597
>
> ## drivers/net/wireless/intel/iwlwifi/iwl-trans.h ##
> @@ drivers/net/wireless/intel/iwlwifi/iwl-trans.h: int
> iwl_trans_read_config32(struct iwl_trans *trans, u32 ofs,
> @@ drivers/net/wireless/intel/iwlwifi/iwl-trans.h: int
> iwl_trans_read_config32(stru
> u64 src_addr, u32 byte_cnt);
>
> ## drivers/net/wireless/intel/iwlwifi/mvm/d3.c ##
> -@@ drivers/net/wireless/intel/iwlwifi/mvm/d3.c: static void
> iwl_mvm_d3_disconnect_iter(void *data, u8 *mac,
> - ieee80211_resume_disconnect(vif);
> - }
> +@@ drivers/net/wireless/intel/iwlwifi/mvm/d3.c: 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);
>
> --
> - static bool iwl_mvm_check_rt_status(struct iwl_mvm *mvm,
> - struct ieee80211_vif *vif)
> - {
> @@ drivers/net/wireless/intel/iwlwifi/mvm/d3.c: int
> iwl_mvm_fast_resume(struct iwl_mvm *mvm)
> iwl_fw_dbg_read_d3_debug_data(&mvm->fwrt);
>
> ---
>
> Results of testing on various branches:
>
> > Branch | Patch Apply | Build Test |
> > ---------------------------|-------------|------------|
> > stable/linux-6.12.y | Success | Success |
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-23 15:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-23 12:13 [PATCH 6.12] wifi: iwlwifi: be less noisy if the NIC is dead in S3 Emmanuel Grumbach
2024-12-23 14:35 ` Sasha Levin
2024-12-23 15:25 ` Grumbach, Emmanuel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.