qcacld-3.0: Fix ML STA + 2 SAP force SCC issue

After ML STA connected on 2.4 GHz + 5 GHz, two existing
SAP (2.4 GHz and 5 GHz) have to force SCC to respective
band's ML link home channel. Currently driver make the
CSA for two sap at same time but to different channel.
We only support CSA one by one (for different target
channel) because only one target channel is in
mac_ctx->sap.SapDfsInfo.target_chan_freq. Otherwise, the
value will be override by second SAP's CSA and causes
first SAP changed to wrong channel.
Fix by:
1. change __policy_mgr_check_sta_ap_concurrent_ch_intf to
trigger CSA for one SAP by break the loop.
2. reschedule the sta_ap workqueue after first CSA done in
multiple SAP case. Then do force SCC for second SAP.

Change-Id: I1de81b5839a7e24f862627ecc49663dcd0d91ce4
CRs-Fixed: 3470343

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -1043,11 +1043,12 @@ void policy_mgr_process_force_scc_for_nan(struct wlan_objmgr_psoc *psoc);
  * scheduled. The workqueue will handle the new channel selection and change
  * the channel of second interface to avoid MCC.
  *
- * Return: void
+ * Return: QDF_STATUS
  */
-void policy_mgr_check_sap_go_force_scc(struct wlan_objmgr_psoc *psoc,
-				       struct wlan_objmgr_vdev *vdev,
-				       enum sap_csa_reason_code reason_code);
+QDF_STATUS
+policy_mgr_check_sap_go_force_scc(struct wlan_objmgr_psoc *psoc,
+				  struct wlan_objmgr_vdev *vdev,
+				  enum sap_csa_reason_code reason_code);
 
 /**
  * policy_mgr_set_pcl_for_existing_combo() - SET PCL for existing combo
@@ -4265,9 +4266,10 @@ qdf_freq_t policy_mgr_get_user_config_sap_freq(struct wlan_objmgr_psoc *psoc,
  *                                               post nan/sap enable
  * @psoc: pointer to psoc
  *
- * Return: void
+ * Return: QDF_STATUS
  **/
