qcacld-3.0: Implement converged packetdump API

Packetdump invokes legacy data path API directly without
considering underlying HW:
1. ol_register_packetdump_callback
2. ol_deregister_packetdump_callback
Global pointer pdev_txrx_ctx will be casted to struct ol_txrx_pdev_t
always even Lithium (use struct dp_pdev) underlying, and overwrite
struct dp_pdev unexpected.

Wrap with cdp API to avoid.

Change-Id: I4f587c5378726b7cc4b340760f1112b054610da1
CRs-Fixed: 2400472

core/dp/ol/inc/ol_txrx_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014,2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2014,2016-2017,2019 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
@@ -51,12 +51,6 @@ enum ol_sec_type {
 	ol_sec_type_types
 };
 
-typedef void (*tp_ol_packetdump_cb)(qdf_nbuf_t netbuf,
-		uint8_t status, uint8_t vdev_id, uint8_t type);
-void ol_register_packetdump_callback(tp_ol_packetdump_cb ol_tx_packetdump_cb,
-			tp_ol_packetdump_cb ol_rx_packetdump_cb);
-void ol_deregister_packetdump_callback(void);
-
 #ifdef WLAN_FEATURE_TSF_PLUS
 typedef int (*tp_ol_timestamp_cb)(qdf_nbuf_t netbuf, uint64_t target_time);
 

core/dp/txrx/ol_rx.c

