qcacld-3.0: Fix 802.11be STA did not follow AP bandwidth

Currently if reference AP upgrades its channel bandwidth, STA
does not follow it.

Make 802.11be STA follow channel bandwidth of ap based on its
capability through lim_handle_sta_csa_param.

Change-Id: I43b19115e05b99d2c234e8a1340f560d03e37b8a
CRs-Fixed: 3326764

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

@@ -357,6 +357,9 @@ typedef struct sLimChannelSwitchInfo {
 	uint8_t ch_center_freq_seg1;
 	uint8_t sec_ch_offset;
 	enum phy_ch_width ch_width;
+#ifdef WLAN_FEATURE_11BE
+	uint16_t puncture_bitmap;
+#endif
 	int8_t switchCount;
 	uint32_t switchTimeoutValue;
 	uint8_t switchMode;

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

@@ -578,6 +578,9 @@ struct pe_session {
 	/* center freq number as advertized OTA */
 	uint8_t ch_center_freq_seg0;
 	enum phy_ch_width ch_width;
+#ifdef WLAN_FEATURE_11BE
+	uint16_t puncture_bitmap;
+#endif
 	uint8_t ch_center_freq_seg1;
 	uint8_t enableVhtpAid;
 	uint8_t enableVhtGid;

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

@@ -220,6 +220,8 @@ void lim_process_beacon_eht_op(struct pe_session *session,
 	QDF_STATUS status;
 	struct mac_context *mac_ctx;
 	struct wlan_objmgr_vdev *vdev;
+	struct wlan_channel *des_chan;
+	struct csa_offload_params *csa_param;
 
 	if (!session || !eht_op || !session->mac_ctx || !session->vdev) {
 		pe_err("invalid input parameters");
@@ -262,12 +264,29 @@ void lim_process_beacon_eht_op(struct pe_session *session,
 							      &update_allow);
 		if (QDF_IS_STATUS_ERROR(status))
 			return;
-		if (update_allow)
+		if (update_allow) {
 			wlan_cm_sta_update_bw_puncture(vdev, session->bssId,
 						       ori_punc, ori_bw,
 						       eht_op->ccfs0,
 						       eht_op->ccfs1,
 						       new_bw);
+		} else {
+			csa_param = qdf_mem_malloc(sizeof(*csa_param));
+			if (!csa_param) {
+				pe_err("csa_param allocation fails");
+				return;
+			}
+			des_chan = wlan_vdev_mlme_get_des_chan(vdev);
+			csa_param->channel = des_chan->ch_ieee;
+			csa_param->csa_chan_freq = des_chan->ch_freq;
+			csa_param->new_ch_width = ori_bw;
+			csa_param->new_punct_bitmap = ori_punc;
+			csa_param->new_ch_freq_seg1 = eht_op->ccfs0;
+			csa_param->new_ch_freq_seg2 = eht_op->ccfs1;
+			qdf_copy_macaddr(&csa_param->bssid,
+					 (struct qdf_mac_addr *)session->bssId);
+			lim_handle_sta_csa_param(session->mac_ctx, csa_param);
+		}
 	}
 }
 

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

@@ -1718,15 +1718,64 @@ static bool lim_is_csa_channel_allowed(struct mac_context *mac_ctx,
 	return is_allowed;
 }
 
+#ifdef WLAN_FEATURE_11BE
 /**
- * lim_handle_sta_csa_param() - Handle CSA offload param
- * @mac_ctx: pointer to global adapter context
- * @csa_params: csa parameters.
+ * lim_set_csa_chan_param_11be() - set csa chan params for 11be
+ * @session: pointer to pe session
+ * @csa_param: pointer to csa_offload_params
+ * @ch_param: channel parameters to get
  *
- * Return: None
+ * Return: void
+ */
+static void lim_set_csa_chan_param_11be(struct pe_session *session,
+					struct csa_offload_params *csa_param,
+					struct ch_params *ch_param)
+{
+	if (!session || !csa_param || !ch_param || !session->vdev) {
+		pe_err("invalid input parameter");
+		return;
+	}
+
+	if (csa_param->new_ch_width == CH_WIDTH_320MHZ &&
+	    !session->eht_config.support_320mhz_6ghz)
+		ch_param->ch_width = CH_WIDTH_160MHZ;
+
+	wlan_cm_sta_set_chan_param(session->vdev,
+				   csa_param->csa_chan_freq,
+				   csa_param->new_ch_width,
+				   csa_param->new_punct_bitmap,
+				   csa_param->new_ch_freq_seg1,
+				   csa_param->new_ch_freq_seg2,
+				   ch_param);
+}
+
+/**
+ * lim_set_chan_sw_puncture() - set puncture to channel switch info
+ * @lim_ch_switch: pointer to tLimChannelSwitchInfo
+ * @ch_param: pointer to ch_params
+ *
+ * Return: void
  */
-static void lim_handle_sta_csa_param(struct mac_context *mac_ctx,
-				     struct csa_offload_params *csa_params)
+static void lim_set_chan_sw_puncture(tLimChannelSwitchInfo *lim_ch_switch,
+				     struct ch_params *ch_param)
+{
+	lim_ch_switch->puncture_bitmap = ch_param->reg_punc_bitmap;
+}
+#else
+static void lim_set_csa_chan_param_11be(struct pe_session *session,
+					struct csa_offload_params *csa_param,
+					struct ch_params *ch_param)
+{
+}
+
+static void lim_set_chan_sw_puncture(tLimChannelSwitchInfo *lim_ch_switch,
+				     struct ch_params *ch_param)
+{
+}
+#endif
+
+void lim_handle_sta_csa_param(struct mac_context *mac_ctx,
+			      struct csa_offload_params *csa_params)
 {
 	struct pe_session *session_entry;
 	tpDphHashNode sta_ds = NULL;
@@ -1819,7 +1868,11 @@ static void lim_handle_sta_csa_param(struct mac_context *mac_ctx,
 		pe_debug("new freq: %u, width: %d", csa_params->csa_chan_freq,
 			 csa_params->new_ch_width);
 		ch_params.ch_width = csa_params->new_ch_width;
-		wlan_reg_set_channel_params_for_pwrmode(
+		if (IS_DOT11_MODE_EHT(session_entry->dot11mode))
+			lim_set_csa_chan_param_11be(session_entry, csa_params,
+						    &ch_params);
+		else
+			wlan_reg_set_channel_params_for_pwrmode(
 						     mac_ctx->pdev,
 						     csa_params->csa_chan_freq,
 						     0, &ch_params,
@@ -1833,6 +1886,7 @@ static void lim_handle_sta_csa_param(struct mac_context *mac_ctx,
 		lim_ch_switch->ch_width = ch_params.ch_width;
 		lim_ch_switch->ch_center_freq_seg0 = ch_params.center_freq_seg0;
 		lim_ch_switch->ch_center_freq_seg1 = ch_params.center_freq_seg1;
+		lim_set_chan_sw_puncture(lim_ch_switch, &ch_params);
 
 		if (ch_params.ch_width == CH_WIDTH_20MHZ) {
 			lim_ch_switch->state = eLIM_CHANNEL_SWITCH_PRIMARY_ONLY;

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

@@ -268,6 +268,16 @@ void
 lim_process_beacon_tx_success_ind(struct mac_context *mac, uint16_t msgType,
 				  void *event);
 
+/**
+ * lim_handle_sta_csa_param() - Handle CSA offload param
+ * @mac_ctx: pointer to global adapter context
+ * @csa_params: csa parameters.
+ *
+ * Return: None
+ */
+void lim_handle_sta_csa_param(struct mac_context *mac_ctx,
+			      struct csa_offload_params *csa_params);
+
 #ifdef WLAN_FEATURE_11BE_MLO
 /**
  * lim_handle_mlo_sta_csa_param() - handle mlo sta csa parameters

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

@@ -1924,11 +1924,7 @@ static void __lim_process_channel_switch_timeout(struct pe_session *pe_session)
 			eLIM_CHANNEL_SWITCH_IDLE;
 		break;
 	case eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY:
-		lim_switch_primary_secondary_channel(mac, pe_session,
-			pe_session->gLimChannelSwitch.sw_target_freq,
-			pe_session->gLimChannelSwitch.ch_center_freq_seg0,
-			pe_session->gLimChannelSwitch.ch_center_freq_seg1,
-			pe_session->gLimChannelSwitch.ch_width);
+		lim_switch_primary_secondary_channel(mac, pe_session);
 		pe_session->gLimChannelSwitch.state =
 			eLIM_CHANNEL_SWITCH_IDLE;
 		break;
@@ -2180,13 +2176,39 @@ void lim_switch_primary_channel(struct mac_context *mac,
 	return;
 }
 
+#ifdef WLAN_FEATURE_11BE
+/**
+ * lim_set_puncture_from_chan_switch_to_session() - set puncture from channel
+ *                                                  switch to pe session
+ * @pe_session: pointer to pe session
+ *
+ * Return: void
+ */
+static void
+lim_set_puncture_from_chan_switch_to_session(struct pe_session *pe_session)
+{
+	pe_session->puncture_bitmap =
+			pe_session->gLimChannelSwitch.puncture_bitmap;
+}
+#else
+static void
+lim_set_puncture_from_chan_switch_to_session(struct pe_session *pe_session)
+{
+}
+#endif
+
 void lim_switch_primary_secondary_channel(struct mac_context *mac,
-					  struct pe_session *pe_session,
-					  uint32_t new_channel_freq,
-					  uint8_t ch_center_freq_seg0,
-					  uint8_t ch_center_freq_seg1,
-					  enum phy_ch_width ch_width)
+					  struct pe_session *pe_session)
 {
+	uint32_t new_channel_freq;
+	uint8_t ch_center_freq_seg0;
+	uint8_t ch_center_freq_seg1;
+	enum phy_ch_width ch_width;
+
+	new_channel_freq = pe_session->gLimChannelSwitch.sw_target_freq,
+	ch_center_freq_seg0 = pe_session->gLimChannelSwitch.ch_center_freq_seg0,
+	ch_center_freq_seg1 = pe_session->gLimChannelSwitch.ch_center_freq_seg1,
+	ch_width = pe_session->gLimChannelSwitch.ch_width;
 
 	/* Assign the callback to resume TX once channel is changed. */
 	pe_session->curr_req_chan_freq = new_channel_freq;
@@ -2223,6 +2245,7 @@ void lim_switch_primary_secondary_channel(struct mac_context *mac,
 	pe_session->ch_center_freq_seg0 = ch_center_freq_seg0;
 	pe_session->ch_center_freq_seg1 = ch_center_freq_seg1;
 	pe_session->ch_width = ch_width;
+	lim_set_puncture_from_chan_switch_to_session(pe_session);
 
 	lim_send_switch_chnl_params(mac, pe_session);
 
@@ -10397,6 +10420,30 @@ static void lim_update_des_chan_puncture(struct wlan_channel *des_chan,
 {
 	des_chan->puncture_bitmap = ch_params->reg_punc_bitmap;
 }
+
+/**
+ * lim_overwrite_sta_puncture() - overwrite STA puncture with AP puncture
+ * @session: session
+ * @@ch_param: pointer to ch_params
+ *
+ * Return: void
+ */
+static void lim_overwrite_sta_puncture(struct pe_session *session,
+				       struct ch_params *ch_param)
+{
+	uint16_t new_punc = 0;
+
+	wlan_reg_extract_puncture_by_bw(session->ch_width,
+					session->puncture_bitmap,
+					session->curr_op_freq,
+					ch_param->mhz_freq_seg1,
+					ch_param->ch_width,
+					&new_punc);
+
+	ch_param->reg_punc_bitmap = new_punc;
+	session->puncture_bitmap = new_punc;
+}
+
 #else
 static void lim_update_ap_puncture(struct pe_session *session,
 				   struct ch_params *ch_params)
@@ -10407,6 +10454,11 @@ static void lim_update_des_chan_puncture(struct wlan_channel *des_chan,
 					 struct ch_params *ch_params)
 {
 }
+
+static void lim_overwrite_sta_puncture(struct pe_session *session,
+				       struct ch_params *ch_params)
+{
+}
 #endif
 
 QDF_STATUS lim_pre_vdev_start(struct mac_context *mac,
@@ -10468,6 +10520,9 @@ QDF_STATUS lim_pre_vdev_start(struct mac_context *mac,
 		return QDF_STATUS_E_INVAL;
 	}
 
+	if (LIM_IS_STA_ROLE(session))
+		lim_overwrite_sta_puncture(session, &ch_params);
+
 	des_chan = mlme_obj->vdev->vdev_mlme.des_chan;
 	des_chan->ch_freq = session->curr_op_freq;
 	des_chan->ch_width = ch_params.ch_width;

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

@@ -527,10 +527,6 @@ void lim_switch_primary_channel(struct mac_context *mac,
  * channel of session
  * @mac: Global MAC structure
  * @pe_session: session context
- * @new_channel_freq: new channel frequency (MHz)
- * @ch_center_freq_seg0: channel center freq seg0
- * @ch_center_freq_seg1: channel center freq seg1
- * @ch_width: ch width of enum phy_ch_width
  *
  *  This function changes the primary and secondary channel.
  *  If 11h is enabled and user provides a "new channel freq"
@@ -541,11 +537,7 @@ void lim_switch_primary_channel(struct mac_context *mac,
  * @return NONE
  */
 void lim_switch_primary_secondary_channel(struct mac_context *mac,
-					  struct pe_session *pe_session,
-					  uint32_t new_channel_freq,
-					  uint8_t ch_center_freq_seg0,
-					  uint8_t ch_center_freq_seg1,
-					  enum phy_ch_width ch_width);
+					  struct pe_session *pe_session);
 
 void lim_update_sta_run_time_ht_capability(struct mac_context *mac,
 		tDot11fIEHTCaps *pHTCaps);