aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/fw-api.h
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-02-03 13:11:48 -0500
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-03-01 09:55:12 -0500
commit7e1223b50089ab5901215d2fd8c61b42c7cfe034 (patch)
treedb8a5926ff56da9f6bc51c2d8a955151f845c3d2 /drivers/net/wireless/iwlwifi/mvm/fw-api.h
parent33cef9256342f200a708211958cec9c44406631d (diff)
iwlwifi: mvm: new Alive / error table API
The new API slightly changes the layout of the version of the firmware - prepare for that. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/fw-api.h')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/fw-api.h26
1 files changed, 25 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api.h b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
index c43e5c2bb85c..d95b47213731 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
@@ -432,7 +432,7 @@ enum {
432 432
433#define IWL_ALIVE_FLG_RFKILL BIT(0) 433#define IWL_ALIVE_FLG_RFKILL BIT(0)
434 434
435struct mvm_alive_resp { 435struct mvm_alive_resp_ver1 {
436 __le16 status; 436 __le16 status;
437 __le16 flags; 437 __le16 flags;
438 u8 ucode_minor; 438 u8 ucode_minor;
@@ -483,6 +483,30 @@ struct mvm_alive_resp_ver2 {
483 __le32 dbg_print_buff_addr; 483 __le32 dbg_print_buff_addr;
484} __packed; /* ALIVE_RES_API_S_VER_2 */ 484} __packed; /* ALIVE_RES_API_S_VER_2 */
485 485
486struct mvm_alive_resp {
487 __le16 status;
488 __le16 flags;
489 __le32 ucode_minor;
490 __le32 ucode_major;
491 u8 ver_subtype;
492 u8 ver_type;
493 u8 mac;
494 u8 opt;
495 __le32 timestamp;
496 __le32 error_event_table_ptr; /* SRAM address for error log */
497 __le32 log_event_table_ptr; /* SRAM address for LMAC event log */
498 __le32 cpu_register_ptr;
499 __le32 dbgm_config_ptr;
500 __le32 alive_counter_ptr;
501 __le32 scd_base_ptr; /* SRAM address for SCD */
502 __le32 st_fwrd_addr; /* pointer to Store and forward */
503 __le32 st_fwrd_size;
504 __le32 umac_minor; /* UMAC version: minor */
505 __le32 umac_major; /* UMAC version: major */
506 __le32 error_info_addr; /* SRAM address for UMAC error log */
507 __le32 dbg_print_buff_addr;
508} __packed; /* ALIVE_RES_API_S_VER_3 */
509
486/* Error response/notification */ 510/* Error response/notification */
487enum { 511enum {
488 FW_ERR_UNKNOWN_CMD = 0x0, 512 FW_ERR_UNKNOWN_CMD = 0x0,