wifi: iwlwifi: pcie: double-check ACK interrupt after timeout

There are evidently cases where the firmware completes the
reset but the interrupt isn't received correctly, so check
for the interrupt again after the timeout, and don't dump
the firmware error log if the right bit is set.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230614123446.00cc2d9b88c3.I429bfe800f17c624e50c0b0c10dd2cd7d885f199@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
index 73b395841ca8a546f3c98e3f26d07e7a6c390ea4..fa46dad5fd6802189f120150c87ea8027567cdff 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
  * Copyright (C) 2017 Intel Deutschland GmbH
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  */
 #include "iwl-trans.h"
 #include "iwl-prph.h"
@@ -117,9 +117,14 @@ static void iwl_trans_pcie_fw_reset_handshake(struct iwl_trans *trans)
                                 trans_pcie->fw_reset_state != FW_RESET_REQUESTED,
                                 FW_RESET_TIMEOUT);
        if (!ret || trans_pcie->fw_reset_state == FW_RESET_ERROR) {
-               IWL_INFO(trans,
-                        "firmware didn't ACK the reset - continue anyway\n");
-               iwl_trans_fw_error(trans, true);
+               u32 inta_hw = iwl_read32(trans, CSR_MSIX_HW_INT_CAUSES_AD);
+
+               IWL_ERR(trans,
+                       "timeout waiting for FW reset ACK (inta_hw=0x%x)\n",
+                       inta_hw);
+
+               if (!(inta_hw & MSIX_HW_INT_CAUSES_REG_RESET_DONE))
+                       iwl_trans_fw_error(trans, true);
        }
 
        trans_pcie->fw_reset_state = FW_RESET_IDLE;