qcacld-3.0: Include BW_IND_ELEM IE in beacon and ECSA frames

Include BW_IND_ELEM IE in beacon and ECSA frames while advertising
CSA. This is needed when upgrading the bandwidth to 320 MHz.
Send the ECSA IE with switch count as 1. Use a timer to reset it
after sending the beacon out.

Change-Id: I6c38ef1ce4629b7a67bcbf803c7dbcced05ade33
CRs-Fixed: 3604422

components/mlme/dispatcher/inc/wlan_mlme_api.h

@@ -1242,6 +1242,15 @@ QDF_STATUS mlme_update_tgt_mlo_caps_in_cfg(struct wlan_objmgr_psoc *psoc);
 enum phy_ch_width wlan_mlme_convert_eht_op_bw_to_phy_ch_width(
 						uint8_t channel_width);
 
+/**
+ * wlan_mlme_convert_phy_ch_width_to_eht_op_bw() - convert channel width to eht
+ *                                                 operation IE format
+ * @ch_width: phy_ch_width
+ *
+ * Return: channel width in eht operation IE
+ */
+uint8_t wlan_mlme_convert_phy_ch_width_to_eht_op_bw(enum phy_ch_width ch_width);
+
 /**
  * wlan_mlme_get_epcs_capability() - Get mlme epcs capability flag
  * @psoc: psoc object

components/mlme/dispatcher/src/wlan_mlme_api.c

@@ -1281,6 +1281,22 @@ QDF_STATUS mlme_update_tgt_mlo_caps_in_cfg(struct wlan_objmgr_psoc *psoc)
 	return status;
 }
 
+uint8_t wlan_mlme_convert_phy_ch_width_to_eht_op_bw(enum phy_ch_width ch_width)
+{
+	switch (ch_width) {
+	case CH_WIDTH_320MHZ:
+		return WLAN_EHT_CHWIDTH_320;
+	case CH_WIDTH_160MHZ:
+		return WLAN_EHT_CHWIDTH_160;
+	case CH_WIDTH_80MHZ:
+		return WLAN_EHT_CHWIDTH_80;
+	case CH_WIDTH_40MHZ:
+		return WLAN_EHT_CHWIDTH_40;
+	default:
+		return WLAN_EHT_CHWIDTH_20;
+	}
+}
+
 enum phy_ch_width wlan_mlme_convert_eht_op_bw_to_phy_ch_width(
 						uint8_t channel_width)
 {

core/mac/src/include/parser_api.h

@@ -1565,6 +1565,18 @@ QDF_STATUS populate_dot11f_eht_operation(struct mac_context *mac_ctx,
 					 struct pe_session *session,
 					 tDot11fIEeht_op *eht_op);
 
+/**
+ * populate_dot11f_bw_ind_element() - pouldate bandwidth ind element
+ * @mac_ctx: Global MAC context
+ * @session: PE session
+ * @bw_ind: pointer to bw ind element IE
+ *
+ * QDF_STATUS
+ */
+QDF_STATUS populate_dot11f_bw_ind_element(struct mac_context *mac_ctx,
+					  struct pe_session *session,
+					  tDot11fIEbw_ind_element *bw_ind);
+
 /**
  * lim_ieee80211_pack_ehtcap() - Pack EHT capabilities IE
  * @ie: output pointer for eht capabilities IE
@@ -1660,6 +1672,14 @@ populate_dot11f_eht_operation(struct mac_context *mac_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
+static inline
+QDF_STATUS populate_dot11f_bw_ind_element(struct mac_context *mac_ctx,
+					  struct pe_session *session,
+					  tDot11fIEbw_ind_element *bw_ind)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
 static inline void lim_ieee80211_pack_ehtcap(uint8_t *ie,
 					     tDot11fIEeht_cap dot11f_eht_cap,
 					     tDot11fIEhe_cap dot11f_he_cap,

core/mac/src/pe/include/lim_global.h

@@ -370,8 +370,7 @@ typedef struct sLimChannelSwitchInfo {
 
 typedef struct sLimOperatingModeInfo {
 	uint8_t present;
-	uint8_t chanWidth:2;
-	uint8_t reserved:2;
+	uint8_t chanWidth:4;
 	uint8_t rxNSS:3;
 	uint8_t rxNSSType:1;
 } tLimOperatingModeInfo, *tpLimOperatingModeInfo;

core/mac/src/pe/include/lim_session.h

@@ -558,6 +558,8 @@ struct wlan_mlo_ie_info {
  * @chainMask:
  * @dfsIncludeChanSwIe: Flag to indicate Chan Sw announcement is required
  * @dfsIncludeChanWrapperIe: Flag to indicate Chan Wrapper Element is required
+ * @bw_update_include_ch_sw_ie: Flag to indicate chan switch Element is required
+ *                              due to bandwidth update
  * @cc_switch_mode:
  * @isCiscoVendorAP:
  * @add_ie_params:
@@ -867,6 +869,7 @@ struct pe_session {
 	uint8_t dfsIncludeChanSwIe;
 
 	uint8_t dfsIncludeChanWrapperIe;
+	uint8_t bw_update_include_ch_sw_ie;
 
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 	uint8_t cc_switch_mode;

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -8691,48 +8691,6 @@ static void lim_process_sme_deauth_req(struct mac_context *mac_ctx,
 	__lim_process_sme_deauth_req(mac_ctx, (uint32_t *)msg->bodyptr);
 }
 
-/**
- * lim_nss_or_ch_width_update_rsp() - send NSS/ch_width update response to SME
- * @mac_ctx Pointer to Global MAC structure
- * @vdev_id: vdev id
- * @status: nss/ch_width update status
- * @reason: Indicates whether it's from NSS update or ch_width update
- *
- * Return: None
- */
-static void
-lim_nss_or_ch_width_update_rsp(struct mac_context *mac_ctx,
-			       uint8_t vdev_id, QDF_STATUS status,
-			       enum sir_bcn_update_reason reason)
-{
-	struct scheduler_msg msg = {0};
-	struct sir_bcn_update_rsp *rsp;
-	QDF_STATUS qdf_status = QDF_STATUS_E_INVAL;
-
-	rsp = qdf_mem_malloc(sizeof(*rsp));
-	if (!rsp)
-		return;
-
-	rsp->vdev_id = vdev_id;
-	rsp->status = status;
-	rsp->reason = reason;
-
-	if (rsp->reason == REASON_NSS_UPDATE)
-		msg.type = eWNI_SME_NSS_UPDATE_RSP;
-	else if (rsp->reason == REASON_CH_WIDTH_UPDATE)
-		msg.type = eWNI_SME_SAP_CH_WIDTH_UPDATE_RSP;
-	else
-		goto done;
-
-	msg.bodyptr = rsp;
-	msg.bodyval = 0;
-	qdf_status = scheduler_post_message(QDF_MODULE_ID_PE, QDF_MODULE_ID_SME,
-					    QDF_MODULE_ID_SME, &msg);
-done:
-	if (QDF_IS_STATUS_ERROR(qdf_status))
-		qdf_mem_free(rsp);
-}
-
 void lim_send_bcn_rsp(struct mac_context *mac_ctx, tpSendbeaconParams rsp)
 {
 	if (!rsp) {
@@ -8740,6 +8698,11 @@ void lim_send_bcn_rsp(struct mac_context *mac_ctx, tpSendbeaconParams rsp)
 		return;
 	}
 
+	/* Success case response is sent from beacon_tx completion/timeout */
+	if (rsp->reason == REASON_CH_WIDTH_UPDATE &&
+	    QDF_IS_STATUS_SUCCESS(rsp->status))
+		return;
+
 	pe_debug("Send beacon resp status %d for reason %d",
 		 rsp->status, rsp->reason);
 
@@ -8760,6 +8723,12 @@ lim_update_bcn_with_new_ch_width(struct mac_context *mac_ctx,
 	pe_debug("ch width %d",
 		 session->gLimOperatingMode.chanWidth);
 
+	session->bw_update_include_ch_sw_ie = true;
+	status = qdf_mc_timer_start(&session->ap_ecsa_timer,
+				    MAX_WAIT_FOR_CH_WIDTH_UPDATE_COMPLETE);
+	if (QDF_IS_STATUS_ERROR(status))
+		pe_err("cannot start ap_ecsa_timer");
+
 	/* Send nss update request from here */
 	status = sch_set_fixed_beacon_fields(mac_ctx, session);
 	if (QDF_IS_STATUS_ERROR(status)) {
@@ -8845,6 +8814,8 @@ lim_process_sap_ch_width_update(struct mac_context *mac_ctx,
 	uint8_t vdev_id;
 	struct sir_bcn_update_rsp *param;
 	struct scheduler_msg msg_return = {0};
+	uint8_t primary_channel;
+	struct ch_params ch_params = {0};
 
 	if (!msg_buf) {
 		pe_err("Buffer is Pointing to NULL");
@@ -8864,6 +8835,26 @@ lim_process_sap_ch_width_update(struct mac_context *mac_ctx,
 		goto fail;
 	}
 
+	ch_params.ch_width = req->ch_width;
+	wlan_reg_set_channel_params_for_pwrmode(mac_ctx->pdev,
+						session->curr_op_freq,
+						0,
+						&ch_params,
+						REG_CURRENT_PWR_MODE);
+
+	session->gLimChannelSwitch.switchCount = 1;
+	session->gLimChannelSwitch.sw_target_freq = session->curr_op_freq;
+	primary_channel = wlan_reg_freq_to_chan(mac_ctx->pdev,
+						session->curr_op_freq);
+	session->gLimChannelSwitch.primaryChannel = primary_channel;
+	session->gLimChannelSwitch.ch_width = req->ch_width;
+	session->gLimChannelSwitch.ch_center_freq_seg0 =
+						ch_params.center_freq_seg0;
+	session->gLimChannelSwitch.ch_center_freq_seg1 =
+						ch_params.center_freq_seg1;
+
+	wlan_mlme_set_ap_oper_ch_width(session->vdev, req->ch_width);
+
 	/* Send ECSA to the peers */
 	send_extended_chan_switch_action_frame(mac_ctx,
 				       session->curr_op_freq,

core/mac/src/pe/lim/lim_send_management_frames.c

@@ -5095,6 +5095,10 @@ lim_send_extended_chan_switch_action_frame(struct mac_context *mac_ctx,
 			 frm.WiderBWChanSwitchAnn.newCenterChanFreq1);
 	}
 
+	if (lim_is_session_eht_capable(session_entry))
+		populate_dot11f_bw_ind_element(mac_ctx, session_entry,
+					       &frm.bw_ind_element);
+
 	status = dot11f_get_packed_ext_channel_switch_action_frame_size(mac_ctx,
 							    &frm, &n_payload);
 	if (DOT11F_FAILED(status)) {

core/mac/src/pe/lim/lim_send_sme_rsp_messages.c

@@ -2678,14 +2678,14 @@ lim_process_beacon_tx_success_ind(struct mac_context *mac_ctx, uint16_t msgType,
 		return;
 	csa_tx_offload = wlan_psoc_nif_fw_ext_cap_get(mac_ctx->psoc,
 						WLAN_SOC_CEXT_CSA_TX_OFFLOAD);
-	if (session->dfsIncludeChanSwIe && !csa_tx_offload &&
-	    ((session->gLimChannelSwitch.switchCount ==
-	      mac_ctx->sap.SapDfsInfo.sap_ch_switch_beacon_cnt) ||
-	     (session->gLimChannelSwitch.switchCount == 1) ||
-	     is_sap_go_moved_before_sta))
+	if ((session->dfsIncludeChanSwIe && !csa_tx_offload &&
+	     ((session->gLimChannelSwitch.switchCount ==
+	       mac_ctx->sap.SapDfsInfo.sap_ch_switch_beacon_cnt) ||
+	      (session->gLimChannelSwitch.switchCount == 1) ||
+	      is_sap_go_moved_before_sta)) ||
+	     session->bw_update_include_ch_sw_ie)
 		lim_process_ap_ecsa_timeout(session);
 
-
 	if (session->gLimOperatingMode.present)
 		/* Done with nss update */
 		session->gLimOperatingMode.present = 0;
@@ -2694,3 +2694,35 @@ lim_process_beacon_tx_success_ind(struct mac_context *mac_ctx, uint16_t msgType,
 
 	return;
 }
+
+void lim_nss_or_ch_width_update_rsp(struct mac_context *mac_ctx,
+				    uint8_t vdev_id, QDF_STATUS status,
+				    enum sir_bcn_update_reason reason)
+{
+	struct scheduler_msg msg = {0};
+	struct sir_bcn_update_rsp *rsp;
+	QDF_STATUS qdf_status = QDF_STATUS_E_INVAL;
+
+	rsp = qdf_mem_malloc(sizeof(*rsp));
+	if (!rsp)
+		return;
+
+	rsp->vdev_id = vdev_id;
+	rsp->status = status;
+	rsp->reason = reason;
+
+	if (rsp->reason == REASON_NSS_UPDATE)
+		msg.type = eWNI_SME_NSS_UPDATE_RSP;
+	else if (rsp->reason == REASON_CH_WIDTH_UPDATE)
+		msg.type = eWNI_SME_SAP_CH_WIDTH_UPDATE_RSP;
+	else
+		goto done;
+
+	msg.bodyptr = rsp;
+	msg.bodyval = 0;
+	qdf_status = scheduler_post_message(QDF_MODULE_ID_PE, QDF_MODULE_ID_SME,
+					    QDF_MODULE_ID_SME, &msg);
+done:
+	if (QDF_IS_STATUS_ERROR(qdf_status))
+		qdf_mem_free(rsp);
+}

core/mac/src/pe/lim/lim_send_sme_rsp_messages.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
@@ -300,4 +300,16 @@ void lim_handle_mlo_sta_csa_param(struct wlan_objmgr_vdev *vdev,
  */
 void lim_send_stop_bss_response(struct mac_context *mac_ctx, uint8_t vdev_id,
 				tSirResultCodes result_code);
+
+/**
+ * lim_nss_or_ch_width_update_rsp() - send NSS/ch_width update response to SME
+ * @mac_ctx Pointer to Global MAC structure
+ * @status: nss/ch_width update status
+ * @reason: Indicates whether it's from NSS update or ch_width update
+ *
+ * Return: None
+ */
+void lim_nss_or_ch_width_update_rsp(struct mac_context *mac_ctx,
+				    uint8_t vdev_id, QDF_STATUS status,
+				    enum sir_bcn_update_reason reason);
 #endif /* __LIM_SEND_SME_RSP_H */

core/mac/src/pe/lim/lim_utils.c

@@ -9976,8 +9976,26 @@ void lim_process_ap_ecsa_timeout(void *data)
 
 	mac_ctx = session->mac_ctx;
 
-	if (!session->dfsIncludeChanSwIe) {
-		pe_debug("session->dfsIncludeChanSwIe not set");
+	if (!session->dfsIncludeChanSwIe &&
+	    !session->bw_update_include_ch_sw_ie) {
+		pe_debug("session->dfsIncludeChanSwIe/chWidthUpdateIncludeChanSwIe not set");
+		return;
+	}
+
+	if (session->bw_update_include_ch_sw_ie) {
+		/* Stop the timer if already running */
+		qdf_mc_timer_stop(&session->ap_ecsa_timer);
+
+		lim_nss_or_ch_width_update_rsp(mac_ctx,
+					       session->vdev_id,
+					       QDF_STATUS_SUCCESS,
+					       REASON_CH_WIDTH_UPDATE);
+		session->gLimChannelSwitch.switchCount = 0;
+		session->bw_update_include_ch_sw_ie = false;
+
+		/* Clear CSA IE count and update beacon */
+		lim_send_dfs_chan_sw_ie_update(mac_ctx, session);
+
 		return;
 	}
 

core/mac/src/pe/lim/lim_utils.h

@@ -109,6 +109,7 @@
 
 #define MAX_WAIT_FOR_BCN_TX_COMPLETE 4000
 #define MAX_WAKELOCK_FOR_CSA         5000
+#define MAX_WAIT_FOR_CH_WIDTH_UPDATE_COMPLETE 200
 
 #ifdef WLAN_FEATURE_11BE
 #define MAX_NUM_PWR_LEVELS 16

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

@@ -661,7 +661,8 @@ sch_set_fixed_beacon_fields(struct mac_context *mac_ctx, struct pe_session *sess
 		WLAN_REG_IS_6GHZ_CHAN_FREQ
 			(session->gLimChannelSwitch.sw_target_freq);
 	if (session->limSystemRole == eLIM_AP_ROLE &&
-	    session->dfsIncludeChanSwIe == true) {
+	    (session->dfsIncludeChanSwIe == true ||
+	     session->bw_update_include_ch_sw_ie == true)) {
 		if (!CHAN_HOP_ALL_BANDS_ENABLE ||
 		    session->lim_non_ecsa_cap_num == 0 || is_6ghz_chsw) {
 			tDot11fIEext_chan_switch_ann *ext_csa =
@@ -674,6 +675,13 @@ sch_set_fixed_beacon_fields(struct mac_context *mac_ctx, struct pe_session *sess
 				 ext_csa->new_reg_class,
 				 ext_csa->new_channel,
 				 ext_csa->switch_count);
+
+			if (lim_is_session_eht_capable(session)) {
+				bcn_2->ChannelSwitchWrapper.present = 1;
+				populate_dot11f_bw_ind_element(mac_ctx,
+						session,
+				&bcn_2->ChannelSwitchWrapper.bw_ind_element);
+			}
 		}
 
 		if (session->lim_non_ecsa_cap_num &&

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

@@ -9719,6 +9719,31 @@ QDF_STATUS populate_dot11f_eht_operation(struct mac_context *mac_ctx,
 
 	return QDF_STATUS_SUCCESS;
 }
+
+
+QDF_STATUS populate_dot11f_bw_ind_element(struct mac_context *mac_ctx,
+					  struct pe_session *session,
+					  tDot11fIEbw_ind_element *bw_ind)
+{
+	tLimChannelSwitchInfo *ch_switch;
+
+	ch_switch = &session->gLimChannelSwitch;
+	bw_ind->present = true;
+	bw_ind->channel_width =	wlan_mlme_convert_phy_ch_width_to_eht_op_bw(
+							ch_switch->ch_width);
+	if (ch_switch->puncture_bitmap) {
+		bw_ind->disabled_sub_chan_bitmap_present = 1;
+		bw_ind->disabled_sub_chan_bitmap[0][0] =
+				QDF_GET_BITS(ch_switch->puncture_bitmap, 0, 8);
+		bw_ind->disabled_sub_chan_bitmap[0][1] =
+				QDF_GET_BITS(ch_switch->puncture_bitmap, 8, 8);
+	}
+	bw_ind->ccfs0 = ch_switch->ch_center_freq_seg0;
+	bw_ind->ccfs1 = ch_switch->ch_center_freq_seg1;
+
+	return QDF_STATUS_SUCCESS;
+}
+
 #endif /* WLAN_FEATURE_11BE */
 
 #ifdef WLAN_FEATURE_11BE_MLO