qcacld-3.0: Validate SAP/GO/LL_LT_SAP channels in LL_LT_SAP mode

Add separate APIs to validate SAP, P2PGO or LL_LT_SAP
channels according to LL_LT_SAP concurrency.

Change-Id: I180796df6b312f9bbb0a8e61085ca1517cd687b5
CRs-Fixed: 3647561

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_ll_sap.h

@@ -17,10 +17,39 @@
 /**
  * DOC: contains policy manager ll_sap definitions specific to the ll_sap module
  */
+#ifndef WLAN_POLICY_MGR_LL_SAP_H
+#define WLAN_POLICY_MGR_LL_SAP_H
 
 #include "wlan_objmgr_psoc_obj.h"
 
 #ifdef WLAN_FEATURE_LL_LT_SAP
+/**
+ * policy_mgr_ll_lt_sap_get_valid_freq() - Check and get valid frequency for
+ * the current interface (SAP/P2PGO/LL_LT_SAP)
+ * @psoc: PSOC object
+ * @pdev: PDEV pointer
+ * @vdev_id: Vdev id of the current interface
+ * @sap_ch_freq: Frequency of the current interface
+ * @cc_switch_mode: Channel switch mode
+ * @new_sap_freq: Updated frequency
+ * @is_ll_lt_sap_present: Indicates if ll_lt_sap is present or not
+ *
+ * This API checks if ll_lt_sap is present or not and if ll_lt_sap is present
+ * then if current frequency of the ll_lt_sap or concurrent SAP or concurrent
+ * P2PGO is valid or not according to ll_lt_sap concurrency, if valid, does not
+ * fill anything in the new_sap_freq and if not valid, update the new_sap_freq
+ * with some new valid frequency.
+ *
+ * Return: true/false
+ */
+void policy_mgr_ll_lt_sap_get_valid_freq(struct wlan_objmgr_psoc *psoc,
+					 struct wlan_objmgr_pdev *pdev,
+					 uint8_t vdev_id,
+					 qdf_freq_t sap_ch_freq,
+					 uint8_t cc_switch_mode,
+					 qdf_freq_t *new_sap_freq,
+					 bool *is_ll_lt_sap_present);
+
 /**
  * wlan_policy_mgr_get_ll_lt_sap_vdev_id() - Get ll_lt_sap vdev id
  * @psoc: PSOC object
@@ -62,7 +91,7 @@ bool __policy_mgr_is_ll_lt_sap_restart_required(struct wlan_objmgr_psoc *psoc,
  * operating on 5 GHz, then move concurrent SAP to 2.4 Ghz MAC to allow
  * ll_lt_sap on 5 GHz
  * If ll_lt_sap is going down and if concurrent SAP is on 2.4 GHz then try to
- * restart ll_lt_sap on its original user configured frequency
+ * restart concurrent SAP on its original user configured frequency
  * If ll_lt_sap interface has come up and in parallel if some other interface
  * comes up on the ll_lt_sap frequency, then ll_lt_sap needs to be restarted.
  *
@@ -78,6 +107,17 @@ policy_mgr_is_ll_lt_sap_restart_required(struct wlan_objmgr_psoc *psoc)
 	return false;
 }
 
+static inline
+void policy_mgr_ll_lt_sap_get_valid_freq(struct wlan_objmgr_psoc *psoc,
+					 struct wlan_objmgr_pdev *pdev,
+					 uint8_t vdev_id,
+					 qdf_freq_t sap_ch_freq,
+					 uint8_t cc_switch_mode,
+					 qdf_freq_t *new_sap_freq,
+					 bool *is_ll_lt_sap_present)
+{
+}
+
 static inline
 uint8_t wlan_policy_mgr_get_ll_lt_sap_vdev_id(struct wlan_objmgr_psoc *psoc)
 {
@@ -90,3 +130,4 @@ policy_mgr_ll_lt_sap_restart_concurrent_sap(struct wlan_objmgr_psoc *psoc,
 {
 }
 #endif
+#endif /* WLAN_POLICY_MGR_LL_SAP_H */

components/cmn_services/policy_mgr/src/wlan_policy_mgr_ll_sap.c

@@ -25,6 +25,64 @@
 #include "wlan_cmn.h"
 #include "wlan_ll_sap_api.h"
 
