qcacld-3.0: CL 1448844 update fw common interface files

WMI handle changes to incorporate ini changes to enable/disable collection of MIB stats
WMI interface change for scan suspend

Change-Id: Icdcca16827af85e6b694dcd7ad0be2b4d0d8ac45
CRs-fixed: 865207

core/wmi/wmi_unified.c

@@ -756,6 +756,7 @@ static uint8_t *get_wmi_cmd_string(WMI_CMD_ID wmi_command)
 		CASE_RETURN_STRING(WMI_PDEV_SET_CTL_TABLE_CMDID);
 		CASE_RETURN_STRING(WMI_PDEV_SET_MIMOGAIN_TABLE_CMDID);
 		CASE_RETURN_STRING(WMI_PDEV_GET_TPC_CMDID);
+		CASE_RETURN_STRING(WMI_MIB_STATS_ENABLE_CMDID);
 		CASE_RETURN_STRING(WMI_PDEV_GET_ANI_CCK_CONFIG_CMDID);
 		CASE_RETURN_STRING(WMI_PDEV_GET_ANI_OFDM_CONFIG_CMDID);
 		CASE_RETURN_STRING(WMI_VDEV_RATEMASK_CMDID);

target/inc/wmi_tlv_defs.h

@@ -658,6 +658,7 @@ typedef enum {
 	WMITLV_TAG_STRUC_wmi_mu_report_total_mu,
 	WMITLV_TAG_STRUC_wmi_vdev_set_dscp_tid_map_cmd_fixed_param,
 	WMITLV_TAG_STRUC_wmi_roam_set_mbo_fixed_param,
+	WMITLV_TAG_STRUC_wmi_mib_stats_enable_cmd_fixed_param,
 
 } WMITLV_TAG_ID;
 
@@ -924,8 +925,8 @@ typedef enum {
 	OP(WMI_PEER_ATF_REQUEST_CMDID) \
 	OP(WMI_FWTEST_CMDID) \
 	OP(WMI_QBOOST_CFG_CMDID) \
-	OP(WMI_ROAM_SET_MBO_PARAM_CMDID)
-
+	OP(WMI_ROAM_SET_MBO_PARAM_CMDID) \
+	OP(WMI_MIB_STATS_ENABLE_CMDID)
 /*
  * IMPORTANT: Please add _ALL_ WMI Events Here.
  * Otherwise, these WMI TLV Functions will be process them.
@@ -1798,6 +1799,12 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_GET_TPC_CONFIG_CMDID);
 
 WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_BASE_MACADDR_CMDID);
 
+/* MIB Stats*/
+#define WMITLV_TABLE_WMI_MIB_STATS_ENABLE_CMDID(id, op, buf, len) \
+	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_mib_stats_enable_cmd_fixed_param, wmi_mib_stats_enable_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
+
+WMITLV_CREATE_PARAM_STRUC(WMI_MIB_STATS_ENABLE_CMDID);
+
 /* Peer multicast group Cmd */
 #define WMITLV_TABLE_WMI_PEER_MCAST_GROUP_CMDID(id,op,buf,len) \
 	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_mcast_group_cmd_fixed_param, wmi_peer_mcast_group_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)

target/inc/wmi_unified.h

