qcacld-3.0: Add tgt layer for packet capture mode

Add tgt layer for packet capture mode.

Change-Id: I8e69701c69d6ec1989e36cb09826c1c0bf3f51e7
CRs-Fixed: 2674337

Kbuild

@@ -1211,10 +1211,10 @@ PKT_CAPTURE_INC := -I$(WLAN_ROOT)/$(PKT_CAPTURE_DIR)/core/inc \
 ifeq ($(CONFIG_WLAN_FEATURE_PKT_CAPTURE), y)
 PKT_CAPTURE_OBJS := $(PKT_CAPTURE_DIR)/core/src/wlan_pkt_capture_main.o \
 		$(PKT_CAPTURE_DIR)/core/src/wlan_pkt_capture_mon_thread.o \
-		$(PKT_CAPTURE_DIR)/dispatcher/src/wlan_pkt_capture_ucfg_api.o \
 		$(PKT_CAPTURE_DIR)/core/src/wlan_pkt_capture_mgmt_txrx.o \
 		$(PKT_CAPTURE_DIR)/core/src/wlan_pkt_capture_data_txrx.o \
 		$(PKT_CAPTURE_DIR)/dispatcher/src/wlan_pkt_capture_ucfg_api.o \
+		$(PKT_CAPTURE_DIR)/dispatcher/src/wlan_pkt_capture_tgt_api.o \
 		$(PKT_CAPTURE_TARGET_IF_DIR)/src/target_if_pkt_capture.o
 endif
 

components/pkt_capture/core/inc/wlan_pkt_capture_priv.h

@@ -31,28 +31,6 @@
 #include "wlan_pkt_capture_public_structs.h"
 #include "wlan_pkt_capture_mon_thread.h"
 