@@ -1540,7 +1540,7 @@ void ol_rx_pkt_dump_call(
 {
 	ol_txrx_pdev_handle pdev;
 	struct ol_txrx_peer_t *peer = NULL;
-	tp_ol_packetdump_cb packetdump_cb;
+	ol_txrx_pktdump_cb packetdump_cb;
 
 	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 

core/dp/txrx/ol_tx_send.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019 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
@@ -759,7 +759,7 @@ ol_tx_completion_handler(ol_txrx_pdev_handle pdev,
 	struct ol_tx_desc_t *tx_desc;
 	uint32_t byte_cnt = 0;
 	qdf_nbuf_t netbuf;
-	tp_ol_packetdump_cb packetdump_cb;
+	ol_txrx_pktdump_cb packetdump_cb;
 	uint32_t is_tx_desc_freed = 0;
 	struct htt_tx_compl_ind_append_tx_tstamp *txtstamp_list = NULL;
 	u_int32_t *msg_word = (u_int32_t *)msg;
@@ -1032,7 +1032,7 @@ ol_tx_single_completion_handler(ol_txrx_pdev_handle pdev,
 {
 	struct ol_tx_desc_t *tx_desc;
 	qdf_nbuf_t netbuf;
-	tp_ol_packetdump_cb packetdump_cb;
+	ol_txrx_pktdump_cb packetdump_cb;
 
 	tx_desc = ol_tx_desc_find_check(pdev, tx_desc_id);
 	if (tx_desc == NULL) {
@@ -1487,58 +1487,6 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev,
 
 #endif /* QCA_COMPUTE_TX_DELAY */
 
-/**
- * ol_register_packetdump_callback() - registers
- *  tx data packet, tx mgmt. packet and rx data packet
- *  dump callback handler.
- *
- * @ol_tx_packetdump_cb: tx packetdump cb
- * @ol_rx_packetdump_cb: rx packetdump cb
- *
- * This function is used to register tx data pkt, tx mgmt.
- * pkt and rx data pkt dump callback
- *
- * Return: None
- *
- */
-void ol_register_packetdump_callback(tp_ol_packetdump_cb ol_tx_packetdump_cb,
-					tp_ol_packetdump_cb ol_rx_packetdump_cb)
-{
-	ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX);
-
-	if (!pdev) {
-		ol_txrx_err("pdev is NULL");
-		return;
-	}
-
-	pdev->ol_tx_packetdump_cb = ol_tx_packetdump_cb;
-	pdev->ol_rx_packetdump_cb = ol_rx_packetdump_cb;
-}
-
-/**
- * ol_deregister_packetdump_callback() - deregidters
- *  tx data packet, tx mgmt. packet and rx data packet
- *  dump callback handler
- *
- * This function is used to deregidter tx data pkt.,
- * tx mgmt. pkt and rx data pkt. dump callback
- *
- * Return: None
- *
- */
-void ol_deregister_packetdump_callback(void)
-{
-	ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX);
-
-	if (!pdev) {
-		ol_txrx_err("pdev is NULL");
-		return;
-	}
-
-	pdev->ol_tx_packetdump_cb = NULL;
-	pdev->ol_rx_packetdump_cb = NULL;
-}
-
 #ifdef WLAN_FEATURE_TSF_PLUS
 void ol_register_timestamp_callback(tp_ol_timestamp_cb ol_tx_timestamp_cb)
 {

core/dp/txrx/ol_txrx.c

@@ -5455,6 +5455,60 @@ void *ol_get_pldev(struct cdp_pdev *txrx_pdev)
 }
 #endif
 
+/**
+ * ol_register_packetdump_callback() - registers
+ *  tx data packet, tx mgmt. packet and rx data packet
+ *  dump callback handler.
+ *
+ * @ol_tx_packetdump_cb: tx packetdump cb
+ * @ol_rx_packetdump_cb: rx packetdump cb
+ *
+ * This function is used to register tx data pkt, tx mgmt.
+ * pkt and rx data pkt dump callback
+ *
+ * Return: None
+ *
+ */
+static inline
+void ol_register_packetdump_callback(ol_txrx_pktdump_cb ol_tx_packetdump_cb,
+				     ol_txrx_pktdump_cb ol_rx_packetdump_cb)
+{
+	ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX);
+
+	if (!pdev) {
+		ol_txrx_err("pdev is NULL");
+		return;
+	}
+
+	pdev->ol_tx_packetdump_cb = ol_tx_packetdump_cb;
+	pdev->ol_rx_packetdump_cb = ol_rx_packetdump_cb;
+}
+
+/**
+ * ol_deregister_packetdump_callback() - deregidters
+ *  tx data packet, tx mgmt. packet and rx data packet
+ *  dump callback handler
+ *
+ * This function is used to deregidter tx data pkt.,
+ * tx mgmt. pkt and rx data pkt. dump callback
+ *
+ * Return: None
+ *
+ */
+static inline
+void ol_deregister_packetdump_callback(void)
+{
+	ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX);
+
+	if (!pdev) {
+		ol_txrx_err("pdev is NULL");
+		return;
+	}
+
+	pdev->ol_tx_packetdump_cb = NULL;
+	pdev->ol_rx_packetdump_cb = NULL;
+}
+
 static struct cdp_cmn_ops ol_ops_cmn = {
 	.txrx_soc_attach_target = ol_txrx_soc_attach_target,
 	.txrx_vdev_attach = ol_txrx_vdev_attach,
@@ -5513,7 +5567,9 @@ static struct cdp_misc_ops ol_ops_misc = {
 	.flush_rx_frames = ol_txrx_wrapper_flush_rx_frames,
 	.get_intra_bss_fwd_pkts_count = ol_get_intra_bss_fwd_pkts_count,
 	.pkt_log_init = htt_pkt_log_init,
-	.pkt_log_con_service = ol_txrx_pkt_log_con_service
+	.pkt_log_con_service = ol_txrx_pkt_log_con_service,
+	.register_pktdump_cb = ol_register_packetdump_callback,
+	.unregister_pktdump_cb = ol_deregister_packetdump_callback
 };
 
 static struct cdp_flowctl_ops ol_ops_flowctl = {

core/dp/txrx/ol_txrx_types.h

@@ -748,8 +748,8 @@ struct ol_txrx_pdev_t {
 
 	data_stall_detect_cb data_stall_detect_callback;
 	/* packetdump callback functions */
-	tp_ol_packetdump_cb ol_tx_packetdump_cb;
-	tp_ol_packetdump_cb ol_rx_packetdump_cb;
+	ol_txrx_pktdump_cb ol_tx_packetdump_cb;
+	ol_txrx_pktdump_cb ol_rx_packetdump_cb;
 
 #ifdef WLAN_FEATURE_TSF_PLUS
 	tp_ol_timestamp_cb ol_tx_timestamp_cb;