qcacmn: Global lmac_if

Add global lmac interface which can be used by all the
modules parallel to UMAC to communicate with LMAC

Change-Id: Iaf121c7411a22e3697881405360caa5dc745298a
CRs-Fixed: 2006686

global_lmac_if/inc/wlan_global_lmac_if_api.h

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2016-2017 The Linux Foundation. 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
+ * above copyright notice and this permission notice appear in all
+ * copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _WLAN_GLOBAL_LMAC_IF_API_H_
+#define _WLAN__GLOBAL_LMAC_IF_API_H_
+
+#include "wlan_objmgr_cmn.h"
+#include "wlan_objmgr_psoc_obj.h"
+
+/**
+ * wlan_global_lmac_if_open() - global lmac_if open
+ * @psoc: psoc context
+ *
+ * Opens up lmac_if southbound layer. This function calls OL,DA and UMAC
+ * modules to register respective tx and rx callbacks.
+ *
+ * Return: QDF_STATUS
+ */
+QDF_STATUS wlan_global_lmac_if_open(struct wlan_objmgr_psoc *psoc);
+
+/**
+ * wlan_global_lmac_if_rx_ops_register() - UMAC rx handler register
+ * @rx_ops: Pointer to rx_ops structure to be populated
+ *
+ * Register umac RX callabacks which will be called by DA/OL/WMA/WMI
+ *
+ * Return: QDF_STATUS_SUCCESS - in case of success
+ */
+QDF_STATUS wlan_global_lmac_if_rx_ops_register
+		(struct wlan_lmac_if_rx_ops *rx_ops);
+
+/**
+ * wlan_global_lmac_if_close() - Close global lmac_if
+ * @psoc: psoc context
+ *
+ * Deregister global lmac_if TX and RX handlers
+ *
+ * Return: QDF_STATUS_SUCCESS - in case of success
+ */
+QDF_STATUS wlan_global_lmac_if_close(struct wlan_objmgr_psoc *psoc);
+
+/**
+ * wlan_global_lmac_if_set_txops_registration_cb() -tx
+ * registration callback assignment
+ * @dev_type: Dev type can be either Direct attach or Offload
+ * @handler: handler to be called for LMAC tx ops registration
+ *
+ * API to assign appropriate tx registration callback handler based on the
+ * device type(Offload or Direct attach)
+ *
+ * Return: QDF_STATUS_SUCCESS - in case of success
+ */
+QDF_STATUS wlan_global_lmac_if_set_txops_registration_cb(WLAN_DEV_TYPE dev_type,
+		QDF_STATUS (*handler)(struct wlan_lmac_if_tx_ops *));
+
+#endif /* _WLAN_LMAC_IF_API_H */

global_lmac_if/src/wlan_global_lmac_if.c

