qcacld-3.0: Add support to use MLD addr for one link

If INI is enabled don't derive first link's MAC address
and directly use MLD address in that place and derive
next link addresses.

Change-Id: I3c2b9f64df3f75799adf8718ee83d157f6dd9097
CRs-Fixed: 3584062

components/mlme/core/src/wlan_mlme_main.c

@@ -2405,6 +2405,8 @@ static void mlme_init_sta_mlo_cfg(struct wlan_objmgr_psoc *psoc,
 		cfg_default(CFG_MLO_MAX_SIMULTANEOUS_LINKS);
 	sta->mlo_prefer_percentage =
 		cfg_get(psoc, CFG_MLO_PREFER_PERCENTAGE);
+	sta->mlo_same_link_mld_address =
+		cfg_default(CFG_MLO_SAME_LINK_MLD_ADDR);
 }
 
 static bool

components/mlme/dispatcher/inc/cfg_mlme_sta.h

@@ -690,6 +690,34 @@
 #define CFG_MLO_MAX_SIMULTANEOUS_LINKS_CFG
 #define CFG_MLO_PREFER_PERCENTAGE_CFG
 #endif
+
+/*
+ * <cfg>
+ * mlo_same_link_mld_addr - Use one of the links address as same mld address
+ * @Default: false
+ *
+ * This cfg is used to configure the one of link address as same mld address
+ *
+ * Related: None
+ *
+ * Supported Feature: STA
+ *
+ * Usage: Internal
+ *
+ *
+ * </cfg>
+ */
+#define CFG_MLO_SAME_LINK_MLD_ADDR CFG_BOOL( \
+			"mlo_same_link_mld_addr",\
+			0, \
+			"same address for mlo link/mld")
+
+#ifdef WLAN_HDD_MULTI_VDEV_SINGLE_NDEV
+#define CFG_MLO_SAME_LINK_MLD_ADDR_CFG CFG(CFG_MLO_SAME_LINK_MLD_ADDR)
+#else
+#define CFG_MLO_SAME_LINK_MLD_ADDR_CFG
+#endif
+
 #define CFG_STA_ALL \
 	CFG(CFG_INFRA_STA_KEEP_ALIVE_PERIOD) \
 	CFG(CFG_STA_BSS_MAX_IDLE_PERIOD) \
@@ -714,6 +742,6 @@
 	CFG_MLO_SUPPORT_LINK_NUM_CFG \
 	CFG_MLO_MAX_SIMULTANEOUS_LINKS_CFG \
 	CFG_MLO_SUPPORT_LINK_BAND_CFG \
-	CFG_MLO_PREFER_PERCENTAGE_CFG
-
+	CFG_MLO_PREFER_PERCENTAGE_CFG \
+	CFG_MLO_SAME_LINK_MLD_ADDR_CFG
 #endif /* CFG_MLME_STA_H__ */

components/mlme/dispatcher/inc/wlan_mlme_api.h

@@ -4138,6 +4138,14 @@ uint8_t wlan_mlme_get_sta_mlo_simultaneous_links(struct wlan_objmgr_psoc *psoc);
  */
 QDF_STATUS wlan_mlme_set_sta_mlo_conn_band_bmp(struct wlan_objmgr_psoc *psoc,
 					       uint8_t value);
