Sfoglia il codice sorgente

qcacmn: Move WIN specific DFS features to WIN code

Move the WIN only DFS features from common code to WIN specific
Component dev. The following features are moved.
1. WIN Hardware mode switch.
2. StaDFS
3. dfs_set_nol
4. nol_history

CRs-Fixed: 2834311
Change-Id: I6c74dd13a16acb2a67bb3b477b13bc0e4ee165ce
Vijay Krishnan 4 anni fa
parent
commit
901ac719a7

+ 26 - 2
umac/dfs/core/src/dfs.h

@@ -1643,9 +1643,19 @@ void dfs_get_nol(struct wlan_dfs *dfs,
  * @dfs_nol: Pointer to dfsreq_nolelem structure.
  * @dfs_nol: Pointer to dfsreq_nolelem structure.
  * @nchan: Number of channels.
  * @nchan: Number of channels.
  */
  */
+#ifdef QCA_RADARTOOL_CMD
 void dfs_set_nol(struct wlan_dfs *dfs,
 void dfs_set_nol(struct wlan_dfs *dfs,
-		struct dfsreq_nolelem *dfs_nol,
-		int nchan);
+		 struct dfsreq_nolelem *dfs_nol,
+		 int nchan);
+#else
+static inline
+void dfs_set_nol(struct wlan_dfs *dfs,
+		 struct dfsreq_nolelem *dfs_nol,
+		 int nchan)
+{
+}
+#endif
+
 
 
 /**
 /**
  * dfs_nol_update() - NOL update
  * dfs_nol_update() - NOL update
@@ -2952,7 +2962,15 @@ void dfs_reinit_nol_from_psoc_copy(struct wlan_dfs *dfs,
  *
  *
  * Return: True if mode switch is in progress, else false.
  * Return: True if mode switch is in progress, else false.
  */
  */
+#ifdef QCA_HW_MODE_SWITCH
 bool dfs_is_hw_mode_switch_in_progress(struct wlan_dfs *dfs);
 bool dfs_is_hw_mode_switch_in_progress(struct wlan_dfs *dfs);
+#else
+static inline
+bool dfs_is_hw_mode_switch_in_progress(struct wlan_dfs *dfs)
+{
+	return false;
+}
+#endif
 
 
 /**
 /**
  * dfs_start_mode_switch_defer_timer() - start mode switch defer timer.
  * dfs_start_mode_switch_defer_timer() - start mode switch defer timer.
@@ -3049,6 +3067,12 @@ uint8_t dfs_find_dfs_sub_channels_for_freq(struct  wlan_dfs *dfs,
 					   struct dfs_channel *chan,
 					   struct dfs_channel *chan,
 					   uint16_t *subchan_arr);
 					   uint16_t *subchan_arr);
 
 
+/**
+ * dfs_clear_cac_started_chan() - Clear dfs cac started channel.
+ * @dfs: Pointer to wlan_dfs structure.
+ */
+void dfs_clear_cac_started_chan(struct wlan_dfs *dfs);
+
 #ifdef QCA_DFS_BANGRADAR
 #ifdef QCA_DFS_BANGRADAR
 /**
 /**
  * dfs_bangradar() - Handles all type of Bangradar.
  * dfs_bangradar() - Handles all type of Bangradar.

+ 0 - 23
umac/dfs/core/src/misc/dfs.c

@@ -859,29 +859,6 @@ void dfs_reset_dfs_prevchan(struct wlan_dfs *dfs)
 	qdf_mem_zero(dfs->dfs_prevchan, sizeof(struct dfs_channel));
 	qdf_mem_zero(dfs->dfs_prevchan, sizeof(struct dfs_channel));
 }
 }
 
 
-bool dfs_is_hw_mode_switch_in_progress(struct wlan_dfs *dfs)
-{
-	return lmac_dfs_is_hw_mode_switch_in_progress(dfs->dfs_pdev_obj);
-}
-
-void dfs_complete_deferred_tasks(struct wlan_dfs *dfs)
-{
-	if (dfs->dfs_defer_params.is_radar_detected) {
-		/* Handle radar event that was deferred and free the temporary
-		 * storage of the radar event parameters.
-		 */
-		dfs_process_radar_ind(dfs, dfs->dfs_defer_params.radar_params);
-		qdf_mem_free(dfs->dfs_defer_params.radar_params);
-		dfs->dfs_defer_params.is_radar_detected = false;
-	} else if (dfs->dfs_defer_params.is_cac_completed) {
-		/* Handle CAC completion event that was deferred for HW mode
-		 * switch.
-		 */
-		dfs_process_cac_completion(dfs);
-		dfs->dfs_defer_params.is_cac_completed = false;
-	}
-}
-
 #ifdef WLAN_DFS_TRUE_160MHZ_SUPPORT
 #ifdef WLAN_DFS_TRUE_160MHZ_SUPPORT
 bool dfs_is_true_160mhz_supported(struct wlan_dfs *dfs)
 bool dfs_is_true_160mhz_supported(struct wlan_dfs *dfs)
 {
 {

+ 1 - 1
umac/dfs/core/src/misc/dfs_cac.c

@@ -116,7 +116,7 @@ static os_timer_func(dfs_cac_valid_timeout)
  * dfs_clear_cac_started_chan() - Clear dfs cac started channel.
  * dfs_clear_cac_started_chan() - Clear dfs cac started channel.
  * @dfs: Pointer to wlan_dfs structure.
  * @dfs: Pointer to wlan_dfs structure.
  */
  */
-static void dfs_clear_cac_started_chan(struct wlan_dfs *dfs)
+void dfs_clear_cac_started_chan(struct wlan_dfs *dfs)
 {
 {
 	qdf_mem_zero(&dfs->dfs_cac_started_chan,
 	qdf_mem_zero(&dfs->dfs_cac_started_chan,
 		     sizeof(dfs->dfs_cac_started_chan));
 		     sizeof(dfs->dfs_cac_started_chan));

+ 0 - 179
umac/dfs/core/src/misc/dfs_nol.c

@@ -458,83 +458,6 @@ void dfs_get_nol(struct wlan_dfs *dfs,
 	}
 	}
 }
 }
 
 
-#ifdef CONFIG_CHAN_FREQ_API
-void dfs_set_nol(struct wlan_dfs *dfs,
-		 struct dfsreq_nolelem *dfs_nol,
-		 int nchan)
-{
-#define TIME_IN_MS 1000
-	uint32_t nol_time_lft_ms;
-	struct dfs_channel chan;
-	int i;
-
-	if (!dfs) {
-		dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS,  "dfs is NULL");
-		return;
-	}
-
-	for (i = 0; i < nchan; i++) {
-		nol_time_lft_ms = qdf_do_div(qdf_get_monotonic_boottime() -
-					     dfs_nol[i].nol_start_us, 1000);
-
-		if (nol_time_lft_ms < dfs_nol[i].nol_timeout_ms) {
-			chan.dfs_ch_freq = dfs_nol[i].nol_freq;
-			chan.dfs_ch_flags = 0;
-			chan.dfs_ch_flagext = 0;
-			nol_time_lft_ms =
-				(dfs_nol[i].nol_timeout_ms - nol_time_lft_ms);
-
-			DFS_NOL_ADD_CHAN_LOCKED(dfs, chan.dfs_ch_freq,
-						(nol_time_lft_ms / TIME_IN_MS));
-			utils_dfs_reg_update_nol_chan_for_freq(dfs->dfs_pdev_obj,
-							     &chan.dfs_ch_freq,
-							     1, DFS_NOL_SET);
-		}
-	}
-#undef TIME_IN_MS
-	dfs_nol_update(dfs);
-}
-#else
-#ifdef CONFIG_CHAN_NUM_API
-void dfs_set_nol(struct wlan_dfs *dfs,
-		struct dfsreq_nolelem *dfs_nol,
-		int nchan)
-{
-#define TIME_IN_MS 1000
-	uint32_t nol_time_left_ms;
-	struct dfs_channel chan;
-	int i;
-	uint8_t chan_num;
-
-	if (!dfs) {
-		dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS,  "dfs is NULL");
-		return;
-	}
-
-	for (i = 0; i < nchan; i++) {
-		nol_time_left_ms = qdf_do_div(qdf_get_monotonic_boottime() -
-					      dfs_nol[i].nol_start_us, 1000);
-
-		if (nol_time_left_ms < dfs_nol[i].nol_timeout_ms) {
-			chan.dfs_ch_freq = dfs_nol[i].nol_freq;
-			chan.dfs_ch_flags = 0;
-			chan.dfs_ch_flagext = 0;
-			nol_time_left_ms =
-				(dfs_nol[i].nol_timeout_ms - nol_time_left_ms);
-
-			DFS_NOL_ADD_CHAN_LOCKED(dfs, chan.dfs_ch_freq,
-					(nol_time_left_ms / TIME_IN_MS));
-			chan_num = utils_dfs_freq_to_chan(chan.dfs_ch_freq);
-			utils_dfs_reg_update_nol_ch(dfs->dfs_pdev_obj,
-						&chan_num, 1, DFS_NOL_SET);
-		}
-	}
-#undef TIME_IN_MS
-	dfs_nol_update(dfs);
-}
-#endif
-#endif
-
 void dfs_nol_addchan(struct wlan_dfs *dfs,
 void dfs_nol_addchan(struct wlan_dfs *dfs,
 		uint16_t freq,
 		uint16_t freq,
 		uint32_t dfs_nol_timeout)
 		uint32_t dfs_nol_timeout)
