qcacld-3.0: Add support to request for hardware stats
As part of the vendor extended stats, add API to
request Rx hardware stats for a given vdev id.
Change-Id: I46d73de21724c4c5ebf4a78075b7b2c1d02fe92a
CRs-Fixed: 2605729
diff --git a/Kbuild b/Kbuild
index 48eb306..2206951 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2900,6 +2900,7 @@
cppflags-$(CONFIG_LITHIUM) += -DFEATURE_ALIGN_STATS_FROM_DP
cppflags-$(CONFIG_LITHIUM) += -DDROP_RXDMA_DECRYPT_ERR
cppflags-$(CONFIG_LITHIUM) += -DDP_RX_SPECIAL_FRAME_NEED
+cppflags-$(CONFIG_LITHIUM) += -DFEATURE_STATS_EXT_V2
cppflags-$(CONFIG_VERBOSE_DEBUG) += -DENABLE_VERBOSE_DEBUG
cppflags-$(CONFIG_RX_DESC_DEBUG_CHECK) += -DRX_DESC_DEBUG_CHECK
cppflags-$(CONFIG_REGISTER_OP_DEBUG) += -DHAL_REGISTER_WRITE_DEBUG
diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c
index d7ddd1d..b75f139 100644
--- a/core/hdd/src/wlan_hdd_stats.c
+++ b/core/hdd/src/wlan_hdd_stats.c
@@ -43,6 +43,7 @@
#include "wlan_mlme_ucfg_api.h"
#include "wlan_hdd_sta_info.h"
#include "cdp_txrx_host_stats.h"
+#include "cdp_txrx_misc.h"
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)) && !defined(WITH_BACKPORTS)
#define HDD_INFO_SIGNAL STATION_INFO_SIGNAL
@@ -2888,6 +2889,7 @@
int ret_val;
QDF_STATUS status;
struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
+ ol_txrx_soc_handle soc = cds_get_context(QDF_MODULE_ID_SOC);
hdd_enter_dev(dev);
@@ -2903,10 +2905,19 @@
stats_ext_req.request_data_len = data_len;
stats_ext_req.request_data = (void *)data;
+ status = cdp_request_rx_hw_stats(soc, adapter->vdev_id);
+
+ if (QDF_STATUS_SUCCESS != status) {
+ hdd_err_rl("Failed to get hw stats: %u", status);
+ ret_val = -EINVAL;
+ }
+
status = sme_stats_ext_request(adapter->vdev_id, &stats_ext_req);
- if (QDF_STATUS_SUCCESS != status)
+ if (QDF_STATUS_SUCCESS != status) {
+ hdd_err_rl("Failed to get fw stats: %u", status);
ret_val = -EINVAL;
+ }
return ret_val;
}
diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h
index 3378af7..6501ee7 100644
--- a/core/wma/inc/wma_internal.h
+++ b/core/wma/inc/wma_internal.h
@@ -1235,6 +1235,14 @@
*/
#ifdef WLAN_FEATURE_STATS_EXT
+/**
+ * wma_stats_ext_event_handler() - extended stats event handler
+ * @handle: wma handle
+ * @event_buf: event buffer received from fw
+ * @len: length of data
+ *
+ * Return: 0 for success or error code
+ */
int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf,
uint32_t len);
#endif
@@ -1487,6 +1495,13 @@
pDelPeriodicTxPtrnParams);
#ifdef WLAN_FEATURE_STATS_EXT
+/**
+ * wma_stats_ext_req() - request ext stats from fw
+ * @wma_ptr: wma handle
+ * @preq: stats ext params
+ *
+ * Return: QDF status
+ */
QDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq);
#endif
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index ef7d585..968f883 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -3387,13 +3387,6 @@
}
#ifdef WLAN_FEATURE_STATS_EXT
-/**
- * wma_stats_ext_req() - request ext stats from fw
- * @wma_ptr: wma handle
- * @preq: stats ext params
- *
- * Return: QDF status
- */
QDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq)
{
tp_wma_handle wma = (tp_wma_handle) wma_ptr;
diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c
index 0d0cfeb..aeba829 100644
--- a/core/wma/src/wma_utils.c
+++ b/core/wma/src/wma_utils.c
@@ -64,6 +64,7 @@
#include "host_diag_core_log.h"
#include <wlan_mlme_api.h>
#include <../../core/src/vdev_mgr_ops.h>
+#include "cdp_txrx_misc.h"
/* MCS Based rate table */
/* HT MCS parameters with Nss = 1 */
@@ -655,14 +656,76 @@
}
#ifdef WLAN_FEATURE_STATS_EXT
-/**
- * wma_stats_ext_event_handler() - extended stats event handler
- * @handle: wma handle
- * @event_buf: event buffer received from fw
- * @len: length of data
- *
- * Return: 0 for success or error code
- */
+#ifdef FEATURE_STATS_EXT_V2
+int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf,
+ uint32_t len)
+{
+ WMI_STATS_EXT_EVENTID_param_tlvs *param_buf;
+ tSirStatsExtEvent *stats_ext_event;
+ wmi_stats_ext_event_fixed_param *stats_ext_info;
+ QDF_STATUS status;
+ struct scheduler_msg cds_msg = {0};
+ uint8_t *buf_ptr;
+ uint32_t alloc_len;
+ struct cdp_txrx_ext_stats ext_stats = {0};
+ struct cdp_soc_t *soc_hdl = cds_get_context(QDF_MODULE_ID_SOC);
+
+ wma_debug("%s: Posting stats ext event to SME", __func__);
+
+ param_buf = (WMI_STATS_EXT_EVENTID_param_tlvs *)event_buf;
+ if (!param_buf) {
+ wma_err("%s: Invalid stats ext event buf", __func__);
+ return -EINVAL;
+ }
+
+ stats_ext_info = param_buf->fixed_param;
+ buf_ptr = (uint8_t *)stats_ext_info;
+
+ alloc_len = sizeof(tSirStatsExtEvent);
+ alloc_len += stats_ext_info->data_len;
+ alloc_len += sizeof(struct cdp_txrx_ext_stats);
+
+ if (stats_ext_info->data_len > (WMI_SVC_MSG_MAX_SIZE -
+ WMI_TLV_HDR_SIZE - sizeof(*stats_ext_info)) ||
+ stats_ext_info->data_len > param_buf->num_data) {
+ wma_err("Excess data_len:%d, num_data:%d",
+ stats_ext_info->data_len, param_buf->num_data);
+ return -EINVAL;
+ }
+ stats_ext_event = qdf_mem_malloc(alloc_len);
+ if (!stats_ext_event)
+ return -ENOMEM;
+
+ buf_ptr += sizeof(wmi_stats_ext_event_fixed_param) + WMI_TLV_HDR_SIZE;
+
+ stats_ext_event->vdev_id = stats_ext_info->vdev_id;
+ stats_ext_event->event_data_len = stats_ext_info->data_len;
+ qdf_mem_copy(stats_ext_event->event_data,
+ buf_ptr, stats_ext_event->event_data_len);
+
+ cdp_txrx_ext_stats_request(soc_hdl, OL_TXRX_PDEV_ID, &ext_stats);
+ qdf_mem_copy(stats_ext_event->event_data +
+ stats_ext_event->event_data_len,
+ &ext_stats, sizeof(struct cdp_txrx_ext_stats));
+
+ stats_ext_event->event_data_len += sizeof(struct cdp_txrx_ext_stats);
+
+ cds_msg.type = eWNI_SME_STATS_EXT_EVENT;
+ cds_msg.bodyptr = (void *)stats_ext_event;
+ cds_msg.bodyval = 0;
+
+ status = scheduler_post_message(QDF_MODULE_ID_WMA,
+ QDF_MODULE_ID_SME,
+ QDF_MODULE_ID_SME, &cds_msg);
+ if (status != QDF_STATUS_SUCCESS) {
+ qdf_mem_free(stats_ext_event);
+ return -EFAULT;
+ }
+
+ wma_debug("%s: stats ext event Posted to SME", __func__);
+ return 0;
+}
+#else
int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf,
uint32_t len)
{
@@ -676,14 +739,14 @@
WMA_LOGD("%s: Posting stats ext event to SME", __func__);
- param_buf = (WMI_STATS_EXT_EVENTID_param_tlvs *) event_buf;
+ param_buf = (WMI_STATS_EXT_EVENTID_param_tlvs *)event_buf;
if (!param_buf) {
WMA_LOGE("%s: Invalid stats ext event buf", __func__);
return -EINVAL;
}
stats_ext_info = param_buf->fixed_param;
- buf_ptr = (uint8_t *) stats_ext_info;
+ buf_ptr = (uint8_t *)stats_ext_info;
alloc_len = sizeof(tSirStatsExtEvent);
alloc_len += stats_ext_info->data_len;
@@ -721,9 +784,9 @@
WMA_LOGD("%s: stats ext event Posted to SME", __func__);
return 0;
}
+#endif
#endif /* WLAN_FEATURE_STATS_EXT */
-
/**
* wma_profile_data_report_event_handler() - fw profiling handler
* @handle: wma handle