Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

[platform/kernel/linux-starfive.git] / drivers / net / wireless / intel / iwlwifi / fw / dbg.c

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index f5dd7d8..8106fd4 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -93,6 +93,8 @@ static void iwl_read_radio_regs(struct iwl_fw_runtime *fwrt,
        unsigned long flags;
        int i;
 
+       IWL_DEBUG_INFO(fwrt, "WRT radio registers dump\n");
+
        if (!iwl_trans_grab_nic_access(fwrt->trans, &flags))
                return;
 
@@ -233,6 +235,8 @@ static void iwl_fw_dump_fifos(struct iwl_fw_runtime *fwrt,
        unsigned long flags;
        int i, j;
 
+       IWL_DEBUG_INFO(fwrt, "WRT FIFO dump\n");
+
        if (!iwl_trans_grab_nic_access(fwrt->trans, &flags))
                return;
 
@@ -476,6 +480,8 @@ static void iwl_dump_prph(struct iwl_trans *trans,
        unsigned long flags;
        u32 i;
 
+       IWL_DEBUG_INFO(trans, "WRT PRPH dump\n");
+
        if (!iwl_trans_grab_nic_access(trans, &flags))
                return;
 
@@ -559,6 +565,8 @@ void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)
        bool monitor_dump_only = false;
        int i;
 
+       IWL_DEBUG_INFO(fwrt, "WRT dump start\n");
+
        /* there's no point in fw dump if the bus is dead */
        if (test_bit(STATUS_TRANS_DEAD, &fwrt->trans->status)) {
                IWL_ERR(fwrt, "Skip fw error dump since bus is dead\n");
@@ -816,6 +824,9 @@ void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)
                dump_mem->type = fw_dbg_mem[i].data_type;
                dump_mem->offset = cpu_to_le32(ofs);
 
+               IWL_DEBUG_INFO(fwrt, "WRT memory dump. Type=%u\n",
+                              dump_mem->type);
+
                switch (dump_mem->type & cpu_to_le32(FW_DBG_MEM_TYPE_MASK)) {
                case cpu_to_le32(FW_DBG_MEM_TYPE_REGULAR):
                        iwl_trans_read_mem_bytes(fwrt->trans, ofs,
@@ -841,6 +852,7 @@ void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)
        }
 
        if (smem_len) {
+               IWL_DEBUG_INFO(fwrt, "WRT SMEM dump\n");
                dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);
                dump_data->len = cpu_to_le32(smem_len + sizeof(*dump_mem));
                dump_mem = (void *)dump_data->data;
@@ -853,6 +865,7 @@ void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)
        }
 
        if (sram2_len) {
+               IWL_DEBUG_INFO(fwrt, "WRT SRAM dump\n");
                dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);
                dump_data->len = cpu_to_le32(sram2_len + sizeof(*dump_mem));
                dump_mem = (void *)dump_data->data;
@@ -868,6 +881,7 @@ void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)
        if (!fwrt->trans->cfg->gen2 &&
            fwrt->fw->img[fwrt->cur_fw_img].paging_mem_size &&
            fwrt->fw_paging_db[0].fw_paging_block) {
+               IWL_DEBUG_INFO(fwrt, "WRT paging dump\n");
                for (i = 1; i < fwrt->num_of_paging_blk + 1; i++) {
                        struct iwl_fw_error_dump_paging *paging;
                        struct page *pages =
@@ -930,6 +944,7 @@ out:
        iwl_fw_free_dump_desc(fwrt);
        fwrt->dump.trig = NULL;
        clear_bit(IWL_FWRT_STATUS_DUMPING, &fwrt->status);
+       IWL_DEBUG_INFO(fwrt, "WRT dump done\n");
 }
 IWL_EXPORT_SYMBOL(iwl_fw_error_dump);