Commit a5d24422 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wen Zhiwei
Browse files

wifi: iwlwifi: clear trans->state earlier upon error 

stable inclusion
from stable-v6.6.53
commit 021cd8f0e4795ff697357017e3af6807fc3b398b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAZ0GM

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=021cd8f0e4795ff697357017e3af6807fc3b398b



--------------------------------

[ Upstream commit 094513f8a2fbddee51b055d8035f995551f98fce ]

When the firmware crashes, we first told the op_mode and only then,
changed the transport's state. This is a problem if the op_mode's
nic_error() handler needs to send a host command: it'll see that the
transport's state still reflects that the firmware is alive.

Today, this has no consequences since we set the STATUS_FW_ERROR bit and
that will prevent sending host commands. iwl_fw_dbg_stop_restart_recording
looks at this bit to know not to send a host command for example.

To fix the hibernation, we needed to reset the firmware without having
an error and checking STATUS_FW_ERROR to see whether the firmware is
alive will no longer hold, so this change is necessary as well.

Change the flow a bit.
Change trans->state before calling the op_mode's nic_error() method and
check trans->state instead of STATUS_FW_ERROR. This will keep the
current behavior of iwl_fw_dbg_stop_restart_recording upon firmware
error, and it'll allow us to call iwl_fw_dbg_stop_restart_recording
safely even if STATUS_FW_ERROR is clear, but yet, the firmware is not
alive.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20240825191257.9d7427fbdfd7.Ia056ca57029a382c921d6f7b6a6b28fc480f2f22@changeid


[I missed this was a dependency for the hibernation fix, changed
 the commit message a bit accordingly]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 77b6b2e0

drivers/net/wireless/intel/iwlwifi/fw/dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -3206,7 +3206,7 @@ void iwl_fw_dbg_stop_restart_recording(struct iwl_fw_runtime *fwrt, 
{

	int ret __maybe_unused = 0;



	if (test_bit(STATUS_FW_ERROR, &fwrt->trans->status))

	if (!iwl_trans_fw_running(fwrt->trans))

		return;



	if (fw_has_capa(&fwrt->fw->ucode_capa,

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

+1 −1
Original line number Diff line number Diff line
@@ -1554,8 +1554,8 @@ static inline void iwl_trans_fw_error(struct iwl_trans *trans, bool sync) 


	/* prevent double restarts due to the same erroneous FW */

	if (!test_and_set_bit(STATUS_FW_ERROR, &trans->status)) {

		iwl_op_mode_nic_error(trans->op_mode, sync);

		trans->state = IWL_TRANS_NO_FW;

		iwl_op_mode_nic_error(trans->op_mode, sync);

	}

}