qcacld-3.0: Add eMLSR HW mode support for ML STA

Add eMLSR HW mode support for ML STA. eMLSR mode
(Enhanced Multi-link Single-Radio) is a new HW mode within 802.11be
op mode. This change consists of the following
1) Handle the new eMLSR HW mode. FW sends this capability to host via
extended service ready event.
2) If FW supports this mode, then update the eMLSR capability sub-fields
in the Basic-variant MLO IE under the assoc request frame.
3) Provide peer info like eMLSR capability, transition timeout, and link
IDs to FW through WMI_PEER_ASSOC_CMDID.

Change-Id: Idc00f5f780b5617e513f307952b58277669dee85
CRs-Fixed: 3184708

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -2796,6 +2796,15 @@ bool policy_mgr_is_dbs_scan_allowed(struct wlan_objmgr_psoc *psoc);
  */
 bool policy_mgr_is_hw_sbs_capable(struct wlan_objmgr_psoc *psoc);
 
+/**
+ * policy_mgr_is_hw_emlsr_capable() - Check if HW is EMLSR capable
+ * @psoc: PSOC object information
+ * Checks if the HW is EMLSR capable
+ *
+ * Return: true if the HW is EMLSR capable
+ */
+bool policy_mgr_is_hw_emlsr_capable(struct wlan_objmgr_psoc *psoc);
+
 /**
  * policy_mgr_2_freq_always_on_same_mac() - Function to check whether both the
  * input frequencies are on same mac in all supported mode/freq range

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h

@@ -165,6 +165,16 @@ enum hw_mode_sbs_capab {
 	HW_MODE_SBS,
 };
 
+/**
+ * enum hw_mode_emlsr_capab - EMLSR HW mode capability
+ * @HW_MODE_EMLSR_NONE: Non EMLSR capable
+ * @HW_MODE_EMLSR: EMLSR capable
+ */
+enum hw_mode_emlsr_capab {
+	HW_MODE_EMLSR_NONE,
+	HW_MODE_EMLSR,
+};
+
 /**
  * enum hw_mode_mac_band_cap - mac band capability
  * @HW_MODE_MAC_BAND_NONE: No band requirement.
@@ -1307,6 +1317,7 @@ struct policy_mgr_disabled_ml_link_info {
  * @mac0_band_cap: mac0 band (5g/2g) capability
  * @dbs_cap: DBS capabality
  * @agile_dfs_cap: Agile DFS capabality
+ * @emlsr_cap: eMLSR capability
  * @action_type: for dbs mode, the field indicates the "Action type" to be
  * used to switch to the mode. To help the hw mode validation.
  */
@@ -1321,6 +1332,7 @@ struct policy_mgr_hw_mode_params {
 	uint8_t dbs_cap;
 	uint8_t agile_dfs_cap;
 	uint8_t sbs_cap;
+	uint8_t emlsr_cap;
 	enum policy_mgr_conc_next_action action_type;
 };
 