-/**
- * struct wlan_pkt_capture_tx_ops - structure of tx operation function
- * pointers for packet capture component
- * @pkt_capture_send_mode: send packet capture mode
- *
- */
-struct wlan_pkt_capture_tx_ops {
-	QDF_STATUS (*pkt_capture_send_mode)(struct wlan_objmgr_psoc *psoc,
-					    uint8_t vdev_id,
-					    enum pkt_capture_mode mode);
-};
-
-/**
- * struct wlan_pkt_capture_rx_ops - structure of rx operation function
- * pointers for packet capture component
- * @pkt_capture_register_mgmt_data_offload_event: register mgmt offload event
- */
-struct wlan_pkt_capture_rx_ops {
-	QDF_STATUS (*pkt_capture_register_mgmt_data_offload_event)
-					(struct wlan_objmgr_psoc *psoc);
-};
-
 /**
  * struct pkt_capture_cfg - packet capture cfg to store ini values
  * @pkt_capture_mode: packet capture mode
@@ -80,7 +58,6 @@ struct pkt_capture_cb_context {
  * @cb_ctx: pointer to packet capture mon callback context
  * @rx_ops: rx ops
  * @tx_ops: tx ops
- * @is_ops_registered: is tx and rx ops registered
  */
 struct pkt_capture_vdev_priv {
 	struct wlan_objmgr_vdev *vdev;
@@ -88,7 +65,6 @@ struct pkt_capture_vdev_priv {
 	struct pkt_capture_cb_context *cb_ctx;
 	struct wlan_pkt_capture_rx_ops rx_ops;
 	struct wlan_pkt_capture_tx_ops tx_ops;
-	bool is_ops_registered;
 };
 
 /**

components/pkt_capture/core/src/wlan_pkt_capture_main.c

@@ -27,6 +27,7 @@
 #include "wlan_pkt_capture_mgmt_txrx.h"
 #include "target_if_pkt_capture.h"
 #include "cdp_txrx_ctrl.h"
+#include "wlan_pkt_capture_tgt_api.h"
 
 static struct wlan_objmgr_vdev *gp_pkt_capture_vdev;
 
@@ -59,6 +60,8 @@ pkt_capture_register_callbacks(struct wlan_objmgr_vdev *vdev,
 			       void *context)
 {
 	struct pkt_capture_vdev_priv *vdev_priv;
+	struct wlan_objmgr_psoc *psoc;
+	enum pkt_capture_mode mode;
 	QDF_STATUS status;
 
 	if (!vdev) {
@@ -66,6 +69,12 @@ pkt_capture_register_callbacks(struct wlan_objmgr_vdev *vdev,
 		return QDF_STATUS_E_INVAL;
 	}
 
+	psoc = wlan_vdev_get_psoc(vdev);
+	if (!psoc) {
+		pkt_capture_err("psoc is NULL");
+		return QDF_STATUS_E_INVAL;
+	}
+
 	vdev_priv = pkt_capture_vdev_get_priv(vdev);
 	if (!vdev_priv) {
 		pkt_capture_err("vdev priv is NULL");
@@ -75,22 +84,44 @@ pkt_capture_register_callbacks(struct wlan_objmgr_vdev *vdev,
 	vdev_priv->cb_ctx->mon_cb = mon_cb;
 	vdev_priv->cb_ctx->mon_ctx = context;
 
-	status = pkt_capture_mgmt_rx_ops(wlan_vdev_get_psoc(vdev), true);
+	status = pkt_capture_mgmt_rx_ops(psoc, true);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		pkt_capture_err("Failed to register pkt capture mgmt rx ops");
-		return status;
+		goto mgmt_rx_ops_fail;
 	}
 
 	target_if_pkt_capture_register_tx_ops(&vdev_priv->tx_ops);
 	target_if_pkt_capture_register_rx_ops(&vdev_priv->rx_ops);
 	pkt_capture_record_channel(vdev);
 
+	status = tgt_pkt_capture_register_ev_handler(vdev);
+	if (QDF_IS_STATUS_ERROR(status))
+		goto register_ev_handlers_fail;
+
+	mode = pkt_capture_get_mode(psoc);
+	status = tgt_pkt_capture_send_mode(vdev, mode);
+	if (QDF_IS_STATUS_ERROR(status)) {
+		pkt_capture_err("Unable to send packet capture mode to fw");
+		goto send_mode_fail;
+	}
+
 	return QDF_STATUS_SUCCESS;
+
+send_mode_fail:
+	tgt_pkt_capture_unregister_ev_handler(vdev);
+register_ev_handlers_fail:
+	pkt_capture_mgmt_rx_ops(psoc, false);
+mgmt_rx_ops_fail:
+	vdev_priv->cb_ctx->mon_cb = NULL;
+	vdev_priv->cb_ctx->mon_ctx = NULL;
+
+	return status;
 }
 
 QDF_STATUS pkt_capture_deregister_callbacks(struct wlan_objmgr_vdev *vdev)
 {
 	struct pkt_capture_vdev_priv *vdev_priv;
+	struct wlan_objmgr_psoc *psoc;
 	QDF_STATUS status;
 
 	if (!vdev) {
@@ -98,13 +129,27 @@ QDF_STATUS pkt_capture_deregister_callbacks(struct wlan_objmgr_vdev *vdev)
 		return QDF_STATUS_E_INVAL;
 	}
 
+	psoc = wlan_vdev_get_psoc(vdev);
+	if (!psoc) {
+		pkt_capture_err("psoc is NULL");
+		return QDF_STATUS_E_INVAL;
+	}
+
 	vdev_priv = pkt_capture_vdev_get_priv(vdev);
 	if (!vdev_priv) {
 		pkt_capture_err("vdev priv is NULL");
 		return QDF_STATUS_E_INVAL;
 	}
 
-	status = pkt_capture_mgmt_rx_ops(wlan_vdev_get_psoc(vdev), false);
+	status = tgt_pkt_capture_send_mode(vdev, PACKET_CAPTURE_MODE_DISABLE);
+	if (QDF_IS_STATUS_ERROR(status))
+		pkt_capture_err("Unable to send packet capture mode to fw");
+
+	status = tgt_pkt_capture_unregister_ev_handler(vdev);
+	if (QDF_IS_STATUS_ERROR(status))
+		pkt_capture_err("Unable to unregister event handlers");
+
+	status = pkt_capture_mgmt_rx_ops(psoc, false);
 	if (QDF_IS_STATUS_ERROR(status))
 		pkt_capture_err("Failed to unregister pkt capture mgmt rx ops");
 

components/pkt_capture/dispatcher/inc/wlan_pkt_capture_public_structs.h

@@ -66,4 +66,30 @@ struct mgmt_offload_event_params {
 struct pkt_capture_callbacks {
 	int (*get_rmf_status)(uint8_t vdev_id);
 };
+
+/**
+ * struct wlan_pkt_capture_tx_ops - structure of tx operation function
+ * pointers for packet capture component
+ * @pkt_capture_send_mode: send packet capture mode
+ *
+ */
+struct wlan_pkt_capture_tx_ops {
+	QDF_STATUS (*pkt_capture_send_mode)(struct wlan_objmgr_psoc *psoc,
+					    uint8_t vdev_id,
+					    enum pkt_capture_mode mode);
+};
+
+/**
+ * struct wlan_pkt_capture_rx_ops - structure of rx operation function
+ * pointers for packet capture component
+ * @pkt_capture_register_ev_handlers: register mgmt offload event
+ * @pkt_capture_unregister_ev_handlers: unregister mgmt offload event
+ */
+struct wlan_pkt_capture_rx_ops {
+	QDF_STATUS (*pkt_capture_register_ev_handlers)
+					(struct wlan_objmgr_psoc *psoc);
+	QDF_STATUS (*pkt_capture_unregister_ev_handlers)
+					(struct wlan_objmgr_psoc *psoc);
+};
+
 #endif /* _WLAN_PKT_CAPTURE_PUBLIC_STRUCTS_H_ */

components/pkt_capture/dispatcher/inc/wlan_pkt_capture_tgt_api.h

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2020, 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.
+ */
+
+/**
+ * DOC: packet capture south bound interface declaration
+ */
+#ifndef _WLAN_PKT_CAPTURE_TGT_API_H
+#define _WLAN_PKT_CAPTURE_TGT_API_H
+
+#include "wlan_pkt_capture_objmgr.h"
+#include "wlan_pkt_capture_main.h"
+#include "wlan_pkt_capture_public_structs.h"
+
+/**
+ * tgt_pkt_capture_register_ev_handler() - register pkt capture ev handler
+ * @vdev: pointer to vdev object
+ *
+ * Return: QDF_STATUS
+ */
+QDF_STATUS
+tgt_pkt_capture_register_ev_handler(struct wlan_objmgr_vdev *vdev);
+
+/**
+ * tgt_pkt_capture_unregister_ev_handler() - unregister pkt capture ev handler
+ * @vdev: pointer to vdev object
+ *
+ * Return: QDF_STATUS
+ */
+QDF_STATUS
+tgt_pkt_capture_unregister_ev_handler(struct wlan_objmgr_vdev *vdev);
+
+/**
+ * tgt_pkt_capture_send_mode() - send packet capture mode to firmware
+ * @vdev: pointer to vdev object
+ * @mode: packet capture mode
+ *
+ * Return: QDF_STATUS
+ */
+QDF_STATUS
+tgt_pkt_capture_send_mode(struct wlan_objmgr_vdev *vdev,
+			  enum pkt_capture_mode mode);
+#endif /* _WLAN_PKT_CAPTURE_TGT_API_H */

components/pkt_capture/dispatcher/inc/wlan_pkt_capture_ucfg_api.h

@@ -168,14 +168,6 @@ ucfg_pkt_capture_mgmt_tx_completion(
 				uint32_t status,
 				struct mgmt_offload_event_params *params);
 
-/**
- * ucfg_pkt_capture_enable_ops - Enable packet capture tx and rx ops handlers
- * @wlan_objmgr_vdev: wlan vdev object manager
- *
- * Return: 0 on success, -EINVAL on failure
- */
-int ucfg_pkt_capture_enable_ops(struct wlan_objmgr_vdev *vdev);
-
 /**
  * ucfg_pkt_capture_rx_msdu_process() -  process data rx pkts
  * @bssid: bssid
@@ -266,8 +258,8 @@ void ucfg_pkt_capture_record_channel(struct wlan_objmgr_vdev *vdev);
 
 /**
  * ucfg_pkt_capture_register_callbacks - ucfg API to register WMA callbacks
- * @psoc - pointer to psoc object
- * @cb_obj - Pointer to packet capture callback structure
+ * @psoc: pointer to psoc object
+ * @cb_obj: Pointer to packet capture callback structure
  *
  * Return: status of operation
  */

components/pkt_capture/dispatcher/src/wlan_pkt_capture_tgt_api.c

@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2020, 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.
+ */
+
+/**
+ * DOC: This file contains packet capture south bound interface definitions
+ */
+
+#include "wlan_pkt_capture_tgt_api.h"
+
+QDF_STATUS
+tgt_pkt_capture_register_ev_handler(struct wlan_objmgr_vdev *vdev)
+{
+	QDF_STATUS status = QDF_STATUS_E_FAILURE;
+	struct pkt_capture_vdev_priv *vdev_priv;
+	struct wlan_pkt_capture_rx_ops *rx_ops;
+	struct wlan_objmgr_psoc *psoc;
+
+	psoc = wlan_vdev_get_psoc(vdev);
+	if (!psoc) {
+		pkt_capture_err("psoc is NULL");
+		return status;
+	}
+
+	vdev_priv = pkt_capture_vdev_get_priv(vdev);
+	if (!vdev_priv) {
+		pkt_capture_err("vdev priv is NULL");
+		return status;
+	}
+
+	rx_ops = &vdev_priv->rx_ops;
+
+	if (!rx_ops->pkt_capture_register_ev_handlers)
+		return status;
+
+	status = rx_ops->pkt_capture_register_ev_handlers(psoc);
+	if (QDF_IS_STATUS_ERROR(status))
+		pkt_capture_err("Unable to register mgmt offload handler");
+
+	return status;
+}
+
+QDF_STATUS
+tgt_pkt_capture_unregister_ev_handler(struct wlan_objmgr_vdev *vdev)
+{
+	QDF_STATUS status = QDF_STATUS_E_FAILURE;
+	struct pkt_capture_vdev_priv *vdev_priv;
+	struct wlan_pkt_capture_rx_ops *rx_ops;
+	struct wlan_objmgr_psoc *psoc;
+
+	psoc = wlan_vdev_get_psoc(vdev);
+	if (!psoc) {
+		pkt_capture_err("psoc is NULL");
+		return status;
+	}
+
+	vdev_priv = pkt_capture_vdev_get_priv(vdev);
+	if (!vdev_priv) {
+		pkt_capture_err("vdev priv is NULL");
+		return status;
+	}
+
+	rx_ops = &vdev_priv->rx_ops;
+
+	if (!rx_ops->pkt_capture_unregister_ev_handlers)
+		return status;
+
+	status = rx_ops->pkt_capture_unregister_ev_handlers(psoc);
+	if (QDF_IS_STATUS_ERROR(status))
+		pkt_capture_err("Unable to register mgmt offload handler");
+
+	return status;
+}
+
+QDF_STATUS
+tgt_pkt_capture_send_mode(struct wlan_objmgr_vdev *vdev,
+			  enum pkt_capture_mode mode)
+{
+	QDF_STATUS status = QDF_STATUS_E_FAILURE;
+	struct pkt_capture_vdev_priv *vdev_priv;
+	struct wlan_pkt_capture_tx_ops *tx_ops;
+	struct wlan_objmgr_psoc *psoc;
+
+	psoc = wlan_vdev_get_psoc(vdev);
+	if (!psoc) {
+		pkt_capture_err("psoc is NULL");
+		return status;
+	}
+
+	vdev_priv = pkt_capture_vdev_get_priv(vdev);
+	if (!vdev_priv) {
+		pkt_capture_err("vdev priv is NULL");
+		return status;
+	}
+
+	tx_ops = &vdev_priv->tx_ops;
+
+	if (!tx_ops->pkt_capture_send_mode)
+		return status;
+
+	status = tx_ops->pkt_capture_send_mode(psoc, wlan_vdev_get_id(vdev),
+					       mode);
+	if (QDF_IS_STATUS_ERROR(status))
+		pkt_capture_err("Unable to send packet capture mode to fw");
+
+	return status;
+}

components/pkt_capture/dispatcher/src/wlan_pkt_capture_ucfg_api.c

@@ -27,6 +27,7 @@
 #include "wlan_pkt_capture_mgmt_txrx.h"
 #include "target_if_pkt_capture.h"
 #include "wlan_pkt_capture_data_txrx.h"
+#include "wlan_pkt_capture_tgt_api.h"
 
 enum pkt_capture_mode ucfg_pkt_capture_get_mode(struct wlan_objmgr_psoc *psoc)
 {
@@ -236,54 +237,6 @@ ucfg_pkt_capture_mgmt_tx_completion(struct wlan_objmgr_pdev *pdev,
 	pkt_capture_mgmt_tx_completion(pdev, desc_id, status, params);
 }
 
-int ucfg_pkt_capture_enable_ops(struct wlan_objmgr_vdev *vdev)
-{
-	struct pkt_capture_vdev_priv *vdev_priv;
-	struct wlan_pkt_capture_rx_ops *rx_ops;
-	struct wlan_pkt_capture_tx_ops *tx_ops;
-	struct wlan_objmgr_psoc *psoc;
-	enum pkt_capture_mode mode;
-	QDF_STATUS status;
-	int ret;
-
-	if (!vdev)
-		return -EINVAL;
-
-	psoc = wlan_vdev_get_psoc(vdev);
-	if (!psoc)
-		return -EINVAL;
-
-	vdev_priv = pkt_capture_vdev_get_priv(vdev);
-	if (!vdev_priv) {
-		pkt_capture_err("vdev_priv got NULL");
-		return -EINVAL;
-	}
-
-	if (vdev_priv->is_ops_registered)
-		return 0;
-
-	rx_ops = &vdev_priv->rx_ops;
-	tx_ops = &vdev_priv->tx_ops;
-
-	status = rx_ops->pkt_capture_register_mgmt_data_offload_event(psoc);
-	if (QDF_IS_STATUS_ERROR(status)) {
-		pkt_capture_err("Unable to register mgmt offload handler");
-		return -EINVAL;
-	}
-
-	mode = pkt_capture_get_mode(psoc);
-	ret = tx_ops->pkt_capture_send_mode(psoc,
-					    vdev->vdev_objmgr.vdev_id,
-					    mode);
-	if (ret) {
-		pkt_capture_err("Unable to send packet capture mode to fw");
-		return ret;
-	}
-	vdev_priv->is_ops_registered = true;
-
-	return 0;
-}
-
 void ucfg_pkt_capture_rx_msdu_process(
 				uint8_t *bssid,
 				qdf_nbuf_t head_msdu,

components/target_if/pkt_capture/src/target_if_pkt_capture.c

@@ -42,6 +42,7 @@ target_if_set_packet_capture_mode(struct wlan_objmgr_psoc *psoc,
 {
 	wmi_unified_t wmi_handle = lmac_get_wmi_unified_hdl(psoc);
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
+	struct vdev_set_params param;
 
 	if (!wmi_handle) {
 		target_if_err("Invalid wmi handle");
@@ -51,19 +52,16 @@ target_if_set_packet_capture_mode(struct wlan_objmgr_psoc *psoc,
 	target_if_debug("psoc:%pK, vdev_id:%d mode:%d",
 			psoc, vdev_id, mode);
 
-	if (mode != PACKET_CAPTURE_MODE_DISABLE) {
-		struct vdev_set_params param;
+	param.vdev_id = vdev_id;
+	param.param_id = WMI_VDEV_PARAM_PACKET_CAPTURE_MODE;
+	param.param_value = (uint32_t)mode;
 
-		param.vdev_id = vdev_id;
-		param.param_id = WMI_VDEV_PARAM_PACKET_CAPTURE_MODE;
-		param.param_value = (uint32_t)mode;
+	status = wmi_unified_vdev_set_param_send(wmi_handle, &param);
+	if (QDF_IS_STATUS_SUCCESS(status))
+		ucfg_pkt_capture_set_pktcap_mode(psoc, mode);
+	else
+		pkt_capture_err("failed to set packet capture mode");
 
-		status = wmi_unified_vdev_set_param_send(wmi_handle, &param);
-		if (QDF_IS_STATUS_SUCCESS(status))
-			ucfg_pkt_capture_set_pktcap_mode(psoc, mode);
-		else
-			pkt_capture_err("failed to set packet capture mode");
-	}
 	return status;
 }
 
@@ -192,10 +190,39 @@ target_if_register_mgmt_data_offload_event(struct wlan_objmgr_psoc *psoc)
 			return QDF_STATUS_E_FAILURE;
 		}
 	}
-	PKT_CAPTURE_ENTER();
+
+	PKT_CAPTURE_EXIT();
+
 	return QDF_STATUS_SUCCESS;
 }
 
+/**
+ * target_if_unregister_mgmt_data_offload_event() - Unregister mgmt data offload
+ * event handler
+ * @psoc: wlan psoc object
+ *
+ * Return: QDF_STATUS
+ */
+static QDF_STATUS
+target_if_unregister_mgmt_data_offload_event(struct wlan_objmgr_psoc *psoc)
+{
+	wmi_unified_t wmi_handle;
+	QDF_STATUS status;
+
+	wmi_handle = get_wmi_unified_hdl_from_psoc(psoc);
+	if (!wmi_handle) {
+		pkt_capture_err("Invalid wmi handle");
+		return QDF_STATUS_E_INVAL;
+	}
+
+	status = wmi_unified_unregister_event(wmi_handle,
+					      wmi_mgmt_offload_data_event_id);
+	if (status)
+		pkt_capture_err("unregister mgmt data offload event cb failed");
+
+	return status;
+}
+
 void
 target_if_pkt_capture_register_rx_ops(struct wlan_pkt_capture_rx_ops *rx_ops)
 {
@@ -204,8 +231,11 @@ target_if_pkt_capture_register_rx_ops(struct wlan_pkt_capture_rx_ops *rx_ops)
 		return;
 	}
 
-	rx_ops->pkt_capture_register_mgmt_data_offload_event =
+	rx_ops->pkt_capture_register_ev_handlers =
 				target_if_register_mgmt_data_offload_event;
+
+	rx_ops->pkt_capture_unregister_ev_handlers =
+				target_if_unregister_mgmt_data_offload_event;
 }
 
 void