qcacld-3.0: Assign combined ACS weight to 6 GHz PSC channel

For bw higher than 20 MHz ACS request, such as 160 MHz,
weight calculation will combine the neighbor channel's
weight which maybe Non PSC channel, the previous setting of
combined weight to channel of lowest weight of neighbor channel.
That maybe Non PSC channel, that causes the final ACS result
is Non PSC channel, which is unexpected for standalone SAP.

Fix by set combined weight to PSC channel, so that PSC
channel will have a valid weight in final sorting with 5 GHz
or 2 GHz list.

Change-Id: Ic37d005af524f5ff2c8cb2c86647f02ced7c32d7
CRs-Fixed: 3394384

components/mlme/core/src/wlan_mlme_main.c

@@ -1734,6 +1734,7 @@ static void mlme_init_acs_cfg(struct wlan_objmgr_psoc *psoc,
 	acs->is_external_acs_policy =
 		cfg_get(psoc, CFG_EXTERNAL_ACS_POLICY);
 	acs->np_chan_weightage = cfg_get(psoc, CFG_ACS_NP_CHAN_WEIGHT);
+	acs->acs_prefer_6ghz_psc = cfg_default(CFG_ACS_PREFER_6GHZ_PSC);
 	mlme_acs_parse_weight_list(psoc, acs);
 }
 

components/mlme/dispatcher/inc/cfg_mlme_acs.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-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
@@ -203,6 +203,32 @@
 		0, \
 		"Force start SAP")
 
+/*
+ * <ini>
+ * acs_prefer_6ghz_psc - Select 6 GHz PSC channel as priority
+ * @Min: 0
+ * @Max: 1
+ * @Default: 1
+ *
+ * This config is used to configure ACS logic to select PSC channel as
+ * perefered result. "normalize_acs_weight" INI can make the PSC
+ * channel priority higher than NON PSC, but it is for a single channel's
+ * weight, for bw 160 or bw 80 combined channel weight, it has less
+ * help.
+ *
+ * Related: None
+ *
+ * Supported Feature: ACS
+ *
+ * Usage: Internal
+ *
+ * </ini>
+ */
+#define CFG_ACS_PREFER_6GHZ_PSC CFG_BOOL( \
+				"acs_prefer_6ghz_psc", \
+				1, \
+				"Select 6 GHz PSC channel as priority")
+
 /*
  * <ini>
  * np_chan_weight - chan weightage for non preferred channels
@@ -248,6 +274,7 @@
 	CFG(CFG_USER_ACS_DFS_LTE) \
 	CFG(CFG_EXTERNAL_ACS_POLICY) \
 	CFG(CFG_NORMALIZE_ACS_WEIGHT) \
+	CFG(CFG_ACS_PREFER_6GHZ_PSC) \
 	CFG(CFG_ACS_FORCE_START_SAP) \
 	CFG(CFG_ACS_NP_CHAN_WEIGHT)
 

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -1512,6 +1512,7 @@ struct acs_weight_range {
  * @num_weight_range: num of ranges provided by user
  * @force_sap_start: Force SAP start when no channel is found suitable
  * by ACS
+ * @acs_prefer_6ghz_psc: Select 6 GHz PSC channel as priority
  * @np_chan_weightage: Weightage to be given to non preferred channels.
  */
 struct wlan_mlme_acs {
@@ -1525,6 +1526,7 @@ struct wlan_mlme_acs {
 	struct acs_weight_range normalize_weight_range[MAX_ACS_WEIGHT_RANGE];
 	uint16_t num_weight_range;
 	bool force_sap_start;
+	bool acs_prefer_6ghz_psc;
 	uint32_t np_chan_weightage;
 };
 

core/sap/src/sap_api_link_cntl.c

@@ -1511,6 +1511,27 @@ void wlansap_process_chan_info_event(struct sap_context *sap_ctx,
 
 	if (sap_ctx->optimize_acs_chan_selected)
 		return;
+	/* If chan_info_freq is not preferred band's freq
+	 * do not select it as ACS result.
+	 */
+	if (sap_ctx->acs_cfg->ch_list_count &&
+	    !wlan_reg_is_same_band_freqs(
+			sap_ctx->acs_cfg->freq_list[
+			sap_ctx->acs_cfg->ch_list_count - 1],
+			roam_info->chan_info_freq))
+		return;
+	/* Confirm the freq is in ACS list. */
+	if (!wlansap_is_channel_present_in_acs_list(
+			    roam_info->chan_info_freq,
+			    sap_ctx->acs_cfg->freq_list,
+			    sap_ctx->acs_cfg->ch_list_count))
+		return;
+	/* For 6 GHz, do not select non PSC channel */
+	if (wlan_reg_is_6ghz_chan_freq(
+		    roam_info->chan_info_freq) &&
+	    !wlan_reg_is_6ghz_psc_chan_freq(
+		    roam_info->chan_info_freq))
+		return;
 
 	filter = qdf_mem_malloc(sizeof(*filter));
 	if (!filter)

core/sap/src/sap_ch_select.c

@@ -1674,6 +1674,37 @@ static void sap_sort_chl_weight(tSapChSelSpectInfo *pSpectInfoParams)
 	}
 }
 
