qcacld-3.0: Filter out passive/dfs channel during get pcl

Filter out passive/dfs channel during get pcl for LL_LT_SAP.

Change-Id: Ica11ca7d085369286a47b73af1a259bb17329ba8
CRs-Fixed: 3493007

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -1684,6 +1684,7 @@ policy_mgr_change_hw_mode_sta_connect(struct wlan_objmgr_psoc *psoc,
 bool policy_mgr_is_dbs_allowed_for_concurrency(
 		struct wlan_objmgr_psoc *psoc, enum QDF_OPMODE new_conn_mode);
 
+#ifndef WLAN_FEATURE_LL_LT_SAP
 /**
  * policy_mgr_get_pcl_chlist_for_ll_sap() - Get pcl channel list for LL SAP
  * @psoc: PSOC object information
@@ -1739,6 +1740,34 @@ policy_mgr_get_pcl_channel_for_ll_sap_concurrency(
 					uint32_t vdev_id,
 					uint32_t *pcl_channels,
 					uint8_t *pcl_weight, uint32_t *len);
+#else
+static inline QDF_STATUS
+policy_mgr_get_pcl_chlist_for_ll_sap(struct wlan_objmgr_psoc *psoc,
+				     uint32_t *len, uint32_t *pcl_channels,
+				     uint8_t *pcl_weight)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
+static inline 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)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
+static inline QDF_STATUS
+policy_mgr_get_pcl_channel_for_ll_sap_concurrency(
+					struct wlan_objmgr_psoc *psoc,
+					uint32_t vdev_id,
+					uint32_t *pcl_channels,
+					uint8_t *pcl_weight, uint32_t *len)
+{
+	return QDF_STATUS_SUCCESS;
+}
+#endif
 
 /**
  * policy_mgr_is_vdev_ll_sap() - Check whether given vdev is LL SAP or not
@@ -1766,7 +1795,7 @@ policy_mgr_is_vdev_ht_ll_sap(struct wlan_objmgr_psoc *psoc,
 			     uint32_t vdev_id);
 
 /**
- * policy_mgr_is_vdev_lt_ll_sap() - Check whether given vdev is LT LL SAP or not
+ * policy_mgr_is_vdev_ll_lt_sap() - Check whether given vdev is LL_LT_SAP or not
  * @psoc: psoc object
  * @vdev_id: vdev id
  *
@@ -1777,7 +1806,7 @@ policy_mgr_is_vdev_ht_ll_sap(struct wlan_objmgr_psoc *psoc,
  * Return: true if it's present otherwise false
  */
 bool
-policy_mgr_is_vdev_lt_ll_sap(struct wlan_objmgr_psoc *psoc,
+policy_mgr_is_vdev_ll_lt_sap(struct wlan_objmgr_psoc *psoc,
 			     uint32_t vdev_id);
 
 /**

components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

@@ -1282,6 +1282,65 @@ static QDF_STATUS policy_mgr_pcl_modification_for_p2p_go(
 	return QDF_STATUS_SUCCESS;
 }
 
+#ifdef WLAN_FEATURE_LL_LT_SAP
+static QDF_STATUS policy_mgr_pcl_modification_for_ll_lt_sap(
+			struct wlan_objmgr_psoc *psoc,
+			uint32_t *pcl_channels, uint8_t *pcl_weight,
+			uint32_t *len, uint32_t weight_len)
+{
+	struct policy_mgr_psoc_priv_obj *pm_ctx;
+	uint32_t pcl_list[NUM_CHANNELS], orig_len = *len;
+	uint8_t weight_list[NUM_CHANNELS];
+	uint32_t i, pcl_len = 0;
+
+	pm_ctx = policy_mgr_get_context(psoc);
+	if (!pm_ctx) {
+		policy_mgr_err("pm_ctx is NULL");
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	policy_mgr_pcl_modification_for_sap(
+		psoc, pcl_channels, pcl_weight, len, weight_len);
+
+	for (i = 0; i < *len; i++) {
+		/* Remove passive/dfs channel for LL_LT_SAP */
+		if (wlan_reg_is_passive_for_freq(
+					pm_ctx->pdev,
+					pcl_channels[i]) ||
+		    wlan_reg_is_dfs_for_freq(
+					pm_ctx->pdev,
+					pcl_channels[i]))
+			continue;
+
+		pcl_list[pcl_len] = pcl_channels[i];
+		weight_list[pcl_len++] = pcl_weight[i];
+	}
+
+	if (orig_len == pcl_len)
+		return QDF_STATUS_SUCCESS;
+
+	qdf_mem_zero(pcl_channels, *len * sizeof(*pcl_channels));
+	qdf_mem_zero(pcl_weight, *len);
+	qdf_mem_copy(pcl_channels, pcl_list, pcl_len * sizeof(*pcl_channels));
+	qdf_mem_copy(pcl_weight, weight_list, pcl_len);
+	*len = pcl_len;
+
+	policy_mgr_debug("PCL after ll sap modification");
+	policy_mgr_dump_channel_list(*len, pcl_channels, pcl_weight);
+
+	return QDF_STATUS_SUCCESS;
+}
+#else
+static inline QDF_STATUS
+policy_mgr_pcl_modification_for_ll_lt_sap(struct wlan_objmgr_psoc *psoc,
+					  uint32_t *pcl_channels,
+					  uint8_t *pcl_weight,
+					  uint32_t *len, uint32_t weight_len)
+{
+	return QDF_STATUS_SUCCESS;
+}
+#endif
+
 static QDF_STATUS policy_mgr_mode_specific_modification_on_pcl(
 			struct wlan_objmgr_psoc *psoc,
 			uint32_t *pcl_channels, uint8_t *pcl_weight,
@@ -1304,6 +1363,10 @@ static QDF_STATUS policy_mgr_mode_specific_modification_on_pcl(
 	case PM_NAN_DISC_MODE:
 		status = QDF_STATUS_SUCCESS;
 		break;
+	case PM_LL_LT_SAP_MODE:
+		status = policy_mgr_pcl_modification_for_ll_lt_sap(
+			psoc, pcl_channels, pcl_weight, len, weight_len);
+		break;
 	default:
 		policy_mgr_err("unexpected mode %d", mode);
 		break;
@@ -4227,12 +4290,13 @@ policy_mgr_is_vdev_ht_ll_sap(struct wlan_objmgr_psoc *psoc,
 }
 
 bool
-policy_mgr_is_vdev_lt_ll_sap(struct wlan_objmgr_psoc *psoc,
+policy_mgr_is_vdev_ll_lt_sap(struct wlan_objmgr_psoc *psoc,
 			     uint32_t vdev_id)
 {
 	return _policy_mgr_is_vdev_ll_sap(psoc, vdev_id, LL_AP_TYPE_LT);
 }
 
+#ifndef WLAN_FEATURE_LL_LT_SAP
 QDF_STATUS
 policy_mgr_get_pcl_chlist_for_ll_sap(struct wlan_objmgr_psoc *psoc,
 				     uint32_t *len, uint32_t *pcl_channels,
@@ -4390,3 +4454,4 @@ policy_mgr_get_pcl_channel_for_ll_sap_concurrency(
 
 	return QDF_STATUS_SUCCESS;
 }
+#endif

core/hdd/src/wlan_hdd_cfg80211.c

@@ -3601,6 +3601,7 @@ static bool wlan_hdd_check_is_acs_request_same(struct hdd_adapter *adapter,
 	return true;
 }
 
+#ifndef WLAN_FEATURE_LL_LT_SAP
 /**
  * hdd_remove_passive_dfs_acs_channel_for_ll_sap(): Remove passive/dfs channel
  * for LL SAP
@@ -3643,6 +3644,15 @@ static void hdd_remove_passive_dfs_acs_channel_for_ll_sap(
 		sap_dump_acs_channel(&sap_config->acs_cfg);
 	}
 }
+#else
+static inline void
+hdd_remove_passive_dfs_acs_channel_for_ll_sap(struct sap_config *sap_config,
+					      struct wlan_objmgr_psoc *psoc,
+					      struct wlan_objmgr_pdev *pdev,
+					      uint8_t vdev_id)
+{
+}
+#endif
 
 /* Stored ACS Frequency timeout in msec */
 #define STORED_ACS_FREQ_TIMEOUT 500
@@ -3697,7 +3707,7 @@ wlan_hdd_ll_lt_sap_get_valid_last_acs_freq(struct hdd_adapter *adapter)
 	if (!sap_config->last_acs_freq || !sap_config->last_acs_complete_time)
 		return prev_acs_freq_valid;
 
-	if (!policy_mgr_is_vdev_lt_ll_sap(
+	if (!policy_mgr_is_vdev_ll_lt_sap(
 				hdd_ctx->psoc,
 				adapter->deflink->vdev_id))
 		return prev_acs_freq_valid;
@@ -3766,6 +3776,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 	uint8_t vht_ch_width;
 	uint32_t channel_bonding_mode_2g;
 	uint32_t last_scan_ageout_time;
+	bool ll_lt_sap = false;
 
 	/* ***Note*** Donot set SME config related to ACS operation here because
 	 * ACS operation is not synchronouse and ACS for Second AP may come when
@@ -4021,9 +4032,11 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 
 	sap_config->acs_cfg.acs_mode = true;
 
-	if (is_external_acs_policy &&
+	ll_lt_sap = policy_mgr_is_vdev_ll_lt_sap(hdd_ctx->psoc,
+						 adapter->deflink->vdev_id);
+	if ((is_external_acs_policy &&
 	    policy_mgr_is_force_scc(hdd_ctx->psoc) &&
-	    policy_mgr_get_connection_count(hdd_ctx->psoc)) {
+	    policy_mgr_get_connection_count(hdd_ctx->psoc)) || ll_lt_sap) {
 		if (adapter->device_mode == QDF_SAP_MODE)
 			is_vendor_unsafe_ch_present =
 				wlansap_filter_vendor_unsafe_ch_freq(sap_ctx,
@@ -4036,8 +4049,7 @@ 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_vdev_ll_sap(hdd_ctx->psoc,
-					       adapter->deflink->vdev_id))
+		    !ll_lt_sap)
 			wlan_hdd_handle_zero_acs_list(
 				hdd_ctx,
 				sap_config->acs_cfg.freq_list,
@@ -4340,7 +4352,7 @@ void wlan_hdd_cfg80211_acs_ch_select_evt(struct hdd_adapter *adapter,
 	len = hdd_get_acs_evt_data_len(sap_cfg);
 
 	if (store_acs_freq &&
-	    policy_mgr_is_vdev_lt_ll_sap(hdd_ctx->psoc,
+	    policy_mgr_is_vdev_ll_lt_sap(hdd_ctx->psoc,
 					 adapter->deflink->vdev_id)) {
 		sap_cfg->last_acs_freq = sap_cfg->acs_cfg.pri_ch_freq;
 		sap_cfg->last_acs_complete_time = qdf_get_time_of_the_day_ms();

core/mac/src/pe/sch/sch_message.c

@@ -536,7 +536,7 @@ void sch_edca_profile_update(struct mac_context *mac, struct pe_session *pe_sess
 		sch_qos_update_broadcast(mac, pe_session);
 		sch_qos_concurrency_update();
 
-		if (policy_mgr_is_vdev_ll_sap(
+		if (policy_mgr_is_vdev_ll_lt_sap(
 				mac->psoc, pe_session->vdev_id))
 			sch_qos_update_edca_pifs_param_for_ll_sap(
 							mac,

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -1751,7 +1751,7 @@ void populate_dot11f_qcn_ie(struct mac_context *mac,
 	}
 
 	populate_dot11f_qcn_ie_he_params(mac, pe_session, qcn_ie, attr_id);
-	if (policy_mgr_is_vdev_ll_sap(mac->psoc, pe_session->vdev_id)) {
+	if (policy_mgr_is_vdev_ll_lt_sap(mac->psoc, pe_session->vdev_id)) {
 		pe_debug("Populate edca/pifs param ie for ll sap");
 		populate_dot11f_edca_pifs_param_set(mac, qcn_ie);
 	}

core/sme/src/csr/csr_util.c

@@ -618,7 +618,7 @@ uint16_t csr_check_concurrent_channel_overlap(struct mac_context *mac_ctx,
 			QDF_MCC_TO_SCC_SWITCH_DISABLE)
 		return 0;
 
-	if (policy_mgr_is_vdev_ll_sap(mac_ctx->psoc, vdev_id))
+	if (policy_mgr_is_vdev_ll_lt_sap(mac_ctx->psoc, vdev_id))
 		return 0;
 
 	if (sap_ch_freq != 0) {