qcacld-3.0: Parse tx and rx packet per MCS from peer extd stats

Based on the new requirement, fw fills the tx packet counts per mcs
and rx packet count per mcs index in the peer extd stats event.
Add logic to parse tx packet count per mcs and rx packet count per mcs
from peer extd stats event.

Change-Id: I4cd8c1ed5dd6942022d9f930f8de0bcbcb679eb5
CRs-Fixed: 3289683

components/cp_stats/dispatcher/inc/wlan_cp_stats_mc_defs.h

@@ -689,6 +689,10 @@ struct chain_rssi_event {
  * @rx_rate: last used rx bitrate (kbps)
  * @rx_rate_code: last rx rate code (last_rx_rate_code of wmi_peer_stats_info)
  * @peer_rssi_per_chain: the average value of RSSI (dbm) per chain
+ * @num_tx_rate_counts: Num tx rate count for current peer
+ * @num_rx_rate_counts: Num rx rate count for current peer
+ * @tx_pkt_per_mcs: Number of tx packets for each MCS
+ * @rx_pkt_per_mcs: Number of rx packets for each MCS
  */
 struct peer_stats_info_ext_event {
 	struct qdf_mac_addr peer_macaddr;
@@ -705,6 +709,10 @@ struct peer_stats_info_ext_event {
 	uint32_t rx_rate;
 	uint32_t rx_rate_code;
 	int32_t peer_rssi_per_chain[WMI_MAX_CHAINS];
+	uint32_t num_tx_rate_counts;
+	uint32_t num_rx_rate_counts;
+	uint32_t *tx_pkt_per_mcs;
+	uint32_t *rx_pkt_per_mcs;
 };
 
 /**
@@ -794,6 +802,10 @@ struct peer_stats_request_params {
  * @peer_rssi: peer rssi
  * @tx_succeed: tx succeed MPDU
  * @peer_rssi_per_chain: peer rssi per chain
+ * @num_tx_rate_counts: Num tx rate count for current peer
+ * @num_rx_rate_counts: Num rx rate count for current peer
+ * @tx_pkt_per_mcs: Number of tx rate counts for each MCS
+ * @rx_pkt_per_mcs: Number of rx rate counts for each MCS
  */
 typedef struct {
 	struct qdf_mac_addr peer_macaddr;
@@ -810,6 +822,10 @@ typedef struct {
 	int32_t peer_rssi;
 	uint32_t tx_succeed;
 	int32_t peer_rssi_per_chain[WMI_MAX_CHAINS];
+	uint32_t num_tx_rate_counts;
+	uint32_t num_rx_rate_counts;
+	uint32_t *tx_pkt_per_mcs;
+	uint32_t *rx_pkt_per_mcs;
 } wmi_host_peer_stats_info;
 
 #endif /* __WLAN_CP_STATS_MC_DEFS_H__ */

components/cp_stats/dispatcher/src/wlan_cp_stats_mc_ucfg_api.c

@@ -939,6 +939,28 @@ QDF_STATUS ucfg_mc_cp_stats_get_pending_req(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_SUCCESS;
 }
 
+/**
+ * ucfg_mc_cp_stats_free_peer_stats_info_ext() - API to free peer stats info ext
+ * structure
+ * @ev: structure from where peer stats info ext needs to be freed
+ *
+ * Return: none
+ */
+static void ucfg_mc_cp_stats_free_peer_stats_info_ext(struct stats_event *ev)
+{
+	struct peer_stats_info_ext_event *peer_stats_info =
+							ev->peer_stats_info_ext;
+	uint16_t i;
+
+	for (i = 0; i < ev->num_peer_stats_info_ext; i++) {
+		qdf_mem_free(peer_stats_info->tx_pkt_per_mcs);
+		qdf_mem_free(peer_stats_info->rx_pkt_per_mcs);
+		peer_stats_info++;
+	}
+
+	qdf_mem_free(ev->peer_stats_info_ext);
+}
+
 void ucfg_mc_cp_stats_free_stats_resources(struct stats_event *ev)
 {
 	if (!ev)
@@ -952,7 +974,7 @@ void ucfg_mc_cp_stats_free_stats_resources(struct stats_event *ev)
 	qdf_mem_free(ev->vdev_summary_stats);
 	qdf_mem_free(ev->vdev_chain_rssi);
 	qdf_mem_free(ev->peer_extended_stats);
-	qdf_mem_free(ev->peer_stats_info_ext);
+	ucfg_mc_cp_stats_free_peer_stats_info_ext(ev);
 	qdf_mem_zero(ev, sizeof(*ev));
 }
 

components/target_if/cp_stats/src/target_if_mc_cp_stats.c

@@ -336,6 +336,33 @@ static void target_if_cp_stats_free_mib_stats(struct stats_event *ev)
 {
 }
 #endif
+
+/**
+ * target_if_cp_stats_free_peer_stats_info_ext() - API to free peer stats
+ * info ext structure
+ * @ev: structure from where peer stats info ext needs to be freed
+ *
+ * Return: none
+ */
+static void target_if_cp_stats_free_peer_stats_info_ext(struct stats_event *ev)
+{
+	struct peer_stats_info_ext_event *peer_stats_info =
+							ev->peer_stats_info_ext;
+	uint16_t i;
+
+	for (i = 0; i < ev->num_peer_stats_info_ext; i++) {
+		qdf_mem_free(peer_stats_info->tx_pkt_per_mcs);
+		peer_stats_info->tx_pkt_per_mcs = NULL;
+		qdf_mem_free(peer_stats_info->rx_pkt_per_mcs);
+		peer_stats_info->rx_pkt_per_mcs = NULL;
+		peer_stats_info++;
+	}
+
+	qdf_mem_free(ev->peer_stats_info_ext);
+	ev->peer_stats_info_ext = NULL;
+	ev->num_peer_stats_info_ext = 0;
+}
+
 static void target_if_cp_stats_free_stats_event(struct stats_event *ev)
 {
 	qdf_mem_free(ev->pdev_stats);
@@ -355,8 +382,7 @@ static void target_if_cp_stats_free_stats_event(struct stats_event *ev)
 	qdf_mem_free(ev->vdev_chain_rssi);
 	ev->vdev_chain_rssi = NULL;
 	target_if_cp_stats_free_mib_stats(ev);
-	qdf_mem_free(ev->peer_stats_info_ext);
-	ev->peer_stats_info_ext = NULL;
+	target_if_cp_stats_free_peer_stats_info_ext(ev);
 }
 
 static QDF_STATUS target_if_cp_stats_extract_pdev_stats(
@@ -1067,6 +1093,7 @@ target_if_cp_stats_extract_peer_stats_event(struct wmi_unified *wmi_hdl,
 	wmi_host_peer_stats_info stats_info;
 	uint32_t peer_stats_info_size;
 	int i, j;
+	uint32_t tx_rate_count_idx = 0, rx_rate_count_idx = 0;
 
 	status = wmi_extract_peer_stats_param(wmi_hdl, data, &stats_param);
 	if (QDF_IS_STATUS_ERROR(status)) {
@@ -1095,9 +1122,7 @@ target_if_cp_stats_extract_peer_stats_event(struct wmi_unified *wmi_hdl,
 		if (QDF_IS_STATUS_ERROR(status)) {
 			cp_stats_err("peer stats info extract failed: %d",
 				     status);
-			qdf_mem_free(ev->peer_stats_info_ext);
-			ev->peer_stats_info_ext = NULL;
-			ev->num_peer_stats_info_ext = 0;
+			target_if_cp_stats_free_peer_stats_info_ext(ev);
 			return status;
 		}
 		qdf_mem_copy(&peer_stats_info->peer_macaddr,
@@ -1118,6 +1143,45 @@ target_if_cp_stats_extract_peer_stats_event(struct wmi_unified *wmi_hdl,
 		for (j = 0; j < WMI_MAX_CHAINS; j++)
 			peer_stats_info->peer_rssi_per_chain[j] =
 					      stats_info.peer_rssi_per_chain[j];
+
+		if (stats_info.num_tx_rate_counts) {
+			peer_stats_info->num_tx_rate_counts =
+						stats_info.num_tx_rate_counts;
+			status = wmi_extract_peer_tx_pkt_per_mcs(
+							wmi_hdl, data,
+							tx_rate_count_idx,
+							&stats_info);
+			if (QDF_IS_STATUS_ERROR(status)) {
+				wmi_err("tx rate count extract failed");
+				target_if_cp_stats_free_peer_stats_info_ext(ev);
+				return status;
+			}
+			tx_rate_count_idx +=
+					peer_stats_info->num_tx_rate_counts;
+
+			peer_stats_info->tx_pkt_per_mcs =
+						stats_info.tx_pkt_per_mcs;
+			stats_info.tx_pkt_per_mcs = NULL;
+		}
+		if (stats_info.num_rx_rate_counts) {
+			peer_stats_info->num_rx_rate_counts =
+						stats_info.num_rx_rate_counts;
+			status = wmi_extract_peer_rx_pkt_per_mcs(
+							wmi_hdl, data,
+							rx_rate_count_idx,
+							&stats_info);
+			if (QDF_IS_STATUS_ERROR(status)) {
+				wmi_err("rx rate count extract failed");
+				target_if_cp_stats_free_peer_stats_info_ext(ev);
+				return status;
+			}
+			rx_rate_count_idx +=
+					peer_stats_info->num_rx_rate_counts;
+
+			peer_stats_info->rx_pkt_per_mcs =
+						stats_info.rx_pkt_per_mcs;
+			stats_info.rx_pkt_per_mcs = NULL;
+		}
 		peer_stats_info++;
 	}
 

components/wmi/inc/wmi_unified_mc_cp_stats_api.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -98,6 +99,36 @@ wmi_extract_peer_stats_info(wmi_unified_t wmi_handle, void *evt_buf,
 			    uint32_t index,
 			    wmi_host_peer_stats_info *peer_stats_info);
 
+/**
+ * wmi_extract_peer_tx_pkt_per_mcs() - extract peer tx packets per MCS
+ * from event
+ * @wmi_handle: wmi handle
+ * @evt_buf: pointer to event buffer
+ * @index: Index to tx packets per MCS for current peer
+ * @peer_stats_info: Pointer to hold peer stats info
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
+QDF_STATUS
+wmi_extract_peer_tx_pkt_per_mcs(wmi_unified_t wmi_handle, void *evt_buf,
+				uint32_t index,
+				wmi_host_peer_stats_info *peer_stats_info);
+
+/**
+ * wmi_extract_peer_rx_pkt_per_mcs() - extract peer rx packets per MCS
+ * from event
+ * @wmi_handle: wmi handle
+ * @evt_buf: pointer to event buffer
+ * @index: Index to tx rate count for current peer
+ * @peer_stats_info: Pointer to hold peer stats info
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
+QDF_STATUS
+wmi_extract_peer_rx_pkt_per_mcs(wmi_unified_t wmi_handle, void *evt_buf,
+				uint32_t index,
+				wmi_host_peer_stats_info *peer_stats_info);
+
 #ifdef WLAN_FEATURE_BIG_DATA_STATS
 /**
  * wmi_extract_big_data_stats_param() - extract big data statsfrom event

components/wmi/src/wmi_unified_mc_cp_stats_api.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -79,6 +80,30 @@ wmi_extract_peer_stats_param(wmi_unified_t wmi_handle, void *evt_buf,
 	return QDF_STATUS_E_FAILURE;
 }
 
+QDF_STATUS
+wmi_extract_peer_tx_pkt_per_mcs(wmi_unified_t wmi_handle, void *evt_buf,
+				uint32_t index,
+				wmi_host_peer_stats_info *peer_stats_info)
+{
+	if (wmi_handle->ops->extract_peer_tx_pkt_per_mcs)
+		return wmi_handle->ops->extract_peer_tx_pkt_per_mcs(wmi_handle,
+				evt_buf, index, peer_stats_info);
+
+	return QDF_STATUS_E_FAILURE;
+}
+
+QDF_STATUS
+wmi_extract_peer_rx_pkt_per_mcs(wmi_unified_t wmi_handle, void *evt_buf,
+				uint32_t index,
+				wmi_host_peer_stats_info *peer_stats_info)
+{
+	if (wmi_handle->ops->extract_peer_rx_pkt_per_mcs)
+		return wmi_handle->ops->extract_peer_rx_pkt_per_mcs(wmi_handle,
+				evt_buf, index, peer_stats_info);
+
+	return QDF_STATUS_E_FAILURE;
+}
+
 QDF_STATUS
 wmi_extract_peer_stats_info(wmi_unified_t wmi_handle, void *evt_buf,
 			    uint32_t index,

components/wmi/src/wmi_unified_mc_cp_stats_tlv.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -370,6 +371,94 @@ static void dump_peer_stats_info(wmi_peer_stats_info *stats)
 		wmi_debug("chain%d_rssi %d", i, stats->peer_rssi_per_chain[i]);
 }
 
+/**
+ * extract_peer_tx_pkt_per_mcs_tlv() - extract peer tx packets per MCS
+ * from event
+ * @wmi_handle: wmi handle
+ * @evt_buf: pointer to event buffer
+ * @index: Index into vdev stats
+ * @peer_stats_info: Pointer to hold peer stats info
+ *
+ * Return: QDF_STATUS_SUCCESS for success or error code
+ */
+static QDF_STATUS
+extract_peer_tx_pkt_per_mcs_tlv(wmi_unified_t wmi_handle, void *evt_buf,
+				uint32_t index,
+				wmi_host_peer_stats_info *peer_stats_info)
+{
+	WMI_PEER_STATS_INFO_EVENTID_param_tlvs *param_buf;
+	int i, j;
+
+	param_buf = (WMI_PEER_STATS_INFO_EVENTID_param_tlvs *)evt_buf;
+
+	if (index + peer_stats_info->num_tx_rate_counts <=
+					param_buf->num_tx_rate_counts) {
+		peer_stats_info->tx_pkt_per_mcs =
+			qdf_mem_malloc(
+			peer_stats_info->num_tx_rate_counts * sizeof(uint32_t));
+
+		if (!peer_stats_info->tx_pkt_per_mcs)
+			return QDF_STATUS_E_NOMEM;
+		wmi_debug("Tx rate counts");
+		for (j = 0, i = index; j < peer_stats_info->num_tx_rate_counts;
+		     j++, i++) {
+			peer_stats_info->tx_pkt_per_mcs[j] =
+						param_buf->tx_rate_counts[i];
+			wmi_nofl_debug("MCS [%d] %d", j,
+				       peer_stats_info->tx_pkt_per_mcs[j]);
+		}
+	} else {
+		wmi_err("invalid idx %d curr peer tx_rate_counts %d total tx_rate_count %d",
+			index, peer_stats_info->num_tx_rate_counts,
+			param_buf->num_tx_rate_counts);
+	}
+	return QDF_STATUS_SUCCESS;
+}
+
+/**
+ * extract_peer_rx_pkt_per_mcs_tlv() - extract peer rx rpackets per MCS
+ * from event
+ * @wmi_handle: wmi handle
+ * @evt_buf: pointer to event buffer
+ * @index: Index into vdev stats
+ * @peer_stats_info: Pointer to hold peer stats info
+ *
+ * Return: QDF_STATUS_SUCCESS for success or error code
+ */
+static QDF_STATUS
+extract_peer_rx_pkt_per_mcs_tlv(wmi_unified_t wmi_handle, void *evt_buf,
+				uint32_t index,
+				wmi_host_peer_stats_info *peer_stats_info)
+{
+	WMI_PEER_STATS_INFO_EVENTID_param_tlvs *param_buf;
+	int i, j;
+
+	param_buf = (WMI_PEER_STATS_INFO_EVENTID_param_tlvs *)evt_buf;
+
+	if (index + peer_stats_info->num_rx_rate_counts <=
+					param_buf->num_rx_rate_counts) {
+		peer_stats_info->rx_pkt_per_mcs =
+			qdf_mem_malloc(
+			peer_stats_info->num_rx_rate_counts * sizeof(uint32_t));
+
+		if (!peer_stats_info->rx_pkt_per_mcs)
+			return QDF_STATUS_E_NOMEM;
+		wmi_debug("Rx rate counts");
+		for (j = 0, i = index; j < peer_stats_info->num_rx_rate_counts;
+		     j++, i++) {
+			peer_stats_info->rx_pkt_per_mcs[j] =
+						param_buf->rx_rate_counts[i];
+			wmi_nofl_debug("MCS [%d] %d", j,
+				       peer_stats_info->rx_pkt_per_mcs[j]);
+		}
+	} else {
+		wmi_err("invalid idx %d curr peer rx_rate_counts %d total rx_rate_count %d",
+			index, peer_stats_info->num_rx_rate_counts,
+			param_buf->num_rx_rate_counts);
+	}
+	return QDF_STATUS_SUCCESS;
+}
+
 /**
  * extract_peer_stats_info_tlv() - extract peer stats info from event
  * @wmi_handle: wmi handle
@@ -419,6 +508,8 @@ extract_peer_stats_info_tlv(wmi_unified_t wmi_handle, void *evt_buf,
 		for (i = 0; i < WMI_MAX_CHAINS; i++)
 			peer_stats_info->peer_rssi_per_chain[i] =
 						     ev->peer_rssi_per_chain[i];
+		peer_stats_info->num_tx_rate_counts = ev->num_tx_rate_counts;
+		peer_stats_info->num_rx_rate_counts = ev->num_rx_rate_counts;
 	}
 
 	return QDF_STATUS_SUCCESS;
@@ -497,5 +588,9 @@ void wmi_mc_cp_stats_attach_tlv(wmi_unified_t wmi_handle)
 		send_request_peer_stats_info_cmd_tlv;
 	ops->extract_peer_stats_count = extract_peer_stats_count_tlv;
 	ops->extract_peer_stats_info = extract_peer_stats_info_tlv;
+	wmi_handle->ops->extract_peer_tx_pkt_per_mcs =
+					extract_peer_tx_pkt_per_mcs_tlv;
+	wmi_handle->ops->extract_peer_rx_pkt_per_mcs =
+					extract_peer_rx_pkt_per_mcs_tlv;
 	wmi_attach_big_data_stats_handler(ops);
 }

os_if/cp_stats/src/wlan_cfg80211_mc_cp_stats.c

@@ -106,6 +106,37 @@ void wlan_cfg80211_mc_infra_cp_stats_dealloc(void *priv)
 }
 #endif /* WLAN_SUPPORT_INFRA_CTRL_PATH_STATS */
 
+/**
+ * wlan_cfg80211_mc_cp_stats_free_peer_stats_info_ext() - API to free peer stats
+ * info ext structure
+ * @ev: structure from where peer stats info ext needs to be freed
+ *
+ * Return: none
+ */
+static void wlan_cfg80211_mc_cp_stats_free_peer_stats_info_ext(
+							struct stats_event *ev)
+{
+	struct peer_stats_info_ext_event *peer_stats_info =
+							ev->peer_stats_info_ext;
+	uint16_t i;
+
+	if (!ev->peer_stats_info_ext) {
+		ev->num_peer_stats_info_ext = 0;
+		return;
+	}
+	for (i = 0; i < ev->num_peer_stats_info_ext; i++) {
+		qdf_mem_free(peer_stats_info->tx_pkt_per_mcs);
+		peer_stats_info->tx_pkt_per_mcs = NULL;
+		qdf_mem_free(peer_stats_info->rx_pkt_per_mcs);
+		peer_stats_info->tx_pkt_per_mcs = NULL;
+		peer_stats_info++;
+	}
+
+	qdf_mem_free(ev->peer_stats_info_ext);
+	ev->peer_stats_info_ext = NULL;
+	ev->num_peer_stats_info_ext = 0;
+}
+
 /**
  * wlan_cfg80211_mc_cp_stats_dealloc() - callback to free priv
  * allocations for stats
@@ -129,7 +160,7 @@ static void wlan_cfg80211_mc_cp_stats_dealloc(void *priv)
 	qdf_mem_free(stats->vdev_summary_stats);
 	qdf_mem_free(stats->vdev_chain_rssi);
 	qdf_mem_free(stats->peer_adv_stats);
-	qdf_mem_free(stats->peer_stats_info_ext);
+	wlan_cfg80211_mc_cp_stats_free_peer_stats_info_ext(stats);
 	wlan_free_mib_stats(stats);
 }
 
@@ -1549,7 +1580,7 @@ void wlan_cfg80211_mc_cp_stats_free_stats_event(struct stats_event *stats)
 	qdf_mem_free(stats->vdev_chain_rssi);
 	qdf_mem_free(stats->peer_adv_stats);
 	wlan_free_mib_stats(stats);
-	qdf_mem_free(stats->peer_stats_info_ext);
+	wlan_cfg80211_mc_cp_stats_free_peer_stats_info_ext(stats);
 	qdf_mem_free(stats);
 }