qcacmn: Add support for RF characterization WMI event

Add support to read the RF characterization WMI event
and parse each individual TLV containing the channel's
center frequency, bandwidth and RF characterization
metric.

Also, remove the support for reading the RF
characterization metrics from the extended
service ready WMI event.

Change-Id: I560583f9304005282c09a27f47c8d5c2778b1645
CRs-Fixed: 2487415

target_if/core/src/target_if_main.c

@@ -577,7 +577,6 @@ QDF_STATUS target_if_free_psoc_tgt_info(struct wlan_objmgr_psoc *psoc)
 		return QDF_STATUS_E_INVAL;
 	}
 	init_deinit_chainmask_table_free(ext_param);
-	init_deinit_rf_characterization_entries_free(ext_param);
 	init_deinit_dbr_ring_cap_free(tgt_psoc_info);
 	init_deinit_spectral_scaling_params_free(tgt_psoc_info);
 

target_if/init_deinit/inc/service_ready_param.h

@@ -289,20 +289,6 @@ struct wlan_psoc_host_chainmask_table {
 	struct wlan_psoc_host_chainmask_capabilities *cap_list;
 };
 
-#ifdef WLAN_SUPPORT_RF_CHARACTERIZATION
-/**
- * struct wlan_psoc_host_rf_characterization_entry - rf characterization table
- * @freq: center frequency of primary channel
- * @bw: bandwidth of primary channel
- * @chan_metric: primary channel-specific metric
- */
-struct wlan_psoc_host_rf_characterization_entry {
-	uint16_t freq;
-	wmi_host_channel_width bw;
-	uint8_t chan_metric;
-};
-#endif
-
 /**
  * struct wlan_psoc_host_service_ext_param - EXT service base params in event
  * @default_conc_scan_config_bits: Default concurrenct scan config
@@ -322,8 +308,6 @@ struct wlan_psoc_host_rf_characterization_entry {
  * @max_bssid_indicator: Maximum number of VAPs in MBSS IE
  * @num_bin_scaling_params: Number of Spectral bin scaling parameters
  * @chainmask_table: Available chain mask tables.
- * @num_rf_characterization_entries: Number of RF characterization info entries
- * @rf_characterization_entries: Channel RF characterization information entries
  * @sar_version: SAR version info
  */
 struct wlan_psoc_host_service_ext_param {
@@ -342,11 +326,6 @@ struct wlan_psoc_host_service_ext_param {
 	uint32_t num_bin_scaling_params;
 	struct wlan_psoc_host_chainmask_table
 		chainmask_table[PSOC_MAX_CHAINMASK_TABLES];
-#ifdef WLAN_SUPPORT_RF_CHARACTERIZATION
-	uint32_t num_rf_characterization_entries;
-	struct wlan_psoc_host_rf_characterization_entry
-		*rf_characterization_entries;
-#endif
 	uint32_t sar_version;
 };
 

target_if/init_deinit/inc/service_ready_util.h

@@ -27,51 +27,6 @@
 #include "service_ready_param.h"
 #include "target_if.h"
 
-#ifdef WLAN_SUPPORT_RF_CHARACTERIZATION
-/**
- * init_deinit_populate_rf_characterization_entries()
- *	- allocates space for and populates the RF characterization information
- * @handle: WMI handle pointer
- * @evt: event buffer received from FW
- * @service_ext_param: pointer to server ext param
- *
- * Allocates space for and populates the RF characterization information
- *
- * Return: QDF Status
- */
-QDF_STATUS init_deinit_populate_rf_characterization_entries(
-		wmi_unified_t handle,
-		uint8_t *evt,
-		struct wlan_psoc_host_service_ext_param *service_ext_par);
-
-/**
- * init_deinit_rf_characterization_entries_free()
- *	- free RF characterization information
- * @service_ext_param: pointer to server ext param
- *
- * Frees RF characterization information
- *
- * Return: QDF Status
- */
-QDF_STATUS init_deinit_rf_characterization_entries_free(
-		struct wlan_psoc_host_service_ext_param *service_ext_par);
-#else
-static inline
-QDF_STATUS init_deinit_populate_rf_characterization_entries(
-		wmi_unified_t handle, uint8_t *evt,
-		struct wlan_psoc_host_service_ext_param *ser_ext_par)
-{
-	return QDF_STATUS_SUCCESS;
-}
-
-static inline
-QDF_STATUS init_deinit_rf_characterization_entries_free(
-		struct wlan_psoc_host_service_ext_param *ser_ext_par)
-{
-	return QDF_STATUS_SUCCESS;
-}
-#endif
-
 /**
  * init_deinit_chainmask_table_alloc()
  *	- allocate chainmask table capability list.

target_if/init_deinit/src/init_event_handler.c

@@ -268,13 +268,6 @@ static int init_deinit_service_ext_ready_event_handler(ol_scn_t scn_handle,
 			goto exit;
 	}
 
-	err_code = init_deinit_populate_rf_characterization_entries(
-						wmi_handle,
-						event,
-						&info->service_ext_param);
-	if (err_code)
-		goto exit;
-
 	err_code = init_deinit_populate_dbr_ring_cap(psoc, wmi_handle,
 						event, info);
 	if (err_code)

target_if/init_deinit/src/service_ready_util.c

@@ -26,51 +26,6 @@
 #include <target_type.h>
 #include <qdf_module.h>
 
-#ifdef WLAN_SUPPORT_RF_CHARACTERIZATION
-QDF_STATUS init_deinit_populate_rf_characterization_entries(
-		wmi_unified_t handle, uint8_t *evt,
-		struct wlan_psoc_host_service_ext_param *ser_ext_par)
-{
-	uint32_t alloc_size;
-	QDF_STATUS status = QDF_STATUS_SUCCESS;
-
-	if (ser_ext_par->num_rf_characterization_entries == 0)
-		return QDF_STATUS_SUCCESS;
-
-	alloc_size = (sizeof(struct wlan_psoc_host_rf_characterization_entry) *
-				ser_ext_par->num_rf_characterization_entries);
-
-	ser_ext_par->rf_characterization_entries = qdf_mem_malloc(alloc_size);
-	if (!ser_ext_par->rf_characterization_entries) {
-		init_deinit_rf_characterization_entries_free(ser_ext_par);
-		return QDF_STATUS_E_NOMEM;
-	}
-
-	status = wmi_extract_rf_characterization_entries(handle, evt,
-				ser_ext_par->rf_characterization_entries);
-	if (QDF_IS_STATUS_ERROR(status)) {
-		target_if_err("failed to parse wmi service ready ext param");
-		init_deinit_rf_characterization_entries_free(ser_ext_par);
-	}
-
-	return status;
-}
-
-qdf_export_symbol(init_deinit_populate_rf_characterization_entries);
-
-QDF_STATUS init_deinit_rf_characterization_entries_free(
-		struct wlan_psoc_host_service_ext_param *ser_ext_par)
-{
-	qdf_mem_free(ser_ext_par->rf_characterization_entries);
-	ser_ext_par->rf_characterization_entries = NULL;
-	ser_ext_par->num_rf_characterization_entries = 0;
-
-	return QDF_STATUS_SUCCESS;
-}
-
-qdf_export_symbol(init_deinit_rf_characterization_entries_free);
-#endif
-
 QDF_STATUS init_deinit_chainmask_table_alloc(
 		struct wlan_psoc_host_service_ext_param *ser_ext_par)
 {

wmi/inc/wmi_unified_api.h

@@ -2968,18 +2968,33 @@ QDF_STATUS wmi_extract_pdev_qvit_event(wmi_unified_t wmi_handle,
 				       struct wmi_host_pdev_qvit_event *param);
 
 #ifdef WLAN_SUPPORT_RF_CHARACTERIZATION
+/**
+ * wmi_extract_num_rf_characterziation_entries - Extract number of RF
+ * characterization metrics received from the RF characterization event.
+ * @wmi_hdl: WMI handle
+ * @evt_buf: Event buffer
+ * @num_rf_characterization_entries: Number of RF characterization metrics
+ *
+ * Return: QDF status of operation
+ */
+QDF_STATUS wmi_extract_num_rf_characterization_entries(wmi_unified_t wmi_hdl,
+				uint8_t *evt_buf,
+				uint32_t *num_rf_characterization_entries);
+
 /**
  * wmi_extract_rf_characterziation_entries - Extract RF characterization metrics
- * received through extended service ready event.
+ * received from the RF characterization event.
  * @wmi_hdl: WMI handle
  * @evt_buf: Event buffer
+ * @num_rf_characterization_entries: Number of RF characterization metrics
  * @rf_characterization_entries: Pointer to RF characterization metrics
  *
  * Return: QDF status of operation
  */
 QDF_STATUS wmi_extract_rf_characterization_entries(wmi_unified_t wmi_hdl,
 	uint8_t *evt_buf,
-	struct wlan_psoc_host_rf_characterization_entry *rf_characterization_entries);
+	uint32_t num_rf_characterization_entries,
+	struct wmi_host_rf_characterization_event_param *rf_characterization_entries);
 #endif
 
 /*

wmi/inc/wmi_unified_param.h

@@ -4860,6 +4860,7 @@ typedef enum {
 	wmi_pdev_interop_issues_ap_event_id,
 #endif
 	wmi_coex_report_antenna_isolation_event_id,
+	wmi_chan_rf_characterization_info_event_id,
 	wmi_events_max,
 } wmi_conv_event_id;
 
@@ -7167,6 +7168,18 @@ struct wmi_host_dcs_interference_param {
 	uint32_t pdev_id;
 };
 
+/**
+ * struct wmi_host_rf_characterization_event_param - rf characterization table
+ * @freq: center frequency of primary channel (in MHz)
+ * @bw: bandwidth of primary channel (in MHz)
+ * @chan_metric: primary channel-specific metric
+ */
+struct wmi_host_rf_characterization_event_param {
+	uint16_t freq;
+	wmi_host_channel_width bw;
+	uint8_t chan_metric;
+};
+
 /*
  * struct wmi_host_fips_event_param: FIPS event param
  * @pdev_id: pdev id

wmi/inc/wmi_unified_priv.h

@@ -1752,9 +1752,15 @@ QDF_STATUS (*extract_reg_ch_avoid_event)(wmi_unified_t wmi_handle,
 		uint32_t len);
 
 #ifdef WLAN_SUPPORT_RF_CHARACTERIZATION
+QDF_STATUS (*extract_num_rf_characterization_entries)(wmi_unified_t wmi_hdl,
+				uint8_t *evt_buf,
+				uint32_t *num_rf_characterization_entries);
+
+
 QDF_STATUS (*extract_rf_characterization_entries)(wmi_unified_t wmi_handle,
 	uint8_t *evt_buf,
-	struct wlan_psoc_host_rf_characterization_entry *rf_characterization_entries);
+	uint32_t num_rf_characterization_entries,
+	struct wmi_host_rf_characterization_event_param *rf_characterization_entries);
 #endif
 
 QDF_STATUS (*extract_chainmask_tables)(wmi_unified_t wmi_handle,

wmi/src/wmi_unified_api.c

@@ -2471,13 +2471,26 @@ wmi_unified_dfs_phyerr_offload_dis_cmd(wmi_unified_t wmi_handle,
 }
 
 #ifdef WLAN_SUPPORT_RF_CHARACTERIZATION
+QDF_STATUS wmi_extract_num_rf_characterization_entries(wmi_unified_t wmi_hdl,
+				uint8_t *evt_buf,
+				uint32_t *num_rf_characterization_entries)
+{
+	if (wmi_hdl->ops->extract_num_rf_characterization_entries)
+		return wmi_hdl->ops->extract_num_rf_characterization_entries(wmi_hdl,
+				evt_buf, num_rf_characterization_entries);
+
+	return QDF_STATUS_E_FAILURE;
+}
+
 QDF_STATUS wmi_extract_rf_characterization_entries(wmi_unified_t wmi_hdl,
 	uint8_t *evt_buf,
-	struct wlan_psoc_host_rf_characterization_entry *rf_characterization_entries)
+	uint32_t num_rf_characterization_entries,
+	struct wmi_host_rf_characterization_event_param *rf_characterization_entries)
 {
 	if (wmi_hdl->ops->extract_rf_characterization_entries)
 		return wmi_hdl->ops->extract_rf_characterization_entries(wmi_hdl,
-					evt_buf, rf_characterization_entries);
+				evt_buf, num_rf_characterization_entries,
+				rf_characterization_entries);
 
 	return QDF_STATUS_E_FAILURE;
 }

wmi/src/wmi_unified_tlv.c

@@ -9301,24 +9301,46 @@ static QDF_STATUS extract_pdev_utf_event_tlv(wmi_unified_t wmi_handle,
 }
 
 #ifdef WLAN_SUPPORT_RF_CHARACTERIZATION
+static QDF_STATUS extract_num_rf_characterization_entries_tlv(wmi_unified_t wmi_handle,
+	uint8_t *event,
+	uint32_t *num_rf_characterization_entries)
+{
+	WMI_CHAN_RF_CHARACTERIZATION_INFO_EVENTID_param_tlvs *param_buf;
+
+	param_buf = (WMI_CHAN_RF_CHARACTERIZATION_INFO_EVENTID_param_tlvs *)event;
+	if (!param_buf)
+		return QDF_STATUS_E_INVAL;
+
+	*num_rf_characterization_entries =
+			param_buf->num_wmi_chan_rf_characterization_info;
+
+	return QDF_STATUS_SUCCESS;
+}
+
 static QDF_STATUS extract_rf_characterization_entries_tlv(wmi_unified_t wmi_handle,
 	uint8_t *event,
-	struct wlan_psoc_host_rf_characterization_entry *rf_characterization_entries)
+	uint32_t num_rf_characterization_entries,
+	struct wmi_host_rf_characterization_event_param *rf_characterization_entries)
 {
-	WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf;
+	WMI_CHAN_RF_CHARACTERIZATION_INFO_EVENTID_param_tlvs *param_buf;
 	WMI_CHAN_RF_CHARACTERIZATION_INFO *wmi_rf_characterization_entry;
 	uint8_t ix;
 
-	param_buf = (WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *)event;
+	param_buf = (WMI_CHAN_RF_CHARACTERIZATION_INFO_EVENTID_param_tlvs *)event;
 	if (!param_buf)
 		return QDF_STATUS_E_INVAL;
 
 	wmi_rf_characterization_entry =
-				param_buf->wmi_chan_rf_characterization_info;
+			param_buf->wmi_chan_rf_characterization_info;
 	if (!wmi_rf_characterization_entry)
 		return QDF_STATUS_E_INVAL;
 
-	for (ix = 0; ix < param_buf->num_wmi_chan_rf_characterization_info; ix++) {
+	/*
+	 * Using num_wmi_chan_rf_characterization instead of param_buf value
+	 * since memory for rf_characterization_entries was allocated using
+	 * the former.
+	 */
+	for (ix = 0; ix < num_rf_characterization_entries; ix++) {
 		rf_characterization_entries[ix].freq =
 				WMI_CHAN_RF_CHARACTERIZATION_FREQ_GET(
 					&wmi_rf_characterization_entry[ix]);
@@ -9447,22 +9469,6 @@ static QDF_STATUS extract_chainmask_tables_tlv(wmi_unified_t wmi_handle,
 	return QDF_STATUS_SUCCESS;
 }
 
-#ifdef WLAN_SUPPORT_RF_CHARACTERIZATION
-static void populate_num_rf_characterization_entries(
-			struct wlan_psoc_host_service_ext_param *param,
-			WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf)
-{
-	param->num_rf_characterization_entries =
-			param_buf->num_wmi_chan_rf_characterization_info;
-}
-#else
-static void populate_num_rf_characterization_entries(
-			struct wlan_psoc_host_service_ext_param *param,
-			WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf)
-{
-}
-#endif
-
 /**
  * extract_service_ready_ext_tlv() - extract basic extended service ready params
  * from event
@@ -9501,7 +9507,6 @@ static QDF_STATUS extract_service_ready_ext_tlv(wmi_unified_t wmi_handle,
 	param->num_dbr_ring_caps = param_buf->num_dma_ring_caps;
 	param->num_bin_scaling_params = param_buf->num_wmi_bin_scaling_params;
 	param->max_bssid_indicator = ev->max_bssid_indicator;
-	populate_num_rf_characterization_entries(param, param_buf);
 	qdf_mem_copy(&param->ppet, &ev->ppet, sizeof(param->ppet));
 
 	hw_caps = param_buf->soc_hw_mode_caps;
@@ -11864,6 +11869,8 @@ struct wmi_ops tlv_ops =  {
 	.extract_reg_chan_list_update_event =
 		extract_reg_chan_list_update_event_tlv,
 #ifdef WLAN_SUPPORT_RF_CHARACTERIZATION
+	.extract_num_rf_characterization_entries =
+		extract_num_rf_characterization_entries_tlv,
 	.extract_rf_characterization_entries =
 		extract_rf_characterization_entries_tlv,
 #endif
@@ -12266,6 +12273,8 @@ static void populate_tlv_events_id(uint32_t *event_ids)
 				WMI_COEX_REPORT_ANTENNA_ISOLATION_EVENTID;
 	event_ids[wmi_peer_ratecode_list_event_id] =
 				WMI_PEER_RATECODE_LIST_EVENTID;
+	event_ids[wmi_chan_rf_characterization_info_event_id] =
+				WMI_CHAN_RF_CHARACTERIZATION_INFO_EVENTID;
 }
 
 /**