wifi: iwlwifi: dbg: print pc register data once fw dump occurred

Add debug print for different FW program counter details of
different CPU. Program counter pc details will be read from
TLV during init.

Signed-off-by: Mukesh Sisodiya <mukesh.sisodiya@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230413213309.862790d336a9.I34e2ea05a79e8b2552f7f221bacf3af0166cb9c0@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dump.c b/drivers/net/wireless/intel/iwlwifi/fw/dump.c
index 59ed321bcc272590607dfef849965c0e8834bc0d..f86f7b4baa18194212cc9f5f665f6430e918b0a7 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dump.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dump.c
@@ -484,6 +484,9 @@ static void iwl_fwrt_dump_fseq_regs(struct iwl_fw_runtime *fwrt)
 
 void iwl_fwrt_dump_error_logs(struct iwl_fw_runtime *fwrt)
 {
+       struct iwl_pc_data *pc_data;
+       u8 count;
+
        if (!test_bit(STATUS_DEVICE_ENABLED, &fwrt->trans->status)) {
                IWL_ERR(fwrt,
                        "DEVICE_ENABLED bit is not set. Aborting dump.\n");
@@ -502,6 +505,14 @@ void iwl_fwrt_dump_error_logs(struct iwl_fw_runtime *fwrt)
                iwl_fwrt_dump_rcm_error_log(fwrt, 1);
        iwl_fwrt_dump_iml_error_log(fwrt);
        iwl_fwrt_dump_fseq_regs(fwrt);
+       if (fwrt->trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_22000) {
+               pc_data = fwrt->trans->dbg.pc_data;
+               for (count = 0; count < fwrt->trans->dbg.num_pc;
+                    count++, pc_data++)
+                       IWL_ERR(fwrt, "%s: 0x%x\n",
+                               pc_data->pc_name,
+                               pc_data->pc_address);
+       }
 
        if (fwrt->trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ) {
                u32 scratch = iwl_read32(fwrt->trans, CSR_FUNC_SCRATCH);

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h
index f2eefca6e260ba6fce942d22c8165a2ea735b884..a0260a1fa099f944cd9e3aaed957854278cf1cd7 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/file.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h
@@ -101,6 +101,7 @@ enum iwl_ucode_tlv_type {
 
        IWL_UCODE_TLV_SEC_TABLE_ADDR            = 66,
        IWL_UCODE_TLV_D3_KEK_KCK_ADDR           = 67,
+       IWL_UCODE_TLV_CURRENT_PC                = 68,
 
        IWL_UCODE_TLV_FW_NUM_STATIONS           = IWL_UCODE_TLV_CONST_BASE + 0,
 

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 4c977ba9cd851b696a032987706efdc7b031ba99..75d52e6cf988eacc5dd586bf9b4f8698750e8f54 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -127,6 +127,7 @@ static void iwl_dealloc_ucode(struct iwl_drv *drv)
        kfree(drv->fw.iml);
        kfree(drv->fw.ucode_capa.cmd_versions);
        kfree(drv->fw.phy_integration_ver);
+       kfree(drv->trans->dbg.pc_data);
 
        for (i = 0; i < IWL_UCODE_TYPE_MAX; i++)
                iwl_free_fw_img(drv, drv->fw.img + i);
@@ -1232,6 +1233,14 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
                        iwl_drv_set_dump_exclude(drv, tlv_type,
                                                 tlv_data, tlv_len);
                        break;
+               case IWL_UCODE_TLV_CURRENT_PC:
+                       if (tlv_len < sizeof(struct iwl_pc_data))
+                               goto invalid_tlv_len;
+                       drv->trans->dbg.num_pc =
+                               tlv_len / sizeof(struct iwl_pc_data);
+                       drv->trans->dbg.pc_data =
+                               kmemdup(tlv_data, tlv_len, GFP_KERNEL);
+                       break;
                default:
                        IWL_DEBUG_INFO(drv, "unknown TLV: %d\n", tlv_type);
                        break;

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
index dd277a4fa8dd314d2bec952252371398a1a8f6a6..74ff4788dc83f39e07ec082bdfa0af0e7722b0c3 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
@@ -748,6 +748,18 @@ struct iwl_imr_data {
        __le64 imr_base_addr;
 };
 
+#define IWL_TRANS_CURRENT_PC_NAME_MAX_BYTES      32
+
+/**
+ * struct iwl_pc_data - program counter details
+ * @pc_name: cpu name
+ * @pc_address: cpu program counter
+ */
+struct iwl_pc_data {
+       u8  pc_name[IWL_TRANS_CURRENT_PC_NAME_MAX_BYTES];
+       u32 pc_address;
+};
+
 /**
  * struct iwl_trans_debug - transport debug related data
  *
@@ -777,6 +789,8 @@ struct iwl_imr_data {
  * @ucode_preset: preset based on ucode
  * @dump_file_name_ext: dump file name extension
  * @dump_file_name_ext_valid: dump file name extension if valid or not
+ * @num_pc: number of program counter for cpu
+ * @pc_data: details of the program counter
  */
 struct iwl_trans_debug {
        u8 n_dest_reg;
@@ -817,6 +831,8 @@ struct iwl_trans_debug {
        struct iwl_imr_data imr_data;
        u8 dump_file_name_ext[IWL_FW_INI_MAX_NAME];
        bool dump_file_name_ext_valid;
+       u32 num_pc;
+       struct iwl_pc_data *pc_data;
 };
 
 struct iwl_dma_ptr {

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 521eded39028cad18cad66139c47c733bf939592..3f5cc6bf3f1c21748a23b515f90fcd64af54b0cf 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -321,6 +321,8 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
        static const u16 alive_cmd[] = { UCODE_ALIVE_NTFY };
        bool run_in_rfkill =
                ucode_type == IWL_UCODE_INIT || iwl_mvm_has_unified_ucode(mvm);
+       u8 count;
+       struct iwl_pc_data *pc_data;
 
        if (ucode_type == IWL_UCODE_REGULAR &&
            iwl_fw_dbg_conf_usniffer(mvm->fw, FW_DBG_START_FROM_ALIVE) &&
@@ -393,6 +395,14 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
 
                /* LMAC/UMAC PC info */
                if (trans->trans_cfg->device_family >=
+                                       IWL_DEVICE_FAMILY_22000) {
+                       pc_data = trans->dbg.pc_data;
+                       for (count = 0; count < trans->dbg.num_pc;
+                            count++, pc_data++)
+                               IWL_ERR(mvm, "%s: 0x%x\n",
+                                       pc_data->pc_name,
+                                       pc_data->pc_address);
+               } else if (trans->trans_cfg->device_family >=
                                        IWL_DEVICE_FAMILY_9000) {
                        IWL_ERR(mvm, "UMAC PC: 0x%x\n",
                                iwl_read_umac_prph(trans,