]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: iwlwifi: pcie: fix non-MSIX handshake register
authorJohannes Berg <johannes.berg@intel.com>
Thu, 12 Jun 2025 11:48:59 +0000 (14:48 +0300)
committerMiri Korenblit <miriam.rachel.korenblit@intel.com>
Wed, 25 Jun 2025 07:57:33 +0000 (10:57 +0300)
When reading the interrupt status after a FW reset handshake
timeout, read the actual value not the mask for the non-MSIX
case.

Fixes: ab606dea80c4 ("wifi: iwlwifi: pcie: add support for the reset handshake in MSI")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250612144708.83aafead6061.I2f8571aafa55aa3b936a30b938de9d260592a584@changeid
drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c

index b5e4b60f710c30a2ba2e708f1c8555fa33635c3d..0df8522ca41094724689e16cbfed6dd7752cc0bd 100644 (file)
@@ -125,7 +125,7 @@ void iwl_trans_pcie_fw_reset_handshake(struct iwl_trans *trans)
                        reset_done =
                                inta_hw & MSIX_HW_INT_CAUSES_REG_RESET_DONE;
                } else {
-                       inta_hw = iwl_read32(trans, CSR_INT_MASK);
+                       inta_hw = iwl_read32(trans, CSR_INT);
                        reset_done = inta_hw & CSR_INT_BIT_RESET_DONE;
                }