iwlwifi: dump CSR scratch from outer function

We shouldn't dump this twice if we have two TCMs, and it really
doesn't belong to the TCM dump anyway, so move this out.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211210110539.b58a02f27512.Idbfbc430776a7abda0eb086215fb64f2c9307ac0@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dump.c b/drivers/net/wireless/intel/iwlwifi/fw/dump.c
index 81acb7df73d703896640fd333a34a2393b5ab768..b0f9a2cb2a93489ce2ff87ca2397c88b8c6d1dd4 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dump.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dump.c
@@ -292,13 +292,6 @@ static void iwl_fwrt_dump_tcm_error_log(struct iwl_fw_runtime *fwrt)
        for (i = 0; i < ARRAY_SIZE(table.sw_status); i++)
                IWL_ERR(fwrt, "0x%08X | tcm SW status[%d]\n",
                        table.sw_status[i], i);
-
-       if (trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ) {
-               u32 scratch = iwl_read32(trans, CSR_FUNC_SCRATCH);
-
-               IWL_ERR(fwrt, "Function Scratch status:\n");
-               IWL_ERR(fwrt, "0x%08X | Func Scratch\n", scratch);
-       }
 }
 
 static void iwl_fwrt_dump_iml_error_log(struct iwl_fw_runtime *fwrt)
@@ -385,5 +378,12 @@ void iwl_fwrt_dump_error_logs(struct iwl_fw_runtime *fwrt)
        iwl_fwrt_dump_tcm_error_log(fwrt);
        iwl_fwrt_dump_iml_error_log(fwrt);
        iwl_fwrt_dump_fseq_regs(fwrt);
+
+       if (fwrt->trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ) {
+               u32 scratch = iwl_read32(fwrt->trans, CSR_FUNC_SCRATCH);
+
+               IWL_ERR(fwrt, "Function Scratch status:\n");
+               IWL_ERR(fwrt, "0x%08X | Func Scratch\n", scratch);
+       }
 }
 IWL_EXPORT_SYMBOL(iwl_fwrt_dump_error_logs);