-void policy_mgr_nan_sap_post_enable_conc_check(struct wlan_objmgr_psoc *psoc);
+QDF_STATUS
+policy_mgr_nan_sap_post_enable_conc_check(struct wlan_objmgr_psoc *psoc);
 
 /**
  * policy_mgr_nan_sap_post_disable_conc_check() - Do concurrency related

components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -1988,17 +1988,19 @@ policy_mgr_nan_sap_pre_enable_conc_check(struct wlan_objmgr_psoc *psoc,
 	return true;
 }
 
-void policy_mgr_nan_sap_post_enable_conc_check(struct wlan_objmgr_psoc *psoc)
+QDF_STATUS
+policy_mgr_nan_sap_post_enable_conc_check(struct wlan_objmgr_psoc *psoc)
 {
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
 	struct policy_mgr_conc_connection_info *sap_info = NULL;
 	uint8_t i;
 	qdf_freq_t nan_freq_2g, nan_freq_5g;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	pm_ctx = policy_mgr_get_context(psoc);
 	if (!pm_ctx) {
 		policy_mgr_err("Invalid pm context");
-		return;
+		return QDF_STATUS_E_INVAL;
 	}
 
 	qdf_mutex_acquire(&pm_ctx->qdf_conc_list_lock);
@@ -2028,7 +2030,7 @@ void policy_mgr_nan_sap_post_enable_conc_check(struct wlan_objmgr_psoc *psoc)
 	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;
+		return status;
 	}
 
 	if (pm_ctx->hdd_cbacks.wlan_hdd_set_sap_csa_reason)
@@ -2041,23 +2043,31 @@ void policy_mgr_nan_sap_post_enable_conc_check(struct wlan_objmgr_psoc *psoc)
 	    WLAN_REG_IS_24GHZ_CH_FREQ(sap_info->freq)) {
 		policy_mgr_debug("Force SCC for NAN+SAP Ch freq: %d",
 				 nan_freq_2g);
+		status =
 		policy_mgr_change_sap_channel_with_csa(psoc, sap_info->vdev_id,
 						       nan_freq_2g,
 						       policy_mgr_get_ch_width(
 						       sap_info->bw),
 						       true);
+		if (status == QDF_STATUS_SUCCESS)
+			status = QDF_STATUS_E_PENDING;
 	} else if (nan_freq_5g && WLAN_REG_IS_5GHZ_CH_FREQ(sap_info->freq)) {
 		policy_mgr_debug("Force SCC for NAN+SAP Ch freq: %d",
 				 nan_freq_5g);
+		status =
 		policy_mgr_change_sap_channel_with_csa(psoc, sap_info->vdev_id,
 						       nan_freq_5g,
 						       policy_mgr_get_ch_width(
 						       sap_info->bw),
 						       true);
+		if (status == QDF_STATUS_SUCCESS)
+			status = QDF_STATUS_E_PENDING;
 	}
 
 end:
 	pm_ctx->sta_ap_intf_check_work_info->nan_force_scc_in_progress = false;
+
+	return status;
 }
 
 void policy_mgr_nan_sap_post_disable_conc_check(struct wlan_objmgr_psoc *psoc)
@@ -2273,7 +2283,7 @@ force_scc_done:
 	return status;
 }
 
-void
+QDF_STATUS
 policy_mgr_check_sap_go_force_scc(struct wlan_objmgr_psoc *psoc,
 				  struct wlan_objmgr_vdev *vdev,
 				  enum sap_csa_reason_code reason_code)
@@ -2289,22 +2299,22 @@ policy_mgr_check_sap_go_force_scc(struct wlan_objmgr_psoc *psoc,
 
 	if (reason_code != CSA_REASON_GO_BSS_STARTED &&
 	    reason_code != CSA_REASON_USER_INITIATED)
-		return;
+		return QDF_STATUS_SUCCESS;
 
 	pm_ctx = policy_mgr_get_context(psoc);
 	if (!pm_ctx) {
 		policy_mgr_err("Invalid Context");
-		return;
+		return QDF_STATUS_E_INVAL;
 	}
 	if (!vdev) {
 		policy_mgr_err("vdev is null");
-		return;
+		return QDF_STATUS_E_INVAL;
 	}
 	vdev_id = wlan_vdev_get_id(vdev);
 	work_info = pm_ctx->sta_ap_intf_check_work_info;
 	if (!work_info) {
 		policy_mgr_err("invalid work info");
-		return;
+		return QDF_STATUS_E_INVAL;
 	}
 
 	chan_freq = wlan_get_operation_chan_freq(vdev);
@@ -2318,13 +2328,13 @@ policy_mgr_check_sap_go_force_scc(struct wlan_objmgr_psoc *psoc,
 						   &existing_vdev_mode,
 						   &con_freq, &ch_width);
 	if (existing_vdev_id == WLAN_UMAC_VDEV_ID_MAX)
-		return;
+		return QDF_STATUS_SUCCESS;
 
 	if (!((vdev_con_mode == PM_P2P_GO_MODE &&
 	       existing_vdev_mode == PM_SAP_MODE) ||
 	      (vdev_con_mode == PM_SAP_MODE &&
 	       existing_vdev_mode == PM_P2P_GO_MODE)))
-		return;
+		return QDF_STATUS_SUCCESS;
 
 	work_info->sap_plus_go_force_scc.reason = reason_code;
 	work_info->sap_plus_go_force_scc.initiator_vdev_id = vdev_id;
@@ -2337,6 +2347,8 @@ policy_mgr_check_sap_go_force_scc(struct wlan_objmgr_psoc *psoc,
 	if (!qdf_delayed_work_start(&pm_ctx->sta_ap_intf_check_work,
 				    WAIT_BEFORE_GO_FORCESCC_RESTART))
 		policy_mgr_debug("change interface request already queued");
+
+	return QDF_STATUS_E_PENDING;
 }
 
 static void __policy_mgr_check_sta_ap_concurrent_ch_intf(
@@ -2438,6 +2450,7 @@ static void __policy_mgr_check_sta_ap_concurrent_ch_intf(
 				policy_mgr_debug("SAP vdev id %d restarts due to MCC->SCC switch, old ch freq :%d new ch freq: %d",
 						 vdev_id[i],
 						 op_ch_freq_list[i], ch_freq);
+				break;
 			}
 		}
 

core/hdd/inc/wlan_hdd_main.h

@@ -3197,10 +3197,10 @@ int hdd_update_acs_timer_reason(struct hdd_adapter *adapter, uint8_t reason);
  * Moves the SAP interface by invoking the function which
  * executes the callback to perform channel switch using (E)CSA.
  *
- * Return: None
+ * Return: QDF_STATUS
  */
