qcacld-3.0: Handle SAP + MLO STA concurrency

Handle SAP and MLO STA concurrency such as:

  1) If MLO STA is present with both links
     in 5/6 Ghz then SAP comes up on 2.4 Ghz,
     then Disable one of the links.

  2) If there is channel switch for sap from
     2.4 ghz to 5 ghz, then enable both the
     links as they were disabled by previous
     operations when sap was on 2.4 ghz.

  3) If MLO STA is present with both links in
     5/6 Ghz and SAP, which was present on
     2.4 ghz, stops then renable both the as
     one of the links were disabled because
     of sap on 2.4 ghz.
     Also, in case where MLO STA roamed from
     5 + 6 link to 2.4 + 5/6 link force scc
     will happen and the disabled link has
     to be enabled.
     Both links should only be enabled if mlo
     sta has more than one links.

Change-Id: I0fd0093b20336ae32325981589c399b44a44b64e
CRs-Fixed: 3092202

components/cmn_services/interface_mgr/src/wlan_if_mgr_sta.c

@@ -32,6 +32,7 @@
 #include <wlan_cm_api.h>
 #include <wlan_mlo_mgr_public_structs.h>
 #include <wlan_mlo_mgr_cmn.h>
+#include <wlan_mlme_main.h>
 
 QDF_STATUS if_mgr_connect_start(struct wlan_objmgr_vdev *vdev,
 				struct if_mgr_event_data *event_data)
@@ -146,72 +147,6 @@ static void if_mgr_get_mlo_and_legacy_sta_count(struct wlan_objmgr_psoc *psoc,
 	}
 }
 
