qcacld-3.0: Set/get candidate channel to switch when radar is detected

Currently driver switches to a random channel when radar is detected.
Easymesh expects ap switching to a given channel.

Add API to set/get given channel. AP should switch to given channel
when radar is detected.
The given channel will be cleared after a radar detection.

Change-Id: I29b97e247583be768842c128e6a3e5d5bfd859f7
CRs-Fixed: 3034735

core/hdd/src/wlan_hdd_son.c

@@ -522,6 +522,81 @@ static int hdd_son_set_country(struct wlan_objmgr_vdev *vdev,
 	return hdd_reg_set_country(hdd_ctx, country_code);
 }
 
+/**
+ * hdd_son_set_candidate_freq() - set candidate freq. Switch to this freq
+ *                                after radar is detected
+ * @vdev: vdev
+ * @freq: candidate frequency
+ *
+ * Return: 0 if candidate freq is set successfully.
+ */
+static int hdd_son_set_candidate_freq(struct wlan_objmgr_vdev *vdev,
+				      qdf_freq_t freq)
+{
+	struct hdd_adapter *adapter;
+	struct sap_context *sap_ctx;
+
+	if (!vdev) {
+		hdd_err("null vdev");
+		return -EINVAL;
+	}
+	adapter = wlan_hdd_get_adapter_from_objmgr(vdev);
+	if (!adapter) {
+		hdd_err("null adapter");
+		return -EINVAL;
+	}
+	if (!hdd_adapter_is_ap(adapter)) {
+		hdd_err("vdev id %d is not AP", adapter->vdev_id);
+		return -EINVAL;
+	}
+
+	sap_ctx = WLAN_HDD_GET_SAP_CTX_PTR(adapter);
+	if (!sap_ctx) {
+		hdd_err("null sap_ctx");
+		return -EINVAL;
+	}
+
+	sap_ctx->candidate_freq = freq;
+
+	return 0;
+}
+
+/**
+ * hdd_son_get_candidate_freq() - get candidate freq
+ * @vdev: vdev
+ *
+ * Return: candidate freq
+ */
+static qdf_freq_t hdd_son_get_candidate_freq(struct wlan_objmgr_vdev *vdev)
+{
+	struct hdd_adapter *adapter;
+	struct sap_context *sap_ctx;
+	qdf_freq_t freq = 0;
+
+	if (!vdev) {
+		hdd_err("null vdev");
+		return freq;
+	}
+	adapter = wlan_hdd_get_adapter_from_objmgr(vdev);
+	if (!adapter) {
+		hdd_err("null adapter");
+		return freq;
+	}
+	if (!hdd_adapter_is_ap(adapter)) {
+		hdd_err("vdev id %d is not AP", adapter->vdev_id);
+		return freq;
+	}
+
+	sap_ctx = WLAN_HDD_GET_SAP_CTX_PTR(adapter);
+	if (!sap_ctx) {
+		hdd_err("null sap_ctx");
+		return freq;
+	}
+	freq = sap_ctx->candidate_freq;
+
+	return freq;
+}
+
 void hdd_son_register_callbacks(struct hdd_context *hdd_ctx)
 {
 	struct son_callbacks cb_obj = {0};
@@ -533,6 +608,8 @@ void hdd_son_register_callbacks(struct hdd_context *hdd_ctx)
 	cb_obj.os_if_get_bandwidth = hdd_son_get_bandwidth;
 	cb_obj.os_if_set_chan = hdd_son_set_chan;
 	cb_obj.os_if_set_country_code = hdd_son_set_country;
+	cb_obj.os_if_set_candidate_freq = hdd_son_set_candidate_freq;
+	cb_obj.os_if_get_candidate_freq = hdd_son_get_candidate_freq;
 
 	os_if_son_register_hdd_callbacks(hdd_ctx->psoc, &cb_obj);
 }

core/sap/src/sap_fsm.c

@@ -245,7 +245,16 @@ static qdf_freq_t sap_random_channel_sel(struct sap_context *sap_ctx)
 	 */
 	flag |= DFS_RANDOM_CH_FLAG_NO_6GHZ_CH;
 
