iwlwifi: dbg_ini: add lmac and umac error tables dumping support

Add LMAC_ERROR_TABLE and UMAC_ERROR_TABLE region types and handle them
in the same way as we handle DEVICE_MEMORY.

Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h b/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h
index af1e3d08c179f7479d1782d70ec46c51ce3cdd3a..f4202bc231a65d21e18450aba6716590f11c004a 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h
@@ -473,6 +473,8 @@ enum iwl_fw_ini_debug_flow {
  * @IWL_FW_INI_REGION_CSR: CSR registers
  * @IWL_FW_INI_REGION_NOTIFICATION: FW notification data
  * @IWL_FW_INI_REGION_DHC: dhc response to dump
+ * @IWL_FW_INI_REGION_LMAC_ERROR_TABLE: lmac error table
+ * @IWL_FW_INI_REGION_UMAC_ERROR_TABLE: umac error table
  * @IWL_FW_INI_REGION_NUM: number of region types
  */
 enum iwl_fw_ini_region_type {
@@ -490,6 +492,8 @@ enum iwl_fw_ini_region_type {
        IWL_FW_INI_REGION_CSR,
        IWL_FW_INI_REGION_NOTIFICATION,
        IWL_FW_INI_REGION_DHC,
+       IWL_FW_INI_REGION_LMAC_ERROR_TABLE,
+       IWL_FW_INI_REGION_UMAC_ERROR_TABLE,
        IWL_FW_INI_REGION_NUM
 }; /* FW_DEBUG_TLV_REGION_TYPE_E_VER_1 */
 

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index 79e36336f623bc56101ac3603b7b10cf839e35ee..035eeeabfc8c5962f1ec0781b8aac88f4778bd9d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -1760,6 +1760,8 @@ static int iwl_fw_ini_get_trigger_len(struct iwl_fw_runtime *fwrt,
                case IWL_FW_INI_REGION_PERIPHERY_PHY:
                case IWL_FW_INI_REGION_PERIPHERY_AUX:
                case IWL_FW_INI_REGION_CSR:
+               case IWL_FW_INI_REGION_LMAC_ERROR_TABLE:
+               case IWL_FW_INI_REGION_UMAC_ERROR_TABLE:
                        size += hdr_len + iwl_dump_ini_mem_get_size(fwrt, reg);
                        break;
                case IWL_FW_INI_REGION_TXF:
@@ -1821,6 +1823,8 @@ static void iwl_fw_ini_dump_trigger(struct iwl_fw_runtime *fwrt,
 
                switch (le32_to_cpu(reg->region_type)) {
                case IWL_FW_INI_REGION_DEVICE_MEMORY:
+               case IWL_FW_INI_REGION_LMAC_ERROR_TABLE:
+               case IWL_FW_INI_REGION_UMAC_ERROR_TABLE:
                        ops.get_num_of_ranges = iwl_dump_ini_mem_ranges;
                        ops.get_size = iwl_dump_ini_mem_get_size;
                        ops.fill_mem_hdr = iwl_dump_ini_mem_fill_header;
@@ -2498,7 +2502,9 @@ static void iwl_fw_dbg_update_regions(struct iwl_fw_runtime *fwrt,
                         type == IWL_FW_INI_REGION_PERIPHERY_AUX ||
                         type == IWL_FW_INI_REGION_INTERNAL_BUFFER ||
                         type == IWL_FW_INI_REGION_PAGING ||
-                        type == IWL_FW_INI_REGION_CSR)
+                        type == IWL_FW_INI_REGION_CSR ||
+                        type == IWL_FW_INI_REGION_LMAC_ERROR_TABLE ||
+                        type == IWL_FW_INI_REGION_UMAC_ERROR_TABLE)
                        iter += le32_to_cpu(reg->internal.num_of_ranges) *
                                sizeof(__le32);