qcacld-3.0: Refine ACS with static puncturing

If EHT is enabled and channel width is bigger than 80 MHZ, static
puncturing is applicable to this SAP.
Consider punctured channel as valid candidate channel with weight
as max ACS weight for the SAP supporting static puncturing.
Indicate puncture bitmap to hostapd. Hostapd need puncture bitmap
when generating EHT operation IE.

Change-Id: I157878cc405c83114cd82f5fac63375c02e48cab
CRs-Fixed: 3101970

core/hdd/src/wlan_hdd_cfg80211.c

@@ -3121,6 +3121,31 @@ static inline void wlan_hdd_set_chandef(struct wlan_objmgr_vdev *vdev,
 }
 #endif /* WLAN_FEATURE_11BE */
 
+#ifdef WLAN_FEATURE_11BE
+/**
+ * wlan_hdd_acs_set_eht_enabled() - set is_eht_enabled of acs config
+ * @sap_config: pointer to sap_config
+ * @eht_enabled: eht is enabled
+ *
+ * Return: void
+ */
+static void wlan_hdd_acs_set_eht_enabled(struct sap_config *sap_config,
+					 bool eht_enabled)
+{
+	if (!sap_config) {
+		hdd_err("Invalid sap_config");
+		return;
+	}
+
+	sap_config->acs_cfg.is_eht_enabled = eht_enabled;
+}
+#else
+static void wlan_hdd_acs_set_eht_enabled(struct sap_config *sap_config,
+					 bool eht_enabled)
+{
+}
+#endif /* WLAN_FEATURE_11BE */
+
 /**
  * __wlan_hdd_cfg80211_do_acs(): CFG80211 handler function for DO_ACS Vendor CMD
  * @wiphy:  Linux wiphy struct pointer
@@ -3144,7 +3169,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 	struct sk_buff *temp_skbuff;
 	int ret, i;
 	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_ACS_MAX + 1];
-	bool ht_enabled, ht40_enabled, vht_enabled;
+	bool ht_enabled, ht40_enabled, vht_enabled, eht_enabled;
 	uint16_t ch_width;
 	enum qca_wlan_vendor_acs_hw_mode hw_mode;
 	enum policy_mgr_con_mode pm_mode;
@@ -3221,23 +3246,10 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 
 	hdd_nofl_info("ACS request vid %d hw mode %d", adapter->vdev_id,
 		      hw_mode);
-	if (tb[QCA_WLAN_VENDOR_ATTR_ACS_HT_ENABLED])
-		ht_enabled =
-			nla_get_flag(tb[QCA_WLAN_VENDOR_ATTR_ACS_HT_ENABLED]);
-	else
-		ht_enabled = 0;
-
-	if (tb[QCA_WLAN_VENDOR_ATTR_ACS_HT40_ENABLED])
-		ht40_enabled =
-			nla_get_flag(tb[QCA_WLAN_VENDOR_ATTR_ACS_HT40_ENABLED]);
-	else
-		ht40_enabled = 0;
-
-	if (tb[QCA_WLAN_VENDOR_ATTR_ACS_VHT_ENABLED])
-		vht_enabled =
-			nla_get_flag(tb[QCA_WLAN_VENDOR_ATTR_ACS_VHT_ENABLED]);
-	else
-		vht_enabled = 0;
+	ht_enabled = nla_get_flag(tb[QCA_WLAN_VENDOR_ATTR_ACS_HT_ENABLED]);
+	ht40_enabled = nla_get_flag(tb[QCA_WLAN_VENDOR_ATTR_ACS_HT40_ENABLED]);
+	vht_enabled = nla_get_flag(tb[QCA_WLAN_VENDOR_ATTR_ACS_VHT_ENABLED]);
+	eht_enabled = nla_get_flag(tb[QCA_WLAN_VENDOR_ATTR_ACS_EHT_ENABLED]);
 
 	if (((adapter->device_mode == QDF_SAP_MODE) &&
 	      sap_force_11n_for_11ac) ||
@@ -3463,10 +3475,11 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 			  channel_bonding_mode_2g);
 	}
 
-	hdd_nofl_debug("ACS Config country %s ch_width %d hw_mode %d ACS_BW: %d HT: %d VHT: %d START_CH: %d END_CH: %d band %d",
+	hdd_nofl_debug("ACS Config country %s ch_width %d hw_mode %d ACS_BW: %d HT: %d VHT: %d EHT: %d START_CH: %d END_CH: %d band %d",
 		       hdd_ctx->reg.alpha2, ch_width,
 		       sap_config->acs_cfg.hw_mode, sap_config->acs_cfg.ch_width,
-		       ht_enabled, vht_enabled, sap_config->acs_cfg.start_ch_freq,
+		       ht_enabled, vht_enabled, eht_enabled,
+		       sap_config->acs_cfg.start_ch_freq,
 		       sap_config->acs_cfg.end_ch_freq,
 		       sap_config->acs_cfg.band);
 	host_log_acs_req_event(adapter->dev->name,
@@ -3477,7 +3490,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 
 	sap_config->acs_cfg.is_ht_enabled = ht_enabled;
 	sap_config->acs_cfg.is_vht_enabled = vht_enabled;
-
+	wlan_hdd_acs_set_eht_enabled(sap_config, eht_enabled);
 	sap_dump_acs_channel(&sap_config->acs_cfg);
 
 	qdf_status = ucfg_mlme_get_vendor_acs_support(hdd_ctx->psoc,
@@ -3597,7 +3610,7 @@ static int hdd_fill_acs_chan_freq(struct hdd_context *hdd_ctx,
 	return 0;
 }
 
-static int hdd_get_acs_evt_data_len(void)
+static int hdd_get_acs_evt_data_len(struct sap_config *sap_cfg)
 {
 	uint32_t len = NLMSG_HDRLEN;
 
@@ -3631,9 +3644,34 @@ static int hdd_get_acs_evt_data_len(void)
 	/* QCA_WLAN_VENDOR_ATTR_ACS_HW_MODE */
 	len += nla_total_size(sizeof(u8));
 