@@ -970,105 +893,3 @@ void dfs_remove_spoof_channel_from_nol(struct wlan_dfs *dfs)
 }
 }
 #endif
 #endif
 #endif
 #endif
-
-void dfs_init_tmp_psoc_nol(struct wlan_dfs *dfs, uint8_t num_radios)
-{
-	struct dfs_soc_priv_obj *dfs_soc_obj = dfs->dfs_soc_obj;
-
-	if (WLAN_UMAC_MAX_PDEVS < num_radios) {
-		dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS,
-			"num_radios (%u) exceeds limit", num_radios);
-		return;
-	}
-
-	/* Allocate the temporary psoc NOL copy structure for the number
-	 * of radios provided.
-	 */
-	dfs_soc_obj->dfs_psoc_nolinfo =
-		qdf_mem_malloc(sizeof(struct dfsreq_nolinfo) * num_radios);
-}
-
-void dfs_deinit_tmp_psoc_nol(struct wlan_dfs *dfs)
-{
-	struct dfs_soc_priv_obj *dfs_soc_obj = dfs->dfs_soc_obj;
-
-	if (!dfs_soc_obj->dfs_psoc_nolinfo)
-		return;
-
-	qdf_mem_free(dfs_soc_obj->dfs_psoc_nolinfo);
-	dfs_soc_obj->dfs_psoc_nolinfo = NULL;
-}
-
-void dfs_save_dfs_nol_in_psoc(struct wlan_dfs *dfs,
-			      uint8_t pdev_id)
-{
-	struct dfs_soc_priv_obj *dfs_soc_obj = dfs->dfs_soc_obj;
-	struct dfsreq_nolinfo tmp_nolinfo, *nolinfo;
-	uint32_t i, num_chans = 0;
-
-	if (!dfs->dfs_nol_count)
-		return;
-
-	if (!dfs_soc_obj->dfs_psoc_nolinfo)
-		return;
-
-	nolinfo = &dfs_soc_obj->dfs_psoc_nolinfo[pdev_id];
-	/* Fetch the NOL entries for the DFS object. */
-	dfs_getnol(dfs, &tmp_nolinfo);
-
-	/* nolinfo might already have some data. Do not overwrite it */
-	num_chans = nolinfo->dfs_ch_nchans;
-	for (i = 0; i < tmp_nolinfo.dfs_ch_nchans; i++) {
-		/* Figure out the completed duration of each NOL. */
-		uint32_t nol_completed_ms = qdf_do_div(
-			qdf_get_monotonic_boottime() -
-			tmp_nolinfo.dfs_nol[i].nol_start_us, 1000);
-
-		nolinfo->dfs_nol[num_chans] = tmp_nolinfo.dfs_nol[i];
-		/* Remember the remaining NOL time in the timeout
-		 * variable.
-		 */
-		nolinfo->dfs_nol[num_chans++].nol_timeout_ms -=
-			nol_completed_ms;
-	}
-
-	nolinfo->dfs_ch_nchans = num_chans;
-}
-
-void dfs_reinit_nol_from_psoc_copy(struct wlan_dfs *dfs,
-				   uint8_t pdev_id,
-				   uint16_t low_5ghz_freq,
-				   uint16_t high_5ghz_freq)
-{
-	struct dfs_soc_priv_obj *dfs_soc_obj = dfs->dfs_soc_obj;
-	struct dfsreq_nolinfo *nol, req_nol;
-	uint8_t i, j = 0;
-
-	if (!dfs_soc_obj->dfs_psoc_nolinfo)
-		return;
-
-	if (!dfs_soc_obj->dfs_psoc_nolinfo[pdev_id].dfs_ch_nchans)
-		return;
-
-	nol = &dfs_soc_obj->dfs_psoc_nolinfo[pdev_id];
-
-	for (i = 0; i < nol->dfs_ch_nchans; i++) {
-		uint16_t tmp_freq = nol->dfs_nol[i].nol_freq;
-
-		/* Add to nol only if within the tgt pdev's frequency range. */
-		if ((low_5ghz_freq < tmp_freq) && (high_5ghz_freq > tmp_freq)) {
-			/* The NOL timeout value in each entry points to the
-			 * remaining time of the NOL. This is to indicate that
-			 * the NOL entries are paused and are not left to
-			 * continue.
-			 * While adding these NOL, update the start ticks to
-			 * current time to avoid losing entries which might
-			 * have timed out during the pause and resume mechanism.
-			 */
-			nol->dfs_nol[i].nol_start_us =
-				qdf_get_monotonic_boottime();
-			req_nol.dfs_nol[j++] = nol->dfs_nol[i];
-		}
-	}
-	dfs_set_nol(dfs, req_nol.dfs_nol, j);
-}

