qcacld-3.0: Avoid wait for hw mode change during SAP CSA

The SAP channel change can be called in scheduler thread and thus
waiting for hw mode change in scheduler thread will always lead to
timeout and thus channel switch failure.

Fix is to avoid wait and continue channel switch after hw mode
change is completed.

Change-Id: I951fab6c95ff2a84d6a619859295b830685fac4e
CRs-Fixed: 2484147

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -1844,29 +1844,19 @@ QDF_STATUS policy_mgr_set_hw_mode_on_channel_switch(
 		struct wlan_objmgr_psoc *psoc, uint8_t session_id);
 
 /**
- * policy_mgr_set_hw_mode_before_channel_switch() - Set hw mode
- * before channel switch, this is required if DBS mode is 2x2
- * @psoc: PSOC object information
- * @vdev_id: vdev id on which channel switch is required
- * @chan: New channel to which channel switch is requested
- *
- * Return: QDF_STATUS
- */
-QDF_STATUS policy_mgr_set_hw_mode_before_channel_switch(
-		struct wlan_objmgr_psoc *psoc, uint8_t vdev_id, uint8_t chan);
-
-/**
- * policy_mgr_check_and_set_hw_mode_sta_channel_switch() - check if hw mode
- * change is required before channel switch for STA,
+ * policy_mgr_check_and_set_hw_mode_for_channel_switch() - check if hw mode
+ * change is required before channel switch for STA/SAP,
  * this is required if DBS mode is 2x2
  * @psoc: PSOC object information
  * @vdev_id: vdev id on which channel switch is required
  * @chan: New channel to which channel switch is requested
+ * @reason: reason for hw mode change
  *
  * Return: QDF_STATUS, success if HW mode change is required else Failure
  */