@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2016-2017 The Linux Foundation. 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
+ * above copyright notice and this permission notice appear in all
+ * copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "qdf_mem.h"
+#include "wlan_lmac_if_def.h"
+#include "wlan_lmac_if_api.h"
+#include "wlan_global_lmac_if_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])
+				(struct wlan_lmac_if_tx_ops *tx_ops);
+
+/**
+ * wlan_global_lmac_if_rx_ops_register() - Global lmac_if
+ * rx handler register
+ * @rx_ops: Pointer to rx_ops structure to be populated
+ *
+ * Register lmac_if RX callabacks which will be called by DA/OL/WMA/WMI
+ *
+ * Return: QDF_STATUS_SUCCESS - in case of success
+ */
+QDF_STATUS
+wlan_global_lmac_if_rx_ops_register(struct wlan_lmac_if_rx_ops *rx_ops)
+{
+	/*
+	 * Component specific public api's to be called to register
+	 * respective callbacks
+	 * Ex: rx_ops->fp = function;
+	 */
+	if (!rx_ops) {
+		qdf_print("%s: lmac if rx ops pointer is NULL", __func__);
+		return QDF_STATUS_E_INVAL;
+	}
+	/* Registeration for UMAC componets */
+	wlan_lmac_if_umac_rx_ops_register(rx_ops);
+
+	/* Registeration for componets outside UMAC */
+
+	return QDF_STATUS_SUCCESS;
+}
+
+/**
+ * wlan_global_lmac_if_open() - global lmac_if open
+ * @psoc: psoc context
+ *
+ * Opens up lmac_if southbound layer. This function calls OL,DA and UMAC
+ * modules to register respective tx and rx callbacks.
+ *
+ * Return: QDF_STATUS
+ */
+QDF_STATUS wlan_global_lmac_if_open(struct wlan_objmgr_psoc *psoc)
+{
+	WLAN_DEV_TYPE dev_type;
+
+	dev_type = psoc->soc_nif.phy_type;
+
+	if (dev_type == WLAN_DEV_DA || dev_type == WLAN_DEV_OL) {
+		wlan_global_lmac_if_tx_ops_register[dev_type]
+					(&psoc->soc_cb.tx_ops);
+	} else {
+		/* Control should ideally not reach here */
+		qdf_print("Invalid device type");
+		return QDF_STATUS_E_INVAL;
+	}
+
+	/* Function call to register rx-ops handlers */
+	wlan_global_lmac_if_rx_ops_register(&psoc->soc_cb.rx_ops);
+
+	return QDF_STATUS_SUCCESS;
+}
+EXPORT_SYMBOL(wlan_global_lmac_if_open);
+
+/**
+ * wlan_global_lmac_if_close() - Close global lmac_if
+ * @psoc: psoc context
+ *
+ * Deregister lmac_if TX and RX handlers
+ *
+ * Return: QDF_STATUS_SUCCESS - in case of success
+ */
+QDF_STATUS wlan_global_lmac_if_close(struct wlan_objmgr_psoc *psoc)
+{
+	qdf_mem_set(&psoc->soc_cb.tx_ops, 0, sizeof(psoc->soc_cb.tx_ops));
+	qdf_mem_set(&psoc->soc_cb.rx_ops, 0, sizeof(psoc->soc_cb.rx_ops));
+
+	return QDF_STATUS_SUCCESS;
+}
+EXPORT_SYMBOL(wlan_global_lmac_if_close);
+
+/**
+ * wlan_global_lmac_if_set_txops_registration_cb() - tx
+ * registration callback assignment
+ * @dev_type: Dev type can be either Direct attach or Offload
+ * @handler: handler to be called for LMAC tx ops registration
+ *
+ * API to assign appropriate tx registration callback handler based on the
+ * device type(Offload or Direct attach)
+ *
+ * Return: QDF_STATUS_SUCCESS - in case of success
+ */
+QDF_STATUS wlan_global_lmac_if_set_txops_registration_cb(WLAN_DEV_TYPE dev_type,
+			QDF_STATUS (*handler)(struct wlan_lmac_if_tx_ops *))
+{
+	wlan_global_lmac_if_tx_ops_register[dev_type] = handler;
+
+	return QDF_STATUS_SUCCESS;
+}
+EXPORT_SYMBOL(wlan_global_lmac_if_set_txops_registration_cb);

target_if/core/src/target_if_main.c

@@ -43,7 +43,6 @@ struct wlan_objmgr_psoc *target_if_get_psoc_from_scn_hdl(void *scn_handle)
 
 	return psoc;
 }
-EXPORT_SYMBOL(target_if_get_psoc_from_scn_hdl);
 
 QDF_STATUS target_if_open(get_psoc_handle_callback psoc_hdl_cb)
 {
@@ -63,7 +62,6 @@ QDF_STATUS target_if_open(get_psoc_handle_callback psoc_hdl_cb)
 
 	return QDF_STATUS_SUCCESS;
 }
-EXPORT_SYMBOL(target_if_open);
 
 QDF_STATUS target_if_close(void)
 {
@@ -85,14 +83,25 @@ QDF_STATUS target_if_close(void)
 
 	return QDF_STATUS_SUCCESS;
 }
-EXPORT_SYMBOL(target_if_close);
 
-QDF_STATUS target_if_register_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops)
+static
+QDF_STATUS target_if_register_umac_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops)
 {
+	/* call umac callback to register tx ops */
+	wlan_lmac_if_umac_tx_ops_register(tx_ops);
+
+	/* Converged UMAC components to register their TX-ops here */
 	return QDF_STATUS_SUCCESS;
 }
-EXPORT_SYMBOL(target_if_register_tx_ops);
 
+QDF_STATUS target_if_register_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops)
+{
+	/* Converged UMAC components to register their TX-ops */
+	target_if_register_umac_tx_ops(tx_ops);
+
+	/* Components parallel to UMAC to register their TX-ops here */
+	return QDF_STATUS_SUCCESS;
+}
 
 wmi_legacy_service_ready_callback
 target_if_get_psoc_legacy_service_ready_cb(void)