+	/* QCA_WLAN_VENDOR_ATTR_ACS_PUNCTURE_BITMAP */
+	if (sap_acs_is_puncture_applicable(&sap_cfg->acs_cfg))
+		len += nla_total_size(sizeof(u16));
+
 	return len;
 }
 
+#ifdef WLAN_FEATURE_11BE
+/**
+ * wlan_hdd_acs_get_puncture_bitmap() - get puncture_bitmap for acs result
+ * @acs_cfg: pointer to struct sap_acs_cfg
+ *
+ * Return: acs puncture bitmap
+ */
+static uint16_t wlan_hdd_acs_get_puncture_bitmap(struct sap_acs_cfg *acs_cfg)
+{
+	if (sap_acs_is_puncture_applicable(acs_cfg))
+		return acs_cfg->acs_puncture_bitmap;
+
+	return 0;
+}
+#else
+static uint16_t wlan_hdd_acs_get_puncture_bitmap(struct sap_acs_cfg *acs_cfg)
+{
+	return 0;
+}
+#endif /* WLAN_FEATURE_11BE */
+
 /**
  * wlan_hdd_cfg80211_acs_ch_select_evt: Callback function for ACS evt
  * @adapter: Pointer to SAP adapter struct
@@ -3657,7 +3695,8 @@ void wlan_hdd_cfg80211_acs_ch_select_evt(struct hdd_adapter *adapter)
 	uint8_t ht_sec_channel;
 	uint8_t vht_seg0_center_ch, vht_seg1_center_ch;
 	uint32_t id = QCA_NL80211_VENDOR_SUBCMD_DO_ACS_INDEX;
-	uint32_t len = hdd_get_acs_evt_data_len();
+	uint32_t len = hdd_get_acs_evt_data_len(sap_cfg);
+	uint16_t puncture_bitmap;
 
 	qdf_atomic_set(&adapter->session.ap.acs_in_progress, 0);
 	qdf_event_set(&adapter->acs_complete_event);
@@ -3758,11 +3797,25 @@ void wlan_hdd_cfg80211_acs_ch_select_evt(struct hdd_adapter *adapter)
 		return;
 	}
 
-	hdd_debug("ACS result for %s: PRI_CH_FREQ: %d SEC_CH_FREQ: %d VHT_SEG0: %d VHT_SEG1: %d ACS_BW: %d",
-		adapter->dev->name, sap_cfg->acs_cfg.pri_ch_freq,
-		sap_cfg->acs_cfg.ht_sec_ch_freq,
-		sap_cfg->acs_cfg.vht_seg0_center_ch_freq,
-		sap_cfg->acs_cfg.vht_seg1_center_ch_freq, ch_width);
+	puncture_bitmap = wlan_hdd_acs_get_puncture_bitmap(&sap_cfg->acs_cfg);
+	if (sap_acs_is_puncture_applicable(&sap_cfg->acs_cfg)) {
+		ret_val = nla_put_u16(vendor_event,
+				      QCA_WLAN_VENDOR_ATTR_ACS_PUNCTURE_BITMAP,
+				      puncture_bitmap);
+		if (ret_val) {
+			hdd_err("QCA_WLAN_VENDOR_ATTR_ACS_PUNCTURE_BITMAP put fail");
+			kfree_skb(vendor_event);
+			return;
+		}
+	}
+
+	hdd_debug("ACS result for %s: PRI_CH_FREQ: %d SEC_CH_FREQ: %d VHT_SEG0: %d VHT_SEG1: %d ACS_BW: %d punc support: %d punc bitmap: %d",
+		  adapter->dev->name, sap_cfg->acs_cfg.pri_ch_freq,
+		  sap_cfg->acs_cfg.ht_sec_ch_freq,
+		  sap_cfg->acs_cfg.vht_seg0_center_ch_freq,
+		  sap_cfg->acs_cfg.vht_seg1_center_ch_freq, ch_width,
+		  sap_acs_is_puncture_applicable(&sap_cfg->acs_cfg),
+		  puncture_bitmap);
 
 	cfg80211_vendor_event(vendor_event, GFP_KERNEL);
 }

core/sap/inc/sap_api.h

@@ -456,6 +456,10 @@ struct sap_acs_cfg {
 	uint32_t    vht_seg0_center_ch_freq;
 	uint32_t    vht_seg1_center_ch_freq;
 	uint32_t   band;
+#ifdef WLAN_FEATURE_11BE
+	bool       is_eht_enabled;
+	uint16_t   acs_puncture_bitmap;
+#endif
 };
 
 /*
@@ -1774,6 +1778,38 @@ void sap_dump_acs_channel(struct sap_acs_cfg *acs_cfg);
  * Return: None
  */
 void sap_release_vdev_ref(struct sap_context *sap_ctx);