-static void
-if_mgr_fill_active_link_vdev_bitmap(struct mlo_link_set_active_req *req,
-				    uint8_t *mlo_vdev_lst,
-				    uint32_t num_mlo_vdev)
-{
-	uint32_t entry_idx, entry_offset, vdev_idx;
-	uint8_t vdev_id;
-
-	for (vdev_idx = 0; vdev_idx < num_mlo_vdev; vdev_idx++) {
-		vdev_id = mlo_vdev_lst[vdev_idx];
-		entry_idx = vdev_id / 32;
-		entry_offset = vdev_id % 32;
-		if (entry_idx >= MLO_LINK_NUM_SZ) {
-			ifmgr_err("Invalid entry_idx %d num_mlo_vdev %d vdev %d",
-				  entry_idx, num_mlo_vdev, vdev_id);
-			continue;
-		}
-		req->param.vdev_bitmap[entry_idx] |= (1 << entry_offset);
-		/* update entry number if entry index changed */
-		if (req->param.num_vdev_bitmap < entry_idx + 1)
-			req->param.num_vdev_bitmap = entry_idx + 1;
-	}
-
-	ifmgr_debug("num_vdev_bitmap %d vdev_bitmap[0] = 0x%x, vdev_bitmap[1] = 0x%x",
-		    req->param.num_vdev_bitmap, req->param.vdev_bitmap[0],
-		    req->param.vdev_bitmap[1]);
-}
-
-static void
-if_mgr_sta_mlo_concurency_set_link(struct wlan_objmgr_vdev *vdev,
-				   enum mlo_link_force_reason reason,
-				   enum mlo_link_force_mode mode,
-				   uint8_t num_mlo_vdev, uint8_t *mlo_vdev_lst)
-{
-	struct mlo_link_set_active_req *req;
-	QDF_STATUS status;
-
-	req = qdf_mem_malloc(sizeof(*req));
-	if (!req)
-		return;
-
-	ifmgr_debug("vdev %d: mode %d num_mlo_vdev %d reason %d",
-		    wlan_vdev_get_id(vdev), mode, num_mlo_vdev, reason);
-
-	req->ctx.vdev = vdev;
-	req->param.reason = reason;
-	req->param.force_mode = mode;
-
-	/* set MLO vdev bit mask for all case */
-	if_mgr_fill_active_link_vdev_bitmap(req, mlo_vdev_lst, num_mlo_vdev);
-
-	/* fill num of links for MLO_LINK_FORCE_MODE_ACTIVE_NUM */
-	if (mode == MLO_LINK_FORCE_MODE_ACTIVE_NUM) {
-		req->param.force_mode = MLO_LINK_FORCE_MODE_ACTIVE_NUM;
-		req->param.num_link_entry = 1;
-		req->param.link_num[0].num_of_link = num_mlo_vdev - 1;
-	}
-
-	status = mlo_ser_set_link_req(req);
-	if (QDF_IS_STATUS_ERROR(status))
-		ifmgr_err("vdev %d: Failed to set link mode %d num_mlo_vdev %d reason %d",
-			  wlan_vdev_get_id(vdev), mode, num_mlo_vdev, reason);
-
-	qdf_mem_free(req);
-}
-
 static uint8_t
 if_mgr_mlo_get_affected_links_for_sbs(struct wlan_objmgr_psoc *psoc,
 				      uint8_t num_mlo, qdf_freq_t *freq_list,
@@ -421,8 +356,10 @@ if_mgr_sta_mlo_concurency_on_connect(struct wlan_objmgr_vdev *vdev,
 	if (affected_links < num_mlo)
 		mode = MLO_LINK_FORCE_MODE_INACTIVE;
 
-	if_mgr_sta_mlo_concurency_set_link(vdev, MLO_LINK_FORCE_REASON_CONNECT,
-					   mode, affected_links, mlo_vdev_lst);
+	wlan_mlo_sta_mlo_concurency_set_link(vdev,
+					     MLO_LINK_FORCE_REASON_CONNECT,
+					     mode, affected_links,
+					     mlo_vdev_lst);
 }
 
 static void
@@ -452,10 +389,10 @@ if_mgr_sta_mlo_concurency_on_disconnect(struct wlan_objmgr_vdev *vdev,
 		i++;
 	}
 
-	if_mgr_sta_mlo_concurency_set_link(vdev,
-					   MLO_LINK_FORCE_REASON_DISCONNECT,
-					   MLO_LINK_FORCE_MODE_NO_FORCE,
-					   num_mlo, mlo_vdev_list);
+	wlan_mlo_sta_mlo_concurency_set_link(vdev,
+					     MLO_LINK_FORCE_REASON_DISCONNECT,
+					     MLO_LINK_FORCE_MODE_NO_FORCE,
+					     num_mlo, mlo_vdev_list);
 }
 
 static void

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -4042,6 +4042,22 @@ policy_mgr_get_conc_ext_flags(struct wlan_objmgr_vdev *vdev, bool force_mlo);
  * Return: True if MLO STA is present, otherwise false.
  */
 bool policy_mgr_is_mlo_sta_present(struct wlan_objmgr_psoc *psoc);
+
+/**
+ * policy_mgr_is_mlo_sta_sbs_link() - Check whether MLO STA is present with both
+ *                                    links on 5 or 6 ghz band (SBS link)
+ *
+ * @psoc: PSOC object information
+ * @mlo_vdev_lst: Pointer to mlo vdev list, this function wil fill this with
+ *                list of mlo vdev
+ * @num_mlo: Pointer to number of mlo link, this function will fill this with
+ *           number of mlo links
+ *
+ * Return: True if MLO STA is present with both links on 5 and 6ghz band
+ */
+bool policy_mgr_is_mlo_sta_sbs_link(struct wlan_objmgr_psoc *psoc,
+				    uint8_t *mlo_vdev_lst,
+				    uint8_t *num_mlo);
 #else
 
 static inline bool policy_mgr_is_mlo_sap_concurrency_allowed(

components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c

@@ -3688,6 +3688,51 @@ bool policy_mgr_is_mlo_sta_present(struct wlan_objmgr_psoc *psoc)
 	qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
 	return mlo_sta_present;
 }
