summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrishna Kumaar Natarajan <kknatara@qca.qualcomm.com>2014-08-21 19:56:09 -0700
committerPitani Venkata Rajesh Kumar <c_vpitan@qti.qualcomm.com>2014-08-23 11:51:36 +0530
commit919c85f2e364cd484782d8fef341c4bd5179462c (patch)
tree979412703d1a2d5e04f6c6132f757819c5f27df0
parent576d9053ac5e749594d148cf97d745e7b17254dd (diff)
qcacld: CL 1066111 1067490 - update fw common interface files
This change set update the fw common interface files associated with the CL 1066111 1067490. Change-Id: I6d9e29d5b892364c79d2801c0008115aae0f866a CRs-Fixed: 713399
-rw-r--r--CORE/SERVICES/COMMON/wmi_tlv_defs.h25
-rw-r--r--CORE/SERVICES/COMMON/wmi_unified.h25
-rw-r--r--CORE/SERVICES/COMMON/wmi_version.h2
-rw-r--r--CORE/SERVICES/WMI/wmi_unified.c1
4 files changed, 50 insertions, 3 deletions
diff --git a/CORE/SERVICES/COMMON/wmi_tlv_defs.h b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
index 94a01e9cb167..4068b000795e 100644
--- a/CORE/SERVICES/COMMON/wmi_tlv_defs.h
+++ b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
@@ -502,7 +502,9 @@ typedef enum {
WMITLV_TAG_STRUC_wmi_lpi_handoff_event_fixed_param,
WMITLV_TAG_STRUC_wmi_vdev_rate_stats_event_fixed_param,
WMITLV_TAG_STRUC_wmi_vdev_rate_ht_info,
- WMITLV_TAG_STRUC_wmi_ric_request_fixed_param
+ WMITLV_TAG_STRUC_wmi_ric_request_fixed_param,
+ WMITLV_TAG_STRUC_wmi_pdev_get_temperature_cmd_fixed_param,
+ WMITLV_TAG_STRUC_wmi_pdev_temperature_event_fixed_param
} WMITLV_TAG_ID;
/*
@@ -687,7 +689,9 @@ typedef enum {
OP(WMI_EXTWOW_ENABLE_CMDID) \
OP(WMI_EXTWOW_SET_APP_TYPE1_PARAMS_CMDID) \
OP(WMI_EXTWOW_SET_APP_TYPE2_PARAMS_CMDID) \
- OP(WMI_ROAM_SET_RIC_REQUEST_CMDID)
+ OP(WMI_ROAM_SET_RIC_REQUEST_CMDID) \
+ OP(WMI_PDEV_GET_TEMPERATURE_CMDID)
+
/*
@@ -776,6 +780,8 @@ typedef enum {
OP(WMI_LPI_STATUS_EVENTID) \
OP(WMI_LPI_HANDOFF_EVENTID) \
OP(WMI_UPDATE_VDEV_RATE_STATS_EVENTID) \
+ OP(WMI_PDEV_TEMPERATURE_EVENTID) \
+ OP(WMI_DIAG_EVENTID)
/* TLV definitions of WMI commands */
@@ -1898,6 +1904,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_CHAN_AVOID_UPDATE_CMDID);
WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_d0_wow_enable_disable_cmd_fixed_param, wmi_d0_wow_enable_disable_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
WMITLV_CREATE_PARAM_STRUC(WMI_D0_WOW_ENABLE_DISABLE_CMDID);
+/* Pdev get chip temperature Cmd */
+#define WMITLV_TABLE_WMI_PDEV_GET_TEMPERATURE_CMDID(id,op,buf,len) \
+ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_get_temperature_cmd_fixed_param, wmi_pdev_get_temperature_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
+WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_GET_TEMPERATURE_CMDID);
+
/************************** TLV definitions of WMI events *******************************/
/* Service Ready event */
@@ -2115,6 +2126,11 @@ 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);
+/* 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)
+WMITLV_CREATE_PARAM_STRUC(WMI_DIAG_EVENTID);
+
/* IGTK Offload Event */
#define WMITLV_TABLE_WMI_GTK_OFFLOAD_STATUS_EVENTID(id,op,buf,len)\
WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_WMI_GTK_OFFLOAD_STATUS_EVENT_fixed_param, WMI_GTK_OFFLOAD_STATUS_EVENT_fixed_param, fixed_param, WMITLV_SIZE_FIX)
@@ -2342,6 +2358,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PEER_STATE_EVENTID);
WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_d0_wow_disable_ack_event_fixed_param, wmi_d0_wow_disable_ack_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)
WMITLV_CREATE_PARAM_STRUC(WMI_D0_WOW_DISABLE_ACK_EVENTID);
+/* Pdev get chip temperature event */
+#define WMITLV_TABLE_WMI_PDEV_TEMPERATURE_EVENTID(id,op,buf,len) \
+ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_temperature_event_fixed_param, wmi_pdev_temperature_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)
+WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_TEMPERATURE_EVENTID);
+
#ifdef __cplusplus
}
#endif
diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h
index 7402a59d40b2..10777815896b 100644
--- a/CORE/SERVICES/COMMON/wmi_unified.h
+++ b/CORE/SERVICES/COMMON/wmi_unified.h
@@ -238,6 +238,8 @@ typedef enum {
WMI_PDEV_DUMP_CMDID,
/* set LED configuration */
WMI_PDEV_SET_LED_CONFIG_CMDID,
+ /* Get Current temprature of chip in Celcius degree*/
+ WMI_PDEV_GET_TEMPERATURE_CMDID,
/* VDEV(virtual device) specific commands */
/** vdev create */
@@ -702,6 +704,9 @@ typedef enum {
/** track L1SS entry and residency event */
WMI_PDEV_L1SS_TRACK_EVENTID,
+ /** Report current temprature of the chip in Celcius degree */
+ WMI_PDEV_TEMPERATURE_EVENTID,
+
/* VDEV specific events */
/** VDEV started event in response to VDEV_START request */
WMI_VDEV_START_RESP_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_VDEV),
@@ -870,6 +875,8 @@ typedef enum {
/*update ht/vht info based on vdev (rx and tx NSS and preamble)*/
WMI_UPDATE_VDEV_RATE_STATS_EVENTID,
+ WMI_DIAG_EVENTID,
+
/* GPIO Event */
WMI_GPIO_INPUT_EVENTID=WMI_EVT_GRP_START_ID(WMI_GRP_GPIO),
/** upload H_CV info WMI event
@@ -1813,6 +1820,14 @@ typedef struct {
A_UINT32 vdev_id;
} wmi_scan_event_fixed_param;
+/* WMI Diag event */
+typedef struct {
+ A_UINT32 tlv_header; /* TLV tag and len; tag is WMITLV_TAG_STRUC_wmi_diag_event_fixed_param */
+ A_UINT32 time_stamp; /* Reference timestamp. diag frame contains diff value */
+ A_UINT32 count; /* Number of diag frames added to current event */
+ A_UINT32 dropped;
+ /* followed by WMITLV_TAG_ARRAY_BYTE */
+} wmi_diag_event_fixed_param;
/*
* If FW has multiple active channels due to MCC(multi channel concurrency),
@@ -8593,6 +8608,16 @@ typedef struct {
*/
} wmi_debug_log_config_cmd_fixed_param;
+typedef struct {
+ A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_get_temperature_cmd_fixed_param */
+ A_UINT32 param; /* Reserved for future use */
+} wmi_pdev_get_temperature_cmd_fixed_param;
+
+typedef struct {
+ A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_temperature_event_fixed_param */
+ A_INT32 value; /* temprature value in Celcius degree */
+} wmi_pdev_temperature_event_fixed_param;
+
#ifdef __cplusplus
}
#endif
diff --git a/CORE/SERVICES/COMMON/wmi_version.h b/CORE/SERVICES/COMMON/wmi_version.h
index e3330ce69eb8..9d704fe81922 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_ 61
+#define __WMI_REVISION_ 62
/** 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 bf6e80d1cb7b..69ed21cc80bc 100644
--- a/CORE/SERVICES/WMI/wmi_unified.c
+++ b/CORE/SERVICES/WMI/wmi_unified.c
@@ -583,6 +583,7 @@ static u_int8_t* get_wmi_cmd_string(WMI_CMD_ID wmi_command)
CASE_RETURN_STRING(WMI_EXTWOW_SET_APP_TYPE2_PARAMS_CMDID);
CASE_RETURN_STRING(WMI_UNIT_TEST_CMDID);
CASE_RETURN_STRING(WMI_ROAM_SET_RIC_REQUEST_CMDID);
+ CASE_RETURN_STRING(WMI_PDEV_GET_TEMPERATURE_CMDID);
}
return "Invalid WMI cmd";
}