qcacld-3.0: Add max link number cfg and band bitmap cfg

Add cfg to configure the max number of links supported for mlo sta
connection.
Add cfg to configure the band bitmap that mlo sta connection supports.

Change-Id: I6b27a7eb13eff026c5123e4bd24ba2424dba781d
CRs-Fixed: 3202029

components/mlme/core/src/wlan_mlme_main.c

@@ -1654,8 +1654,10 @@ mlme_init_product_details_cfg(struct wlan_mlme_product_details_cfg
 static void mlme_init_sta_mlo_cfg(struct wlan_objmgr_psoc *psoc,
 				  struct wlan_mlme_sta_cfg *sta)
 {
-	sta->single_link_mlo_conn =
-		cfg_default(CFG_SINGLE_LINK_MLO_CONN);
+	sta->mlo_support_link_num =
+		cfg_default(CFG_MLO_SUPPORT_LINK_NUM);
+	sta->mlo_support_link_band =
+		cfg_default(CFG_MLO_SUPPORT_LINK_BAND);
 }
 #else
 static void mlme_init_sta_mlo_cfg(struct wlan_objmgr_psoc *psoc,

components/mlme/dispatcher/inc/cfg_mlme_sta.h

@@ -539,12 +539,12 @@
 #ifdef WLAN_FEATURE_11BE_MLO
 /*
  * <cfg>
- * single_link_mlo_conn - Set single link mlo connection for sta
- * @Min: 0
- * @Max: 1
- * @Default: 0
+ * mlo_support_link_num - Set number of link mlo connection supports for sta
+ * @Min: 1
+ * @Max: 3
+ * @Default: 2
  *
- * This cfg is used to enable single link mlo connection
+ * This cfg is used to configure the number of link mlo connection supports
  *
  * Related: None
  *
@@ -554,14 +554,49 @@
  *
  * </cfg>
  */
-#define CFG_SINGLE_LINK_MLO_CONN CFG_BOOL( \
-			"single_link_mlo_conn", \
-			0, \
-			"Enable single link mlo connection")
+#define CFG_MLO_SUPPORT_LINK_NUM CFG_UINT( \
+			"mlo_support_link_num", \
+			1, \
+			3, \
+			2, \
+			CFG_VALUE_OR_DEFAULT, \
+			"supported mlo link number")
+
+#define CFG_MLO_SUPPORT_LINK_NUM_CFG CFG(CFG_MLO_SUPPORT_LINK_NUM)
+
+/*
+ * <cfg>
+ * mlo_support_link_band - Set band bitmap of mlo connection supports for sta
+ * @Min: 1
+ * @Max: 7
+ * @Default: 7
+ *
+ * This cfg is used to configure the band bitmap of mlo connection supports
+ *
+ * Related: None
+ *
+ * Supported Feature: STA
+ *
+ * Usage: Internal
+ *
+ * bits 0: REG_BAND_2G
+ * bits 1: REG_BAND_5G
+ * bits 2: REG_BAND_6G
+ *
+ * </cfg>
+ */
+#define CFG_MLO_SUPPORT_LINK_BAND CFG_UINT( \
+			"mlo_support_link_band", \
+			1, \
+			7, \
+			7, \
+			CFG_VALUE_OR_DEFAULT, \
+			"supported mlo link band")
 
-#define CFG_SINGLE_LINK_MLO_CONN_CFG CFG(CFG_SINGLE_LINK_MLO_CONN)
+#define CFG_MLO_SUPPORT_LINK_BAND_CFG CFG(CFG_MLO_SUPPORT_LINK_BAND)
 #else
-#define CFG_SINGLE_LINK_MLO_CONN_CFG
+#define CFG_MLO_SUPPORT_LINK_NUM_CFG
+#define CFG_MLO_SUPPORT_LINK_BAND_CFG
 #endif
 
 #define CFG_STA_ALL \
