qcacld-3.0: ACS changes for 6ghz support

Driver ACS changes for 6Ghz channel support

Change-Id: I3d01f8aeda10037175588690100762d6a7e00f2c
CRs-Fixed: 2555901

core/hdd/src/wlan_hdd_cfg80211.c

@@ -2841,21 +2841,23 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 			sap_config->acs_cfg.freq_list = qdf_mem_malloc(
 					sap_config->acs_cfg.ch_list_count *
 					sizeof(uint32_t));
-			sap_config->acs_cfg.master_ch_list = qdf_mem_malloc(
-					sap_config->acs_cfg.ch_list_count);
+			sap_config->acs_cfg.master_freq_list = qdf_mem_malloc(
+					sap_config->acs_cfg.ch_list_count *
+					sizeof(uint32_t));
 			if (!sap_config->acs_cfg.freq_list ||
-			    !sap_config->acs_cfg.master_ch_list) {
+			    !sap_config->acs_cfg.master_freq_list) {
 				ret = -ENOMEM;
 				goto out;
 			}
 
 			/* convert frequency to channel */
-			for (i = 0; i < sap_config->acs_cfg.ch_list_count; i++)
+			for (i = 0; i < sap_config->acs_cfg.ch_list_count;
+			     i++) {
 				sap_config->acs_cfg.freq_list[i] =
 				wlan_reg_chan_to_freq(hdd_ctx->pdev, tmp[i]);
-
-			qdf_mem_copy(sap_config->acs_cfg.master_ch_list, tmp,
-				     sap_config->acs_cfg.ch_list_count);
+				sap_config->acs_cfg.master_freq_list[i] =
+					sap_config->acs_cfg.freq_list[i];
+			}
 			sap_config->acs_cfg.master_ch_list_count =
 					sap_config->acs_cfg.ch_list_count;
 		}
@@ -2869,10 +2871,11 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 			sap_config->acs_cfg.freq_list = qdf_mem_malloc(
 				sap_config->acs_cfg.ch_list_count *
 				sizeof(uint32_t));
-			sap_config->acs_cfg.master_ch_list = qdf_mem_malloc(
-					sap_config->acs_cfg.ch_list_count);
+			sap_config->acs_cfg.master_freq_list = qdf_mem_malloc(
+				sap_config->acs_cfg.ch_list_count *
+				sizeof(uint32_t));
 			if (!sap_config->acs_cfg.freq_list ||
-			    !sap_config->acs_cfg.master_ch_list) {
+			    !sap_config->acs_cfg.master_freq_list) {
 				ret = -ENOMEM;
 				goto out;
 			}
@@ -2880,8 +2883,8 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 			/* convert frequency to channel */
 			for (i = 0; i < sap_config->acs_cfg.ch_list_count;
 			     i++) {
-				sap_config->acs_cfg.master_ch_list[i] =
-					ieee80211_frequency_to_channel(freq[i]);
+				sap_config->acs_cfg.master_freq_list[i] =
+									freq[i];
 				sap_config->acs_cfg.freq_list[i] = freq[i];
 			}
 			sap_config->acs_cfg.master_ch_list_count =
@@ -2962,7 +2965,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 	}
 
 	ret = wlan_hdd_set_acs_ch_range(sap_config, hw_mode,
-					   ht_enabled, vht_enabled);
+					ht_enabled, vht_enabled);
 	if (ret) {
 		hdd_err("set acs channel range failed");
 		goto out;

core/hdd/src/wlan_hdd_main.c

@@ -9266,6 +9266,7 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 	uint8_t restart_chan_store[SAP_MAX_NUM_SESSION] = {0};
 	uint8_t restart_chan, ap_chan;
 	uint8_t scc_on_lte_coex = 0;
+	uint32_t restart_freq;
 	bool value;
 	QDF_STATUS status;
 	bool is_acs_support_for_dfs_ltecoex = cfg_default(CFG_USER_ACS_DFS_LTE);
@@ -9354,11 +9355,13 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 				break;
 			}
 		}
