qcacld-3.0: Fix 3rd SAP failed to avoid LTE unsafe channel

wlan0 on 5180, wlan2 on 5180, wlan1 on 2462. wlan1 conf file
has ACS “freqlist=2457-2472,5180-5945”.
When LTE unsafe event comes, it marks 2457, 2462, 5180 unsafe,
wlan0 changes channel to 5200. wlan1 has no available 2G channels.
It selects 5G channel 5200. But 5G has two vdevs already, then
Concurrency check failed - drv doesn’t support 3 home channel.
wlan1 keep active on 2457, but driver doesn't continue to check
wlan2's channel and do CSA to safe channel.
Fix by checking the wlan1's CSA status and if status is failure
then do unsafe channel check for 3rd wlan2.

Change-Id: I28e9397436780cf47e57a47482b729a42fb728f0
CRs-Fixed: 3136773

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -688,17 +688,18 @@ QDF_STATUS policy_mgr_change_mcc_go_beacon_interval(
  *
  * Invoke the callback function to change SAP channel using (E)CSA
  *
- * Return: None
+ * Return: QDF_STATUS_SUCCESS on success
  */
-void policy_mgr_change_sap_channel_with_csa(struct wlan_objmgr_psoc *psoc,
-					    uint8_t vdev_id, uint32_t ch_freq,
-					    uint32_t ch_width, bool forced);
+QDF_STATUS
+policy_mgr_change_sap_channel_with_csa(struct wlan_objmgr_psoc *psoc,
+				       uint8_t vdev_id, uint32_t ch_freq,
+				       uint32_t ch_width, bool forced);
 
 #else
-static inline void policy_mgr_change_sap_channel_with_csa(
-		struct wlan_objmgr_psoc *psoc,
-		uint8_t vdev_id, uint32_t ch_freq,
-		uint32_t ch_width, bool forced)
+static inline QDF_STATUS
+policy_mgr_change_sap_channel_with_csa(struct wlan_objmgr_psoc *psoc,
+				       uint8_t vdev_id, uint32_t ch_freq,
+				       uint32_t ch_width, bool forced)
 {
 
 }
@@ -1716,10 +1717,11 @@ struct policy_mgr_sme_cbacks {
  * @wlan_get_sap_acs_band: get acs band from sap config
  */
 struct policy_mgr_hdd_cbacks {
-	void (*sap_restart_chan_switch_cb)(struct wlan_objmgr_psoc *psoc,
-				uint8_t vdev_id, uint32_t ch_freq,
-				uint32_t channel_bw,
-				bool forced);
+	QDF_STATUS (*sap_restart_chan_switch_cb)(struct wlan_objmgr_psoc *psoc,
+						 uint8_t vdev_id,
+						 uint32_t ch_freq,
+						 uint32_t channel_bw,
+						 bool forced);
 	QDF_STATUS (*wlan_hdd_get_channel_for_sap_restart)(
 				struct wlan_objmgr_psoc *psoc,
 				uint8_t vdev_id, uint32_t *ch_freq);

components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 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
@@ -2585,11 +2585,12 @@ policy_mgr_check_bw_with_unsafe_chan_freq(struct wlan_objmgr_psoc *psoc,
  *
  * Invoke the callback function to change SAP channel using (E)CSA
  *
- * Return: None
+ * Return: QDF_STATUS_SUCCESS for success
  */
-void policy_mgr_change_sap_channel_with_csa(struct wlan_objmgr_psoc *psoc,
-					    uint8_t vdev_id, uint32_t ch_freq,
-					    uint32_t ch_width, bool forced)
+QDF_STATUS
+policy_mgr_change_sap_channel_with_csa(struct wlan_objmgr_psoc *psoc,
+				       uint8_t vdev_id, uint32_t ch_freq,
+				       uint32_t ch_width, bool forced)
 {
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
 	struct ch_params ch_params = {0};
@@ -2598,7 +2599,7 @@ void policy_mgr_change_sap_channel_with_csa(struct wlan_objmgr_psoc *psoc,
 	pm_ctx = policy_mgr_get_context(psoc);
 	if (!pm_ctx) {
 		policy_mgr_err("Invalid context");
-		return;
+		return QDF_STATUS_E_INVAL;
 	}
 	if (pm_ctx->hdd_cbacks.wlan_get_ap_prefer_conc_ch_params) {
 		ch_params.ch_width = ch_width;
@@ -2618,9 +2619,16 @@ void policy_mgr_change_sap_channel_with_csa(struct wlan_objmgr_psoc *psoc,
 
 	if (pm_ctx->hdd_cbacks.sap_restart_chan_switch_cb) {
 		policy_mgr_info("SAP change change without restart");
-		pm_ctx->hdd_cbacks.sap_restart_chan_switch_cb(psoc,
-				vdev_id, ch_freq, ch_width, forced);
+		status = pm_ctx->hdd_cbacks.sap_restart_chan_switch_cb(psoc,
+								       vdev_id,
+								       ch_freq,
+								       ch_width,
+								       forced);
+	} else {
+		status = QDF_STATUS_E_INVAL;
 	}
+
+	return status;
 }
 #endif /* FEATURE_WLAN_MCC_TO_SCC_SWITCH */
 

core/hdd/inc/wlan_hdd_main.h

@@ -3562,10 +3562,10 @@ void hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel,
  * Moves the SAP interface by invoking the function which
  * executes the callback to perform channel switch using (E)CSA.
  *
- * Return: None
+ * Return: QDF_STATUS_SUCCESS if successfully
  */
-void hdd_switch_sap_chan_freq(struct hdd_adapter *adapter, qdf_freq_t chan_freq,
-			      bool forced);
+QDF_STATUS hdd_switch_sap_chan_freq(struct hdd_adapter *adapter,
+				    qdf_freq_t chan_freq, bool forced);
 
 #if defined(FEATURE_WLAN_CH_AVOID)
 void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctx);

core/hdd/src/wlan_hdd_hostapd.c

@@ -3462,23 +3462,11 @@ void hdd_stop_sap_set_tx_power(struct wlan_objmgr_psoc *psoc,
 }
 
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
-/**
- * hdd_sap_restart_with_channel_switch() - SAP channel change with E/CSA
- * @wlan_objmgr_psoc: psoc common object
- * @ap_adapter: HDD adapter
- * @target_channel: Channel to which switch must happen
- * @target_bw: Bandwidth of the target channel
- * @forced: Force to switch channel, ignore SCC/MCC check
- *
- * Invokes the necessary API to perform channel switch for the SAP or GO
- *
- * Return: None
- */
-void hdd_sap_restart_with_channel_switch(struct wlan_objmgr_psoc *psoc,
-					 struct hdd_adapter *ap_adapter,
-					 uint32_t target_chan_freq,
-					 uint32_t target_bw,
-					 bool forced)
+QDF_STATUS hdd_sap_restart_with_channel_switch(struct wlan_objmgr_psoc *psoc,
+					       struct hdd_adapter *ap_adapter,
+					       uint32_t target_chan_freq,
+					       uint32_t target_bw,
+					       bool forced)
 {
 	struct net_device *dev = ap_adapter->dev;
 	int ret;
@@ -3487,7 +3475,7 @@ void hdd_sap_restart_with_channel_switch(struct wlan_objmgr_psoc *psoc,
 
 	if (!dev) {
 		hdd_err("Invalid dev pointer");
-		return;
+		return QDF_STATUS_E_INVAL;
 	}
 
 	ret = hdd_softap_set_channel_change(dev, target_chan_freq,
@@ -3495,25 +3483,27 @@ void hdd_sap_restart_with_channel_switch(struct wlan_objmgr_psoc *psoc,
 	if (ret) {
 		hdd_err("channel switch failed");
 		hdd_stop_sap_set_tx_power(psoc, ap_adapter);
-		return;
 	}
+
+	return qdf_status_from_os_return(ret);
 }
 
-void hdd_sap_restart_chan_switch_cb(struct wlan_objmgr_psoc *psoc,
-				    uint8_t vdev_id, uint32_t ch_freq,
-				    uint32_t channel_bw,
-				    bool forced)
+QDF_STATUS hdd_sap_restart_chan_switch_cb(struct wlan_objmgr_psoc *psoc,
+					  uint8_t vdev_id, uint32_t ch_freq,
+					  uint32_t channel_bw, bool forced)
 {
 	struct hdd_adapter *ap_adapter =
 		wlan_hdd_get_adapter_from_vdev(psoc, vdev_id);
 
 	if (!ap_adapter) {
 		hdd_err("Adapter is NULL");
-		return;
+		return QDF_STATUS_E_INVAL;
 	}
-	hdd_sap_restart_with_channel_switch(psoc, ap_adapter,
-					    ch_freq,
-					    channel_bw, forced);
+
+	return hdd_sap_restart_with_channel_switch(psoc,
+						   ap_adapter,
+						   ch_freq,
+						   channel_bw, forced);
 }
 
 void wlan_hdd_set_sap_csa_reason(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
@@ -3546,6 +3536,7 @@ QDF_STATUS wlan_hdd_get_channel_for_sap_restart(
 	struct sap_context *sap_context;
 	enum sap_csa_reason_code csa_reason =
 		CSA_REASON_CONCURRENT_STA_CHANGED_CHANNEL;
+	QDF_STATUS status;
 
 	if (!ap_adapter) {
 		hdd_err("ap_adapter is NULL");
@@ -3668,11 +3659,11 @@ sap_restart:
 	hdd_ap_ctx->bss_stop_reason = BSS_STOP_DUE_TO_MCC_SCC_SWITCH;
 	*ch_freq = intf_ch_freq;
 	hdd_debug("SAP channel change with CSA/ECSA");
-	hdd_sap_restart_chan_switch_cb(psoc, vdev_id, *ch_freq,
-				       ch_params.ch_width, false);
+	status = hdd_sap_restart_chan_switch_cb(psoc, vdev_id, *ch_freq,
+						ch_params.ch_width, false);
 	wlansap_context_put(sap_context);
 
-	return QDF_STATUS_SUCCESS;
+	return status;
 }
 
 QDF_STATUS

core/hdd/src/wlan_hdd_hostapd.h

@@ -87,13 +87,14 @@ void hdd_stop_sap_set_tx_power(struct wlan_objmgr_psoc *psoc,
  *
  * Invokes the necessary API to perform channel switch for the SAP or GO
  *
- * Return: None
+ * Return: QDF_STATUS_SUCCESS if successfully
  */
-void hdd_sap_restart_with_channel_switch(struct wlan_objmgr_psoc *psoc,
-					 struct hdd_adapter *adapter,
-					 uint32_t target_chan_freq,
-					 uint32_t target_bw,
-					 bool forced);
+QDF_STATUS hdd_sap_restart_with_channel_switch(struct wlan_objmgr_psoc *psoc,
+					       struct hdd_adapter *ap_adapter,
+					       uint32_t target_chan_freq,
+					       uint32_t target_bw,
+					       bool forced);
+
 /**
  * hdd_sap_restart_chan_switch_cb() - Function to restart SAP with
  * a different channel
@@ -104,13 +105,12 @@ void hdd_sap_restart_with_channel_switch(struct wlan_objmgr_psoc *psoc,
  *
  * This function restarts SAP with a different channel
  *
- * Return: None
+ * Return: QDF_STATUS_SUCCESS if successfully
  *
  */
-void hdd_sap_restart_chan_switch_cb(struct wlan_objmgr_psoc *psoc,
-				    uint8_t vdev_id, uint32_t ch_freq,
-				    uint32_t channel_bw,
-				    bool forced);
+QDF_STATUS hdd_sap_restart_chan_switch_cb(struct wlan_objmgr_psoc *psoc,
+					  uint8_t vdev_id, uint32_t ch_freq,
+					  uint32_t channel_bw, bool forced);
 /**
  * wlan_hdd_get_channel_for_sap_restart() - Function to get
  * suitable channel and restart SAP

core/hdd/src/wlan_hdd_main.c

@@ -12016,28 +12016,30 @@ void hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel,
 		hdd_ap_ctx->sap_config.ch_width_orig, forced);
 }
 
-void hdd_switch_sap_chan_freq(struct hdd_adapter *adapter, qdf_freq_t chan_freq,
-			      bool forced)
+QDF_STATUS hdd_switch_sap_chan_freq(struct hdd_adapter *adapter,
+				    qdf_freq_t chan_freq, bool forced)
 {
 	struct hdd_ap_ctx *hdd_ap_ctx;
 	struct hdd_context *hdd_ctx;
 
 	if (hdd_validate_adapter(adapter))
-		return;
+		return QDF_STATUS_E_INVAL;
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	if(wlan_hdd_validate_context(hdd_ctx))
-		return;
+		return QDF_STATUS_E_INVAL;
 
 	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
 
 	hdd_debug("chan freq:%d width:%d",
 		  chan_freq, hdd_ap_ctx->sap_config.ch_width_orig);
 
-	policy_mgr_change_sap_channel_with_csa(
-		hdd_ctx->psoc, adapter->vdev_id, chan_freq,
-		hdd_ap_ctx->sap_config.ch_width_orig, forced);
+	return policy_mgr_change_sap_channel_with_csa(hdd_ctx->psoc,
+						      adapter->vdev_id,
+						      chan_freq,
+						      hdd_ap_ctx->sap_config.ch_width_orig,
+						      forced);
 }
 
 int hdd_update_acs_timer_reason(struct hdd_adapter *adapter, uint8_t reason)
@@ -12238,43 +12240,47 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 						    adapter->vdev_id,
 						    CSA_REASON_UNSAFE_CHANNEL);
 			hdd_err("Unable to find safe chan, Stop the SAP if restriction mask is set else stop SAP");
-				hdd_stop_sap_set_tx_power(hdd_ctxt->psoc,
-							  adapter);
-		} else {
-			/*
-			 * SAP restart due to unsafe channel. While
-			 * restarting the SAP, make sure to clear
-			 * acs_channel, channel to reset to
-			 * 0. Otherwise these settings will override
-			 * the ACS while restart.
-			 */
-			hdd_ctxt->acs_policy.acs_chan_freq =
-						AUTO_CHANNEL_SELECT;
-			ucfg_mlme_get_sap_internal_restart(hdd_ctxt->psoc,
-							   &value);
-			if (value) {
-				wlan_hdd_set_sap_csa_reason(hdd_ctxt->psoc,
-						adapter->vdev_id,
-						CSA_REASON_UNSAFE_CHANNEL);
-				hdd_switch_sap_chan_freq(adapter, restart_freq,
-							 true);
-				hdd_adapter_dev_put_debug(adapter, dbgid);
-				if (next_adapter)
-					hdd_adapter_dev_put_debug(next_adapter,
-								  dbgid);
-				return;
-			}
-			else {
-				hdd_debug("sending coex indication");
-				wlan_hdd_send_svc_nlink_msg(
-						hdd_ctxt->radio_index,
-						WLAN_SVC_LTE_COEX_IND, NULL, 0);
+			hdd_stop_sap_set_tx_power(hdd_ctxt->psoc, adapter);
+			hdd_adapter_dev_put_debug(adapter, dbgid);
+			continue;
+		}
+		/*
+		 * SAP restart due to unsafe channel. While
+		 * restarting the SAP, make sure to clear
+		 * acs_channel, channel to reset to
+		 * 0. Otherwise these settings will override
+		 * the ACS while restart.
+		 */
+		hdd_ctxt->acs_policy.acs_chan_freq =
+					AUTO_CHANNEL_SELECT;
+		ucfg_mlme_get_sap_internal_restart(hdd_ctxt->psoc,
+						   &value);
+		if (value) {
+			wlan_hdd_set_sap_csa_reason(hdd_ctxt->psoc,
+						    adapter->vdev_id,
+						    CSA_REASON_UNSAFE_CHANNEL);
+			status = hdd_switch_sap_chan_freq(adapter,
+							  restart_freq,
+							  true);
+			if (QDF_IS_STATUS_SUCCESS(status)) {
 				hdd_adapter_dev_put_debug(adapter, dbgid);
 				if (next_adapter)
 					hdd_adapter_dev_put_debug(next_adapter,
 								  dbgid);
 				return;
+			} else {
+				hdd_debug("CSA failed, check next SAP");
 			}
+		} else {
+			hdd_debug("sending coex indication");
+			wlan_hdd_send_svc_nlink_msg(
+					hdd_ctxt->radio_index,
+					WLAN_SVC_LTE_COEX_IND, NULL, 0);
+			hdd_adapter_dev_put_debug(adapter, dbgid);
+			if (next_adapter)
+				hdd_adapter_dev_put_debug(next_adapter,
+							  dbgid);
+			return;
 		}
 		/* dev_put has to be done here */
 		hdd_adapter_dev_put_debug(adapter, dbgid);