Browse Source

qcacld-3.0: CL 1507516 – update fw common interface files

Propagation from qcacld-2.0 to qcacld-3.0

Add dbglog IDs for ARP and DHCP packets
WMI CMDID for dbglog time stamp sync
Move reason code from wmi to nan_msg.h

Change-Id: I2e6e837fade375ef86c0c4247490b44ec502be1b
CRs-Fixed: 865207
Himanshu Agarwal 9 years ago
parent
commit
b0497b5f39
4 changed files with 37 additions and 31 deletions
  1. 8 3
      target/inc/dbglog_id.h
  2. 7 0
      target/inc/wmi_tlv_defs.h
  3. 21 27
      target/inc/wmi_unified.h
  4. 1 1
      target/inc/wmi_version.h

+ 8 - 3
target/inc/dbglog_id.h

@@ -616,7 +616,8 @@ extern "C" {
 #define SCAN_SM_CANCEL                              46
 #define SCAN_SM_PROBE_REQ_FRAME_SEND_FAILED         47
 #define SCAN_SCH_BANNED_MODULE                      48
-#define SCAN_DBGID_DEFINITION_END                   49
+#define SCAN_SM_STATS_INFO                          49
+#define SCAN_DBGID_DEFINITION_END                   50
 
 #define BEACON_EVENT_SWBA_SEND_FAILED               0
 #define BEACON_EVENT_EARLY_RX_BMISS_STATUS          1
@@ -772,7 +773,9 @@ extern "C" {
 #define WAL_DBGID_TX_MGMT_FRAME_DESC_ALLOC_FAILED   87
 #define WAL_DBGID_TX_MGMT_TID_STRUCT_NOT_FOUND      88
 #define WAL_DBGID_TX_MGMT_ENQUEUE_FAILED            89
-#define WAL_DBGID_DEFINITION_END                    90
+#define WAL_DBGID_TX_ARP                            90
+#define WAL_DBGID_TX_DHCP                           91
+#define WAL_DBGID_DEFINITION_END                    92
 
 #define ANI_DBGID_POLL                               0
 #define ANI_DBGID_CONTROL                            1
@@ -804,7 +807,9 @@ extern "C" {
 #define OFFLOADMGR_DEREG_OFFLOAD_FAILED                6
 #define OFFLOADMGR_ENTER_FAILED                        7
 #define OFFLOADMGR_EXIT_FAILED                         8
-#define OFFLOADMGR_DBGID_DEFINITION_END                9
+#define OFFLOADMGR_GTK_FAILED                          9
+#define OFFLOADMGR_GTK_REKEY_FAILED                   10
+#define OFFLOADMGR_DBGID_DEFINITION_END               11
 
 /*Resource Debug IDs*/
 #define RESOURCE_DBGID_DEFINITION_START             0

+ 7 - 0
target/inc/wmi_tlv_defs.h

@@ -706,6 +706,7 @@ typedef enum {
 	WMITLV_TAG_STRUC_wmi_ndp_end_rsp_per_ndi,
 	WMITLV_TAG_STRUC_wmi_peer_bwf_request_fixed_param,
 	WMITLV_TAG_STRUC_wmi_bwf_peer_info,
+	WMITLV_TAG_STRUC_wmi_dbglog_time_stamp_sync_cmd_fixed_param,
 } WMITLV_TAG_ID;
 
 /*
@@ -992,6 +993,7 @@ typedef enum {
 	OP(WMI_SCAN_ADAPTIVE_DWELL_CONFIG_CMDID) \
 	OP(WMI_WOW_SET_ACTION_WAKE_UP_CMDID) \
 	OP(WMI_PEER_BWF_REQUEST_CMDID) \
+	OP(WMI_DBGLOG_TIME_STAMP_SYNC_CMDID) \
 	/* add new CMD_LIST elements above this line */
 
 /*
@@ -1768,6 +1770,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_FORCE_FW_HANG_CMDID);
 	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_WMI_SET_MCASTBCAST_FILTER_CMD_fixed_param, WMI_SET_MCASTBCAST_FILTER_CMD_fixed_param, fixed_param, WMITLV_SIZE_FIX)
 WMITLV_CREATE_PARAM_STRUC(WMI_SET_MCASTBCAST_FILTER_CMDID);
 
+/* Set dbglog time stamp sync cmd */
+#define WMITLV_TABLE_WMI_DBGLOG_TIME_STAMP_SYNC_CMDID(id, op, buf, len) \
+	 WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_dbglog_time_stamp_sync_cmd_fixed_param, WMI_DBGLOG_TIME_STAMP_SYNC_CMD_fixed_param, fixed_param, WMITLV_SIZE_FIX)
+WMITLV_CREATE_PARAM_STRUC(WMI_DBGLOG_TIME_STAMP_SYNC_CMDID);
+
 /* GPIO config Cmd */
 #define WMITLV_TABLE_WMI_GPIO_CONFIG_CMDID(id,op,buf,len) \
 	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_gpio_config_cmd_fixed_param, wmi_gpio_config_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)

+ 21 - 27
target/inc/wmi_unified.h

@@ -784,6 +784,8 @@ typedef enum {
 	WMI_CONFIG_ENHANCED_MCAST_FILTER_CMDID,
 	/** Command to control WISA mode */
 	WMI_VDEV_WISA_CMDID,
+	/** set debug log time stamp sync up with host */
+	WMI_DBGLOG_TIME_STAMP_SYNC_CMDID,
 
 	/* GPIO Configuration */
 	WMI_GPIO_CONFIG_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_GPIO),
@@ -9473,6 +9475,25 @@ typedef struct {
 	wmi_mac_addr mcastbdcastaddr;
 } WMI_SET_MCASTBCAST_FILTER_CMD_fixed_param;
 
+/* WMI_DBGLOG_TIME_STAMP_SYNC_CMDID */
+typedef enum {
+	WMI_TIME_STAMP_SYNC_MODE_MS, /* millisecond units */
+	WMI_TIME_STAMP_SYNC_MODE_US, /* microsecond units */
+} WMI_TIME_STAMP_SYNC_MODE;
+
+typedef struct {
+	/*
+	 * TLV tag and len; tag equals
+	 * WMITLV_TAG_STRUC_wmi_dbglog_time_stamp_sync_cmd_fixed_param
+	 */
+	A_UINT32 tlv_header;
+	/* 0: millisec, 1: microsec (see WMI_TIME_STAMP_SYNC_MODE) */
+	A_UINT32 mode;
+	A_UINT32 time_stamp_low; /* lower 32 bits of remote time stamp */
+	A_UINT32 time_stamp_high; /* higher 32 bits of remote time stamp */
+} WMI_DBGLOG_TIME_STAMP_SYNC_CMD_fixed_param;
+
+
 /* GPIO Command and Event data structures */
 
 /* WMI_GPIO_CONFIG_CMDID */
@@ -11306,30 +11327,6 @@ typedef enum {
 
 #define wmi_ndp_cmd_rsp_status wmi_ndp_cmd_rsp_status_PROTOTYPE
 
-/**
- * NDP command reason code
- */
-typedef enum {
-	NDP_INVALID_VDEV_ID_PARAM = 0x00,
-	NDP_INVALID_SERVICE_INSTANCE_ID_PARAM = 0x01,
-	NDP_INVALID_PEER_DISC_MAC_ADDR_PARAM = 0x02,
-	NDP_INVALID_NDP_CFG_SECURITY_PARAM = 0x03,
-	NDP_INVALID_NDP_CFG_QOS_PARAM = 0x04,
-	NDP_INVALID_APP_INFO_LEN_PARAM = 0x05,
-	NDP_INVALID_NDP_INSTANCE_ID_PARAM = 0x06,
-	NDP_INVALID_RSP_CODE_PARAM = 0x07,
-	NDP_INVALID_CHANNEL_PARAM = 0x08,
-	NDP_INVALID_APP_INFO = 0x09,
-	NDP_INVALID_NDP_CFG = 0x0A,
-	NDP_INVALID_NDP_CFG_LEN_PARAM = 0x0B,
-	NDP_INVALID_NUM_NDP_INSTANCES_PARAM = 0x0C,
-	NDP_INVALID_NDP_END_REQ_LEN_PARAM = 0x0D,
-	NDP_INVALID_NDP_END_REQ = 0x0E,
-	NDP_REACHED_MAX_NDP_INSTANCES = 0x0F,
-} wmi_ndp_cmd_reason_code_PROTOTYPE;
-
-#define wmi_ndp_cmd_reason_code wmi_ndp_cmd_reason_code_PROTOTYPE
-
 /**
  * Event response for wmi_ndp_initiator_req
  */
@@ -11345,7 +11342,6 @@ typedef struct {
 	A_UINT32 transaction_id;
 	/** Response status defined in wmi_ndp_cmd_rsp_status*/
 	A_UINT32 rsp_status;
-	/** Reason code defined in wmi_ndp_cmd_reason_code */
 	A_UINT32 reason_code;
 	/*
 	 * Unique token Id generated on the initiator/responder
@@ -11371,7 +11367,6 @@ typedef struct {
 	A_UINT32 transaction_id;
 	/** Response status defined in wmi_ndp_cmd_rsp_status*/
 	A_UINT32 rsp_status;
-	/** Reason code defined in wmi_ndp_cmd_reason_code */
 	A_UINT32 reason_code;
 	/*
 	 * Unique token Id generated on the initiator/responder
@@ -11430,7 +11425,6 @@ typedef struct {
 	A_UINT32 transaction_id;
 	/** Response status defined in wmi_ndp_cmd_rsp_status*/
 	A_UINT32 rsp_status;
-	/** Reason code defined in wmi_ndp_cmd_reason_code */
 	A_UINT32 reason_code;
 	/**
 	 * TLV (tag length value ) parameters follow the ndp_end_rsp

+ 1 - 1
target/inc/wmi_version.h

@@ -36,7 +36,7 @@
 #define __WMI_VER_MINOR_    0
 /** WMI revision number has to be incremented when there is a
  *  change that may or may not break compatibility */
-#define __WMI_REVISION_ 242
+#define __WMI_REVISION_ 244
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work