@@ -120,4 +129,3 @@ QDF_STATUS target_if_register_legacy_service_ready_cb(
 	return QDF_STATUS_SUCCESS;
 }
 EXPORT_SYMBOL(target_if_register_legacy_service_ready_cb);
-

umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_api.h

@@ -24,39 +24,19 @@
 #include "wlan_objmgr_psoc_obj.h"
 
 /**
- * wlan_lmac_if_open() - lmac_if open
- * @psoc: psoc context
- *
- * Opens up lmac_if southbound layer. This function calls OL,DA and UMAC
- * modules to register respective tx and rx callbacks.
- *
- * Return: QDF_STATUS
- */
-QDF_STATUS wlan_lmac_if_open(struct wlan_objmgr_psoc *psoc);
-
-/**
- * wlan_lmac_if_register_rx_handlers() - UMAC rx handler register
+ * wlan_lmac_if_umac_rx_ops_register() - UMAC rx handler register
  * @rx_ops: Pointer to rx_ops structure to be populated
  *
  * Register umac RX callabacks which will be called by DA/OL/WMA/WMI
  *
  * Return: QDF_STATUS_SUCCESS - in case of success
  */
-QDF_STATUS wlan_lmac_if_register_rx_handlers
+QDF_STATUS wlan_lmac_if_umac_rx_ops_register
 		(struct wlan_lmac_if_rx_ops *rx_ops);
 
 /**
- * wlan_lmac_if_close() - Close lmac_if
- * @psoc: psoc context
- *
- * Deregister lmac_if TX and RX handlers
- *
- * Return: QDF_STATUS_SUCCESS - in case of success
- */
-QDF_STATUS wlan_lmac_if_close(struct wlan_objmgr_psoc *psoc);
-
-/**
- * wlan_lmac_if_assign_tx_registration_cb() -tx registration callback assignment
+ * wlan_lmac_if_set_umac_txops_registration_cb() - tx registration
+ * callback assignment
  * @dev_type: Dev type can be either Direct attach or Offload
  * @handler: handler to be called for LMAC tx ops registration
  *
@@ -65,8 +45,8 @@ QDF_STATUS wlan_lmac_if_close(struct wlan_objmgr_psoc *psoc);
  *
  * Return: QDF_STATUS_SUCCESS - in case of success
  */
-QDF_STATUS wlan_lmac_if_assign_tx_registration_cb(WLAN_DEV_TYPE dev_type,
-		QDF_STATUS (*handler)(struct wlan_lmac_if_tx_ops *));
+QDF_STATUS wlan_lmac_if_set_umac_txops_registration_cb
+		(QDF_STATUS (*handler)(struct wlan_lmac_if_tx_ops *));
 
 
 /**

umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h

@@ -119,4 +119,8 @@ struct wlan_lmac_if_rx_ops {
 	 struct wlan_lmac_if_mgmt_txrx_rx_ops mgmt_txrx_rx_ops;
 };
 
+/* Function pointer to call legacy tx_ops registration in OL/WMA.
+ */
+extern QDF_STATUS (*wlan_lmac_if_umac_tx_ops_register)
+				(struct wlan_lmac_if_tx_ops *tx_ops);
 #endif /* _WLAN_LMAC_IF_DEF_H_ */

umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c

@@ -22,12 +22,15 @@
 #include "wlan_lmac_if_api.h"
 #include "wlan_mgmt_txrx_tgt_api.h"
 
-/* Function pointer to call DA/OL specific tx_ops registration function */
-QDF_STATUS (*wlan_lmac_if_tx_ops_create_handler[MAX_DEV_TYPE])
+/* Function pointer for OL/WMA specific UMAC tx_ops
+ * registration.
+ */
+QDF_STATUS (*wlan_lmac_if_umac_tx_ops_register)
 				(struct wlan_lmac_if_tx_ops *tx_ops);
+EXPORT_SYMBOL(wlan_lmac_if_umac_tx_ops_register);
 
 /**
- * wlan_lmac_if_register_rx_handlers() - UMAC rx handler register
+ * wlan_lmac_if_umac_rx_ops_register() - UMAC rx handler register
  * @rx_ops: Pointer to rx_ops structure to be populated
  *
  * Register umac RX callabacks which will be called by DA/OL/WMA/WMI
@@ -35,7 +38,7 @@ QDF_STATUS (*wlan_lmac_if_tx_ops_create_handler[MAX_DEV_TYPE])
  * Return: QDF_STATUS_SUCCESS - in case of success
  */
 QDF_STATUS
