summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHimanshu Agarwal <himanaga@qti.qualcomm.com>2016-05-10 22:02:19 +0530
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-05-18 17:49:06 +0530
commit2d514b1c5c2f9fc1bf37713a20497f3804e40d75 (patch)
tree06bfcff46de467467a878936a0e5422d8c13973c
parenta192bb79e9902df66e3ddbcb7a034ddf718de5f6 (diff)
qcacld-2.0: CL 1507516 – update fw common interface files
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
-rw-r--r--CORE/SERVICES/COMMON/dbglog_id.h11
-rw-r--r--CORE/SERVICES/COMMON/wmi_tlv_defs.h8
-rw-r--r--CORE/SERVICES/COMMON/wmi_unified.h43
-rw-r--r--CORE/SERVICES/COMMON/wmi_version.h2
-rw-r--r--CORE/SERVICES/WMI/wmi_unified.c1
5 files changed, 34 insertions, 31 deletions
diff --git a/CORE/SERVICES/COMMON/dbglog_id.h b/CORE/SERVICES/COMMON/dbglog_id.h
index b79ec0c3bc4a..66eafe6d9058 100644
--- a/CORE/SERVICES/COMMON/dbglog_id.h
+++ b/CORE/SERVICES/COMMON/dbglog_id.h
@@ -617,7 +617,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
@@ -774,7 +775,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
@@ -806,7 +809,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
diff --git a/CORE/SERVICES/COMMON/wmi_tlv_defs.h b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
index 05f226ac975b..075fa61f27f3 100644
--- a/CORE/SERVICES/COMMON/wmi_tlv_defs.h
+++ b/CORE/SERVICES/COMMON/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 */
/*
@@ -1772,6 +1774,12 @@ 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)
diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h
index c41bad5f08e8..e4bec3ba4ca5 100644
--- a/CORE/SERVICES/COMMON/wmi_unified.h
+++ b/CORE/SERVICES/COMMON/wmi_unified.h
@@ -763,6 +763,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),
@@ -8990,6 +8992,20 @@ 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 {
+ A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_dbglog_time_stamp_sync_cmd_fixed_param */
+ A_UINT32 mode; /* 0: millisec, 1: microsec (see WMI_TIME_STAMP_SYNC_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 */
@@ -10787,30 +10803,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
*/
typedef struct {
@@ -10822,7 +10814,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
@@ -10845,7 +10836,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
@@ -10895,7 +10885,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
diff --git a/CORE/SERVICES/COMMON/wmi_version.h b/CORE/SERVICES/COMMON/wmi_version.h
index 52933bd5524d..2dbe13edd1e8 100644
--- a/CORE/SERVICES/COMMON/wmi_version.h
+++ b/CORE/SERVICES/COMMON/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
diff --git a/CORE/SERVICES/WMI/wmi_unified.c b/CORE/SERVICES/WMI/wmi_unified.c
index b6792587db4a..aecda1f89c30 100644
--- a/CORE/SERVICES/WMI/wmi_unified.c
+++ b/CORE/SERVICES/WMI/wmi_unified.c
@@ -701,6 +701,7 @@ static u_int8_t* get_wmi_cmd_string(WMI_CMD_ID wmi_command)
CASE_RETURN_STRING(WMI_SCAN_ADAPTIVE_DWELL_CONFIG_CMDID);
CASE_RETURN_STRING(WMI_WOW_SET_ACTION_WAKE_UP_CMDID);
CASE_RETURN_STRING(WMI_PEER_BWF_REQUEST_CMDID);
+ CASE_RETURN_STRING(WMI_DBGLOG_TIME_STAMP_SYNC_CMDID);
}
return "Invalid WMI cmd";
}