+
+/**
+ * wlan_mlme_get_sta_same_link_mld_addr() - check if mld/link use same address
+ * @psoc: pointer to psoc object
+ *
+ * Return: bool to check if the mld/link use same mac address
+ */
+bool wlan_mlme_get_sta_same_link_mld_addr(struct wlan_objmgr_psoc *psoc);
 #else
 static inline QDF_STATUS
 wlan_mlme_set_user_set_link_num(struct wlan_objmgr_psoc *psoc,

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -1791,6 +1791,7 @@ enum station_prefer_bw {
  * @usr_scan_probe_unicast_ra:      User config unicast probe req in scan
  * @event_payload:                  Diagnostic event payload
  * @max_li_modulated_dtim_time_ms:  Max modulated DTIM time in ms.
+ * @mlo_same_link_mld_address:      Use one of the links same as mld address
  * @user_set_link_num:              save link num set by vendor command
  * @mlo_support_link_num:           max number of links that sta mlo supports
  * @mlo_support_link_band:          band bitmap that sta mlo supports
@@ -1826,6 +1827,7 @@ struct wlan_mlme_sta_cfg {
 #endif
 	uint16_t max_li_modulated_dtim_time_ms;
 #ifdef WLAN_FEATURE_11BE_MLO
+	bool mlo_same_link_mld_address;
 	uint8_t user_set_link_num;
 	uint8_t mlo_support_link_num;
 	uint8_t mlo_support_link_band;

components/mlme/dispatcher/src/wlan_mlme_api.c

@@ -1500,6 +1500,17 @@ wlan_mlme_get_mlo_prefer_percentage(struct wlan_objmgr_psoc *psoc,
 	*mlo_prefer_percentage = mlme_obj->cfg.sta.mlo_prefer_percentage;
 	mlme_legacy_debug("mlo_prefer_percentage %d", *mlo_prefer_percentage);
 }
+
+bool wlan_mlme_get_sta_same_link_mld_addr(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_same_link_mld_address;
+}
 #endif
 
 QDF_STATUS wlan_mlme_get_num_11b_tx_chains(struct wlan_objmgr_psoc *psoc,

core/hdd/inc/wlan_hdd_mlo.h

@@ -325,17 +325,21 @@ int wlan_hdd_cfg80211_process_ml_link_state(struct wiphy *wiphy,
 /**
  * hdd_derive_link_address_from_mld() - Function to derive link address from
  * MLD address which is passed as input argument.
+ * @psoc: PSOC object manager
  * @mld_addr: Input MLD address
  * @link_addr_list: Start index of array to hold derived MAC addresses
  * @max_idx: Number of addresses to derive
  *
  * The API will generate link addresses from the input MLD address and saves
- * each link address as an array in @link_addr_list. Caller can request upto
- * WLAN_MAX_MLD addresses.
+ * each link address as an array in @link_addr_list.
+ *
+ * If CFG_MLO_SAME_LINK_MLD_ADDR is enabled, then API will not derive first
+ * link address and will use MLD address in that place.
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS hdd_derive_link_address_from_mld(struct qdf_mac_addr *mld_addr,
+QDF_STATUS hdd_derive_link_address_from_mld(struct wlan_objmgr_psoc *psoc,
+					    struct qdf_mac_addr *mld_addr,
 					    struct qdf_mac_addr *link_addr_list,
 					    uint8_t max_idx);
 
@@ -415,7 +419,8 @@ int wlan_hdd_cfg80211_process_ml_link_state(struct wiphy *wiphy,
 }
 
 static inline
-QDF_STATUS hdd_derive_link_address_from_mld(struct qdf_mac_addr *mld_addr,
+QDF_STATUS hdd_derive_link_address_from_mld(struct wlan_objmgr_psoc *psoc,
+					    struct qdf_mac_addr *mld_addr,
 					    struct qdf_mac_addr *link_addr_list,
 					    uint8_t max_idx)
 {

core/hdd/src/wlan_hdd_cfg80211.c

@@ -21616,7 +21616,8 @@ hdd_adapter_update_mac_on_mode_change(struct hdd_adapter *adapter)
 	struct hdd_context *hdd_ctx = adapter->hdd_ctx;
 	struct qdf_mac_addr link_addr[WLAN_MAX_ML_BSS_LINKS] = {0};
 
-	status = hdd_derive_link_address_from_mld(&adapter->mld_addr,
+	status = hdd_derive_link_address_from_mld(hdd_ctx->psoc,
+						  &adapter->mld_addr,
 						  &link_addr[0],
 						  WLAN_MAX_ML_BSS_LINKS);
 	if (QDF_IS_STATUS_ERROR(status))

core/hdd/src/wlan_hdd_main.c

@@ -14373,6 +14373,7 @@ QDF_STATUS hdd_adapter_fill_link_address(struct hdd_adapter *adapter)
 {
 	int i = 0;
 	QDF_STATUS status;
+	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	enum QDF_OPMODE opmode = adapter->device_mode;
 	struct qdf_mac_addr link_addrs[WLAN_MAX_ML_BSS_LINKS] = {0};
 	struct wlan_hdd_link_info *link_info;
@@ -14389,7 +14390,8 @@ QDF_STATUS hdd_adapter_fill_link_address(struct hdd_adapter *adapter)
 	if (!hdd_adapter_is_ml_adapter(adapter))
 		return QDF_STATUS_SUCCESS;
 
-	status = hdd_derive_link_address_from_mld(&adapter->mac_addr,
+	status = hdd_derive_link_address_from_mld(hdd_ctx->psoc,
+						  &adapter->mac_addr,
 						  &link_addrs[0],
 						  WLAN_MAX_ML_BSS_LINKS);
 	if (QDF_IS_STATUS_ERROR(status))

core/hdd/src/wlan_hdd_mlo.c

@@ -177,7 +177,8 @@ void hdd_wlan_register_mlo_interfaces(struct hdd_context *hdd_ctx)
 	if (!ml_adapter)
 		return;
 
-	status = hdd_derive_link_address_from_mld(&ml_adapter->mld_addr,
+	status = hdd_derive_link_address_from_mld(hdd_ctx->psoc,
+						  &ml_adapter->mld_addr,
 						  &link_addr[0],
 						  WLAN_MAX_ML_BSS_LINKS);
 	if (QDF_IS_STATUS_ERROR(status))
@@ -337,15 +338,16 @@ void hdd_mlo_t2lm_unregister_callback(struct wlan_objmgr_vdev *vdev)
 	wlan_unregister_t2lm_link_update_notify_handler(vdev->mlo_dev_ctx, 0);
 }
 
-QDF_STATUS hdd_derive_link_address_from_mld(struct qdf_mac_addr *mld_addr,
+QDF_STATUS hdd_derive_link_address_from_mld(struct wlan_objmgr_psoc *psoc,
+					    struct qdf_mac_addr *mld_addr,
 					    struct qdf_mac_addr *link_addr_list,
 					    uint8_t max_idx)
 {
-	uint8_t last_byte, temp_byte, idx;
+	uint8_t last_byte, temp_byte, idx, start_idx = 0;
 	struct qdf_mac_addr new_addr;
 	struct qdf_mac_addr *link_addr;
 
-	if (!mld_addr || !link_addr_list || !max_idx ||
+	if (!psoc || !mld_addr || !link_addr_list || !max_idx ||
 	    max_idx > WLAN_MAX_ML_BSS_LINKS || qdf_is_macaddr_zero(mld_addr)) {
 		hdd_err("Invalid values");
 		return QDF_STATUS_E_INVAL;
@@ -360,7 +362,13 @@ QDF_STATUS hdd_derive_link_address_from_mld(struct qdf_mac_addr *mld_addr,
 	hdd_debug("MLD addr: " QDF_MAC_ADDR_FMT,
 		  QDF_MAC_ADDR_REF(mld_addr->bytes));
 
-	for (idx = 0; idx < max_idx; idx++) {
+	if (wlan_mlme_get_sta_same_link_mld_addr(psoc)) {
+		qdf_copy_macaddr(link_addr, mld_addr);
+		link_addr++;
+		start_idx++;
+	}
+
+	for (idx = start_idx; idx < max_idx; idx++) {
 		temp_byte = ((last_byte >> 4 & INTF_MACADDR_MASK) + idx) &
 			     INTF_MACADDR_MASK;
 		new_addr.bytes[5] = last_byte + temp_byte;
@@ -471,7 +479,8 @@ int hdd_update_vdev_mac_address(struct hdd_adapter *adapter,
 		return ret;
 	}
 
-	status = hdd_derive_link_address_from_mld(&mac_addr, &link_addrs[0],
+	status = hdd_derive_link_address_from_mld(hdd_ctx->psoc,
+						  &mac_addr, &link_addrs[0],
 						  WLAN_MAX_ML_BSS_LINKS);
 
 	if (QDF_IS_STATUS_ERROR(status))
@@ -535,7 +544,8 @@ int hdd_update_vdev_mac_address(struct hdd_adapter *adapter,
 		return ret;
 	}
 
-	status = hdd_derive_link_address_from_mld(&mac_addr, &link_addrs[0],
+	status = hdd_derive_link_address_from_mld(hdd_ctx->psoc,
+						  &mac_addr, &link_addrs[0],
 						  WLAN_MAX_ML_BSS_LINKS);
 
 	if (QDF_IS_STATUS_ERROR(status))