+ 14 - 0
umac/dfs/dispatcher/inc/wlan_dfs_mlme_api.h

@@ -442,7 +442,14 @@ bool dfs_mlme_is_inter_band_chan_switch_allowed(struct wlan_objmgr_pdev *pdev);
  *
  *
  * Return: void.
  * Return: void.
  */
  */
+#ifdef QCA_HW_MODE_SWITCH
 void dfs_mlme_acquire_radar_mode_switch_lock(struct wlan_objmgr_pdev *pdev);
 void dfs_mlme_acquire_radar_mode_switch_lock(struct wlan_objmgr_pdev *pdev);
+#else
+static inline
+void dfs_mlme_acquire_radar_mode_switch_lock(struct wlan_objmgr_pdev *pdev)
+{
+}
+#endif
 
 
 /**
 /**
  * dfs_mlme_release_radar_mode_switch_lock() - Release lock taken for radar
  * dfs_mlme_release_radar_mode_switch_lock() - Release lock taken for radar
@@ -451,5 +458,12 @@ void dfs_mlme_acquire_radar_mode_switch_lock(struct wlan_objmgr_pdev *pdev);
  *
  *
  * Return: void.
  * Return: void.
  */
  */
+#ifdef QCA_HW_MODE_SWITCH
 void dfs_mlme_release_radar_mode_switch_lock(struct wlan_objmgr_pdev *pdev);
 void dfs_mlme_release_radar_mode_switch_lock(struct wlan_objmgr_pdev *pdev);
