qcacld-3.0: Handle LL SAP + SAP/GO scenario during acs

Filter pcl channel list for SAP/GO if LL SAP is present
and SAP/GO comes up.

Change-Id: I7527131ba8b465f5be9bafec3d0c8b527a70b3dd
CRs-Fixed: 3331013

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -1533,11 +1533,9 @@ bool policy_mgr_is_dbs_allowed_for_concurrency(
 /**
  * policy_mgr_get_pcl_chlist_for_ll_sap() - Get pcl channel list for LL SAP
  * @psoc: PSOC object information
- * @mode: Device mode
- * @vdev_id: Vdev id
+ * @len: length of the PCL
  * @pcl_channels: Preferred channel freq list
  * @pcl_weight: Weights of the PCL
- * @len: length of the PCL
  *
  * This function provides the preferred channel list on which the ll sap
  * can come.
@@ -1546,13 +1544,52 @@ bool policy_mgr_is_dbs_allowed_for_concurrency(
  */
 QDF_STATUS
 policy_mgr_get_pcl_chlist_for_ll_sap(struct wlan_objmgr_psoc *psoc,
-				     enum policy_mgr_con_mode mode,
-				     uint32_t vdev_id, uint32_t *pcl_channels,
-				     uint8_t *pcl_weight, uint32_t *len);
+				     uint32_t *len, uint32_t *pcl_channels,
+				     uint8_t *pcl_weight);
+
+/**
+ * policy_mgr_get_pcl_ch_for_sap_go_with_ll_sap_present() - Get pcl channel
+ * list for SAP/GO when LL SAP is present
+ * @psoc: PSOC object information
+ * @len: length of the PCL
+ * @pcl_channels: Preferred channel freq list
+ * @pcl_weight: Weights of the PCL
+ *
+ * This function provides the preferred channel list for SAP/GO when LL SAP
+ * is present
+ *
+ * Return: QDF_STATUS
+ */
+
+QDF_STATUS
+policy_mgr_get_pcl_ch_for_sap_go_with_ll_sap_present(
+					struct wlan_objmgr_psoc *psoc,
+					uint32_t *len, uint32_t *pcl_channels,
+					uint8_t *pcl_weight);
+
+/**
+ * policy_mgr_get_pcl_channel_for_ll_sap_concurrency() - Get pcl channel list
+ * for LL SAP concurrency
+ * @psoc: PSOC object information
+ * @mode: Device mode
+ * @vdev_id: Vdev id
+ * @pcl_channels: Preferred channel freq list
+ * @pcl_weight: Weights of the PCL
+ * @len: length of the PCL
+ *
+ * Return: QDF_STATUS
+ */
+
+QDF_STATUS
+policy_mgr_get_pcl_channel_for_ll_sap_concurrency(
+					struct wlan_objmgr_psoc *psoc,
+					enum policy_mgr_con_mode curr_mode,
+					uint32_t vdev_id,
+					uint32_t *pcl_channels,
+					uint8_t *pcl_weight, uint32_t *len);
 
 /**
- * policy_mgr_is_ll_sap_present_in_current_mode() - Check whether LL SAP is
- * present in current mode or not.
+ * policy_mgr_is_ll_sap_present() - Check whether LL SAP is present or not
  * @psoc: psoc object
  * @mode: device mode
  * @vdev_id: vdev id
@@ -1560,9 +1597,9 @@ policy_mgr_get_pcl_chlist_for_ll_sap(struct wlan_objmgr_psoc *psoc,
  * Return: true if it's present otherwise false
  */
 bool
