summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajeev Kumar <rajekuma@qca.qualcomm.com>2015-05-08 13:33:02 -0700
committerAnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com>2015-05-13 17:17:31 +0530
commit6f47ef6603a949d55d70dc6bfa6eff5ab8cb65ed (patch)
treecb0f8abc0167f974303a18135fdc74b9e284adeb
parent20dbae4e6657d0005806079231a00c2612f4381a (diff)
qcacld: CL 1300020 - update fw common interface files
WMI changes for Flushing the Debug logs Change-Id: Ice1e3528f025b4b95060513c42608dd77a3f0328 CRs-Fixed: 819213
-rw-r--r--CORE/SERVICES/COMMON/wmi_tlv_defs.h21
-rw-r--r--CORE/SERVICES/COMMON/wmi_unified.h16
-rw-r--r--CORE/SERVICES/COMMON/wmi_version.h2
-rw-r--r--CORE/SERVICES/WMI/wmi_unified.c1
4 files changed, 36 insertions, 4 deletions
diff --git a/CORE/SERVICES/COMMON/wmi_tlv_defs.h b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
index 1be1bf6b3fe7..cddc5b830e53 100644
--- a/CORE/SERVICES/COMMON/wmi_tlv_defs.h
+++ b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
@@ -559,7 +559,9 @@ typedef enum {
WMITLV_TAG_STRUC_wmi_vdev_tsf_report_event_fixed_param,
WMITLV_TAG_STRUC_wmi_get_fw_mem_dump_fixed_param,
WMITLV_TAG_STRUC_wmi_update_fw_mem_dump_fixed_param,
- WMITLV_TAG_STRUC_wmi_fw_mem_dump_params
+ WMITLV_TAG_STRUC_wmi_fw_mem_dump_params,
+ WMITLV_TAG_STRUC_wmi_debug_mesg_flush_fixed_param,
+ WMITLV_TAG_STRUC_wmi_debug_mesg_flush_complete_fixed_param
} WMITLV_TAG_ID;
/*
@@ -773,7 +775,8 @@ typedef enum {
OP(WMI_ROAM_FILTER_CMDID) \
OP(WMI_PASSPOINT_LIST_CONFIG_CMDID) \
OP(WMI_VDEV_TSF_TSTAMP_ACTION_CMDID) \
- OP(WMI_GET_FW_MEM_DUMP_CMDID)
+ OP(WMI_GET_FW_MEM_DUMP_CMDID) \
+ OP(WMI_DEBUG_MESG_FLUSH_CMDID)
/*
* IMPORTANT: Please add _ALL_ WMI Events Here.
@@ -877,7 +880,8 @@ typedef enum {
OP(WMI_DCC_STATS_EVENTID) \
OP(WMI_PASSPOINT_MATCH_EVENTID) \
OP(WMI_VDEV_TSF_REPORT_EVENTID) \
- OP(WMI_UPDATE_FW_MEM_DUMP_EVENTID)
+ OP(WMI_UPDATE_FW_MEM_DUMP_EVENTID) \
+ OP(WMI_DEBUG_MESG_FLUSH_COMPLETE_EVENTID)
/* TLV definitions of WMI commands */
@@ -1325,6 +1329,13 @@ WMITLV_CREATE_PARAM_STRUC(WMI_REQUEST_STATS_CMDID);
WMITLV_CREATE_PARAM_STRUC(WMI_GET_FW_MEM_DUMP_CMDID);
+/* Request for memory dump stats Cmd */
+#define WMITLV_TABLE_WMI_DEBUG_MESG_FLUSH_CMDID(id,op,buf,len) \
+ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_debug_mesg_flush_fixed_param, wmi_debug_mesg_flush_fixed_param, fixed_param, WMITLV_SIZE_FIX)
+
+WMITLV_CREATE_PARAM_STRUC(WMI_DEBUG_MESG_FLUSH_CMDID);
+
+
/* Set config params */
#define WMITLV_TABLE_WMI_START_LINK_STATS_CMDID(id,op,buf,len) \
@@ -2398,6 +2409,10 @@ WMITLV_CREATE_PARAM_STRUC(WMI_RFKILL_STATE_CHANGE_EVENTID);
WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, bufp, WMITLV_SIZE_VAR)
WMITLV_CREATE_PARAM_STRUC(WMI_DEBUG_MESG_EVENTID);
+#define WMITLV_TABLE_WMI_DEBUG_MESG_FLUSH_COMPLETE_EVENTID(id,op,buf,len)\
+ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_debug_mesg_flush_complete_fixed_param, wmi_debug_mesg_flush_complete_fixed_param, fixed_param, WMITLV_SIZE_FIX)
+WMITLV_CREATE_PARAM_STRUC(WMI_DEBUG_MESG_FLUSH_COMPLETE_EVENTID);
+
/* Diagnostics Event */
#define WMITLV_TABLE_WMI_DIAG_EVENTID(id,op,buf,len)\
WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, bufp, WMITLV_SIZE_VAR)
diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h
index 30e33ca1ac16..9a71786b571e 100644
--- a/CORE/SERVICES/COMMON/wmi_unified.h
+++ b/CORE/SERVICES/COMMON/wmi_unified.h
@@ -552,6 +552,9 @@ typedef enum {
/** Request for getting the Firmware Memory Dump */
WMI_GET_FW_MEM_DUMP_CMDID,
+ /** Request to flush of the buffered debug messages */
+ WMI_DEBUG_MESG_FLUSH_CMDID,
+
/** ARP OFFLOAD REQUEST*/
WMI_SET_ARP_NS_OFFLOAD_CMDID=WMI_CMD_GRP_START_ID(WMI_GRP_ARP_NS_OFL),
@@ -1002,6 +1005,8 @@ typedef enum {
/** Set OCB Sched Response, deprecated */
WMI_OCB_SET_SCHED_EVENTID,
+ /** event to indicate the flush of the buffered debug messages is complete*/
+ WMI_DEBUG_MESG_FLUSH_COMPLETE_EVENTID,
/* GPIO Event */
WMI_GPIO_INPUT_EVENTID=WMI_EVT_GRP_START_ID(WMI_GRP_GPIO),
/** upload H_CV info WMI event
@@ -1161,6 +1166,7 @@ WMI_CHANNEL_CHANGE_CAUSE_CSA,
} while(0)
#define WMI_GET_CHANNEL_ANTENNA_MAX(pwmi_channel) ((pwmi_channel)->reg_info_2 & 0xff )
+/* max tx power is in 1 dBm units */
#define WMI_SET_CHANNEL_MAX_TX_POWER(pwmi_channel,val) do { \
(pwmi_channel)->reg_info_2 &= 0xffff00ff; \
(pwmi_channel)->reg_info_2 |= ((val&0xff)<<8); \
@@ -2946,6 +2952,16 @@ typedef struct {
#define WMI_STATS_VALUE_INVALID 0xffffffff
typedef struct {
+ A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_debug_mesg_flush_fixed_param*/
+ A_UINT32 reserved0; /** placeholder for future */
+} wmi_debug_mesg_flush_fixed_param;
+
+typedef struct {
+ A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_debug_mesg_flush_complete_fixed_param*/
+ A_UINT32 reserved0; /** placeholder for future */
+} wmi_debug_mesg_flush_complete_fixed_param;
+
+typedef struct {
A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_fw_mem_dump */
/** unique id identifying the segment */
A_UINT32 seg_id;
diff --git a/CORE/SERVICES/COMMON/wmi_version.h b/CORE/SERVICES/COMMON/wmi_version.h
index d80bc5f034da..4329b982d6b4 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_ 111
+#define __WMI_REVISION_ 112
/** 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 a76a505ba4ca..7fff69b9a42a 100644
--- a/CORE/SERVICES/WMI/wmi_unified.c
+++ b/CORE/SERVICES/WMI/wmi_unified.c
@@ -630,6 +630,7 @@ static u_int8_t* get_wmi_cmd_string(WMI_CMD_ID wmi_command)
CASE_RETURN_STRING(WMI_DCC_CLEAR_STATS_CMDID);
CASE_RETURN_STRING(WMI_DCC_UPDATE_NDL_CMDID);
CASE_RETURN_STRING(WMI_ROAM_FILTER_CMDID);
+ CASE_RETURN_STRING(WMI_DEBUG_MESG_FLUSH_CMDID);
}
return "Invalid WMI cmd";
}