+#else
+static inline
+void dfs_mlme_release_radar_mode_switch_lock(struct wlan_objmgr_pdev *pdev)
+{
+}
+#endif
 #endif /* _WLAN_DFS_MLME_API_H_ */
 #endif /* _WLAN_DFS_MLME_API_H_ */

+ 55 - 0
umac/dfs/dispatcher/inc/wlan_dfs_tgt_api.h

@@ -544,7 +544,14 @@ QDF_STATUS tgt_dfs_reset_spoof_test(struct wlan_objmgr_pdev *pdev)
  * @pdev: Pointer to DFS pdev object.
  * @pdev: Pointer to DFS pdev object.
  * @val: input value.
  * @val: input value.
  */
  */
+#ifdef QCA_SUPPORT_STA_DFS
 void tgt_dfs_enable_stadfs(struct wlan_objmgr_pdev *pdev, bool val);
 void tgt_dfs_enable_stadfs(struct wlan_objmgr_pdev *pdev, bool val);
+#else
+static inline
+void tgt_dfs_enable_stadfs(struct wlan_objmgr_pdev *pdev, bool val)
+{
+}
+#endif
 
 
 /**
 /**
  * tgt_dfs_is_stadfs_enabled() - Get STADFS capability
  * tgt_dfs_is_stadfs_enabled() - Get STADFS capability
@@ -552,7 +559,15 @@ void tgt_dfs_enable_stadfs(struct wlan_objmgr_pdev *pdev, bool val);
  *
  *
  * Return: true if STADFS is enabled, else false.
  * Return: true if STADFS is enabled, else false.
  */
  */