+
+#ifdef WLAN_FEATURE_11BE
+/**
+ * sap_acs_is_puncture_applicable() - Is static puncturing applicable according
+ *                                    to ACS configure of given sap acs config.
+ * @acs_cfg: pointer to sap_acs_cfg
+ *
+ * Return: true if static puncturing is applicable to given sap acs config.
+ */
+bool sap_acs_is_puncture_applicable(struct sap_acs_cfg *acs_cfg);
+
+/**
+ * sap_acs_set_puncture_support() - Set puncturing support according
+ *                                  to ACS configure of given sap.
+ * @sap_ctx: Pointer to SAP Context
+ * @ch_params: pointer to ch_params
+ *
+ * Return: void.
+ */
+void sap_acs_set_puncture_support(struct sap_context *sap_ctx,
+				  struct ch_params *ch_params);
+#else
+static inline bool sap_acs_is_puncture_applicable(struct sap_acs_cfg *acs_cfg)
+{
+	return false;
+}
+
+static inline void sap_acs_set_puncture_support(struct sap_context *sap_ctx,
+						struct ch_params *ch_params)
+{
+}
+#endif /* WLAN_FEATURE_11BE */
 #ifdef __cplusplus
 }
 #endif

core/sap/src/sap_api_link_cntl.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
@@ -97,6 +97,19 @@ static inline bool sap_acs_cfg_is_chwidth_320mhz(uint16_t width)
 }
 #endif
 
