Commit 28965ec0 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

wifi: iwlwifi: make the loop for card preparation effective 



Since we didn't reset t to 0, only the first iteration of the loop
did checked the ready bit several times.
From the second iteration and on, we just tested the bit once and
continued to the next iteration.

Reported-and-tested-by: default avatarLorenzo Zolfanelli <lorenzo@zolfa.nl>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216452


Fixes: 289e5501 ("iwlwifi: fix the preparation of the card")
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230416154301.615b683ab9c8.Ic52c3229d3345b0064fa34263293db095d88daf8@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent d9bfd5a0

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+2 −1
Original line number Diff line number Diff line
@@ -599,7 +599,6 @@ static int iwl_pcie_set_hw_ready(struct iwl_trans *trans) 
int iwl_pcie_prepare_card_hw(struct iwl_trans *trans)

{

	int ret;

	int t = 0;

	int iter;



	IWL_DEBUG_INFO(trans, "iwl_trans_prepare_card_hw enter\n");
@@ -616,6 +615,8 @@ int iwl_pcie_prepare_card_hw(struct iwl_trans *trans) 
	usleep_range(1000, 2000);



	for (iter = 0; iter < 10; iter++) {

		int t = 0;



		/* If HW is not ready, prepare the conditions to check again */

		iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,

			    CSR_HW_IF_CONFIG_REG_PREPARE);