-		if (!restart_chan)
-			restart_chan =
+		if (!restart_chan) {
+			restart_freq =
 				wlansap_get_safe_channel_from_pcl_and_acs_range(
 					WLAN_HDD_GET_SAP_CTX_PTR(adapter));
-
+			restart_chan = wlan_reg_freq_to_chan(hdd_ctxt->pdev,
+							     restart_freq);
+		}
 		if (!restart_chan) {
 			hdd_err("fail to restart SAP");
 		} else {
@@ -9430,9 +9433,14 @@ static void hdd_lte_coex_restart_sap(struct hdd_adapter *adapter,
 				     struct hdd_context *hdd_ctx)
 {
 	uint8_t restart_chan;
+	uint32_t restart_freq;
 
-	restart_chan = wlansap_get_safe_channel_from_pcl_and_acs_range(
+	restart_freq = wlansap_get_safe_channel_from_pcl_and_acs_range(
 				WLAN_HDD_GET_SAP_CTX_PTR(adapter));
+
+	restart_chan = wlan_reg_freq_to_chan(hdd_ctx->pdev,
+					     restart_freq);
+
 	if (!restart_chan) {
 		hdd_alert("fail to restart SAP");
 		return;
@@ -15646,6 +15654,7 @@ void hdd_check_and_restart_sap_with_non_dfs_acs(void)
 	struct hdd_context *hdd_ctx;
 	struct cds_context *cds_ctx;
 	uint8_t restart_chan;
+	uint32_t restart_freq;
 
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
@@ -15676,9 +15685,12 @@ void hdd_check_and_restart_sap_with_non_dfs_acs(void)
 			return;
 		hdd_warn("STA-AP Mode DFS not supported, Switch SAP channel to Non DFS");
 
-		restart_chan =
+		restart_freq =
 			wlansap_get_safe_channel_from_pcl_and_acs_range(
 				WLAN_HDD_GET_SAP_CTX_PTR(ap_adapter));
+
+		restart_chan = wlan_reg_freq_to_chan(hdd_ctx->pdev,
+						     restart_freq);
 		if (!restart_chan ||
 		    wlan_reg_is_dfs_ch(hdd_ctx->pdev, restart_chan))
 			restart_chan = SAP_DEFAULT_5GHZ_CHANNEL;

core/sap/inc/sap_api.h

@@ -433,7 +433,7 @@ struct sap_acs_cfg {
 	uint8_t    end_ch;
 	uint32_t   *freq_list;
 	uint8_t    ch_list_count;
-	uint8_t    *master_ch_list;
+	uint32_t   *master_freq_list;
 	uint8_t    master_ch_list_count;
 #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE
 	uint8_t    skip_scan_status;
@@ -982,6 +982,18 @@ QDF_STATUS wlansap_get_acl_accept_list(struct sap_context *sap_ctx,
 				       struct qdf_mac_addr *pAcceptList,
 				       uint8_t *nAcceptList);
 
+/**
+ * wlansap_is_channel_present_in_acs_list() - Freq present in ACS list or not
+ * @freq: Frequency to be searched
+ * @ch_freq_list: channel frequency list.
+ * @ch_count: Channel frequency list count
+ *
+ * Return: True is found, false otherwise
+ */
+bool wlansap_is_channel_present_in_acs_list(uint32_t freq,
+					    uint32_t *ch_freq_list,
+					    uint8_t ch_count);
+
 /**
  * wlansap_get_acl_deny_list() - Get ACL deny list
  * @sap_ctx: Pointer to the SAP context
@@ -1424,13 +1436,13 @@ QDF_STATUS wlansap_update_owe_info(struct sap_context *sap_ctx,
 /**
  * wlansap_filter_ch_based_acs() -filter out channel based on acs
  * @sap_ctx: sap context
- * @ch_list: pointer to channel list
+ * @ch_freq_list: pointer to channel frequency list
  * @ch_cnt: channel number of channel list
  *
  * Return: QDF_STATUS
  */
 QDF_STATUS wlansap_filter_ch_based_acs(struct sap_context *sap_ctx,
-				       uint8_t *ch_list,
+				       uint32_t *ch_freq_list,
 				       uint32_t *ch_cnt);
 
 /**
@@ -1442,10 +1454,10 @@ QDF_STATUS wlansap_filter_ch_based_acs(struct sap_context *sap_ctx,
  * unsafe channels. So, the PCL is validated with the ACS range to provide
  * a safe channel for the SAP to restart.
  *
- * Return: Channel number to restart SAP in case of success. In case of any
+ * Return: Chan freq num to restart SAP in case of success. In case of any
  * failure, the channel number returned is zero.
  */
-uint8_t
+uint32_t
 wlansap_get_safe_channel_from_pcl_and_acs_range(struct sap_context *sap_ctx);
 #ifdef __cplusplus
 }

core/sap/src/sap_ch_select.c

@@ -353,39 +353,6 @@ static void sap_process_avoid_ie(mac_handle_t mac_handle,
 }
 #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */
 
-/**
- * sap_channel_in_acs_channel_list() - check if channel in acs channel list
- * @channel_num: channel to check
- * @sap_ctx: struct ptSapContext
- * @spect_info_params: strcut tSapChSelSpectInfo
- *
- * This function checks if specified channel is in the configured ACS channel
- * list.
- *
- * Return: channel number if in acs channel list or SAP_CHANNEL_NOT_SELECTED
- */
-uint8_t sap_channel_in_acs_channel_list(uint8_t channel_num,
-					struct sap_context *sap_ctx,
-					tSapChSelSpectInfo *spect_info_params)
-{
-	uint8_t i = 0;
-
-	if ((!sap_ctx->acs_cfg->master_ch_list) ||
-	    (!spect_info_params))
-		return channel_num;
-
-	if (channel_num > 0 && channel_num <= 252) {
-		for (i = 0; i < sap_ctx->acs_cfg->master_ch_list_count; i++) {
-			if ((sap_ctx->acs_cfg->master_ch_list[i]) ==
-			     channel_num)
-				return channel_num;
-		}
-		return SAP_CHANNEL_NOT_SELECTED;
-	} else {
-		return SAP_CHANNEL_NOT_SELECTED;
-	}
-}
-
 /**
  * sap_select_preferred_channel_from_channel_list() - to calc best cahnnel
  * @best_chnl: best channel already calculated among all the chanels
@@ -2461,6 +2428,7 @@ uint32_t sap_select_channel(mac_handle_t mac_handle,
 	uint32_t start_ch_num, end_ch_num, tmp_ch_num, operating_band = 0;
 #endif
 	struct mac_context *mac_ctx;
+	uint32_t chan_freq;
 
 	mac_ctx = MAC_CONTEXT(mac_handle);
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -2569,9 +2537,10 @@ uint32_t sap_select_channel(mac_handle_t mac_handle,
 			continue;
 
 		tmp_ch_num = spect_info->pSpectCh[count].chNum;
-		tmp_ch_num = sap_channel_in_acs_channel_list(
-					tmp_ch_num, sap_ctx, spect_info);
-		if (tmp_ch_num == SAP_CHANNEL_NOT_SELECTED)
+		chan_freq = wlan_reg_chan_to_freq(mac_ctx->pdev, tmp_ch_num);
+		if (!wlansap_is_channel_present_in_acs_list(chan_freq,
+					sap_ctx->acs_cfg->freq_list,
+					sap_ctx->acs_cfg->ch_list_count))
 			continue;
 
 		best_ch_num = tmp_ch_num;

core/sap/src/sap_fsm.c

@@ -218,7 +218,7 @@ static uint8_t sap_random_channel_sel(struct sap_context *sap_ctx)
 	ch_params->ch_width = ch_wd;
 	if (sap_ctx->acs_cfg) {
 		acs_info.acs_mode = sap_ctx->acs_cfg->acs_mode;
-		acs_info.channel_list = sap_ctx->acs_cfg->master_ch_list;
+		acs_info.chan_freq_list = sap_ctx->acs_cfg->master_freq_list;
 		acs_info.num_of_channel =
 					sap_ctx->acs_cfg->master_ch_list_count;
 	} else {
@@ -3256,7 +3256,6 @@ static QDF_STATUS sap_get_freq_list(struct sap_context *sap_ctx,
 	uint8_t end_ch_num, band_end_ch;
 	uint32_t en_lte_coex;
 	struct mac_context *mac_ctx;
-	tSapChSelSpectInfo spect_info_obj = { NULL, 0 };
 	uint16_t ch_width;
 	uint8_t normalize_factor = 100;
 	uint32_t chan_freq;
@@ -3321,6 +3320,9 @@ static QDF_STATUS sap_get_freq_list(struct sap_context *sap_ctx,
 	ch_count = 0;
 	for (loop_count = band_start_ch; loop_count <= band_end_ch;
 	     loop_count++) {
+		chan_freq = wlan_reg_chan_to_freq(mac_ctx->pdev,
+						  WLAN_REG_CH_NUM(loop_count));
+
 		/* go to next channel if rf_channel is out of range */
 		if ((start_ch_num > WLAN_REG_CH_NUM(loop_count)) ||
 		    (end_ch_num < WLAN_REG_CH_NUM(loop_count)))
@@ -3363,10 +3365,9 @@ static QDF_STATUS sap_get_freq_list(struct sap_context *sap_ctx,
 		 * Skip the channels which are not in ACS config from user
 		 * space
 		 */
-		if (SAP_CHANNEL_NOT_SELECTED ==
-			sap_channel_in_acs_channel_list(
-				WLAN_REG_CH_NUM(loop_count),
-				sap_ctx, &spect_info_obj))
+		if (!wlansap_is_channel_present_in_acs_list(chan_freq,
+					sap_ctx->acs_cfg->freq_list,
+					sap_ctx->acs_cfg->ch_list_count))
 			continue;
 		/* Dont scan DFS channels in case of MCC disallowed
 		 * As it can result in SAP starting on DFS channel
@@ -3388,8 +3389,6 @@ static QDF_STATUS sap_get_freq_list(struct sap_context *sap_ctx,
 						WLAN_REG_CH_NUM(loop_count)))
 			continue;
 
-		chan_freq = wlan_reg_chan_to_freq(mac_ctx->pdev,
-						  WLAN_REG_CH_NUM(loop_count));
 		/* Check if the freq is present in range list */
 		for (i = 0; i < mac_ctx->mlme_cfg->acs.num_weight_range; i++) {
 			if (chan_freq >= range_list[i].start_freq &&

core/sap/src/sap_internal.h

@@ -464,21 +464,6 @@ uint32_t sap_select_default_oper_chan(struct sap_acs_cfg *acs_cfg);
  */
 bool sap_is_dfs_cac_wait_state(struct sap_context *sap_ctx);
 
-/**
- * sap_channel_in_acs_channel_list() - check if channel in acs channel list
- * @channel_num: channel to check
- * @sap_ctx: struct ptSapContext
- * @spect_info_params: strcut tSapChSelSpectInfo
- *
- * This function checks if specified channel is in the configured ACS channel
- * list.
- *
- * Return: channel number if in acs channel list or SAP_CHANNEL_NOT_SELECTED
- */
-uint8_t sap_channel_in_acs_channel_list(uint8_t channel_num,
-					struct sap_context *sap_ctx,
-					tSapChSelSpectInfo *spect_info_params);
-
 /**
  * sap_chan_bond_dfs_sub_chan - check bonded channel includes dfs sub chan
  * @sap_context: Handle to SAP context.

core/sap/src/sap_module.c

@@ -2488,10 +2488,10 @@ void sap_undo_acs(struct sap_context *sap_ctx, struct sap_config *sap_cfg)
 		qdf_mem_free(acs_cfg->freq_list);
 		acs_cfg->freq_list = NULL;
 	}
-	if (acs_cfg->master_ch_list) {
-		sap_debug("Clearing master ACS cfg channel list");
-		qdf_mem_free(acs_cfg->master_ch_list);
-		acs_cfg->master_ch_list = NULL;
+	if (acs_cfg->master_freq_list) {
+		sap_debug("Clearing master ACS cfg chan freq list");
+		qdf_mem_free(acs_cfg->master_freq_list);
+		acs_cfg->master_freq_list = NULL;
 	}
 	if (sap_ctx->freq_list) {
 		sap_debug("Clearing sap context ch freq list");
@@ -2841,18 +2841,20 @@ QDF_STATUS wlansap_update_owe_info(struct sap_context *sap_ctx,
 	return status;
 }
 
-static bool wlansap_is_channel_present_in_acs_list(uint8_t ch, uint8_t *ch_list,
-						   uint8_t ch_count)
+bool wlansap_is_channel_present_in_acs_list(uint32_t freq,
+					    uint32_t *ch_freq_list,
+					    uint8_t ch_count)
 {
 	uint8_t i;
 
 	for(i = 0; i < ch_count; i++) {
-		if (ch_list[i] == ch) {
+		if (ch_freq_list[i] == freq) {
 			/*
 			 * channel was given by hostpad for ACS, and is present
 			 * in PCL.
 			 */
-			sap_debug("channel present in ACS channel list %d", ch);
+			sap_debug("channel present in ACS channel list %d",
+				  freq);
 			return true;
 		}
 	}
@@ -2861,24 +2863,25 @@ static bool wlansap_is_channel_present_in_acs_list(uint8_t ch, uint8_t *ch_list,
 }
 
 QDF_STATUS wlansap_filter_ch_based_acs(struct sap_context *sap_ctx,
-				       uint8_t *ch_list,
+				       uint32_t *ch_freq_list,
 				       uint32_t *ch_cnt)
 {
 	size_t ch_index;
 	size_t target_ch_cnt = 0;
 
-	if (!sap_ctx || !ch_list || !ch_cnt ||
-	    !sap_ctx->acs_cfg->master_ch_list ||
+	if (!sap_ctx || !ch_freq_list || !ch_cnt ||
+	    !sap_ctx->acs_cfg->master_freq_list ||
 	    !sap_ctx->acs_cfg->master_ch_list_count) {
 		sap_err("NULL parameters");
 		return QDF_STATUS_E_FAULT;
 	}
 
 	for (ch_index = 0; ch_index < *ch_cnt; ch_index++) {
-		if (wlansap_is_channel_present_in_acs_list(ch_list[ch_index],
-					sap_ctx->acs_cfg->master_ch_list,
+		if (wlansap_is_channel_present_in_acs_list(
+					ch_freq_list[ch_index],
+					sap_ctx->acs_cfg->master_freq_list,
 					sap_ctx->acs_cfg->master_ch_list_count))
-			ch_list[target_ch_cnt++] = ch_list[ch_index];
+			ch_freq_list[target_ch_cnt++] = ch_freq_list[ch_index];
 	}
 
 	*ch_cnt = target_ch_cnt;
@@ -2894,17 +2897,17 @@ QDF_STATUS wlansap_filter_ch_based_acs(struct sap_context *sap_ctx,
  * This function is used to get safe channel from current regulatory valid
  * channels to restart SAP if failed to get safe channel from PCL.
  *
- * Return: Channel number to restart SAP in case of success. In case of any
+ * Return: Chan freq num to restart SAP in case of success. In case of any
  * failure, the channel number returned is zero.
  */
-static uint8_t
+static uint32_t
 wlansap_get_safe_channel(struct sap_context *sap_ctx)
 {
 	struct mac_context *mac;
-	struct sir_pcl_list pcl = {0};
-	uint32_t i, pcl_freqs[QDF_MAX_NUM_CHAN];
+	uint32_t pcl_freqs[QDF_MAX_NUM_CHAN];
 	QDF_STATUS status;
 	mac_handle_t mac_handle;
+	uint32_t pcl_len = 0;
 
 	if (!sap_ctx) {
 		sap_err("NULL parameter");
@@ -2919,39 +2922,33 @@ wlansap_get_safe_channel(struct sap_context *sap_ctx)
 	mac_handle = MAC_HANDLE(mac);
 
 	/* get the channel list for current domain */
-	status = policy_mgr_get_valid_chans(mac->psoc,
-					    pcl_freqs,
-					    &pcl.pcl_len);
+	status = policy_mgr_get_valid_chans(mac->psoc, pcl_freqs, &pcl_len);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		sap_err("Error in getting valid channels");
 		return INVALID_CHANNEL_ID;
 	}
-	for (i = 0; i < pcl.pcl_len; i++)
-		pcl.pcl_list[i] = wlan_freq_to_chan(pcl_freqs[i]);
-	status = wlansap_filter_ch_based_acs(sap_ctx,
-					     pcl.pcl_list,
-					     &pcl.pcl_len);
+
+	status = wlansap_filter_ch_based_acs(sap_ctx, pcl_freqs, &pcl_len);
+
 	if (QDF_IS_STATUS_ERROR(status)) {
 		sap_err("failed to filter ch from acs %d", status);
 		return INVALID_CHANNEL_ID;
 	}
-	for (i = 0; i < pcl.pcl_len; i++)
-		pcl_freqs[i] = wlan_chan_to_freq(pcl.pcl_list[i]);
 
-	if (pcl.pcl_len) {
+	if (pcl_len) {
 		status = policy_mgr_get_valid_chans_from_range(mac->psoc,
 							       pcl_freqs,
-							       &pcl.pcl_len,
+							       &pcl_len,
 							       PM_SAP_MODE);
 		if (QDF_IS_STATUS_ERROR(status)) {
 			sap_err("failed to get valid channel: %d", status);
 			return INVALID_CHANNEL_ID;
 		}
 
-		if (pcl.pcl_len) {
+		if (pcl_len) {
 			sap_debug("select %d from valid channel list",
 				  pcl_freqs[0]);
-			return wlan_freq_to_chan(pcl_freqs[0]);
+			return pcl_freqs[0];
 		}
 	}
 
@@ -2975,14 +2972,15 @@ wlansap_get_safe_channel(struct sap_context *sap_ctx)
 }
 #endif
 
-uint8_t
+uint32_t
 wlansap_get_safe_channel_from_pcl_and_acs_range(struct sap_context *sap_ctx)
 {
 	struct mac_context *mac;
 	struct sir_pcl_list pcl = {0};
-	uint32_t i, pcl_freqs[QDF_MAX_NUM_CHAN] = {0};
+	uint32_t pcl_freqs[QDF_MAX_NUM_CHAN] = {0};
 	QDF_STATUS status;
 	mac_handle_t mac_handle;
+	uint32_t pcl_len = 0;
 
 	if (!sap_ctx) {
 		sap_err("NULL parameter");
@@ -2997,29 +2995,26 @@ wlansap_get_safe_channel_from_pcl_and_acs_range(struct sap_context *sap_ctx)
 	mac_handle = MAC_HANDLE(mac);
 
 	status = policy_mgr_get_pcl_for_existing_conn(
-			mac->psoc, PM_SAP_MODE, pcl_freqs, &pcl.pcl_len,
+			mac->psoc, PM_SAP_MODE, pcl_freqs, &pcl_len,
 			pcl.weight_list, QDF_ARRAY_SIZE(pcl.weight_list),
 			false);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		sap_err("Get PCL failed");
 		return INVALID_CHANNEL_ID;
 	}
-	for (i = 0; i < pcl.pcl_len; i++)
-		pcl.pcl_list[i] = wlan_freq_to_chan(pcl_freqs[i]);
 
-	if (pcl.pcl_len) {
-		status = wlansap_filter_ch_based_acs(sap_ctx,
-						     pcl.pcl_list,
-						     &pcl.pcl_len);
+	if (pcl_len) {
+		status = wlansap_filter_ch_based_acs(sap_ctx, pcl_freqs,
+						     &pcl_len);
 		if (QDF_IS_STATUS_ERROR(status)) {
 			sap_err("failed to filter ch from acs %d", status);
 			return INVALID_CHANNEL_ID;
 		}
 
-		if (pcl.pcl_len) {
-			sap_debug("select %d from valid channel list",
-				  pcl.pcl_list[0]);
-			return pcl.pcl_list[0];
+		if (pcl_len) {
+			sap_debug("select %d from valid ch freq list",
+				  pcl_freqs[0]);
+			return pcl_freqs[0];
 		}
 		sap_debug("no safe channel from PCL found in ACS range");
 	} else {