+#ifdef WLAN_FEATURE_11BE
+static void sap_acs_set_puncture_bitmap(struct sap_context *sap_ctx,
+					struct ch_params *ch_params)
+{
+	sap_ctx->acs_cfg->acs_puncture_bitmap = ch_params->reg_punc_bitmap;
+}
+#else
+static void sap_acs_set_puncture_bitmap(struct sap_context *sap_ctx,
+					struct ch_params *ch_params)
+{
+}
+#endif /* WLAN_FEATURE_11BE */
+
 /**
  * sap_config_acs_result : Generate ACS result params based on ch constraints
  * @sap_ctx: pointer to SAP context data struct
@@ -117,6 +130,7 @@ void sap_config_acs_result(mac_handle_t mac_handle,
 	struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle);
 
 	ch_params.ch_width = sap_ctx->acs_cfg->ch_width;
+	sap_acs_set_puncture_support(sap_ctx, &ch_params);
 	wlan_reg_set_channel_params_for_freq(
 			mac_ctx->pdev, sap_ctx->acs_cfg->pri_ch_freq,
 			sec_ch_freq, &ch_params);
@@ -144,6 +158,8 @@ void sap_config_acs_result(mac_handle_t mac_handle,
 				sap_ctx->acs_cfg->pri_ch_freq + 20;
 	else
 		sap_ctx->acs_cfg->ht_sec_ch_freq = 0;
+
+	sap_acs_set_puncture_bitmap(sap_ctx, &ch_params);
 }
 
 /**

core/sap/src/sap_ch_select.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 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
@@ -414,6 +415,7 @@ static bool sap_chan_sel_init(mac_handle_t mac_handle,
 	struct mac_context *mac = MAC_CONTEXT(mac_handle);
 	bool include_dfs_ch = true;
 	uint8_t sta_sap_scc_on_dfs_chnl_config_value;
+	bool ch_support_puncture;
 
 	pSpectInfoParams->numSpectChans =
 		mac->scan.base_channels.numChannels;
@@ -443,6 +445,7 @@ static bool sap_chan_sel_init(mac_handle_t mac_handle,
 	for (channelnum = 0;
 	     channelnum < pSpectInfoParams->numSpectChans;
 	     channelnum++, pChans++, pSpectCh++) {
+		ch_support_puncture = false;
 		pSpectCh->chan_freq = *pChans;
 		/* Initialise for all channels */
 		pSpectCh->rssiAgr = SOFTAP_MIN_RSSI;