@@ -1432,6 +1444,7 @@ struct policy_mgr_freq_range {
  * @MODE_SBS:               SBS mode with either high share or low share
  * @MODE_SBS_UPPER_SHARE:   Higher 5Ghz shared with 2.4Ghz
  * @MODE_SBS_LOWER_SHARE:   LOWER 5Ghz shared with 2.4Ghz
+ * #MODE_EMLSR:             eMLSR mode
  * @MODE_HW_MAX: MAX
  */
 enum policy_mgr_mode {
@@ -1440,6 +1453,7 @@ enum policy_mgr_mode {
 	MODE_SBS,
 	MODE_SBS_UPPER_SHARE,
 	MODE_SBS_LOWER_SHARE,
+	MODE_EMLSR,
 	MODE_HW_MAX,
 };
 
@@ -1454,7 +1468,7 @@ enum policy_mgr_mode {
  *                      and current HW mode.
  */
 struct dbs_hw_mode_info {
-	uint32_t *hw_mode_list;
+	uint64_t *hw_mode_list;
 	qdf_freq_t sbs_lower_band_end_freq;
 	struct policy_mgr_freq_range freq_range_caps[MODE_HW_MAX][MAX_MAC];
 	struct policy_mgr_freq_range cur_mac_freq_range[MAX_MAC];

components/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c

@@ -511,7 +511,7 @@ QDF_STATUS policy_mgr_get_hw_mode_from_idx(
 		uint32_t idx,
 		struct policy_mgr_hw_mode_params *hw_mode)
 {
-	uint32_t param;
+	uint64_t param;
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
 	uint8_t mac0_min_ss;
 	uint8_t mac1_min_ss;
@@ -549,6 +549,7 @@ QDF_STATUS policy_mgr_get_hw_mode_from_idx(
 	hw_mode->dbs_cap = POLICY_MGR_HW_MODE_DBS_MODE_GET(param);
 	hw_mode->agile_dfs_cap = POLICY_MGR_HW_MODE_AGILE_DFS_GET(param);
 	hw_mode->sbs_cap = POLICY_MGR_HW_MODE_SBS_MODE_GET(param);
+	hw_mode->emlsr_cap = POLICY_MGR_HW_MODE_EMLSR_MODE_GET(param);
 	if (hw_mode->dbs_cap) {
 		mac0_min_ss = QDF_MIN(hw_mode->mac0_tx_ss, hw_mode->mac0_rx_ss);
 		mac1_min_ss = QDF_MIN(hw_mode->mac1_tx_ss, hw_mode->mac1_rx_ss);

components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c

@@ -696,6 +696,7 @@ static void policy_mgr_get_hw_mode_params(
  * @hw_mode_id: hw mode id value used by firmware
  * @dbs_mode: dbs_mode for the dbs_hw_mode
  * @sbs_mode: sbs_mode for the sbs_hw_mode
+ * @emlsr_mode: emlsr_mode for the emlsr_hw_mode
  *
  * This function sets TX-RX stream, bandwidth and DBS mode in
  * hw_mode_list.
@@ -706,9 +707,10 @@ static void policy_mgr_set_hw_mode_params(struct wlan_objmgr_psoc *psoc,
 			struct policy_mgr_mac_ss_bw_info mac0_ss_bw_info,
 			struct policy_mgr_mac_ss_bw_info mac1_ss_bw_info,
 			uint32_t pos, uint32_t hw_mode_id, uint32_t dbs_mode,
-			uint32_t sbs_mode)
+			uint32_t sbs_mode, uint64_t emlsr_mode)
 {
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
+	uint64_t legacy_hwmode_lst;
 
 	pm_ctx = policy_mgr_get_context(psoc);
 	if (!pm_ctx) {
@@ -749,6 +751,11 @@ static void policy_mgr_set_hw_mode_params(struct wlan_objmgr_psoc *psoc,
 	POLICY_MGR_HW_MODE_ID_SET(
 		pm_ctx->hw_mode.hw_mode_list[pos],
 		hw_mode_id);
+
+	legacy_hwmode_lst = pm_ctx->hw_mode.hw_mode_list[pos];
+	POLICY_MGR_HW_MODE_EMLSR_MODE_SET(
+	    pm_ctx->hw_mode.hw_mode_list[pos],
+	    legacy_hwmode_lst, emlsr_mode);
 }
 
 static void
@@ -1103,6 +1110,10 @@ policy_mgr_update_mac_freq_info(struct wlan_objmgr_psoc *psoc,
 			policy_mgr_update_sbs_freq_info(pm_ctx);
 
 		break;
+	case WMI_HW_MODE_EMLSR:
+		policy_mgr_update_freq_info(pm_ctx, mac_cap, MODE_EMLSR,
+					    phy_id);
+		break;
 	default:
 		policy_mgr_err("HW mode not defined %d",
 			       hw_config_type);
@@ -1137,6 +1148,7 @@ static const char *policy_mgr_hw_mode_to_str(enum policy_mgr_mode hw_mode)
 	CASE_RETURN_STRING(MODE_SBS);
 	CASE_RETURN_STRING(MODE_SBS_UPPER_SHARE);
 	CASE_RETURN_STRING(MODE_SBS_LOWER_SHARE);
+	CASE_RETURN_STRING(MODE_EMLSR);
 	default:
 		return "Unknown";
 	}
@@ -1222,6 +1234,7 @@ QDF_STATUS policy_mgr_update_hw_mode_list(struct wlan_objmgr_psoc *psoc,
 	uint32_t i, j = 0;
 	enum wmi_hw_mode_config_type hw_config_type;
 	uint32_t dbs_mode, sbs_mode;
+	uint64_t emlsr_mode;
 	struct policy_mgr_mac_ss_bw_info mac0_ss_bw_info = {0};
 	struct policy_mgr_mac_ss_bw_info mac1_ss_bw_info = {0};
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
@@ -1302,11 +1315,20 @@ QDF_STATUS policy_mgr_update_hw_mode_list(struct wlan_objmgr_psoc *psoc,
 			    (hw_config_type == WMI_HW_MODE_DBS_OR_SBS)))
 				sbs_mode = HW_MODE_SBS;
 		}
+		/* eMLSR mode */
+		if (hw_config_type == WMI_HW_MODE_EMLSR) {
+			tmp = &info->mac_phy_cap[j++];
+			policy_mgr_get_hw_mode_params(tmp, &mac1_ss_bw_info);
+			policy_mgr_update_mac_freq_info(psoc, pm_ctx,
+							hw_config_type,
+							tmp->phy_id, tmp);
+			emlsr_mode = HW_MODE_EMLSR;
+		}
 
 		/* Updating HW mode list */
 		policy_mgr_set_hw_mode_params(psoc, mac0_ss_bw_info,
 			mac1_ss_bw_info, i, tmp->hw_mode_id, dbs_mode,
-			sbs_mode);
+			sbs_mode, emlsr_mode);
 	}
 
 	/*
@@ -2154,6 +2176,26 @@ bool policy_mgr_is_hw_dbs_capable(struct wlan_objmgr_psoc *psoc)
 	return true;
 }
 
+bool policy_mgr_is_hw_emlsr_capable(struct wlan_objmgr_psoc *psoc)
+{
+	struct policy_mgr_psoc_priv_obj *pm_ctx;
+	uint64_t param, i;
+
+	pm_ctx = policy_mgr_get_context(psoc);
+
+	if (!pm_ctx) {
+		policy_mgr_err("Invalid Context");
+		return false;
+	}
+	for (i = 0; i < pm_ctx->num_dbs_hw_modes; i++) {
+		param = pm_ctx->hw_mode.hw_mode_list[i];
+		if (POLICY_MGR_HW_MODE_EMLSR_MODE_GET(param))
+			return true;
+	}
+
+	return false;
+}
+
 bool policy_mgr_is_current_hwmode_dbs(struct wlan_objmgr_psoc *psoc)
 {
 	struct policy_mgr_hw_mode_params hw_mode;

components/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h

@@ -54,6 +54,7 @@
  * WMI macros, then these macros' BIT definitions are also need to be
  * changed.
  */
+#define POLICY_MGR_HW_MODE_EMLSR_MODE_BITPOS       (32)
 #define POLICY_MGR_HW_MODE_MAC0_TX_STREAMS_BITPOS  (28)
 #define POLICY_MGR_HW_MODE_MAC0_RX_STREAMS_BITPOS  (24)
 #define POLICY_MGR_HW_MODE_MAC1_TX_STREAMS_BITPOS  (20)
@@ -66,6 +67,8 @@
 #define POLICY_MGR_HW_MODE_MAC0_BAND_BITPOS        (3)
 #define POLICY_MGR_HW_MODE_ID_BITPOS               (0)
 
+#define POLICY_MGR_HW_MODE_EMLSR_MODE_MASK         \
+	(0x1 << POLICY_MGR_HW_MODE_EMLSR_MODE_BITPOS)
 #define POLICY_MGR_HW_MODE_MAC0_TX_STREAMS_MASK    \
 	(0xf << POLICY_MGR_HW_MODE_MAC0_TX_STREAMS_BITPOS)
 #define POLICY_MGR_HW_MODE_MAC0_RX_STREAMS_MASK    \
@@ -89,6 +92,9 @@
 #define POLICY_MGR_HW_MODE_ID_MASK           \
 			(0x7 << POLICY_MGR_HW_MODE_ID_BITPOS)
 
+#define POLICY_MGR_HW_MODE_EMLSR_MODE_SET(hw_mode, tmp, value) \
+	QDF_SET_BITS64(hw_mode, tmp, POLICY_MGR_HW_MODE_EMLSR_MODE_BITPOS,\
+	1, value)
 #define POLICY_MGR_HW_MODE_MAC0_TX_STREAMS_SET(hw_mode, value) \
 	WMI_SET_BITS(hw_mode, POLICY_MGR_HW_MODE_MAC0_TX_STREAMS_BITPOS,\
 	4, value)
@@ -123,6 +129,9 @@
 	WMI_SET_BITS(hw_mode, POLICY_MGR_HW_MODE_ID_BITPOS,\
 	3, value)
 
+#define POLICY_MGR_HW_MODE_EMLSR_MODE_GET(hw_mode)                     \
+		QDF_GET_BITS64(hw_mode, POLICY_MGR_HW_MODE_EMLSR_MODE_BITPOS,\
+		1)
 #define POLICY_MGR_HW_MODE_MAC0_TX_STREAMS_GET(hw_mode)                \
 		(((hw_mode) & POLICY_MGR_HW_MODE_MAC0_TX_STREAMS_MASK) >>    \
 		POLICY_MGR_HW_MODE_MAC0_TX_STREAMS_BITPOS)

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

@@ -247,6 +247,7 @@ typedef struct tLimPreAuthTable {
  * @owe_ie:         Pointer to OWE IE
  * @owe_ie_len:     Length of OWE IE
  * @eht_capable:     802.11be EHT capability
+ * @emlsr_capable:   802.11be eMLSR capability
  */
 struct lim_sta_context {
 	tLimMlmStates mlmState;
@@ -275,6 +276,9 @@ struct lim_sta_context {
 #ifdef WLAN_FEATURE_11BE
 	bool eht_capable;
 #endif
+#ifdef WLAN_FEATURE_11BE_MLO
+	bool emlsr_capable;
+#endif
 };
 
 /* Structure definition to hold deferred messages queue parameters */

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

@@ -693,6 +693,7 @@ struct pe_session {
 #ifdef WLAN_FEATURE_11BE_MLO
 	struct mlo_link_ie_info mlo_link_info;
 	struct mlo_partner_info ml_partner_info;
+	bool is_emlsr_capable;
 #endif
 #endif /* WLAN_FEATURE_11BE */
 	uint8_t user_edca_set;

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

@@ -3875,6 +3875,9 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
 						  pAssocRsp);
 		}
 	}
+
+	lim_intersect_ap_emlsr_caps(pe_session, pAddBssParams, pAssocRsp);
+
 	pAddBssParams->staContext.smesessionId =
 		pe_session->smeSessionId;
 	pAddBssParams->staContext.wpa_rsn = pBeaconStruct->rsnPresent;

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

@@ -207,6 +207,8 @@ void lim_update_assoc_sta_datas(struct mac_context *mac_ctx,
 	lim_update_stads_eht_caps(mac_ctx, sta_ds, assoc_rsp,
 				  session_entry, beacon);
 
+	lim_update_stads_emlsr_caps(mac_ctx, sta_ds, assoc_rsp);
+
 	if (lim_is_sta_he_capable(sta_ds))
 		he_cap = &assoc_rsp->he_cap;
 

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

@@ -8865,6 +8865,59 @@ void lim_update_stads_eht_bw_320mhz(struct pe_session *session,
 
 #endif
 
+#ifdef WLAN_FEATURE_11BE_MLO
+void lim_update_stads_emlsr_caps(struct mac_context *mac_ctx,
+				 tpDphHashNode sta_ds, tpSirAssocRsp assoc_rsp)
+{
+	if (!assoc_rsp->mlo_ie.mlo_ie.eml_capabilities.info.emlsr_support) {
+		pe_debug("eMLSR cap not present in assoc rsp");
+		sta_ds->mlmStaContext.emlsr_capable = false;
+		return;
+	}
+
+	sta_ds->mlmStaContext.emlsr_capable = true;
+}
+
+void lim_intersect_ap_emlsr_caps(struct pe_session *session,
+				 struct bss_params *add_bss,
+				 tpSirAssocRsp assoc_rsp)
+{
+	if (session->is_emlsr_capable && assoc_rsp &&
+	    assoc_rsp->mlo_ie.mlo_ie.eml_capabilities.info.emlsr_support) {
+		add_bss->staContext.emlsr_support = true;
+		add_bss->staContext.link_id =
+		    assoc_rsp->mlo_ie.mlo_ie.link_id_info.info.link_id;
+		add_bss->staContext.emlsr_trans_timeout =
+		    assoc_rsp->mlo_ie.mlo_ie.eml_capabilities.info.transition_timeout;
+	} else {
+		add_bss->staContext.emlsr_support = false;
+	}
+}
+
+bool lim_is_mlo_in_emlsr_mode(struct mac_context *mac_ctx, uint8_t vdev_id)
+{
+	struct pe_session *session;
+	tpDphHashNode sta_ds = NULL;
+	uint16_t aid;
+
+	session = pe_find_session_by_vdev_id(mac_ctx, vdev_id);
+	if (!session) {
+		pe_err("Session does not exist for given vdev_id %d", vdev_id);
+		return false;
+	}
+
+	sta_ds = dph_lookup_hash_entry(mac_ctx, session->bssId, &aid,
+				       &session->dph.dphHashTable);
+	if (!sta_ds) {
+		pe_debug("No STA DS entry found for " QDF_MAC_ADDR_FMT,
+			 QDF_MAC_ADDR_REF(session->bssId));
+		return false;
+	}
+
+	return session->is_emlsr_capable && sta_ds->mlmStaContext.emlsr_capable;
+}
+#endif
+
 #if defined(CONFIG_BAND_6GHZ) && defined(WLAN_FEATURE_11AX)
 QDF_STATUS lim_send_he_6g_band_caps_ie(struct mac_context *mac_ctx,
 				       struct pe_session *session,

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

@@ -2187,6 +2187,61 @@ lim_update_stads_eht_bw_320mhz(struct pe_session *session,
 }
 #endif /* WLAN_FEATURE_11BE */
 
+#ifdef WLAN_FEATURE_11BE_MLO
+/**
+ * lim_intersect_ap_emlsr_caps() - Intersect AP and self STA EHT capabilities
+ * @session: pointer to PE session
+ * @add_bss: pointer to ADD BSS params
+ * @beacon: pointer to beacon
+ * @assoc_rsp: pointer to assoc response
+ *
+ * Return: None
+ */
+void lim_intersect_ap_emlsr_caps(struct pe_session *session,
+				 struct bss_params *add_bss,
+				 tpSirAssocRsp assoc_rsp);
+
+/**
+ * lim_update_stads_emlsr_caps() - Copy eMLSR capability into STA DPH hash table
+ *                                 entry
+ * @mac_ctx: pointer to mac context
+ * @sta_ds: pointer to sta dph hash table entry
+ * @assoc_rsp: pointer to assoc response
+ *
+ * Return: None
+ */
+void lim_update_stads_emlsr_caps(struct mac_context *mac_ctx,
+				 tpDphHashNode sta_ds, tpSirAssocRsp assoc_rsp);
+
+/**
+ * lim_is_mlo_in_emlsr_mode() - Check if MLO is in eMLSR mode.
+ * @mac_ctx: pointer to mac context
+ * @vdev_id: vdev ID
+ *
+ * Return: True if both STA and peer support eMLSR capability, else False
+ */
+bool lim_is_mlo_in_emlsr_mode(struct mac_context *mac_ctx, uint8_t vdev_id);
+#else
+static inline void
+lim_intersect_ap_emlsr_caps(struct pe_session *session,
+			    struct bss_params *add_bss,
+			    tpSirAssocRsp assoc_rsp)
+{
+}
+
+static inline
+void lim_update_stads_emlsr_caps(struct mac_context *mac_ctx,
+				 tpDphHashNode sta_ds, tpSirAssocRsp assoc_rsp)
+{
+}
+
+static inline
+bool lim_is_mlo_in_emlsr_mode(struct mac_context *mac_ctx, uint8_t vdev_id)
+{
+	return false;
+}
+#endif /* WLAN_FEATURE_11BE_MLO */
+
 #if defined(CONFIG_BAND_6GHZ) && defined(WLAN_FEATURE_11AX)
 /**
  * lim_send_he_6g_band_caps_ie() - Send HE 6ghz band caps to FW

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

@@ -3931,6 +3931,12 @@ sir_convert_assoc_resp_frame2_struct(struct mac_context *mac,
 	fils_convert_assoc_rsp_frame2_struct(ar, pAssocRsp);
 	sir_convert_assoc_resp_frame2_mlo_struct(frame, frame_len,
 						 session_entry, ar, pAssocRsp);
+	if (ar->mlo_ie.eml_capab_present) {
+		pAssocRsp->mlo_ie.mlo_ie.eml_capabilities.info.emlsr_support =
+			ar->mlo_ie.eml_capabilities.info.emlsr_support;
+		pAssocRsp->mlo_ie.mlo_ie.eml_capabilities.info.transition_timeout =
+			ar->mlo_ie.eml_capabilities.info.transition_timeout;
+	}
 	pe_debug("ht %d vht %d vendor vht: cap %d op %d, he %d he 6ghband %d eht %d eht320 %d, max idle: present %d val %d, he mu edca %d wmm %d qos %d",
 		 ar->HTCaps.present, ar->VHTCaps.present,
 		 ar->vendor_vht_ie.VHTCaps.present,
@@ -10571,6 +10577,8 @@ QDF_STATUS populate_dot11f_assoc_req_mlo_ie(struct mac_context *mac_ctx,
 	uint8_t *p_sta_prof;
 	uint32_t len_consumed;
 	uint8_t len_remaining, len;
+	bool emlsr_cap = false;
+	struct wlan_objmgr_psoc *psoc;
 	tDot11fIEnon_inheritance sta_prof_non_inherit;
 	tDot11fFfCapabilities mlo_cap;
 	tDot11fIEHTCaps ht_caps;
@@ -10586,6 +10594,12 @@ QDF_STATUS populate_dot11f_assoc_req_mlo_ie(struct mac_context *mac_ctx,
 	if (!frm)
 		return QDF_STATUS_E_NULL_VALUE;
 
+	psoc = wlan_vdev_get_psoc(pe_session->vdev);
+	if (!psoc) {
+		pe_err("Invalid psoc");
+		return QDF_STATUS_E_FAILURE;
+	}
+
 	pe_debug("Populate Assoc req MLO IEs");
 
 	mlo_ie = &frm->mlo_ie;
@@ -10613,6 +10627,16 @@ QDF_STATUS populate_dot11f_assoc_req_mlo_ie(struct mac_context *mac_ctx,
 		mlo_ie->mld_capabilities.info.aar_support = 0;
 	}
 
+	emlsr_cap = policy_mgr_is_hw_emlsr_capable(psoc);
+	pe_session->is_emlsr_capable = emlsr_cap;
+
+	if (emlsr_cap) {
+		mlo_ie->eml_capab_present = 1;
+		mlo_ie->eml_capabilities.info.emlsr_support = 1;
+		mlo_ie->eml_capabilities.info.emlmr_support = 0;
+		mlo_ie->eml_capabilities.info.transition_timeout = 0;
+		mlo_ie->eml_capabilities.info.emlsr_padding_delay = 0;
+	}
 	/* find out number of links from bcn or prb rsp */
 	partner_info = &pe_session->lim_join_req->partner_info;
 	total_sta_prof = partner_info->num_partner_links;

core/wma/inc/wma_if.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-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
@@ -261,6 +262,10 @@ typedef struct {
 #ifdef WLAN_FEATURE_11BE_MLO
 	uint8_t mld_mac_addr[QDF_MAC_ADDR_SIZE];
 	bool is_assoc_peer;
+	bool emlsr_support;
+	uint8_t link_id;
+	uint16_t emlsr_trans_timeout;
+
 #endif
 } tAddStaParams, *tpAddStaParams;
 

core/wma/src/wma_mgmt.c

@@ -1345,12 +1345,14 @@ static void wma_objmgr_set_peer_mlme_type(tp_wma_handle wma,
  * wma_set_mlo_capability() - set MLO caps to the peer assoc request
  * @wma: wma handle
  * @vdev: vdev object
+ * @params: Add sta params
  * @req: peer assoc request parameters
  *
  * Return: None
  */
 static void wma_set_mlo_capability(tp_wma_handle wma,
 				   struct wlan_objmgr_vdev *vdev,
+				   tpAddStaParams params,
 				   struct peer_assoc_params *req)
 {
 	uint8_t pdev_id;
@@ -1377,15 +1379,27 @@ static void wma_set_mlo_capability(tp_wma_handle wma,
 			  req->mlo_params.mlo_assoc_link,
 			  QDF_MAC_ADDR_REF(peer->mldaddr),
 			  req->mlo_params.mlo_force_link_inactive);
+		req->mlo_params.emlsr_support = params->emlsr_support;
+		if (req->mlo_params.emlsr_support) {
+			req->mlo_params.ieee_link_id = params->link_id;
+			req->mlo_params.emlsr_trans_timeout =
+					params->emlsr_trans_timeout;
+		}
+		wma_debug("eMLSR support:%d, link_id:%d, transition timeout:%d",
+			  req->mlo_params.emlsr_support,
+			  req->mlo_params.ieee_link_id,
+			  req->mlo_params.emlsr_trans_timeout);
 	} else {
 		wma_debug("Peer MLO context is NULL");
 		req->mlo_params.mlo_enabled = false;
+		req->mlo_params.emlsr_support = false;
 	}
 	wlan_objmgr_peer_release_ref(peer, WLAN_LEGACY_WMA_ID);
 }
 #else
 static inline void wma_set_mlo_capability(tp_wma_handle wma,
 					  struct wlan_objmgr_vdev *vdev,
+					  tpAddStaParams params,
 					  struct peer_assoc_params *req)
 {
 }
@@ -1729,7 +1743,7 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 		}
 	}
 
-	wma_set_mlo_capability(wma, intr->vdev, cmd);
+	wma_set_mlo_capability(wma, intr->vdev, params, cmd);
 
 	wma_debug("rx_max_rate %d, rx_mcs %x, tx_max_rate %d, tx_mcs: %x num rates %d need 4 way %d",
 		  cmd->rx_max_rate, cmd->rx_mcs_set, cmd->tx_max_rate,