@@ -323,6 +323,8 @@ typedef enum {
 	WMI_PDEV_GET_NFCAL_POWER_CMDID,
 	/** TxPPDU TPC */
 	WMI_PDEV_GET_TPC_CMDID,
+	/* Set to enable MIB stats collection */
+	WMI_MIB_STATS_ENABLE_CMDID,
 
 	/* VDEV(virtual device) specific commands */
 	/** vdev create */
@@ -2508,6 +2510,8 @@ enum wmi_scan_event_type {
 	WMI_SCAN_EVENT_START_FAILED = 0x40,             /* scan start failed */
 	WMI_SCAN_EVENT_RESTARTED = 0x80,                /* scan restarted */
 	WMI_SCAN_EVENT_FOREIGN_CHANNEL_EXIT = 0x100,
+	WMI_SCAN_EVENT_SUSPENDED = 0x200, /* scan request is suspended */
+	WMI_SCAN_EVENT_RESUMED = 0x400,   /* scan request is resumed */
 	WMI_SCAN_EVENT_MAX = 0x8000
 };
 
@@ -2519,6 +2523,7 @@ enum wmi_scan_completion_reason {
 	WMI_SCAN_REASON_PREEMPTED = 2,
 	WMI_SCAN_REASON_TIMEDOUT = 3,
 	WMI_SCAN_REASON_INTERNAL_FAILURE = 4,           /* This reason indication failures when performaing scan */
+	WMI_SCAN_REASON_SUSPENDED = 5,
 	WMI_SCAN_REASON_MAX,
 };
 
@@ -3674,6 +3679,23 @@ typedef struct {
 	A_UINT32 reserved0;
 } wmi_pdev_pktlog_disable_cmd_fixed_param;
 
+typedef struct {
+	/*
+	 * TLV tag and len; tag equals
+	 * WMITLV_TAG_STRUC_wmi_mib_stats_enable_cmd_fixed_param
+	 */
+	A_UINT32 tlv_header;
+	/** placeholder for pdev_id of multiple MAC products.  Init. to 0. */
+	A_UINT32 reserved0;
+	/*
+	 * enable for mib stats collection.
+	 * Stats are delivered to host in wmi_mib_stats structure.
+	 * If enable_Mib=1, stats collection is enabled.
+	 * If enable_Mib=0, stats collection does not happen
+	 */
+	A_UINT32 enable_Mib;
+} wmi_mib_stats_enable_cmd_fixed_param;
+
 /** Customize the DSCP (bit) to TID (0-7) mapping for QOS.
  *  NOTE: This constant cannot be changed without breaking
  *  WMI Compatibility. */
@@ -3829,6 +3851,7 @@ typedef enum {
 	WMI_REQUEST_BCNFLT_STAT = 0x10,
 	WMI_REQUEST_VDEV_RATE_STAT = 0x20,
 	WMI_REQUEST_INST_STAT  = 0x40,
+	WMI_REQUEST_MIB_STAT       = 0x80,
 } wmi_stats_id;
 
 typedef struct {
@@ -4332,6 +4355,8 @@ typedef struct {
 	A_UINT32 num_bcnflt_stats;
 	/** number of chan stats event structures  (wmi_chan_stats) 0 to MAX MCC CHANS */
 	A_UINT32 num_chan_stats;
+	/** number of MIB stats event structures (wmi_mib_stats) */
+	A_UINT32 num_mib_stats;
 	/* This TLV is followed by another TLV of array of bytes
 	 *   A_UINT8 data[];
 	 *  This data array contains
@@ -4340,6 +4365,7 @@ typedef struct {
 	 *   num_peer_stats * size of(struct wmi_peer_stats)
 	 *   num_bcnflt_stats * size_of()
 	 *   num_chan_stats * size of(struct wmi_chan_stats)
+	 *   num_mib_stats * size of(struct wmi_mib_stats)
 	 *
 	 */
 } wmi_stats_event_fixed_param;
@@ -4429,6 +4455,63 @@ typedef struct {
 	A_UINT32 rx_duration_us;
 } wmi_chan_stats;
 
+typedef struct {
+	A_UINT32 tx_mpdu_grp_frag_cnt;       /*dot11TransmittedFragmentCount */
+	A_UINT32 tx_msdu_grp_frm_cnt;        /*dot11GroupTransmittedFrameCount */
+	A_UINT32 tx_msdu_fail_cnt;           /*dot11FailedCount*/
+	A_UINT32 rx_mpdu_frag_cnt;           /*dot11ReceivedFragmentCount*/
+	A_UINT32 rx_msdu_grp_frm_cnt;        /*dot11GroupReceivedFrameCount*/
+	A_UINT32 rx_mpdu_fcs_err;            /*dot11FCSErrorCount*/
+	A_UINT32 tx_msdu_frm_cnt;            /*dot11TransmittedFrameCount*/
+	A_UINT32 tx_msdu_retry_cnt;          /*dot11RetryCount*/
+	A_UINT32 rx_frm_dup_cnt;             /*dot11FrameDuplicateCount */
+	A_UINT32 tx_rts_success_cnt;         /*dot11RTSSuccessCount*/
+	A_UINT32 tx_rts_fail_cnt;            /*dot11RTSFailureCount*/
+	/*dot11QosTransmittedFragmentCount */
+	A_UINT32 tx_Qos_mpdu_grp_frag_cnt;
+	A_UINT32 tx_Qos_msdu_fail_UP;        /*dot11QosFailedCount */
+	A_UINT32 tx_Qos_msdu_retry_UP;       /*dot11QosRetryCount */
+	A_UINT32 rx_Qos_frm_dup_cnt_UP;      /*dot11QosFrameDuplicateCount*/
+	A_UINT32 tx_Qos_rts_success_cnt_UP;  /*dot11QosRTSSuccessCount*/
+	A_UINT32 tx_Qos_rts_fail_cnt_UP;     /*dot11QosRTSFailureCount*/
+	A_UINT32 rx_Qos_mpdu_frag_cnt_UP;    /*dot11QosReceivedFragmentCount*/
+	A_UINT32 tx_Qos_msdu_frm_cnt_UP;     /*dot11QosTransmittedFrameCount*/
+	A_UINT32 rx_Qos_msdu_discard_cnt_UP; /*dot11QosDiscardedFrameCount*/
+	A_UINT32 rx_Qos_mpdu_cnt;            /*dot11QosMPDUsReceivedCount*/
+	A_UINT32 rx_Qos_mpdu_retryBit_cnt;   /*dot11QosRetriesReceivedCount*/
+	/*dot11RSNAStatsRobustMgmtCCMPReplays */
+	A_UINT32 rsna_Mgmt_discard_CCMP_replay_err_cnt;
+	A_UINT32 rsna_TKIP_icv_err_cnt;      /*dot11RSNAStatsTKIPICVErrors*/
+	A_UINT32 rsna_TKIP_replay_err_cnt;   /*dot11RSNAStatsTKIPReplays*/
+	/*dot11RSNAStatsCCMPDecryptErrors */
+	A_UINT32 rsna_CCMP_decrypt_err_cnt;
+	A_UINT32 rsna_CCMP_replay_err_cnt;   /*dot11RSNAStatsCCMPReplays*/
+	A_UINT32 tx_ampdu_cnt;               /*dot11TransmittedAMPDUCount*/
+	/*dot11TransmittedMPDUsInAMPDUCount*/
+	A_UINT32 tx_mpdu_cnt_in_ampdu;
+	/*dot11TransmittedOctetsInAMPDUCount*/
+	union {
+		A_UINT64 counter; /* for use by target only */
+		struct {
+			A_UINT32 low;
+			A_UINT32 high;
+		} upload; /* for use by host */
+	} tx_octets_in_ampdu;
+	A_UINT32 rx_ampdu_cnt;               /*dot11AMPDUReceivedCount*/
+	A_UINT32 rx_mpdu_cnt_in_ampdu;       /*dot11MPDUInReceivedAMPDUCount*/
+	union {
+		A_UINT64 counter; /* for use by target only */
+		struct {
+			A_UINT32 rx_octets_in_ampdu_low;
+			A_UINT32 rx_octets_in_ampdu_high;
+		} upload; /* for use by host */
+	} rx_octets_in_ampdu;                /*dot11ReceivedOctetsInAMPDUCount*/
+	A_UINT32 reserved_1;
+	A_UINT32 reserved_2;
+	A_UINT32 reserved_3;
+	A_UINT32 reserved_4;
+} wmi_mib_stats;
+
 typedef struct {
 	A_UINT32 tlv_header;
 	/** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_vdev_create_cmd_fixed_param */

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_ 200
+#define __WMI_REVISION_ 202
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work