-void hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel,
-			    bool forced);
+QDF_STATUS hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel,
+				  bool forced);
 
 /**
  * hdd_switch_sap_chan_freq() - Move SAP to the given channel
@@ -3220,15 +3220,16 @@ QDF_STATUS hdd_switch_sap_chan_freq(struct hdd_adapter *adapter,
 				    bool forced);
 
 #if defined(FEATURE_WLAN_CH_AVOID)
-void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctx);
+QDF_STATUS hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctx);
 
 void hdd_ch_avoid_ind(struct hdd_context *hdd_ctxt,
 		      struct unsafe_ch_list *unsafe_chan_list,
 		      struct ch_avoid_ind_type *avoid_freq_list);
 #else
 static inline
-void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctx)
+QDF_STATUS hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctx)
 {
+	return QDF_STATUS_SUCCESS;
 }
 
 static inline
@@ -3768,7 +3769,7 @@ static inline void hdd_enable_fastpath(struct hdd_context *hdd_ctx,
 void hdd_wlan_update_target_info(struct hdd_context *hdd_ctx, void *context);
 
 enum  sap_acs_dfs_mode wlan_hdd_get_dfs_mode(enum dfs_mode mode);
-void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctx);
+
 /**
  * hdd_clone_local_unsafe_chan() - clone hdd ctx unsafe chan list
  * @hdd_ctx: hdd context pointer

core/hdd/src/wlan_hdd_dcs.c

@@ -374,9 +374,9 @@ void hdd_dcs_register_cb(struct hdd_context *hdd_ctx)
 					  hdd_ctx);
 }
 
-void hdd_dcs_hostapd_set_chan(struct hdd_context *hdd_ctx,
-			      uint8_t vdev_id,
-			      qdf_freq_t dcs_ch_freq)
+QDF_STATUS hdd_dcs_hostapd_set_chan(struct hdd_context *hdd_ctx,
+				    uint8_t vdev_id,
+				    qdf_freq_t dcs_ch_freq)
 {
 	struct hdd_ap_ctx *ap_ctx;
 	QDF_STATUS status;
@@ -391,7 +391,7 @@ void hdd_dcs_hostapd_set_chan(struct hdd_context *hdd_ctx,
 
 	if (QDF_IS_STATUS_ERROR(status)) {
 		hdd_err("get mac id failed");
-		return;
+		return QDF_STATUS_E_INVAL;
 	}
 	count = policy_mgr_get_sap_go_count_on_mac(hdd_ctx->psoc, list, mac_id);
 
@@ -405,7 +405,7 @@ void hdd_dcs_hostapd_set_chan(struct hdd_context *hdd_ctx,
 		if (!adapter) {
 			hdd_err("vdev_id %u does not exist with host",
 				list[conn_index]);
-			return;
+			return QDF_STATUS_E_INVAL;
 		}
 
 		if (adapter->deflink->session.ap.operating_chan_freq !=
@@ -421,7 +421,7 @@ void hdd_dcs_hostapd_set_chan(struct hdd_context *hdd_ctx,
 		if (!adapter) {
 			hdd_err("vdev_id %u does not exist with host",
 				list[conn_index]);
-			return;
+			return QDF_STATUS_E_INVAL;
 		}
 
 		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
@@ -434,11 +434,14 @@ void hdd_dcs_hostapd_set_chan(struct hdd_context *hdd_ctx,
 			wlan_hdd_set_sap_csa_reason(hdd_ctx->psoc,
 						    adapter->deflink->vdev_id,
 						    CSA_REASON_DCS);
-			hdd_switch_sap_channel(adapter, dcs_ch, true);
-
-			return;
+			status = hdd_switch_sap_channel(adapter, dcs_ch, true);
+			if (status == QDF_STATUS_SUCCESS)
+				status = QDF_STATUS_E_PENDING;
+			return status;
 		}
 	}
+
+	return QDF_STATUS_SUCCESS;
 }
 
 /**

core/hdd/src/wlan_hdd_dcs.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -47,9 +48,9 @@ void hdd_dcs_register_cb(struct hdd_context *hdd_ctx);
  *
  * Return: None
  */