@@ -584,7 +619,8 @@
 	CFG(CFG_WT_CNF_TIMEOUT) \
 	CFG(CFG_CURRENT_RSSI) \
 	CFG(CFG_TX_POWER_CTRL) \
-	CFG_SINGLE_LINK_MLO_CONN_CFG \
-	CFG(CFG_MAX_LI_MODULATED_DTIM_MS)
+	CFG(CFG_MAX_LI_MODULATED_DTIM_MS) \
+	CFG_MLO_SUPPORT_LINK_NUM_CFG \
+	CFG_MLO_SUPPORT_LINK_BAND_CFG
 
 #endif /* CFG_MLME_STA_H__ */

components/mlme/dispatcher/inc/wlan_mlme_api.h

@@ -3370,23 +3370,44 @@ QDF_STATUS mlme_cfg_get_eht_caps(struct wlan_objmgr_psoc *psoc,
 
 #ifdef WLAN_FEATURE_11BE_MLO
 /**
- * wlan_mlme_is_sta_single_mlo_conn() - Is single mlo connection for sta
- *                                      set or not
+ * wlan_mlme_get_sta_mlo_conn_max_num() - get max number of links that sta mlo
+ *                                        connection can support
  * @psoc: pointer to psoc object
  *
- * Return: True if single mlo connection for sta is set
+ * Return: max number of links that sta mlo connection can support
  */
-bool wlan_mlme_is_sta_single_mlo_conn(struct wlan_objmgr_psoc *psoc);
+uint8_t wlan_mlme_get_sta_mlo_conn_max_num(struct wlan_objmgr_psoc *psoc);
 
 /**
- * wlan_mlme_set_sta_single_mlo_conn() - Set single mlo connection for sta
+ * wlan_mlme_set_sta_mlo_conn_max_num() - set max number of links that sta mlo
+ *                                        connection can support
  * @psoc: pointer to psoc object
  * @value: value to set
  *
  * Return: QDF Status
  */
-QDF_STATUS wlan_mlme_set_sta_single_mlo_conn(struct wlan_objmgr_psoc *psoc,
-					     bool value);
+QDF_STATUS wlan_mlme_set_sta_mlo_conn_max_num(struct wlan_objmgr_psoc *psoc,
+					      bool value);
+
+/**
+ * wlan_mlme_get_sta_mlo_conn_band_bmp() - get band bitmap that sta mlo
+ *                                         connection can support
+ * @psoc: pointer to psoc object
+ *
+ * Return: band bitmap that sta mlo connection can support
+ */
+uint8_t wlan_mlme_get_sta_mlo_conn_band_bmp(struct wlan_objmgr_psoc *psoc);
+
+/**
+ * wlan_mlme_set_sta_mlo_conn_band_bmp() - set band bitmap that sta mlo
+ *                                         connection can support
+ * @psoc: pointer to psoc object
+ * @value: value to set
+ *
+ * Return: QDF Status
+ */
+QDF_STATUS wlan_mlme_set_sta_mlo_conn_band_bmp(struct wlan_objmgr_psoc *psoc,
+					       bool value);
 #endif
 
 /**

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -1642,8 +1642,9 @@ enum station_prefer_bw {
  * @allow_tpc_from_ap:              Support for AP power constraint
  * @usr_disabled_roaming:           User config for roaming disable
  * @usr_scan_probe_unicast_ra:      User config unicast probe req in scan
- * @single_link_mlo_conn:           Single link mlo connection is configured
  * @max_li_modulated_dtim_time_ms: Max modulated DTIM time in ms.
+ * @mlo_support_link_num:           max number of links that sta mlo supports
+ * @mlo_support_link_band:          band bitmap that sta mlo supports
  */
 struct wlan_mlme_sta_cfg {
 	uint32_t sta_keep_alive_period;
@@ -1670,10 +1671,11 @@ struct wlan_mlme_sta_cfg {
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
 	host_event_wlan_status_payload_type event_payload;
 #endif
+	uint16_t max_li_modulated_dtim_time_ms;
 #ifdef WLAN_FEATURE_11BE_MLO
-	bool single_link_mlo_conn;
+	uint8_t mlo_support_link_num;
+	uint8_t mlo_support_link_band;
 #endif
-	uint16_t max_li_modulated_dtim_time_ms;
 };
 
 /**

components/mlme/dispatcher/src/wlan_mlme_api.c

@@ -1045,7 +1045,7 @@ QDF_STATUS mlme_update_tgt_eht_caps_in_cfg(struct wlan_objmgr_psoc *psoc,
 #endif
 
 #ifdef WLAN_FEATURE_11BE_MLO
-bool wlan_mlme_is_sta_single_mlo_conn(struct wlan_objmgr_psoc *psoc)
+uint8_t wlan_mlme_get_sta_mlo_conn_max_num(struct wlan_objmgr_psoc *psoc)
 {
 	struct wlan_mlme_psoc_ext_obj *mlme_obj;
 
@@ -1053,11 +1053,11 @@ bool wlan_mlme_is_sta_single_mlo_conn(struct wlan_objmgr_psoc *psoc)
 	if (!mlme_obj)
 		return false;
 
-	return mlme_obj->cfg.sta.single_link_mlo_conn;
+	return mlme_obj->cfg.sta.mlo_support_link_num;
 }
 
-QDF_STATUS wlan_mlme_set_sta_single_mlo_conn(struct wlan_objmgr_psoc *psoc,
-					     bool value)
+QDF_STATUS wlan_mlme_set_sta_mlo_conn_max_num(struct wlan_objmgr_psoc *psoc,
+					      bool value)
 {
 	struct wlan_mlme_psoc_ext_obj *mlme_obj;
 
@@ -1065,7 +1065,32 @@ QDF_STATUS wlan_mlme_set_sta_single_mlo_conn(struct wlan_objmgr_psoc *psoc,
 	if (!mlme_obj)
 		return QDF_STATUS_E_FAILURE;
 
-	mlme_obj->cfg.sta.single_link_mlo_conn = value;
+	mlme_obj->cfg.sta.mlo_support_link_num = value;
+
+	return QDF_STATUS_SUCCESS;
+}
+
+uint8_t wlan_mlme_get_sta_mlo_conn_band_bmp(struct wlan_objmgr_psoc *psoc)
+{
+	struct wlan_mlme_psoc_ext_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_ext_obj(psoc);
+	if (!mlme_obj)
+		return false;
+
+	return mlme_obj->cfg.sta.mlo_support_link_band;
+}
+
+QDF_STATUS wlan_mlme_set_sta_mlo_conn_band_bmp(struct wlan_objmgr_psoc *psoc,
+					       bool value)
+{
+	struct wlan_mlme_psoc_ext_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_ext_obj(psoc);
+	if (!mlme_obj)
+		return QDF_STATUS_E_FAILURE;
+
+	mlme_obj->cfg.sta.mlo_support_link_band = value;
 
 	return QDF_STATUS_SUCCESS;
 }

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

@@ -10326,13 +10326,8 @@ QDF_STATUS populate_dot11f_assoc_req_mlo_ie(struct mac_context *mac_ctx,
 	}
 
 	/* find out number of links from bcn or prb rsp */
-	total_sta_prof = 1;
-	if (wlan_mlme_is_sta_single_mlo_conn(
-				wlan_vdev_get_psoc(pe_session->vdev))) {
-		pe_debug("Single link mlo connection is enabled for mlo sta");
-		total_sta_prof = 0;
-	}
 	partner_info = &pe_session->lim_join_req->partner_info;
+	total_sta_prof = partner_info->num_partner_links;
 
 	mlo_dev_ctx = pe_session->vdev->mlo_dev_ctx;
 	if (!mlo_dev_ctx) {