+#ifdef QCA_SUPPORT_STA_DFS
 bool tgt_dfs_is_stadfs_enabled(struct wlan_objmgr_pdev *pdev);
 bool tgt_dfs_is_stadfs_enabled(struct wlan_objmgr_pdev *pdev);
+#else
+static inline
+bool tgt_dfs_is_stadfs_enabled(struct wlan_objmgr_pdev *pdev)
+{
+	return false;
+}
+#endif
 
 
 /**
 /**
  * tgt_dfs_is_pdev_5ghz() - Check if the input pdev is 5GHZ.
  * tgt_dfs_is_pdev_5ghz() - Check if the input pdev is 5GHZ.
@@ -617,6 +632,7 @@ void tgt_dfs_set_fw_adfs_support(struct wlan_objmgr_pdev *pdev,
 }
 }
 #endif
 #endif
 
 
+#ifdef QCA_HW_MODE_SWITCH
 /**
 /**
  * tgt_dfs_init_tmp_psoc_nol() - Init temporary psoc NOL structure.
  * tgt_dfs_init_tmp_psoc_nol() - Init temporary psoc NOL structure.
  * @pdev: Pointer to pdev object.
  * @pdev: Pointer to pdev object.
@@ -689,4 +705,43 @@ void tgt_dfs_reinit_precac_lists(struct wlan_objmgr_pdev *src_pdev,
  * Return: void.
  * Return: void.
  */
  */
 void tgt_dfs_complete_deferred_tasks(struct wlan_objmgr_pdev *pdev);
 void tgt_dfs_complete_deferred_tasks(struct wlan_objmgr_pdev *pdev);
