|
|
@@ -91,3 +91,166 @@ bool __policy_mgr_is_ll_lt_sap_restart_required(struct wlan_objmgr_psoc *psoc,
|
|
|
|
|
|
return false;
|
|
|
}
|
|
|
+
|
|
|
+/**
|
|
|
+ * policy_mgr_ll_lt_sap_get_restart_freq_for_concurent_sap() - Get restart frequency
|
|
|
+ * for concurrent SAP which is in concurrency with LL_LT_SAP
|
|
|
+ * @pm_ctx: Policy manager context
|
|
|
+ * @vdev_id: Vdev id of the SAP for which restart freq is required
|
|
|
+ * @curr_freq: Current frequency of the SAP for which restart freq is required
|
|
|
+ * @ll_lt_sap_enabled: Indicates if ll_lt_sap is getting enabled or disabled
|
|
|
+ *
|
|
|
+ * This API returns user configured frequency if ll_lt_sap is going down and
|
|
|
+ * if ll_lt_sap is coming up it returns frequency according to ll_lt_sap
|
|
|
+ * concurrency.
|
|
|
+ *
|
|
|
+ * Return: Restart frequency
|
|
|
+ */
|
|
|
+static qdf_freq_t
|
|
|
+policy_mgr_ll_lt_sap_get_restart_freq_for_concurent_sap(
|
|
|
+ struct policy_mgr_psoc_priv_obj *pm_ctx,
|
|
|
+ uint8_t vdev_id,
|
|
|
+ qdf_freq_t curr_freq,
|
|
|
+ bool ll_lt_sap_enabled)
|
|
|
+{
|
|
|
+ qdf_freq_t user_config_freq;
|
|
|
+ uint8_t i;
|
|
|
+ QDF_STATUS status;
|
|
|
+ uint32_t channel_list[NUM_CHANNELS];
|
|
|
+ uint32_t num_channels;
|
|
|
+ qdf_freq_t restart_freq = 0;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * If ll_lt_sap is getting disabled, return user configured frequency
|
|
|
+ * for concurrent SAP restart, if user configured frequency is not valid
|
|
|
+ * frequency, remain on the same frequency and do not restart the SAP
|
|
|
+ */
|
|
|
+ if (!ll_lt_sap_enabled) {
|
|
|
+ user_config_freq = policy_mgr_get_user_config_sap_freq(
|
|
|
+ pm_ctx->psoc,
|
|
|
+ vdev_id);
|
|
|
+ if (wlan_reg_is_enable_in_secondary_list_for_freq(
|
|
|
+ pm_ctx->pdev,
|
|
|
+ user_config_freq) &&
|
|
|
+ policy_mgr_is_safe_channel(pm_ctx->psoc, user_config_freq))
|
|
|
+ return user_config_freq;
|
|
|
+ return curr_freq;
|
|
|
+ }
|
|
|
+
|
|
|
+ status = policy_mgr_get_valid_chans(pm_ctx->psoc, channel_list,
|
|
|
+ &num_channels);
|
|
|
+ if (QDF_IS_STATUS_ERROR(status)) {
|
|
|
+ policy_mgr_err("Error in getting valid channels");
|
|
|
+ return curr_freq;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* return first valid 2.4 GHz frequency */
|
|
|
+ for (i = 0; i < num_channels; i++) {
|
|
|
+ if (wlan_reg_is_24ghz_ch_freq(channel_list[i])) {
|
|
|
+ if (!restart_freq)
|
|
|
+ restart_freq = channel_list[i];
|
|
|
+ /* Prefer SCC frequency */
|
|
|
+ if (policy_mgr_get_connection_count_with_ch_freq(
|
|
|
+ channel_list[i])) {
|
|
|
+ restart_freq = channel_list[i];
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return restart_freq;
|
|
|
+}
|
|
|
+
|
|
|
+void policy_mgr_ll_lt_sap_restart_concurrent_sap(struct wlan_objmgr_psoc *psoc,
|
|
|
+ bool is_ll_lt_sap_enabled)
|
|
|
+{
|
|
|
+ struct policy_mgr_psoc_priv_obj *pm_ctx;
|
|
|
+ struct policy_mgr_conc_connection_info sap_info = {0};
|
|
|
+ qdf_freq_t restart_freq;
|
|
|
+ struct ch_params ch_params = {0};
|
|
|
+ uint8_t i;
|
|
|
+
|
|
|
+ pm_ctx = policy_mgr_get_context(psoc);
|
|
|
+ if (!pm_ctx) {
|
|
|
+ policy_mgr_err("Invalid pm context");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+ * For SBS case, no need to restart concurrent SAP as LL_LT_SAP and
|
|
|
+ * concurrent SAP can be on different MACs
|
|
|
+ */
|
|
|
+ if (policy_mgr_is_hw_sbs_capable(psoc))
|
|
|
+ return;
|
|
|
+
|
|
|
+ qdf_mutex_acquire(&pm_ctx->qdf_conc_list_lock);
|
|
|
+ for (i = 0; i < MAX_NUMBER_OF_CONC_CONNECTIONS; i++) {
|
|
|
+ if ((PM_SAP_MODE == pm_conc_connection_list[i].mode) &&
|
|
|
+ pm_conc_connection_list[i].in_use) {
|
|
|
+ qdf_mem_copy(&sap_info, &pm_conc_connection_list[i],
|
|
|
+ sizeof(sap_info));
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
|
|
|
+
|
|
|
+ /* No concurrent SAP present, return */
|
|
|
+ if (!sap_info.in_use)
|
|
|
+ return;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * If concurrent SAP is 2.4 GHz and ll_lt_sap is getting enabled then
|
|
|
+ * there is no need to restart the concurrent SAP
|
|
|
+ */
|
|
|
+ if (is_ll_lt_sap_enabled && wlan_reg_is_24ghz_ch_freq(sap_info.freq))
|
|
|
+ return;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * If concurrent SAP is 5 GHz/6 GHz and ll_lt_sap is getting disabled
|
|
|
+ * then there is no need to restart the concurrent SAP
|
|
|
+ */
|
|
|
+ else if (!is_ll_lt_sap_enabled &&
|
|
|
+ (wlan_reg_is_5ghz_ch_freq(sap_info.freq) ||
|
|
|
+ wlan_reg_is_6ghz_chan_freq(sap_info.freq)))
|
|
|
+ return;
|
|
|
+
|
|
|
+ if (pm_ctx->hdd_cbacks.hdd_is_chan_switch_in_progress &&
|
|
|
+ pm_ctx->hdd_cbacks.hdd_is_chan_switch_in_progress()) {
|
|
|
+ policy_mgr_debug("channel switch is already in progress");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ restart_freq =
|
|
|
+ policy_mgr_ll_lt_sap_get_restart_freq_for_concurent_sap(
|
|
|
+ pm_ctx,
|
|
|
+ sap_info.vdev_id,
|
|
|
+ sap_info.freq,
|
|
|
+ is_ll_lt_sap_enabled);
|
|
|
+
|
|
|
+ if (!restart_freq) {
|
|
|
+ policy_mgr_err("Restart freq not found for vdev %d",
|
|
|
+ sap_info.vdev_id);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (restart_freq == sap_info.freq) {
|
|
|
+ policy_mgr_debug("vdev %d restart freq %d same as current freq",
|
|
|
+ sap_info.vdev_id, restart_freq);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ ch_params.ch_width = policy_mgr_get_ch_width(sap_info.bw);
|
|
|
+ wlan_reg_set_channel_params_for_pwrmode(pm_ctx->pdev, restart_freq,
|
|
|
+ 0, &ch_params,
|
|
|
+ REG_CURRENT_PWR_MODE);
|
|
|
+ policy_mgr_debug("Restart SAP vdev %d with %d freq width %d",
|
|
|
+ sap_info.vdev_id, restart_freq, ch_params.ch_width);
|
|
|
+
|
|
|
+ if (pm_ctx->hdd_cbacks.wlan_hdd_set_sap_csa_reason)
|
|
|
+ pm_ctx->hdd_cbacks.wlan_hdd_set_sap_csa_reason(
|
|
|
+ psoc,
|
|
|
+ sap_info.vdev_id,
|
|
|
+ CSA_REASON_CONCURRENT_LL_LT_SAP_EVENT);
|
|
|
+
|
|
|
+ policy_mgr_change_sap_channel_with_csa(psoc, sap_info.vdev_id,
|
|
|
+ restart_freq,
|
|
|
+ ch_params.ch_width, true);
|
|
|
+}
|
Ashish Kumar Dhanotiya