+
+bool policy_mgr_is_mlo_sta_sbs_link(struct wlan_objmgr_psoc *psoc,
+				    uint8_t *mlo_vdev_lst,
+				    uint8_t *num_mlo)
+{
+	uint32_t sta_num = 0;
+	uint8_t i, mlo_idx = 0;
+	struct wlan_objmgr_vdev *temp_vdev;
+	qdf_freq_t mlo_freq_list[MAX_NUMBER_OF_CONC_CONNECTIONS] = {0};
+	uint8_t vdev_id_list[MAX_NUMBER_OF_CONC_CONNECTIONS] = {0};
+	bool is_sbs_link = true;
+
+	sta_num = policy_mgr_get_mode_specific_conn_info(psoc, NULL,
+							 vdev_id_list,
+							 PM_STA_MODE);
+	if (!sta_num)
+		return false;
+
+	for (i = 0; i < sta_num; i++) {
+		temp_vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc,
+							vdev_id_list[i],
+							WLAN_POLICY_MGR_ID);
+		if (!temp_vdev) {
+			sme_err("invalid vdev for id %d", vdev_id_list[i]);
+			return false;
+		}
+
+		if (wlan_vdev_mlme_is_mlo_vdev(temp_vdev)) {
+			mlo_vdev_lst[mlo_idx] = vdev_id_list[i];
+			mlo_freq_list[mlo_idx] =
+				wlan_get_operation_chan_freq(temp_vdev);
+			if (wlan_reg_is_24ghz_ch_freq(mlo_freq_list[mlo_idx]))
+				is_sbs_link = false;
+
+			mlo_idx++;
+		}
+		wlan_objmgr_vdev_release_ref(temp_vdev, WLAN_POLICY_MGR_ID);
+	}
+
+	*num_mlo = mlo_idx;
+	if (mlo_idx < 2)
+		is_sbs_link = false;
+
+	return is_sbs_link;
+}
 #else
 static bool
 policy_mgr_allow_sta_concurrency(struct wlan_objmgr_psoc *psoc,

components/mlme/core/inc/wlan_mlme_main.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 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
@@ -1046,6 +1047,28 @@ QDF_STATUS mlme_get_cfg_wlm_reset(struct wlan_objmgr_psoc *psoc,
 void mlme_reinit_control_config_lfr_params(struct wlan_objmgr_psoc *psoc,
 					   struct wlan_mlme_lfr_cfg *lfr);
 
+/**
+ * wlan_mlme_mlo_sta_mlo_concurency_set_link() - Set links for MLO STA
+ *
+ * @vdev: vdev object
+ * @reason: Reason for which link is forced
+ * @mode: Force reason
+ * @num_mlo_vdev: number of mlo vdev
+ * @mlo_vdev_lst: MLO STA vdev list
+
+ * Interface manager Set links for MLO STA
+ *
+ * Return: void
+ */
+#ifdef WLAN_FEATURE_11BE_MLO
+void
+wlan_mlo_sta_mlo_concurency_set_link(struct wlan_objmgr_vdev *vdev,
+				     enum mlo_link_force_reason reason,
+				     enum mlo_link_force_mode mode,
+				     uint8_t num_mlo_vdev,
+				     uint8_t *mlo_vdev_lst);
+#endif
+
 /**
  * wlan_mlme_get_mac_vdev_id() - get vdev self mac address using vdev id
  * @pdev: pdev

components/mlme/core/src/wlan_mlme_main.c

@@ -29,6 +29,7 @@
 #include "wlan_vdev_mlme_api.h"
 #include "wlan_mlme_api.h"
 #include <wlan_crypto_global_api.h>
+#include <wlan_mlo_mgr_cmn.h>
 
 #define NUM_OF_SOUNDING_DIMENSIONS     1 /*Nss - 1, (Nss = 2 for 2x2)*/
 
@@ -3637,6 +3638,76 @@ QDF_STATUS mlme_get_fw_scan_channels(struct wlan_objmgr_psoc *psoc,
 }
 #endif
 
+#ifdef WLAN_FEATURE_11BE_MLO
+static void
+wlan_mlo_fill_active_link_vdev_bitmap(struct mlo_link_set_active_req *req,
+				      uint8_t *mlo_vdev_lst,
+				      uint32_t num_mlo_vdev)
+{
+	uint32_t entry_idx, entry_offset, vdev_idx;
+	uint8_t vdev_id;
+
+	for (vdev_idx = 0; vdev_idx < num_mlo_vdev; vdev_idx++) {
+		vdev_id = mlo_vdev_lst[vdev_idx];
+		entry_idx = vdev_id / 32;
+		entry_offset = vdev_id % 32;
+		if (entry_idx >= MLO_LINK_NUM_SZ) {
+			mlme_err("Invalid entry_idx %d num_mlo_vdev %d vdev %d",
+				 entry_idx, num_mlo_vdev, vdev_id);
+			continue;
+		}
+		req->param.vdev_bitmap[entry_idx] |= (1 << entry_offset);
+		/* update entry number if entry index changed */
+		if (req->param.num_vdev_bitmap < entry_idx + 1)
+			req->param.num_vdev_bitmap = entry_idx + 1;
+	}
+
+	mlme_debug("num_vdev_bitmap %d vdev_bitmap[0] = 0x%x, vdev_bitmap[1] = 0x%x",
+		   req->param.num_vdev_bitmap, req->param.vdev_bitmap[0],
+		   req->param.vdev_bitmap[1]);
+}
+
+void
+wlan_mlo_sta_mlo_concurency_set_link(struct wlan_objmgr_vdev *vdev,
+				     enum mlo_link_force_reason reason,
+				     enum mlo_link_force_mode mode,
+				     uint8_t num_mlo_vdev,
+				     uint8_t *mlo_vdev_lst)
+{
+	struct mlo_link_set_active_req *req;
+	QDF_STATUS status;
+
+	req = qdf_mem_malloc(sizeof(*req));
+	if (!req)
+		return;
+
+	mlme_debug("vdev %d: mode %d num_mlo_vdev %d reason %d",
+		   wlan_vdev_get_id(vdev), mode, num_mlo_vdev, reason);
+
+	req->ctx.vdev = vdev;
+	req->param.reason = reason;
+	req->param.force_mode = mode;
+
+	/* set MLO vdev bit mask for all case */
+	wlan_mlo_fill_active_link_vdev_bitmap(req, mlo_vdev_lst, num_mlo_vdev);
+
+	/* fill num of links for MLO_LINK_FORCE_MODE_ACTIVE_NUM */
+	if (mode == MLO_LINK_FORCE_MODE_ACTIVE_NUM) {
+		req->param.force_mode = MLO_LINK_FORCE_MODE_ACTIVE_NUM;
+		req->param.num_link_entry = 1;
+		req->param.link_num[0].num_of_link = num_mlo_vdev - 1;
+	}
+
+	status = mlo_ser_set_link_req(req);
+	if (QDF_IS_STATUS_ERROR(status))
+		mlme_err("vdev %d: Failed to set link mode %d num_mlo_vdev %d reason %d",
+			 wlan_vdev_get_id(vdev), mode, num_mlo_vdev,
+			 reason);
+
+	qdf_mem_free(req);
+}
+#endif
+
 QDF_STATUS wlan_mlme_get_mac_vdev_id(struct wlan_objmgr_pdev *pdev,
 				     uint8_t vdev_id,
 				     struct qdf_mac_addr *self_mac)

components/mlme/core/src/wlan_mlme_vdev_mgr_interface.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 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
@@ -440,6 +441,21 @@ static QDF_STATUS ap_mlme_vdev_up_send(struct vdev_mlme_obj *vdev_mlme,
 	return lim_ap_mlme_vdev_up_send(vdev_mlme, data_len, data);
 }
 
+#ifdef WLAN_FEATURE_11BE_MLO
+static inline void
+wlan_handle_sap_mlo_sta_concurrency(struct wlan_objmgr_vdev *vdev,
+				    bool is_ap_up)
+{
+	csr_handle_sap_mlo_sta_concurrency(vdev, is_ap_up);
+}
+#else
+static inline void
+wlan_handle_sap_mlo_sta_concurrency(struct wlan_objmgr_vdev *vdev,
+				    bool is_ap_up)
+{
+}
+#endif
+
 /**
  * ap_mlme_vdev_notify_up_complete() - callback to notify up completion
  * @vdev_mlme: vdev mlme object
@@ -460,6 +476,8 @@ ap_mlme_vdev_notify_up_complete(struct vdev_mlme_obj *vdev_mlme,
 	}
 
 	pe_debug("Vdev %d is up", wlan_vdev_get_id(vdev_mlme->vdev));
+	if (wlan_vdev_mlme_get_opmode(vdev_mlme->vdev) == QDF_SAP_MODE)
+		wlan_handle_sap_mlo_sta_concurrency(vdev_mlme->vdev, true);
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -560,6 +578,8 @@ static QDF_STATUS vdevmgr_notify_down_complete(struct vdev_mlme_obj *vdev_mlme,
 {
 	mlme_legacy_debug("vdev id = %d ",
 			  vdev_mlme->vdev->vdev_objmgr.vdev_id);
+	if (wlan_vdev_mlme_get_opmode(vdev_mlme->vdev) == QDF_SAP_MODE)
+		wlan_handle_sap_mlo_sta_concurrency(vdev_mlme->vdev, false);
 	return wma_mlme_vdev_notify_down_complete(vdev_mlme, data_len, data);
 }
 

core/sme/inc/csr_api.h

@@ -934,6 +934,25 @@ QDF_STATUS csr_mlme_vdev_disconnect_all_p2p_client_event(uint8_t vdev_id);
  */
 QDF_STATUS csr_mlme_vdev_stop_bss(uint8_t vdev_id);
 
+/*
+ * csr_mlme_handle_sap_mlo_sta_concurrency() - Handle SAP MLO STA concurrency
+ *                                             such as:
+ *       1) If MLO STA is present with both links in 5/6 Ghz then SAP comes up
+ *          on 2.4 Ghz, then Disable one of the links
+ *       2) If MLO STA is present with both links in 5/6 Ghz and SAP, which was
+ *          present on 2.4 ghz, stops then renable both the as one of the links
+ *          were disabled because of sap on 2.4 ghz.
+ *
+ * @vdev: vdev mlme object
+ * @is_ap_up: bool to represent sap state
+ *
+ * Return: Void
+ */
+#ifdef WLAN_FEATURE_11BE_MLO
+void csr_handle_sap_mlo_sta_concurrency(struct wlan_objmgr_vdev *vdev,
+					bool is_ap_up);
+#endif
+
 /*
  * csr_mlme_get_concurrent_operation_freq() - Callback for MLME module to
  *	get the concurrent operation frequency

core/sme/src/csr/csr_util.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 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
@@ -35,6 +36,8 @@
 #include "wlan_crypto_global_api.h"
 #include "wlan_cm_roam_api.h"
 #include <../../core/src/wlan_cm_vdev_api.h>
+#include <wlan_mlo_mgr_public_structs.h>
+#include "wlan_objmgr_vdev_obj.h"
 
 #define CASE_RETURN_STR(n) {\
 	case (n): return (# n);\
@@ -1447,6 +1450,90 @@ QDF_STATUS csr_mlme_vdev_stop_bss(uint8_t vdev_id)
 				      eCSR_ROAM_RESULT_NONE);
 }
 
+#ifdef WLAN_FEATURE_11BE_MLO
+void csr_handle_sap_mlo_sta_concurrency(struct wlan_objmgr_vdev *vdev,
+					bool is_ap_up)
+{
+	uint8_t num_mlo = 0;
+	qdf_freq_t sap_chan = 0;
+	struct wlan_channel *bss_chan = NULL;
+	uint8_t mlo_vdev_lst[MAX_NUMBER_OF_CONC_CONNECTIONS] = {0};
+	bool are_both_mlo_5g = false;
+	struct mac_context *mac_ctx = cds_get_context(QDF_MODULE_ID_SME);
+
+	if (!mac_ctx)
+		return;
+
+	are_both_mlo_5g = policy_mgr_is_mlo_sta_sbs_link(mac_ctx->psoc,
+							 mlo_vdev_lst,
+							 &num_mlo);
+
+	if (num_mlo < 2) {
+		sme_debug("vdev %d AP_state %d MLO Sta links %d",
+			  wlan_vdev_get_id(vdev), is_ap_up, num_mlo);
+		return;
+	}
+
+	bss_chan = wlan_vdev_mlme_get_bss_chan(vdev);
+	if (bss_chan)
+		sap_chan = bss_chan->ch_freq;
+	if (!sap_chan) {
+		sme_debug("Invalid SAP Chan");
+		return;
+	}
+
+	sme_debug("vdev %d: is_ap_up %d num_mlo %d are_both_mlo_5g %d sap_chan %d",
+		  wlan_vdev_get_id(vdev), is_ap_up, num_mlo, are_both_mlo_5g,
+		  sap_chan);
+
+	/*
+	 * if MLO STA exist with 2.4 + 5/6 ghz links, then there will be SCC
+	 * with one of the links.
+	 */
+	if (!are_both_mlo_5g)
+		goto enable_both_lnks_on_disc;
+
+	if (is_ap_up) {
+		/*
+		 * 1) If MLO STA is present with both links in 5/6 Ghz then SAP
+		 *    comes up on 2.4 Ghz, then Disable one of the links.
+		 *
+		 * 2) If there is channel switch for sap from 2.4 ghz to 5 ghz,
+		 *    then enable both the links as they were disabled by
+		 *    previous operations when sap was on 2.4 ghz
+		 */
+		if (wlan_reg_is_24ghz_ch_freq(sap_chan))
+			wlan_mlo_sta_mlo_concurency_set_link(vdev,
+						MLO_LINK_FORCE_REASON_CONNECT,
+						MLO_LINK_FORCE_MODE_ACTIVE_NUM,
+						num_mlo, mlo_vdev_lst);
+		else
+			wlan_mlo_sta_mlo_concurency_set_link(vdev,
+						MLO_LINK_FORCE_REASON_CONNECT,
+						MLO_LINK_FORCE_MODE_NO_FORCE,
+						num_mlo, mlo_vdev_lst);
+
+		return;
+	}
+
+	/*
+	 * If MLO STA is present with both links in 5/6 Ghz and SAP,
+	 * which was present on 2.4 ghz, stops then renable both the
+	 * as one of the links were disabled because of sap on 2.4
+	 * ghz.
+	 * Also, in case where MLO STA roamed from 5 + 6 link to 2.4 + 5/6 link
+	 * force scc will happen and the disabled link has to be enabled.
+	 * Both links should only be enabled if mlo sta has more than one links.
+	 */
+enable_both_lnks_on_disc:
+	if (wlan_reg_is_24ghz_ch_freq(sap_chan))
+		wlan_mlo_sta_mlo_concurency_set_link(vdev,
+					MLO_LINK_FORCE_REASON_DISCONNECT,
+					MLO_LINK_FORCE_MODE_NO_FORCE,
+					num_mlo, mlo_vdev_lst);
+}
+#endif
+
 qdf_freq_t csr_mlme_get_concurrent_operation_freq(void)
 {
 	struct mac_context *mac_ctx = cds_get_context(QDF_MODULE_ID_SME);