+#else
+static inline
+void tgt_dfs_init_tmp_psoc_nol(struct wlan_objmgr_pdev *pdev,
+			       uint8_t num_radios)
+{
+}
+
+static inline
+void tgt_dfs_deinit_tmp_psoc_nol(struct wlan_objmgr_pdev *pdev)
+{
+}
+
+static inline
+void tgt_dfs_save_dfs_nol_in_psoc(struct wlan_objmgr_pdev *pdev,
+				  uint8_t pdev_id)
+{
+}
+
+static inline
+void tgt_dfs_reinit_nol_from_psoc_copy(struct wlan_objmgr_pdev *pdev,
+				       uint8_t pdev_id,
+				       uint16_t low_5ghz_freq,
+				       uint16_t high_5ghz_freq)
+{
+}
+
+static inline
+void tgt_dfs_reinit_precac_lists(struct wlan_objmgr_pdev *src_pdev,
+				 struct wlan_objmgr_pdev *dest_pdev,
+				 uint16_t low_5g_freq,
+				 uint16_t high_5g_freq)
+{
+}
+
+static inline
+void tgt_dfs_complete_deferred_tasks(struct wlan_objmgr_pdev *pdev)
+{
+}
+#endif
 #endif /* _WLAN_DFS_TGT_API_H_ */
 #endif /* _WLAN_DFS_TGT_API_H_ */

+ 0 - 1
umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h