+/**
+ * sap_override_6ghz_psc_minidx() - override mindex to 6 GHz PSC channel's idx
+ * @mac_ctx: pointer to max context
+ * @spectinfo: Pointer to array of tSapSpectChInfo
+ * @count: number of tSapSpectChInfo element to search
+ * @minidx: index to be overridden
+ *
+ * Return: QDF STATUS
+ */
+static void
+sap_override_6ghz_psc_minidx(struct mac_context *mac_ctx,
+			     tSapSpectChInfo *spectinfo,
+			     uint8_t count,
+			     uint8_t *minidx)
+{
+	uint8_t i;
+
+	if (!mac_ctx->mlme_cfg->acs.acs_prefer_6ghz_psc)
+		return;
+
+	for (i = 0; i < count; i++) {
+		if (wlan_reg_is_6ghz_chan_freq(
+				spectinfo[i].chan_freq) &&
+		    wlan_reg_is_6ghz_psc_chan_freq(
+				spectinfo[i].chan_freq)) {
+			*minidx = i;
+			return;
+		}
+	}
+}
+
 /**
  * sap_sort_chl_weight_80_mhz() - to sort the channels with the least weight
  * @mac_ctx: pointer to max context
@@ -1787,6 +1818,8 @@ sap_sort_chl_weight_80_mhz(struct mac_context *mac_ctx,
 			pSpectInfo[j + i].weight = SAP_ACS_WEIGHT_MAX * 4;
 			pSpectInfo[j + i].weight_calc_done = true;
 		}
+		sap_override_6ghz_psc_minidx(mac_ctx, &pSpectInfo[j], 4,
+					     &minIdx);
 
 		pSpectInfo[j + minIdx].weight = combined_weight;
 
@@ -1958,6 +1991,8 @@ sap_sort_chl_weight_160_mhz(struct mac_context *mac_ctx,
 			pSpectInfo[j + i].weight = SAP_ACS_WEIGHT_MAX * 8;
 			pSpectInfo[j + i].weight_calc_done = true;
 		}
+		sap_override_6ghz_psc_minidx(mac_ctx, &pSpectInfo[j], 8,
+					     &minIdx);
 
 		pSpectInfo[j + minIdx].weight = combined_weight;
 
@@ -2201,6 +2236,8 @@ sap_sort_chl_weight_320_mhz(struct mac_context *mac_ctx,
 			pSpectInfo[j + i].weight = SAP_ACS_WEIGHT_MAX * 16;
 			pSpectInfo[j + i].weight_calc_done = true;
 		}
+		sap_override_6ghz_psc_minidx(mac_ctx, &pSpectInfo[j], 16,
+					     &minIdx);
 
 		pSpectInfo[j + minIdx].weight = combined_weight;
 
@@ -2516,6 +2553,8 @@ sap_sort_chl_weight_40_mhz(struct mac_context *mac_ctx,
 			pSpectInfo[j + i].weight = SAP_ACS_WEIGHT_MAX * 2;
 			pSpectInfo[j + i].weight_calc_done = true;
 		}
+		sap_override_6ghz_psc_minidx(mac_ctx, &pSpectInfo[j], 2,
+					     &minIdx);
 
 		pSpectInfo[j + minIdx].weight = combined_weight;