-policy_mgr_is_ll_sap_present_in_current_mode(struct wlan_objmgr_psoc *psoc,
-					     enum policy_mgr_con_mode mode,
-					     uint32_t vdev_id);
+policy_mgr_is_ll_sap_present(struct wlan_objmgr_psoc *psoc,
+			     enum policy_mgr_con_mode mode,
+			     uint32_t vdev_id);
 
 /**
  * policy_mgr_get_preferred_dbs_action_table() - get dbs action table type

components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

@@ -4044,9 +4044,9 @@ bool policy_mgr_is_sta_chan_valid_for_connect_and_roam(
 }
 
 bool
-policy_mgr_is_ll_sap_present_in_current_mode(struct wlan_objmgr_psoc *psoc,
-					     enum policy_mgr_con_mode curr_mode,
-					     uint32_t vdev_id)
+policy_mgr_is_ll_sap_present(struct wlan_objmgr_psoc *psoc,
+			     enum policy_mgr_con_mode curr_mode,
+			     uint32_t vdev_id)
 {
 	struct wlan_objmgr_vdev *vdev;
 	bool is_ll_sap = false;
@@ -4073,9 +4073,8 @@ policy_mgr_is_ll_sap_present_in_current_mode(struct wlan_objmgr_psoc *psoc,
 
 QDF_STATUS
 policy_mgr_get_pcl_chlist_for_ll_sap(struct wlan_objmgr_psoc *psoc,
-				     enum policy_mgr_con_mode curr_mode,
-				     uint32_t vdev_id, uint32_t *pcl_channels,
-				     uint8_t *pcl_weight, uint32_t *len)
+				     uint32_t *len, uint32_t *pcl_channels,
+				     uint8_t *pcl_weight)
 {
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
 	uint32_t pcl_len = 0, i, conn_idx = 0;
@@ -4089,15 +4088,8 @@ policy_mgr_get_pcl_chlist_for_ll_sap(struct wlan_objmgr_psoc *psoc,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	if (!policy_mgr_is_ll_sap_present_in_current_mode(psoc, curr_mode,
-							  vdev_id)) {
-		policy_mgr_debug("LL SAP is not present in current mode %d",
-				 curr_mode);
-		return QDF_STATUS_SUCCESS;
-	}
-
 	total_connection = policy_mgr_get_connection_count(psoc);
-	if (!total_connection && curr_mode == PM_SAP_MODE) {
+	if (!total_connection) {
 		for (i = 0; i < *len; i++) {
 			if (WLAN_REG_IS_24GHZ_CH_FREQ(pcl_channels[i]))
 				continue;
@@ -4142,3 +4134,88 @@ policy_mgr_get_pcl_chlist_for_ll_sap(struct wlan_objmgr_psoc *psoc,
 
 	return QDF_STATUS_SUCCESS;
 }
+
+QDF_STATUS
+policy_mgr_get_pcl_ch_for_sap_go_with_ll_sap_present(
+					struct wlan_objmgr_psoc *psoc,
+					uint32_t *len, uint32_t *pcl_channels,
+					uint8_t *pcl_weight)
+{
+	struct policy_mgr_psoc_priv_obj *pm_ctx;
+	uint32_t pcl_len = 0, i, conn_idx = 0;
+	uint32_t pcl_list[NUM_CHANNELS];
+	uint8_t weight_list[NUM_CHANNELS];
+	qdf_freq_t freq;
+	uint32_t vdev_id;
+	enum policy_mgr_con_mode mode;
+
+	pm_ctx = policy_mgr_get_context(psoc);
+	if (!pm_ctx) {
+		policy_mgr_err("pm_ctx is null");
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	qdf_mutex_acquire(&pm_ctx->qdf_conc_list_lock);
+	for (conn_idx = 0; conn_idx < MAX_NUMBER_OF_CONC_CONNECTIONS;
+	     conn_idx++) {
+		if (!pm_conc_connection_list[conn_idx].in_use)
+			continue;
+
+		freq = pm_conc_connection_list[conn_idx].freq;
+		vdev_id = pm_conc_connection_list[conn_idx].vdev_id;
+		mode = pm_conc_connection_list[conn_idx].mode;
+		if (!policy_mgr_is_ll_sap_present(psoc, mode, vdev_id))
+			continue;
+
+		for (i = 0; i < *len; i++) {
+			if (policy_mgr_2_freq_always_on_same_mac(
+								psoc,
+								pcl_channels[i],
+								freq))
+				continue;
+			pcl_list[pcl_len] = pcl_channels[i];
+			weight_list[pcl_len++] = pcl_weight[i];
+		}
+		*len = pcl_len;
+		qdf_mem_zero(pcl_channels,
+			     *len * sizeof(*pcl_channels));
+		qdf_mem_copy(pcl_channels, pcl_list,
+			     pcl_len * sizeof(*pcl_channels));
+	}
+	qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
+
+	qdf_mem_zero(pcl_weight, *len * sizeof(*pcl_weight));
+	qdf_mem_copy(pcl_weight, weight_list, pcl_len);
+	*len = pcl_len;
+
+	return QDF_STATUS_SUCCESS;
+}
+
+QDF_STATUS
+policy_mgr_get_pcl_channel_for_ll_sap_concurrency(
+					struct wlan_objmgr_psoc *psoc,
+					enum policy_mgr_con_mode curr_mode,
+					uint32_t vdev_id,
+					uint32_t *pcl_channels,
+					uint8_t *pcl_weight, uint32_t *len)
+{
+	if (policy_mgr_is_ll_sap_present(psoc, curr_mode, vdev_id)) {
+		/* Scenario: If there is some existing interface present and
+		 * LL SAP is coming up.
+		 * Filter pcl channel for LL SAP
+		 */
+		policy_mgr_get_pcl_chlist_for_ll_sap(psoc, len, pcl_channels,
+						     pcl_weight);
+	} else {
+		/* Scenario: If there is LL SAP and GO/SAP is coming up.
+		 * Filter pcl channel for GO/SAP
+		 */
+		policy_mgr_get_pcl_ch_for_sap_go_with_ll_sap_present(
+								psoc,
+								len,
+								pcl_channels,
+								pcl_weight);
+	}
+
+	return QDF_STATUS_SUCCESS;
+}

core/hdd/src/wlan_hdd_cfg80211.c

@@ -3737,7 +3737,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 					pcl_channels_weight_list,
 					NUM_CHANNELS);
 
-	policy_mgr_get_pcl_chlist_for_ll_sap(
+	policy_mgr_get_pcl_channel_for_ll_sap_concurrency(
 				hdd_ctx->psoc, pm_mode, adapter->vdev_id,
 				sap_config->acs_cfg.pcl_chan_freq,
 				sap_config->acs_cfg.pcl_channels_weight_list,
@@ -3768,10 +3768,8 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 		if (!sap_config->acs_cfg.ch_list_count &&
 		    sap_config->acs_cfg.master_ch_list_count &&
 		    !is_vendor_unsafe_ch_present &&
-		    !policy_mgr_is_ll_sap_present_in_current_mode(
-							hdd_ctx->psoc,
-							pm_mode,
-							adapter->vdev_id))
+		    !policy_mgr_is_ll_sap_present(hdd_ctx->psoc, pm_mode,
+						  adapter->vdev_id))
 			wlan_hdd_handle_zero_acs_list(
 				hdd_ctx,
 				sap_config->acs_cfg.freq_list,

core/sme/src/csr/csr_util.c

@@ -634,7 +634,7 @@ uint16_t csr_check_concurrent_channel_overlap(struct mac_context *mac_ctx,
 		return 0;
 
 	op_mode = wlan_get_opmode_vdev_id(mac_ctx->pdev, vdev_id);
-	if (policy_mgr_is_ll_sap_present_in_current_mode(
+	if (policy_mgr_is_ll_sap_present(
 			mac_ctx->psoc,
 			policy_mgr_convert_device_mode_to_qdf_type(op_mode),
 			vdev_id))