-	if (QDF_IS_STATUS_ERROR(utils_dfs_get_vdev_random_channel_for_freq(
+	if (sap_ctx->candidate_freq &&
+	    sap_ctx->chan_freq != sap_ctx->candidate_freq &&
+	    !utils_dfs_is_freq_in_nol(pdev, sap_ctx->candidate_freq)) {
+		chan_freq = sap_ctx->candidate_freq;
+		wlan_reg_set_channel_params_for_freq(pdev, chan_freq, 0,
+						     ch_params);
+		sap_debug("random chan select candidate freq=%d", chan_freq);
+		sap_ctx->candidate_freq = 0;
+	} else if (QDF_IS_STATUS_ERROR(
+				utils_dfs_get_vdev_random_channel_for_freq(
 					pdev, sap_ctx->vdev, flag, ch_params,
 					&hw_mode, &chan_freq, &acs_info))) {
 		/* No available channel found */

core/sap/src/sap_internal.h

@@ -240,6 +240,7 @@ struct sap_context {
  */
 	bool is_forcescc_restart_required;
 #endif
+	qdf_freq_t candidate_freq;
 };
 
 /*----------------------------------------------------------------------------

os_if/son/inc/os_if_son.h

@@ -41,6 +41,8 @@
  * @os_if_get_bandwidth: get band width
  * @os_if_set_chan: set chan
  * @os_if_set_country_code: set country code
+ * @os_if_set_candidate_freq: set freq to switch after radar detection
+ * @os_if_get_candidate_freq: get freq to switch after radar detection
  */
 struct son_callbacks {
 	uint32_t (*os_if_is_acs_in_progress)(struct wlan_objmgr_vdev *vdev);
@@ -57,6 +59,9 @@ struct son_callbacks {
 	uint32_t (*os_if_get_sta_count)(struct wlan_objmgr_vdev *vdev);
 	int (*os_if_set_country_code)(struct wlan_objmgr_vdev *vdev,
 				      char *country_code);
+	int (*os_if_set_candidate_freq)(struct wlan_objmgr_vdev *vdev,
+					qdf_freq_t freq);
+	qdf_freq_t (*os_if_get_candidate_freq)(struct wlan_objmgr_vdev *vdev);
 };
 
 /**
@@ -233,4 +238,22 @@ int os_if_son_set_country_code(struct wlan_objmgr_vdev *vdev,
  */
 int os_if_son_get_country_code(struct wlan_objmgr_vdev *vdev,
 			       char *country_code);
+
+/**
+ * os_if_son_set_candidate_freq() - set freq to switch after radar detection
+ * @vdev: vdev
+ * @freq: freq to switch
+ *
+ * Return: 0 if candidate freq is set successfully
+ */
+int os_if_son_set_candidate_freq(struct wlan_objmgr_vdev *vdev,
+				 qdf_freq_t freq);
+
+/**
+ * os_if_son_get_candidate_freq() - get freq to switch after radar detection
+ * @vdev: vdev
+ *
+ * Return: candidate freq to switch after radar detection
+ */
+qdf_freq_t os_if_son_get_candidate_freq(struct wlan_objmgr_vdev *vdev);
 #endif

os_if/son/src/os_if_son.c

@@ -588,3 +588,38 @@ int os_if_son_get_country_code(struct wlan_objmgr_vdev *vdev,
 	return qdf_status_to_os_return(status);
 }
 qdf_export_symbol(os_if_son_get_country_code);
+
+int os_if_son_set_candidate_freq(struct wlan_objmgr_vdev *vdev,
+				 qdf_freq_t freq)
+{
+	int ret;
+
+	if (!vdev) {
+		osif_err("null vdev");
+		return -EINVAL;
+	}
+
+	ret = g_son_os_if_cb.os_if_set_candidate_freq(vdev, freq);
+	osif_debug("vdev %d set_candidate_freq %d ret %d",
+		   wlan_vdev_get_id(vdev), freq, ret);
+
+	return ret;
+}
+qdf_export_symbol(os_if_son_set_candidate_freq);
+
+qdf_freq_t os_if_son_get_candidate_freq(struct wlan_objmgr_vdev *vdev)
+{
+	qdf_freq_t freq;
+
+	if (!vdev) {
+		osif_err("null vdev");
+		return 0;
+	}
+
+	freq = g_son_os_if_cb.os_if_get_candidate_freq(vdev);
+	osif_debug("vdev %d candidate_freq %d",
+		   wlan_vdev_get_id(vdev), freq);
+
+	return freq;
+}
+qdf_export_symbol(os_if_son_get_candidate_freq);