Merge remote-tracking branch 'sound-current/for-linus'

[karo-tx-linux.git] / drivers / net / wireless / iwlwifi / iwl-fw-error-dump.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h b/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
index af5b3201492cb7a690ec993d784866b1630d91a5..9dbe19cbb4dd7233c57277fb91907d0b199dff04 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
@@ -86,6 +86,8 @@
  *     Structured as &struct iwl_fw_error_dump_trigger_desc.
  * @IWL_FW_ERROR_DUMP_RB: the content of an RB structured as
  *     &struct iwl_fw_error_dump_rb
+ * @IWL_FW_ERROR_PAGING: UMAC's image memory segments which were
+ *     paged to the DRAM.
  */
 enum iwl_fw_error_dump_type {
        /* 0 is deprecated */
@@ -100,6 +102,7 @@ enum iwl_fw_error_dump_type {
        IWL_FW_ERROR_DUMP_MEM = 9,
        IWL_FW_ERROR_DUMP_ERROR_INFO = 10,
        IWL_FW_ERROR_DUMP_RB = 11,
+       IWL_FW_ERROR_DUMP_PAGING = 12,
 
        IWL_FW_ERROR_DUMP_MAX,
 };
@@ -239,6 +242,19 @@ struct iwl_fw_error_dump_rb {
        u8 data[];
 };
 
+/**
+ * struct iwl_fw_error_dump_paging - content of the UMAC's image page
+ *     block on DRAM
+ * @index: the index of the page block
+ * @reserved:
+ * @data: the content of the page block
+ */
+struct iwl_fw_error_dump_paging {
+       __le32 index;
+       __le32 reserved;
+       u8 data[];
+};
+
 /**
  * iwl_fw_error_next_data - advance fw error dump data pointer
  * @data: previous data block