-void hdd_dcs_hostapd_set_chan(struct hdd_context *hdd_ctx,
-			      uint8_t vdev_id,
-			      qdf_freq_t dcs_ch_freq);
+QDF_STATUS hdd_dcs_hostapd_set_chan(struct hdd_context *hdd_ctx,
+				    uint8_t vdev_id,
+				    qdf_freq_t dcs_ch_freq);
 
 /**
  * hdd_dcs_chan_select_complete() - dcs triggered channel select
@@ -78,10 +79,11 @@ static inline void hdd_dcs_register_cb(struct hdd_context *hdd_ctx)
 {
 }
 
-static inline void hdd_dcs_hostapd_set_chan(struct hdd_context *hdd_ctx,
-					    uint8_t vdev_id,
-					    qdf_freq_t dcs_ch_freq)
+static inline QDF_STATUS hdd_dcs_hostapd_set_chan(struct hdd_context *hdd_ctx,
+						  uint8_t vdev_id,
+						  qdf_freq_t dcs_ch_freq)
 {
+	return QDF_STATUS_SUCCESS;
 }
 
 static inline void hdd_dcs_chan_select_complete(struct hdd_adapter *adapter)

core/hdd/src/wlan_hdd_hostapd.c

@@ -1922,6 +1922,63 @@ hdd_hostapd_sap_fill_peer_ml_info(struct hdd_adapter *adapter,
 }
 #endif
 
+static void
+hdd_hostapd_check_channel_post_csa(struct hdd_context *hdd_ctx,
+				   struct hdd_adapter *adapter)
+{
+	struct hdd_ap_ctx *ap_ctx;
+	uint8_t sta_cnt, sap_cnt;
+	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
+
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+	if (ap_ctx->sap_context->csa_reason ==
+	    CSA_REASON_UNSAFE_CHANNEL)
+		qdf_status = hdd_unsafe_channel_restart_sap(hdd_ctx);
+	else if (ap_ctx->sap_context->csa_reason == CSA_REASON_DCS)
+		qdf_status = hdd_dcs_hostapd_set_chan(
+			hdd_ctx, adapter->deflink->vdev_id,
+			ap_ctx->operating_chan_freq);
+	if (qdf_status == QDF_STATUS_E_PENDING) {
+		hdd_debug("csa is pending with reason %d",
+			  ap_ctx->sap_context->csa_reason);
+		return;
+	}
+
+	/* Added the sta cnt check as we don't support sta+sap+nan
+	 * today. But this needs to be re-visited when we start
+	 * supporting this combo.
+	 */
+	sta_cnt = policy_mgr_mode_specific_connection_count(hdd_ctx->psoc,
+							    PM_STA_MODE,
+							    NULL);
+	if (!sta_cnt)
+		qdf_status =
+		policy_mgr_nan_sap_post_enable_conc_check(hdd_ctx->psoc);
+	if (qdf_status == QDF_STATUS_E_PENDING) {
+		hdd_debug("csa is pending by nan sap conc");
+		return;
+	}
+
+	qdf_status = policy_mgr_check_sap_go_force_scc(
+			hdd_ctx->psoc, adapter->deflink->vdev,
+			ap_ctx->sap_context->csa_reason);
+	if (qdf_status == QDF_STATUS_E_PENDING) {
+		hdd_debug("csa is pending by sap go force scc");
+		return;
+	}
+
+	sap_cnt = policy_mgr_mode_specific_connection_count(hdd_ctx->psoc,
+							    PM_SAP_MODE,
+							    NULL);
+	sap_cnt += policy_mgr_mode_specific_connection_count(hdd_ctx->psoc,
+							     PM_P2P_GO_MODE,
+							     NULL);
+	if (sap_cnt > 1)
+		policy_mgr_check_concurrent_intf_and_restart_sap(
+				hdd_ctx->psoc,
+				ap_ctx->sap_config.acs_cfg.acs_mode);
+}
+
 QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 				    void *context)
 {
@@ -1961,7 +2018,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 	struct wlan_objmgr_vdev *vdev;
 	struct qdf_mac_addr sta_addr = {0};
 	qdf_freq_t dfs_freq;
-	uint8_t sta_cnt;
 
 	dev = context;
 	if (!dev) {
@@ -2941,26 +2997,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		}
 
 		/* Check any other sap need restart */
-		if (ap_ctx->sap_context->csa_reason ==
-		    CSA_REASON_UNSAFE_CHANNEL)
-			hdd_unsafe_channel_restart_sap(hdd_ctx);
-		else if (ap_ctx->sap_context->csa_reason == CSA_REASON_DCS)
-			hdd_dcs_hostapd_set_chan(
-				hdd_ctx, adapter->deflink->vdev_id,
-				ap_ctx->operating_chan_freq);
+		hdd_hostapd_check_channel_post_csa(hdd_ctx, adapter);
 
-		/* Added the sta cnt check as we don't support sta+sap+nan
-		 * today. But this needs to be re-visited when we start
-		 * supporting this combo.
-		 */
-		sta_cnt = policy_mgr_mode_specific_connection_count(hdd_ctx->psoc,
-								    PM_STA_MODE,
-								    NULL);
-		if (!sta_cnt)
-			policy_mgr_nan_sap_post_enable_conc_check(hdd_ctx->psoc);
-		policy_mgr_check_sap_go_force_scc(
-				hdd_ctx->psoc, adapter->deflink->vdev,
-				ap_ctx->sap_context->csa_reason);
 		qdf_status = qdf_event_set(&hostapd_state->qdf_event);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			hdd_err("qdf_event_set failed! status: %d",

core/hdd/src/wlan_hdd_main.c

@@ -11823,8 +11823,8 @@ static void hdd_set_thermal_level_cb(hdd_handle_t hdd_handle, u_int8_t level)
  *
  * Return: None
  */
-void hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel,
-			    bool forced)
+QDF_STATUS hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel,
+				  bool forced)
 {
 	struct hdd_ap_ctx *hdd_ap_ctx;
 	struct hdd_context *hdd_ctx;
@@ -11832,7 +11832,7 @@ void hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel,
 
 	if (!adapter) {
 		hdd_err("invalid adapter");
-		return;
+		return QDF_STATUS_E_INVAL;
 	}
 
 	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
@@ -11840,7 +11840,7 @@ void hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel,
 	mac_handle = hdd_adapter_get_mac_handle(adapter);
 	if (!mac_handle) {
 		hdd_err("invalid MAC handle");
-		return;
+		return QDF_STATUS_E_INVAL;
 	}
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@@ -11848,7 +11848,7 @@ void hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel,
 	hdd_debug("chan:%d width:%d",
 		channel, hdd_ap_ctx->sap_config.ch_width_orig);
 
-	policy_mgr_change_sap_channel_with_csa(
+	return policy_mgr_change_sap_channel_with_csa(
 		hdd_ctx->psoc, adapter->deflink->vdev_id,
 		wlan_reg_legacy_chan_to_freq(hdd_ctx->pdev, channel),
 		hdd_ap_ctx->sap_config.ch_width_orig, forced);
@@ -12017,7 +12017,7 @@ hdd_check_chn_bw_boundary_unsafe(struct hdd_context *hdd_ctxt,
  *
  * Return - none
  */
-void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
+QDF_STATUS hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 {
 	struct hdd_adapter *adapter, *next_adapter = NULL;
 	struct hdd_ap_ctx *ap_ctx;
@@ -12147,7 +12147,7 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 				if (next_adapter)
 					hdd_adapter_dev_put_debug(next_adapter,
 								  dbgid);
-				return;
+				return QDF_STATUS_E_PENDING;
 			} else {
 				hdd_debug("CSA failed, check next SAP");
 			}
@@ -12160,11 +12160,13 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 			if (next_adapter)
 				hdd_adapter_dev_put_debug(next_adapter,
 							  dbgid);
-			return;
+			return QDF_STATUS_SUCCESS;
 		}
 		/* dev_put has to be done here */
 		hdd_adapter_dev_put_debug(adapter, dbgid);
 	}
+
+	return QDF_STATUS_SUCCESS;
 }
 
 /**