qcacmn: Spectral scan module initialization for MCL

Changes to support spectral module initalization
on MCL platform.

Change-Id: I968e199d0090d11480f111acca1240c3fb8117ba
CRs-Fixed: 2161633

global_lmac_if/src/wlan_global_lmac_if.c

@@ -21,6 +21,7 @@
 #include "wlan_lmac_if_def.h"
 #include "wlan_lmac_if_api.h"
 #include "wlan_global_lmac_if_api.h"
+#include <wlan_spectral_utils_api.h>
 
 /* Function pointer to call DA/OL specific tx_ops registration function */
 QDF_STATUS (*wlan_global_lmac_if_tx_ops_register[MAX_DEV_TYPE])
@@ -40,6 +41,12 @@ QDF_STATUS wlan_lmac_if_sptrl_set_rx_ops_register_cb(void (*handler)
 EXPORT_SYMBOL(wlan_lmac_if_sptrl_set_rx_ops_register_cb);
 #endif /* WLAN_CONV_SPECTRAL_ENABLE */
 
+/*
+ * spectral scan is built as seperate .ko for WIN where
+ * MCL it is part of wlan.ko so the registration of
+.* rx ops to global lmac if layer is different between WIN
+ * and MCL
+ */
 #ifdef WLAN_CONV_SPECTRAL_ENABLE
 /**
  * wlan_spectral_register_rx_ops() - Register spectral component RX OPS
@@ -47,11 +54,18 @@ EXPORT_SYMBOL(wlan_lmac_if_sptrl_set_rx_ops_register_cb);
  *
  * Return: None
  */
+#ifdef CONFIG_WIN
 static void wlan_spectral_register_rx_ops(struct wlan_lmac_if_rx_ops *rx_ops)
 {
 	wlan_lmac_if_sptrl_rx_ops(rx_ops);
 }
 #else
+static void wlan_spectral_register_rx_ops(struct wlan_lmac_if_rx_ops *rx_ops)
+{
+	wlan_lmac_if_sptrl_register_rx_ops(rx_ops);
+}
+#endif /*CONFIG_WIN*/
+#else
 /**
  * wlan_spectral_register_rx_ops() - Dummy api to register spectral RX OPS
  * @rx_ops: lmac if receive ops
@@ -61,7 +75,7 @@ static void wlan_spectral_register_rx_ops(struct wlan_lmac_if_rx_ops *rx_ops)
 static void wlan_spectral_register_rx_ops(struct wlan_lmac_if_rx_ops *rx_ops)
 {
 }
-#endif
+#endif /*WLAN_CONV_SPECTRAL_ENABLE*/
 
 /**
  * wlan_global_lmac_if_rx_ops_register() - Global lmac_if

init_deinit/dispatcher/src/dispatcher_init_deinit.c

@@ -66,6 +66,8 @@
 #include <wlan_splitmac.h>
 #endif
 
+#include <wlan_spectral_utils_api.h>
+
 /**
  * DOC: This file provides various init/deinit trigger point for new
  * components.
@@ -631,6 +633,28 @@ static QDF_STATUS dispatcher_splitmac_deinit(void)
 }
 #endif  /* WLAN_SUPPORT_SPLITMAC */
 
+#ifdef CONFIG_MCL
+static QDF_STATUS dispatcher_spectral_init(void)
+{
+	return wlan_spectral_init();
+}
+
+static QDF_STATUS dispatcher_spectral_deinit(void)
+{
+	return wlan_spectral_deinit();
+}
+#else
+static QDF_STATUS dispatcher_spectral_init(void)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
+static QDF_STATUS dispatcher_spectral_deinit(void)
+{
+	return QDF_STATUS_SUCCESS;
+}
+#endif /*CONFIG_MCL*/
+
 QDF_STATUS dispatcher_init(void)
 {
 	if (QDF_STATUS_SUCCESS != wlan_objmgr_global_obj_init())
@@ -684,12 +708,22 @@ QDF_STATUS dispatcher_init(void)
 	if (QDF_STATUS_SUCCESS != dispatcher_splitmac_init())
 		goto splitmac_init_fail;
 
+	if (QDF_STATUS_SUCCESS != dispatcher_spectral_init())
+		goto spectral_init_fail;
+
+	/*
+	 * scheduler INIT has to be the last as each component's
+	 * initialization has to happen first and then at the end
+	 * scheduler needs to start accepting the service.
+	 */
 	if (QDF_STATUS_SUCCESS != scheduler_init())
 		goto scheduler_init_fail;
 
 	return QDF_STATUS_SUCCESS;
 
 scheduler_init_fail:
+	dispatcher_spectral_deinit();
+spectral_init_fail:
 	dispatcher_splitmac_deinit();
 splitmac_init_fail:
 	dispatcher_deinit_son();
@@ -733,6 +767,8 @@ QDF_STATUS dispatcher_deinit(void)
 {
 	QDF_BUG(QDF_STATUS_SUCCESS == scheduler_deinit());
 
+	QDF_BUG(QDF_STATUS_SUCCESS == dispatcher_spectral_deinit());
+
 	QDF_BUG(QDF_STATUS_SUCCESS == dispatcher_splitmac_deinit());
 
 	QDF_BUG(QDF_STATUS_SUCCESS == dispatcher_deinit_son());

umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h

@@ -303,7 +303,7 @@ struct wmi_spectral_cmd_ops;
  * @sptrlto_get_spectral_diagstats: Get Spectral diagnostic statistics
  **/
 struct wlan_lmac_if_sptrl_tx_ops {
-	void * (*sptrlto_pdev_spectral_init)(struct wlan_objmgr_pdev *pdev);
+	void *(*sptrlto_pdev_spectral_init)(struct wlan_objmgr_pdev *pdev);
 	void (*sptrlto_pdev_spectral_deinit)(struct wlan_objmgr_pdev *pdev);
 	int (*sptrlto_set_spectral_config)(struct wlan_objmgr_pdev *pdev,
 					   const u_int32_t threshtype,