qcacld-3.0: Add MLO STA + NAN + NDI service cap support

Add MLO STA + NAN + NDI service cap support

Change-Id: I736a68552502f5fc1fb498cfd8db6bad99a75b5e
CRs-Fixed: 3120620

components/nan/core/inc/nan_public_structs.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017-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
@@ -850,6 +851,7 @@ struct wlan_nan_rx_ops {
  * @sta_nan_ndi_ndi_allowed: 4 port concurrency of STA+NAN+NDI+NDI is supported
  * @ndi_txbf_supported: Target supports NAN Datapath with TX beamforming
  * by Fw or not.
+ * @mlo_sta_nan_ndi_allowed: MLO STA + NAN + NDI concurrency is supported
  */
 struct nan_tgt_caps {
 	uint32_t nan_conc_control:1;
@@ -860,6 +862,9 @@ struct nan_tgt_caps {
 	uint32_t nan_vdev_allowed:1;
 	uint32_t sta_nan_ndi_ndi_allowed:1;
 	uint32_t ndi_txbf_supported:1;
+#ifdef WLAN_FEATURE_11BE_MLO
+	uint32_t mlo_sta_nan_ndi_allowed:1;
+#endif
 };
 
 #endif

components/nan/core/inc/wlan_nan_api.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017-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
@@ -285,4 +286,21 @@ bool wlan_is_nan_allowed_on_freq(struct wlan_objmgr_pdev *pdev, uint32_t freq)
 	return false;
 }
 #endif /* WLAN_FEATURE_NAN */
+
+#if defined(WLAN_FEATURE_NAN) && defined(WLAN_FEATURE_11BE_MLO)
+/**
+ * wlan_is_mlo_sta_nan_ndi_allowed()- Get support for MLO STA +
+ * NAN Disc + NDI concurrency
+ * @psoc: pointer to psoc object
+ *
+ * Return: True if mlo sta + nan + ndi concurrency allowed or not.
+ */
+bool wlan_is_mlo_sta_nan_ndi_allowed(struct wlan_objmgr_psoc *psoc);
+#else
+static inline bool
+wlan_is_mlo_sta_nan_ndi_allowed(struct wlan_objmgr_psoc *psoc)
+{
+	return false;
+}
+#endif
 #endif /* _WLAN_NAN_API_H_ */

components/nan/core/src/nan_api.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-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
@@ -457,3 +457,18 @@ bool wlan_is_nan_allowed_on_freq(struct wlan_objmgr_pdev *pdev, uint32_t freq)
 
 	return nan_allowed;
 }
+
+#ifdef WLAN_FEATURE_11BE_MLO
+bool wlan_is_mlo_sta_nan_ndi_allowed(struct wlan_objmgr_psoc *psoc)
+{
+	struct nan_psoc_priv_obj *psoc_nan_obj;
+
+	psoc_nan_obj = nan_get_psoc_priv_obj(psoc);
+	if (!psoc_nan_obj) {
+		nan_err("psoc_nan_obj is null");
+		return false;
+	}
+
+	return psoc_nan_obj->nan_caps.mlo_sta_nan_ndi_allowed;
+}
+#endif

components/nan/dispatcher/inc/nan_ucfg_api.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-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
@@ -528,6 +528,15 @@ bool ucfg_is_nan_allowed_on_freq(struct wlan_objmgr_pdev *pdev, uint32_t freq);
  */
 bool ucfg_get_disable_6g_nan(struct wlan_objmgr_psoc *psoc);
 
+/**
+ * ucfg_nan_is_mlo_sta_nan_ndi_allowed()- Get support for MLO STA +
+ * NAN Disc + NDI concurrency
+ * @psoc: pointer to psoc object
+ *
+ * Return: True if mlo sta + nan + ndi concurrency allowed or not.
+ */
+bool ucfg_is_mlo_sta_nan_ndi_allowed(struct wlan_objmgr_psoc *psoc);
+
 #else /* WLAN_FEATURE_NAN */
 
 static inline
@@ -664,5 +673,11 @@ ucfg_nan_get_peer_mc_list(struct wlan_objmgr_vdev *vdev,
 			  struct qdf_mac_addr **peer_mc_addr_list)
 {
 }
+
+static inline bool
+ucfg_is_mlo_sta_nan_ndi_allowed(struct wlan_objmgr_psoc *psoc)
+{
+	return false;
+}
 #endif /* WLAN_FEATURE_NAN */
 #endif /* _NAN_UCFG_API_H_ */

components/nan/dispatcher/src/nan_ucfg_api.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-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
@@ -1402,3 +1402,8 @@ bool ucfg_is_nan_allowed_on_freq(struct wlan_objmgr_pdev *pdev, uint32_t freq)
 {
 	return wlan_is_nan_allowed_on_freq(pdev, freq);
 }
+
+bool ucfg_is_mlo_sta_nan_ndi_allowed(struct wlan_objmgr_psoc *psoc)
+{
+	return wlan_is_mlo_sta_nan_ndi_allowed(psoc);
+}

core/wma/src/wma_main.c

@@ -5419,6 +5419,21 @@ static void wma_green_ap_register_handlers(tp_wma_handle wma_handle)
 #endif
 
 #ifdef WLAN_FEATURE_NAN
+#ifdef WLAN_FEATURE_11BE_MLO
+static void wma_update_mlo_sta_nan_ndi_target_caps(tp_wma_handle wma_handle,
+						   struct wma_tgt_cfg *tgt_cfg)
+{
+	if (wmi_service_enabled(wma_handle->wmi_handle,
+				wmi_service_mlo_sta_nan_ndi_support))
+		tgt_cfg->nan_caps.mlo_sta_nan_ndi_allowed = 1;
+}
+#else
+static void wma_update_mlo_sta_nan_ndi_target_caps(tp_wma_handle wma_handle,
+						   struct wma_tgt_cfg *tgt_cfg)
+{
+}
+#endif /* WLAN_FEATURE_11BE_MLO */
+
 static void wma_update_nan_target_caps(tp_wma_handle wma_handle,
 				       struct wma_tgt_cfg *tgt_cfg)
 {
@@ -5452,6 +5467,8 @@ static void wma_update_nan_target_caps(tp_wma_handle wma_handle,
 	if (wmi_service_enabled(wma_handle->wmi_handle,
 				wmi_service_ndi_txbf_support))
 		tgt_cfg->nan_caps.ndi_txbf_supported = 1;
+
+	wma_update_mlo_sta_nan_ndi_target_caps(wma_handle, tgt_cfg);
 }
 #else
 static void wma_update_nan_target_caps(tp_wma_handle wma_handle,