@@ -874,7 +874,6 @@ void utils_dfs_get_chan_list(struct wlan_objmgr_pdev *pdev,
  */
  */
 void utils_dfs_get_nol_history_chan_list(struct wlan_objmgr_pdev *pdev,
 void utils_dfs_get_nol_history_chan_list(struct wlan_objmgr_pdev *pdev,
 					 void *clist, uint32_t *num_chan);
 					 void *clist, uint32_t *num_chan);
-
 /**
 /**
  * utils_dfs_reg_update_nol_history_ch() - set nol history channel
  * utils_dfs_reg_update_nol_history_ch() - set nol history channel
  *
  *

+ 0 - 24
umac/dfs/dispatcher/src/wlan_dfs_lmac_api.c

@@ -265,27 +265,3 @@ bool lmac_is_host_dfs_check_support_enabled(struct wlan_objmgr_pdev *pdev)
 	return enabled;
 	return enabled;
 }
 }
 #endif
 #endif
-
-bool lmac_dfs_is_hw_mode_switch_in_progress(struct wlan_objmgr_pdev *pdev)
-{
-	struct wlan_objmgr_psoc *psoc;
-	struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops;
-	bool is_hw_mode_switch_in_progress = false;
-	struct wlan_lmac_if_tx_ops *tx_ops;
-
-	psoc = wlan_pdev_get_psoc(pdev);
-	tx_ops = wlan_psoc_get_lmac_if_txops(psoc);
-	if (!tx_ops) {
-		dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS,  "tx_ops is null");
-		return is_hw_mode_switch_in_progress;
-	}
-
-	dfs_tx_ops = &tx_ops->dfs_tx_ops;
-
-	if (dfs_tx_ops->dfs_check_mode_switch_state)
-		dfs_tx_ops->dfs_check_mode_switch_state(
-			pdev,
-			&is_hw_mode_switch_in_progress);
-
-	return is_hw_mode_switch_in_progress;
-}

+ 0 - 16
umac/dfs/dispatcher/src/wlan_dfs_mlme_api.c

@@ -509,19 +509,3 @@ bool dfs_mlme_is_opmode_sta(struct wlan_objmgr_pdev *pdev)
 
 
 	return global_dfs_to_mlme.mlme_is_opmode_sta(pdev);
 	return global_dfs_to_mlme.mlme_is_opmode_sta(pdev);
 }
 }
-
-void dfs_mlme_acquire_radar_mode_switch_lock(struct wlan_objmgr_pdev *pdev)
-{
-	if (!global_dfs_to_mlme.mlme_acquire_radar_mode_switch_lock)
-		return;
-
-	global_dfs_to_mlme.mlme_acquire_radar_mode_switch_lock(pdev);
-}
-
-void dfs_mlme_release_radar_mode_switch_lock(struct wlan_objmgr_pdev *pdev)
-{
-	if (!global_dfs_to_mlme.mlme_release_radar_mode_switch_lock)
-		return;
-
-	global_dfs_to_mlme.mlme_release_radar_mode_switch_lock(pdev);
-}

+ 0 - 128
umac/dfs/dispatcher/src/wlan_dfs_tgt_api.c

@@ -909,32 +909,6 @@ QDF_STATUS tgt_dfs_send_subchan_marking(struct wlan_objmgr_pdev *pdev,
 qdf_export_symbol(tgt_dfs_send_subchan_marking);
 qdf_export_symbol(tgt_dfs_send_subchan_marking);
 #endif
 #endif
 
 
-void tgt_dfs_enable_stadfs(struct wlan_objmgr_pdev *pdev, bool val)
-{
-	struct wlan_dfs *dfs;
-
-	dfs = wlan_pdev_get_dfs_obj(pdev);
-	if (!dfs) {
-		dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
-		return;
-	}
-
-	dfs->dfs_is_stadfs_enabled = val;
-}
-
-bool tgt_dfs_is_stadfs_enabled(struct wlan_objmgr_pdev *pdev)
-{
-	struct wlan_dfs *dfs;
-
-	dfs = wlan_pdev_get_dfs_obj(pdev);
-	if (!dfs) {
-		dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
-		return false;
-	}
-
-	return dfs->dfs_is_stadfs_enabled;
-}
-
 #ifdef QCA_SUPPORT_AGILE_DFS
 #ifdef QCA_SUPPORT_AGILE_DFS
 void tgt_dfs_set_fw_adfs_support(struct wlan_objmgr_pdev *pdev,
 void tgt_dfs_set_fw_adfs_support(struct wlan_objmgr_pdev *pdev,
 				 bool fw_adfs_support_160,
 				 bool fw_adfs_support_160,
@@ -955,105 +929,3 @@ void tgt_dfs_set_fw_adfs_support(struct wlan_objmgr_pdev *pdev,
 
 
 qdf_export_symbol(tgt_dfs_set_fw_adfs_support);
 qdf_export_symbol(tgt_dfs_set_fw_adfs_support);
 #endif
 #endif
-
-void tgt_dfs_init_tmp_psoc_nol(struct wlan_objmgr_pdev *pdev,
-			       uint8_t num_radios)
-{
-	struct wlan_dfs *dfs;
-
-	dfs = wlan_pdev_get_dfs_obj(pdev);
-	if (!dfs) {
-		dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
-		return;
-	}
-
-	dfs_init_tmp_psoc_nol(dfs, num_radios);
-}
-
-qdf_export_symbol(tgt_dfs_init_tmp_psoc_nol);
-
-void tgt_dfs_deinit_tmp_psoc_nol(struct wlan_objmgr_pdev *pdev)
-{
-	struct wlan_dfs *dfs;
-
-	dfs = wlan_pdev_get_dfs_obj(pdev);
-	if (!dfs) {
-		dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
-		return;
-	}
-
-	dfs_deinit_tmp_psoc_nol(dfs);
-}
-
-qdf_export_symbol(tgt_dfs_deinit_tmp_psoc_nol);
-
-void tgt_dfs_save_dfs_nol_in_psoc(struct wlan_objmgr_pdev *pdev,
-				  uint8_t pdev_id)
-{
-	struct wlan_dfs *dfs;
-
-	dfs = wlan_pdev_get_dfs_obj(pdev);
-	if (!dfs) {
-		dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
-		return;
-	}
-
-	dfs_save_dfs_nol_in_psoc(dfs, pdev_id);
-}
-
-qdf_export_symbol(tgt_dfs_save_dfs_nol_in_psoc);
-
-void tgt_dfs_reinit_nol_from_psoc_copy(struct wlan_objmgr_pdev *pdev,
-				       uint8_t pdev_id,
-				       uint16_t low_5ghz_freq,
-				       uint16_t high_5ghz_freq)
-{
-	struct wlan_dfs *dfs;
-
-	dfs = wlan_pdev_get_dfs_obj(pdev);
-	if (!dfs) {
-		dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
-		return;
-	}
-
-	dfs_reinit_nol_from_psoc_copy(dfs,
-				      pdev_id,
-				      low_5ghz_freq,
-				      high_5ghz_freq);
-}
-
-qdf_export_symbol(tgt_dfs_reinit_nol_from_psoc_copy);
-
-void tgt_dfs_reinit_precac_lists(struct wlan_objmgr_pdev *src_pdev,
-				 struct wlan_objmgr_pdev *dest_pdev,
-				 uint16_t low_5g_freq,
-				 uint16_t high_5g_freq)
-{
-	struct wlan_dfs *src_dfs, *dest_dfs;
-
-	src_dfs = wlan_pdev_get_dfs_obj(src_pdev);
-	if (!src_dfs) {
-		dfs_err(src_dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
-		return;
-	}
-	dest_dfs = wlan_pdev_get_dfs_obj(dest_pdev);
-	if (!dest_dfs) {
-		dfs_err(dest_dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
-		return;
-	}
-
-	dfs_reinit_precac_lists(src_dfs, dest_dfs, low_5g_freq, high_5g_freq);
-}
-
-void tgt_dfs_complete_deferred_tasks(struct wlan_objmgr_pdev *pdev)
-{
-	struct wlan_dfs *dfs;
-
-	dfs = wlan_pdev_get_dfs_obj(pdev);
-	if (!dfs) {
-		dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
-		return;
-	}
-
-	dfs_complete_deferred_tasks(dfs);
-}

+ 0 - 38
umac/dfs/dispatcher/src/wlan_dfs_utils_api.c

@@ -666,43 +666,6 @@ static void utils_dfs_get_max_sup_width(struct wlan_objmgr_pdev *pdev,
 }
 }
 
 
 #ifndef QCA_DFS_USE_POLICY_MANAGER
 #ifndef QCA_DFS_USE_POLICY_MANAGER
-void utils_dfs_get_nol_history_chan_list(struct wlan_objmgr_pdev *pdev,
-					 void *clist, uint32_t *num_chan)
-{
-	int i, j = 0;
-	struct regulatory_channel *cur_chan_list;
-	struct wlan_dfs *dfs;
-	struct dfs_channel *chan_list = (struct dfs_channel *)clist;
-
-	*num_chan = 0;
-
-	dfs = wlan_pdev_get_dfs_obj(pdev);
-	if (!dfs)
-		return;
-
-	cur_chan_list = qdf_mem_malloc(NUM_CHANNELS * sizeof(*cur_chan_list));
-	if (!cur_chan_list)
-		return;
-
-	if (wlan_reg_get_current_chan_list(
-			pdev, cur_chan_list) != QDF_STATUS_SUCCESS) {
-		dfs_alert(dfs, WLAN_DEBUG_DFS_ALWAYS,
-			  "failed to get cur_chan list");
-		qdf_mem_free(cur_chan_list);
-		return;
-	}
-
-	for (i = 0; i < NUM_CHANNELS; i++) {
-		if (cur_chan_list[i].nol_history) {
-			chan_list[j].dfs_ch_freq = cur_chan_list[i].center_freq;
-			j++;
-		}
-	}
-
-	*num_chan = j;
-	qdf_mem_free(cur_chan_list);
-}
-
 void utils_dfs_get_chan_list(struct wlan_objmgr_pdev *pdev,
 void utils_dfs_get_chan_list(struct wlan_objmgr_pdev *pdev,
 			     void *clist, uint32_t *num_chan)
 			     void *clist, uint32_t *num_chan)
 {
 {
@@ -910,7 +873,6 @@ static void utils_dfs_get_channel_list(struct wlan_objmgr_pdev *pdev,
 #endif
 #endif
 
 
 #else
 #else
-
 void utils_dfs_get_nol_history_chan_list(struct wlan_objmgr_pdev *pdev,
 void utils_dfs_get_nol_history_chan_list(struct wlan_objmgr_pdev *pdev,
 					 void *clist, uint32_t *num_chan)
 					 void *clist, uint32_t *num_chan)
 {
 {