-QDF_STATUS policy_mgr_check_and_set_hw_mode_sta_channel_switch(
-		struct wlan_objmgr_psoc *psoc, uint8_t vdev_id, uint8_t chan);
+QDF_STATUS policy_mgr_check_and_set_hw_mode_for_channel_switch(
+		struct wlan_objmgr_psoc *psoc, uint8_t vdev_id, uint8_t chan,
+		enum policy_mgr_conn_update_reason reason);
 
 /**
  * policy_mgr_set_do_hw_mode_change_flag() - Set flag to indicate hw mode change

components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -1543,11 +1543,15 @@ void policy_mgr_nan_sap_post_enable_conc_check(struct wlan_objmgr_psoc *psoc)
 	if (nan_ch_2g == 0)
 		return;
 
-	status = qdf_wait_single_event(&pm_ctx->channel_switch_complete_evt,
-				       CHANNEL_SWITCH_COMPLETE_TIMEOUT);
-	policy_mgr_reset_chan_switch_complete_evt(psoc);
-	if (!QDF_IS_STATUS_SUCCESS(status))
-		policy_mgr_err("SAP Ch Switch wait fail. Force new Ch switch");
+	if (pm_ctx->hdd_cbacks.hdd_is_chan_switch_in_progress &&
+	    pm_ctx->hdd_cbacks.hdd_is_chan_switch_in_progress()) {
+		policy_mgr_debug("wait as channel switch is already in progress");
+		status = qdf_wait_single_event(
+					&pm_ctx->channel_switch_complete_evt,
+					CHANNEL_SWITCH_COMPLETE_TIMEOUT);
+		if (QDF_IS_STATUS_ERROR(status))
+			policy_mgr_err("wait for event failed, still continue with channel switch");
+	}
 
 	policy_mgr_debug("Force SCC for NAN+SAP Ch: %d",
 			 WLAN_REG_IS_5GHZ_CH(sap_ch) ? nan_ch_5g : nan_ch_2g);
@@ -1594,11 +1598,15 @@ void policy_mgr_nan_sap_post_disable_conc_check(struct wlan_objmgr_psoc *psoc)
 							 false);
 	policy_mgr_debug("User/ACS orig ch: %d New SAP ch: %d",
 			 pm_ctx->user_config_sap_channel, sap_ch);
-	status = qdf_wait_single_event(&pm_ctx->channel_switch_complete_evt,
-				       CHANNEL_SWITCH_COMPLETE_TIMEOUT);
-	policy_mgr_reset_chan_switch_complete_evt(psoc);
-	if (!QDF_IS_STATUS_SUCCESS(status))
-		policy_mgr_err("SAP Ch Switch wait fail. Force new Ch switch");
+	if (pm_ctx->hdd_cbacks.hdd_is_chan_switch_in_progress &&
+	    pm_ctx->hdd_cbacks.hdd_is_chan_switch_in_progress()) {
+		policy_mgr_debug("wait as channel switch is already in progress");
+		status = qdf_wait_single_event(
+					&pm_ctx->channel_switch_complete_evt,
+					CHANNEL_SWITCH_COMPLETE_TIMEOUT);
+		if (QDF_IS_STATUS_ERROR(status))
+			policy_mgr_err("wait for event failed, still continue with channel switch");
+	}
 
 	policy_mgr_change_sap_channel_with_csa(psoc, sap_info->vdev_id,
 					       sap_ch,
@@ -2205,106 +2213,15 @@ done:
 	return status;
 }
 
-QDF_STATUS policy_mgr_set_hw_mode_before_channel_switch(
-		struct wlan_objmgr_psoc *psoc, uint8_t vdev_id, uint8_t chan)
-{
-	QDF_STATUS status;
-	struct policy_mgr_conc_connection_info info;
-	uint8_t num_cxn_del = 0;
-	struct policy_mgr_psoc_priv_obj *pm_ctx;
-	enum policy_mgr_conc_next_action next_action = PM_NOP;
-	enum policy_mgr_conn_update_reason reason =
-			POLICY_MGR_UPDATE_REASON_CHANNEL_SWITCH;
-
-	pm_ctx = policy_mgr_get_context(psoc);
-	if (!pm_ctx) {
-		policy_mgr_err("Invalid context");
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	if (!policy_mgr_is_hw_dbs_capable(psoc)) {
-		policy_mgr_err("DBS is disabled");
-		return QDF_STATUS_E_NOSUPPORT;
-	}
-
-	/*
-	 * Stop opportunistic timer as current connection info will change once
-	 * channel is switched and thus if required it will be started once
-	 * channel switch is completed. With new connection info.
-	 */
-	policy_mgr_stop_opportunistic_timer(psoc);
-
-	/*
-	 * Return if driver is already in the dbs mode, movement to
-	 * Single mac/SBS mode will be decided and changed once channel
-	 * switch is completed. This will avoid changing to SBS/Single mac
-	 * till new channel is configured, while the old channel still
-	 * requires DBS.
-	 */
-	if (policy_mgr_is_current_hwmode_dbs(psoc)) {
-		policy_mgr_err("Already in DBS mode");
-		return QDF_STATUS_E_ALREADY;
-	}
-
-	qdf_mutex_acquire(&pm_ctx->qdf_conc_list_lock);
-	/*
-	 * Store the connection's parameter and temporarily delete it
-	 * from the concurrency table. This way the allow concurrency
-	 * check can be used as though a new connection is coming up,
-	 * after check, restore the connection to concurrency table.
-	 */
-	policy_mgr_store_and_del_conn_info_by_vdev_id(psoc, vdev_id,
-						      &info, &num_cxn_del);
-	status = policy_mgr_get_next_action(psoc, vdev_id, chan, reason,
-					    &next_action);
-	/* Restore the connection entry */
-	if (num_cxn_del)
-		policy_mgr_restore_deleted_conn_info(psoc, &info, num_cxn_del);
-	qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
-
-	if (QDF_IS_STATUS_ERROR(status))
-		goto chk_opportunistic_timer;
-
-	status = policy_mgr_reset_connection_update(psoc);
-	if (QDF_IS_STATUS_ERROR(status))
-		policy_mgr_err("clearing event failed");
-
-	if (PM_NOP != next_action)
-		status = policy_mgr_next_actions(psoc, vdev_id,
-						 next_action, reason);
-	else
-		status = QDF_STATUS_E_NOSUPPORT;
-
-	if (QDF_IS_STATUS_SUCCESS(status)) {
-		status = policy_mgr_wait_for_connection_update(psoc);
-		if (QDF_IS_STATUS_ERROR(status)) {
-			policy_mgr_err("qdf wait for event failed");
-		}
-	}
-
-chk_opportunistic_timer:
-	/*
-	 * If hw mode change failed restart the opportunistic timer to
-	 * Switch to single mac if required.
-	 */
-	if (status == QDF_STATUS_E_FAILURE) {
-		policy_mgr_err("Failed to update HW modeStatus %d", status);
-		policy_mgr_check_n_start_opportunistic_timer(psoc);
-	}
-
-	return status;
-}
-
-QDF_STATUS policy_mgr_check_and_set_hw_mode_sta_channel_switch(
-		struct wlan_objmgr_psoc *psoc, uint8_t vdev_id, uint8_t chan)
+QDF_STATUS policy_mgr_check_and_set_hw_mode_for_channel_switch(
+		struct wlan_objmgr_psoc *psoc, uint8_t vdev_id, uint8_t chan,
+		enum policy_mgr_conn_update_reason reason)
 {
 	QDF_STATUS status;
 	struct policy_mgr_conc_connection_info info;
 	uint8_t num_cxn_del = 0;
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
 	enum policy_mgr_conc_next_action next_action = PM_NOP;
-	enum policy_mgr_conn_update_reason reason =
-			POLICY_MGR_UPDATE_REASON_CHANNEL_SWITCH_STA;
 
 	pm_ctx = policy_mgr_get_context(psoc);
 	if (!pm_ctx) {

core/mac/src/pe/lim/lim_process_action_frame.c

@@ -83,9 +83,10 @@ void lim_stop_tx_and_switch_channel(struct mac_context *mac, uint8_t sessionId)
 		       pe_session->gLimChannelSwitch.switchMode);
 
 	mac->lim.limTimers.gLimChannelSwitchTimer.sessionId = sessionId;
-	status = policy_mgr_check_and_set_hw_mode_sta_channel_switch(mac->psoc,
+	status = policy_mgr_check_and_set_hw_mode_for_channel_switch(mac->psoc,
 				pe_session->smeSessionId,
-				pe_session->gLimChannelSwitch.primaryChannel);
+				pe_session->gLimChannelSwitch.primaryChannel,
+				POLICY_MGR_UPDATE_REASON_CHANNEL_SWITCH_STA);
 
 	/*
 	 * If status is QDF_STATUS_E_FAILURE, mean HW mode change was required

core/sap/src/sap_module.c

@@ -1350,7 +1350,7 @@ QDF_STATUS wlansap_set_channel_change_with_csa(struct sap_context *sap_ctx,
 	struct mac_context *mac;
 	mac_handle_t mac_handle;
 	bool valid;
-	QDF_STATUS status;
+	QDF_STATUS status, hw_mode_status;
 	bool sta_sap_scc_on_dfs_chan;
 
 	if (!sap_ctx) {
@@ -1421,25 +1421,30 @@ QDF_STATUS wlansap_set_channel_change_with_csa(struct sap_context *sap_ctx,
 			if (status != QDF_STATUS_SUCCESS)
 				return status;
 
-			status = policy_mgr_set_hw_mode_before_channel_switch(
-						mac->psoc,
-						sap_ctx->sessionId,
-						targetChannel);
+			hw_mode_status =
+			  policy_mgr_check_and_set_hw_mode_for_channel_switch(
+				   mac->psoc, sap_ctx->sessionId, targetChannel,
+				   POLICY_MGR_UPDATE_REASON_CHANNEL_SWITCH);
+
 			/*
-			 * If status is QDF_STATUS_E_FAILURE that mean HW mode
-			 * change was required but set HW mode change failed.
+			 * If hw_mode_status is QDF_STATUS_E_FAILURE, mean HW
+			 * mode change was required but driver failed to set HW
+			 * mode so ignore CSA for the channel.
 			 */
-			if (status == QDF_STATUS_E_FAILURE) {
+			if (hw_mode_status == QDF_STATUS_E_FAILURE) {
 				QDF_TRACE(QDF_MODULE_ID_SAP,
 					  QDF_TRACE_LEVEL_ERROR,
 					  FL("HW change required but failed to set hw mode"));
-				return status;
+				return hw_mode_status;
 			}
 
 			status = policy_mgr_reset_chan_switch_complete_evt(
 								mac->psoc);
-			if (QDF_IS_STATUS_ERROR(status))
+			if (QDF_IS_STATUS_ERROR(status)) {
+				policy_mgr_check_n_start_opportunistic_timer(
+								mac->psoc);
 				return status;
+			}
 			/*
 			 * Copy the requested target channel
 			 * to sap context.
@@ -1494,6 +1499,26 @@ QDF_STATUS wlansap_set_channel_change_with_csa(struct sap_context *sap_ctx,
 			mac->sap.SapDfsInfo.cac_state =
 					eSAP_DFS_DO_NOT_SKIP_CAC;
 			sap_cac_reset_notify(mac_handle);
+
+			/*
+			 * If hw_mode_status is QDF_STATUS_SUCCESS mean HW mode
+			 * change was required and was successfully requested so
+			 * the channel switch will continue after HW mode change
+			 * completion.
+			 */
+			if (QDF_IS_STATUS_SUCCESS(hw_mode_status)) {
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO,
+					  FL("Channel change will continue after HW mode change"));
+				return QDF_STATUS_SUCCESS;
+			}
+			/*
+			 * If hw_mode_status is QDF_STATUS_E_NOSUPPORT or
+			 * QDF_STATUS_E_ALREADY (not QDF_STATUS_E_FAILURE and
+			 * not QDF_STATUS_SUCCESS), mean DBS is not supported or
+			 * required HW mode is already set, So contunue with
+			 * CSA from here.
+			 */
 			sap_start_csa_restart(mac, sap_ctx);
 		} else {
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,

core/sme/src/common/sme_api.c

@@ -211,9 +211,14 @@ static QDF_STATUS sme_process_set_hw_mode_resp(struct mac_context *mac, uint8_t
 		csr_saved_scan_cmd_free_fields(mac, session);
 	}
 	if (reason == POLICY_MGR_UPDATE_REASON_CHANNEL_SWITCH_STA) {
-		sme_debug(" Continue channel switch for STA");
+		sme_info("Continue channel switch for STA");
 		csr_sta_continue_csa(mac, session_id);
 	}
+
+	if (reason == POLICY_MGR_UPDATE_REASON_CHANNEL_SWITCH) {
+		sme_info("Continue channel switch for SAP");
+		csr_csa_restart(mac, session_id);
+	}
 	if (reason == POLICY_MGR_UPDATE_REASON_LFR2_ROAM)
 		csr_continue_lfr2_connect(mac, session_id);