+void policy_mgr_ll_lt_sap_get_valid_freq(struct wlan_objmgr_psoc *psoc,
+					 struct wlan_objmgr_pdev *pdev,
+					 uint8_t vdev_id,
+					 qdf_freq_t sap_ch_freq,
+					 uint8_t cc_switch_mode,
+					 qdf_freq_t *new_sap_freq,
+					 bool *is_ll_lt_sap_present)
+{
+	enum sap_csa_reason_code csa_reason;
+	enum policy_mgr_con_mode conn_mode;
+	qdf_freq_t ll_lt_sap_freq = 0;
+	*is_ll_lt_sap_present = false;
+
+	/* If Vdev is ll_lt_sap, check if the frequency on which it is
+	 * coming up is correct, else, get new frequency
+	 */
+	if (policy_mgr_is_vdev_ll_lt_sap(psoc, vdev_id)) {
+		*new_sap_freq = wlan_get_ll_lt_sap_restart_freq(pdev,
+								sap_ch_freq,
+								vdev_id,
+								&csa_reason);
+		*is_ll_lt_sap_present = true;
+	}
+
+	ll_lt_sap_freq = policy_mgr_get_ll_lt_sap_freq(psoc);
+	if (!ll_lt_sap_freq)
+		return;
+
+	conn_mode = policy_mgr_get_mode_by_vdev_id(psoc, vdev_id);
+
+	if (conn_mode == PM_SAP_MODE) {
+		/* If ll_lt_sap and concurrent SAP are on same MAC,
+		 * update the frequency of concurrent SAP, else return.
+		 */
+		if (!policy_mgr_are_2_freq_on_same_mac(psoc, sap_ch_freq,
+						       ll_lt_sap_freq))
+			return;
+		goto policy_mgr_check_scc;
+	} else if (conn_mode == PM_P2P_GO_MODE) {
+		/* If ll_lt_sap and P2P_GO are in SCC,
+		 * update the frequency of concurrent GO else, return.
+		 */
+		if (ll_lt_sap_freq != sap_ch_freq)
+			return;
+		goto policy_mgr_check_scc;
+	} else {
+		policy_mgr_debug("Invalid con mode %d vdev %d", conn_mode,
+				 vdev_id);
+		return;
+	}
+
+policy_mgr_check_scc:
+	policy_mgr_check_scc_channel(psoc, new_sap_freq, sap_ch_freq, vdev_id,
+				     cc_switch_mode);
+	policy_mgr_debug("vdev_id %d old_freq %d new_freq %d", vdev_id,
+			 sap_ch_freq, new_sap_freq);
+}
+
 uint8_t wlan_policy_mgr_get_ll_lt_sap_vdev_id(struct wlan_objmgr_psoc *psoc)
 {
 	uint8_t ll_lt_sap_cnt;

components/umac/mlme/sap/ll_sap/dispatcher/inc/wlan_ll_sap_api.h

@@ -210,5 +210,14 @@ qdf_freq_t wlan_ll_lt_sap_override_freq(struct wlan_objmgr_psoc *psoc,
 {
 	return chan_freq;
 }
+
+static inline
+qdf_freq_t wlan_get_ll_lt_sap_restart_freq(struct wlan_objmgr_pdev *pdev,
+					   qdf_freq_t chan_freq,
+					   uint8_t vdev_id,
+					   enum sap_csa_reason_code *csa_reason)
+{
+	return 0;
+}
 #endif /* WLAN_FEATURE_LL_LT_SAP */
 #endif /* _WLAN_LL_LT_SAP_API_H_ */

core/sap/src/sap_fsm.c

@@ -63,6 +63,7 @@
 #include "wlan_pre_cac_api.h"
 #include <wlan_cmn_ieee80211.h>
 #include <target_if.h>
+#include "wlan_ll_sap_api.h"
 
 /*----------------------------------------------------------------------------
  * Preprocessor Definitions and Constants
@@ -1156,6 +1157,14 @@ sap_validate_chan(struct sap_context *sap_context,
 		return QDF_STATUS_E_FAILURE;
 	}
 
+	if (policy_mgr_is_vdev_ll_lt_sap(mac_ctx->psoc, sap_context->vdev_id)) {
+		sap_context->chan_freq = wlan_ll_lt_sap_override_freq(
+							mac_ctx->psoc,
+							sap_context->vdev_id,
+							sap_context->chan_freq);
+		return QDF_STATUS_SUCCESS;
+	}
+
 	if (sap_context->vdev &&
 	    sap_context->vdev->vdev_mlme.vdev_opmode == QDF_P2P_GO_MODE) {
 	       /*

core/sme/src/csr/csr_util.c

@@ -38,6 +38,7 @@
 #include <../../core/src/wlan_cm_vdev_api.h>
 #include <wlan_mlo_mgr_public_structs.h>
 #include "wlan_objmgr_vdev_obj.h"
+#include "wlan_policy_mgr_ll_sap.h"
 
 #define CASE_RETURN_STR(n) {\
 	case (n): return (# n);\
@@ -623,12 +624,42 @@ uint16_t csr_check_concurrent_channel_overlap(struct mac_context *mac_ctx,
 	enum phy_ch_width ch_width;
 	enum channel_state state;
 
+#ifdef WLAN_FEATURE_LL_LT_SAP
+	qdf_freq_t new_sap_freq = 0;
+	bool is_ll_lt_sap_present = false;
+#endif
+
 	if (mac_ctx->roam.configParam.cc_switch_mode ==
 			QDF_MCC_TO_SCC_SWITCH_DISABLE)
 		return 0;
 
-	if (policy_mgr_is_vdev_ll_lt_sap(mac_ctx->psoc, vdev_id))
-		return 0;
+	/*
+	 * This is temporary code and will be removed once this feature flag
+	 * is enabled
+	 */
+#ifndef WLAN_FEATURE_LL_LT_SAP
+		if (policy_mgr_is_vdev_ll_lt_sap(mac_ctx->psoc, vdev_id))
+			return 0;
+#else
+	policy_mgr_ll_lt_sap_get_valid_freq(
+				mac_ctx->psoc, mac_ctx->pdev,
+				vdev_id, sap_ch_freq,
+				mac_ctx->roam.configParam.cc_switch_mode,
+				&new_sap_freq,
+				&is_ll_lt_sap_present);
+	/*
+	 * If ll_lt_sap is present, then it has already updated the frequency
+	 * according to current concurrency, so, return from here
+	 */
+	if (is_ll_lt_sap_present) {
+		if (new_sap_freq == sap_ch_freq)
+			return 0;
+
+		sme_debug("LL_LT_SAP concurrency updated freq %d for vdev %d",
+			  new_sap_freq, vdev_id);
+		return new_sap_freq;
+	}
+#endif
 
 	if (sap_ch_freq != 0) {
 		sap_cfreq = sap_ch_freq;