-wlan_lmac_if_register_rx_handlers(struct wlan_lmac_if_rx_ops *rx_ops)
+wlan_lmac_if_umac_rx_ops_register(struct wlan_lmac_if_rx_ops *rx_ops)
 {
 	/* Component specific public api's to be called to register
 	 * respective callbacks
@@ -61,63 +64,12 @@ wlan_lmac_if_register_rx_handlers(struct wlan_lmac_if_rx_ops *rx_ops)
 			tgt_mgmt_txrx_get_peer_from_desc_id;
 	mgmt_txrx_rx_ops->mgmt_txrx_get_vdev_id_from_desc_id =
 			tgt_mgmt_txrx_get_vdev_id_from_desc_id;
-
 	return QDF_STATUS_SUCCESS;
 }
 
 /**
- * wlan_lmac_if_open() - lmac_if open
- * @psoc: psoc context
- *
- * Opens up lmac_if southbound layer. This function calls OL,DA and UMAC
- * modules to register respective tx and rx callbacks.
- *
- * Return: QDF_STATUS
- */
-QDF_STATUS wlan_lmac_if_open(struct wlan_objmgr_psoc *psoc)
-{
-	WLAN_DEV_TYPE dev_type;
-
-	dev_type = psoc->soc_nif.phy_type;
-
-	if (dev_type == WLAN_DEV_DA) {
-		wlan_lmac_if_tx_ops_create_handler[WLAN_DEV_DA]
-					(&psoc->soc_cb.tx_ops);
-	} else if (dev_type == WLAN_DEV_OL) {
-		wlan_lmac_if_tx_ops_create_handler[WLAN_DEV_OL]
-					(&psoc->soc_cb.tx_ops);
-	} else {
-		/* Control should ideally not reach here */
-		qdf_print("Invalid device type");
-		return QDF_STATUS_E_INVAL;
-	}
-
-	/* Function call into umac to register rx-ops handlers */
-	wlan_lmac_if_register_rx_handlers(&psoc->soc_cb.rx_ops);
-
-	return QDF_STATUS_SUCCESS;
-}
-EXPORT_SYMBOL(wlan_lmac_if_open);
-
-/**
- * wlan_lmac_if_close() - Close lmac_if
- * @psoc: psoc context
- *
- * Deregister lmac_if TX and RX handlers
- *
- * Return: QDF_STATUS_SUCCESS - in case of success
- */
-QDF_STATUS wlan_lmac_if_close(struct wlan_objmgr_psoc *psoc)
-{
-	qdf_mem_set(&psoc->soc_cb.tx_ops, 0, sizeof(psoc->soc_cb.tx_ops));
-	qdf_mem_set(&psoc->soc_cb.rx_ops, 0, sizeof(psoc->soc_cb.rx_ops));
-
-	return QDF_STATUS_SUCCESS;
-}
-EXPORT_SYMBOL(wlan_lmac_if_close);
-
-/**
- * wlan_lmac_if_assign_tx_registration_cb() -tx registration callback assignment
+ * wlan_lmac_if_set_umac_txops_registration_cb() - tx registration
+ * callback assignment
  * @dev_type: Dev type can be either Direct attach or Offload
  * @handler: handler to be called for LMAC tx ops registration
  *
@@ -126,10 +78,11 @@ EXPORT_SYMBOL(wlan_lmac_if_close);
  *
  * Return: QDF_STATUS_SUCCESS - in case of success
  */
-QDF_STATUS wlan_lmac_if_assign_tx_registration_cb(WLAN_DEV_TYPE dev_type,
-			QDF_STATUS (*handler)(struct wlan_lmac_if_tx_ops *))
+QDF_STATUS wlan_lmac_if_set_umac_txops_registration_cb(QDF_STATUS (*handler)
+				(struct wlan_lmac_if_tx_ops *))
 {
-	wlan_lmac_if_tx_ops_create_handler[dev_type] = handler;
+	wlan_lmac_if_umac_tx_ops_register = handler;
 	return QDF_STATUS_SUCCESS;
 }
-EXPORT_SYMBOL(wlan_lmac_if_assign_tx_registration_cb);
+EXPORT_SYMBOL(wlan_lmac_if_set_umac_txops_registration_cb);
+