@@ -453,8 +456,14 @@ static bool sap_chan_sel_init(mac_handle_t mac_handle,
 		if (sap_dfs_is_channel_in_nol_list(
 					sap_ctx, *pChans,
 					PHY_SINGLE_CHANNEL_CENTERED)) {
-			sap_debug_rl("Ch freq %d is in NOL list", *pChans);
-			continue;
+			if (sap_acs_is_puncture_applicable(sap_ctx->acs_cfg)) {
+				sap_debug_rl("freq %d is in NOL list, can be punctured",
+					     *pChans);
+				ch_support_puncture = true;
+			} else {
+				sap_debug_rl("freq %d is in NOL list", *pChans);
+				continue;
+			}
 		}
 
 		if (!include_dfs_ch ||
@@ -469,9 +478,14 @@ static bool sap_chan_sel_init(mac_handle_t mac_handle,
 		}
 
 		if (!policy_mgr_is_sap_freq_allowed(mac->psoc, *pChans)) {
-			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-				  "%s: Skip freq %d", __func__, *pChans);
-			continue;
+			if (sap_acs_is_puncture_applicable(sap_ctx->acs_cfg)) {
+				sap_info("freq %d is not allowed, can be punctured",
+					 *pChans);
+				ch_support_puncture = true;
+			} else {
+				sap_info("Skip freq %d", *pChans);
+				continue;
+			}
 		}
 
 		/* OFDM rates are not supported on frequency 2484 */
@@ -493,7 +507,8 @@ static bool sap_chan_sel_init(mac_handle_t mac_handle,
 			continue;
 
 		pSpectCh->valid = true;
-		pSpectCh->weight = 0;
+		if (!ch_support_puncture)
+			pSpectCh->weight = 0;
 	}
 
 	return true;
@@ -1535,12 +1550,15 @@ static void sap_sort_chl_weight(tSapChSelSpectInfo *pSpectInfoParams)
 
 /**
  * sap_sort_chl_weight_80_mhz() - to sort the channels with the least weight
+ * @mac_ctx: pointer to max context
+ * @sap_ctx: Pointer to the struct sap_context *structure
  * @pSpectInfoParams: Pointer to the tSapChSelSpectInfo structure
  * Function to sort the channels with the least weight first for HT80 channels
  *
  * Return: none
  */
 static void sap_sort_chl_weight_80_mhz(struct mac_context *mac_ctx,
+				       struct sap_context *sap_ctx,
 				       tSapChSelSpectInfo *pSpectInfoParams)
 {
 	uint8_t i, j;
@@ -1559,6 +1577,7 @@ static void sap_sort_chl_weight_80_mhz(struct mac_context *mac_ctx,
 			continue;
 
 		acs_ch_params.ch_width = CH_WIDTH_80MHZ;
+		sap_acs_set_puncture_support(sap_ctx, &acs_ch_params);
 
 		wlan_reg_set_channel_params_for_freq(mac_ctx->pdev,
 						     pSpectInfo[j].chan_freq,
@@ -1663,6 +1682,8 @@ static void sap_sort_chl_weight_80_mhz(struct mac_context *mac_ctx,
 
 /**
  * sap_sort_chl_weight_vht160() - to sort the channels with the least weight
+ * @mac_ctx: pointer to max context
+ * @sap_ctx: Pointer to the struct sap_context *structure
  * @pSpectInfoParams: Pointer to the tSapChSelSpectInfo structure
  *
  * Function to sort the channels with the least weight first for VHT160 channels
@@ -1670,6 +1691,7 @@ static void sap_sort_chl_weight_80_mhz(struct mac_context *mac_ctx,
  * Return: none
  */
 static void sap_sort_chl_weight_160_mhz(struct mac_context *mac_ctx,
+					struct sap_context *sap_ctx,
 					tSapChSelSpectInfo *pSpectInfoParams)
 {
 	uint8_t i, j;
@@ -1688,6 +1710,7 @@ static void sap_sort_chl_weight_160_mhz(struct mac_context *mac_ctx,
 			continue;
 
 		acs_ch_params.ch_width = CH_WIDTH_160MHZ;
+		sap_acs_set_puncture_support(sap_ctx, &acs_ch_params);
 
 		wlan_reg_set_channel_params_for_freq(mac_ctx->pdev,
 						     pSpectInfo[j].chan_freq,
@@ -1829,6 +1852,8 @@ static void sap_sort_chl_weight_160_mhz(struct mac_context *mac_ctx,
 #if defined(WLAN_FEATURE_11BE)
 /**
  * sap_sort_chl_weight_320_mhz() - to sort the channels with the least weight
+ * @mac_ctx: pointer to max context
+ * @sap_ctx: Pointer to the struct sap_context *structure
  * @pSpectInfoParams: Pointer to the tSapChSelSpectInfo structure
  *
  * Function to sort the channels with the least weight first for 320MHz channels
@@ -1836,6 +1861,7 @@ static void sap_sort_chl_weight_160_mhz(struct mac_context *mac_ctx,
  * Return: none
  */
 static void sap_sort_chl_weight_320_mhz(struct mac_context *mac_ctx,
+					struct sap_context *sap_ctx,
 					tSapChSelSpectInfo *pSpectInfoParams)
 {
 	uint8_t i, j;
@@ -1853,6 +1879,7 @@ static void sap_sort_chl_weight_320_mhz(struct mac_context *mac_ctx,
 			continue;
 
 		acs_ch_params.ch_width = CH_WIDTH_320MHZ;
+		sap_acs_set_puncture_support(sap_ctx, &acs_ch_params);
 
 		wlan_reg_set_channel_params_for_freq(mac_ctx->pdev,
 						     pSpectInfo[j].chan_freq,
@@ -2413,14 +2440,14 @@ static void sap_sort_chl_weight_all(struct mac_context *mac_ctx,
 		break;
 	case CH_WIDTH_80MHZ:
 	case CH_WIDTH_80P80MHZ:
-		sap_sort_chl_weight_80_mhz(mac_ctx, pSpectInfoParams);
+		sap_sort_chl_weight_80_mhz(mac_ctx, sap_ctx, pSpectInfoParams);
 		break;
 	case CH_WIDTH_160MHZ:
-		sap_sort_chl_weight_160_mhz(mac_ctx, pSpectInfoParams);
+		sap_sort_chl_weight_160_mhz(mac_ctx, sap_ctx, pSpectInfoParams);
 		break;
 #if defined(WLAN_FEATURE_11BE)
 	case CH_WIDTH_320MHZ:
-		sap_sort_chl_weight_320_mhz(mac_ctx, pSpectInfoParams);
+		sap_sort_chl_weight_320_mhz(mac_ctx, sap_ctx, pSpectInfoParams);
 		break;
 #endif
 	case CH_WIDTH_20MHZ:
@@ -2588,6 +2615,7 @@ next_bw:
 				== SAP_CHANNEL_NOT_SELECTED)
 				continue;
 			ch_params.ch_width = pref_bw;
+			sap_acs_set_puncture_support(sap_ctx, &ch_params);
 			wlan_reg_set_channel_params_for_freq(
 				mac_ctx->pdev, cal_chan_freq, 0, &ch_params);
 			if (ch_params.ch_width != pref_bw)

core/sap/src/sap_module.c

@@ -3439,3 +3439,40 @@ void wlansap_set_acs_ch_freq(struct sap_context *sap_context,
 	sap_debug("ACS configuring ch_freq=%d", sap_context->chan_freq);
 }
 #endif
+
+#ifdef WLAN_FEATURE_11BE
+bool sap_acs_is_puncture_applicable(struct sap_acs_cfg *acs_cfg)
+{
+	bool is_eht_bw_80 = false;
+
+	if (!acs_cfg) {
+		sap_err("Invalid parameters");
+		return is_eht_bw_80;
+	}
+
+	switch (acs_cfg->ch_width) {
+	case CH_WIDTH_80MHZ:
+	case CH_WIDTH_80P80MHZ:
+	case CH_WIDTH_160MHZ:
+	case CH_WIDTH_320MHZ:
+		is_eht_bw_80 = acs_cfg->is_eht_enabled;
+		break;
+	default:
+		break;
+	}
+
+	return is_eht_bw_80;
+}
+
+void sap_acs_set_puncture_support(struct sap_context *sap_ctx,
+				  struct ch_params *ch_params)
+{
+	if (!sap_ctx || !ch_params) {
+		sap_err("Invalid parameters");
+		return;
+	}
+
+	if (sap_acs_is_puncture_applicable(sap_ctx->acs_cfg))
+		ch_params->is_create_punc_bitmap = true;
+}
+#endif