qcacld-3.0: Make changes to use QDF status and type

Make changes in packet logging to send QDF status
and type instead of packet log type and status.

Change-Id: I8c1d04a78272159f7d34d6034c41d52e1e44b61d
CRs-Fixed: 3224876

core/dp/htt/htt_rx.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2020 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
@@ -377,7 +378,7 @@ int htt_rx_ipa_uc_detach(struct htt_pdev_t *pdev)
 }
 #endif /* IPA_OFFLOAD */
 
-#ifndef REMOVE_PKT_LOG
+#ifdef CONNECTIVITY_PKTLOG
 /**
  * htt_register_rx_pkt_dump_callback() - registers callback to
  *   get rx pkt status and call callback to do rx packet dump

core/dp/htt/htt_rx_ll.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-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
@@ -1483,7 +1484,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev,
 	uint8_t offload_ind, frag_ind;
 	uint8_t peer_id;
 	struct htt_host_rx_desc_base *rx_desc = NULL;
-	enum rx_pkt_fate status = RX_PKT_FATE_SUCCESS;
+	enum qdf_dp_tx_rx_status status = QDF_TX_RX_STATUS_OK;
 	qdf_dma_addr_t paddr;
 	qdf_mem_info_t mem_map_table = {0};
 	int ret = 1;
@@ -1646,7 +1647,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev,
 		if (pdev->rx_pkt_dump_cb) {
 			if (qdf_unlikely(RX_DESC_MIC_ERR_IS_SET &&
 					 !RX_DESC_DISCARD_IS_SET))
-				status = RX_PKT_FATE_FW_DROP_INVALID;
+				status = QDF_TX_RX_STATUS_FW_DISCARD;
 			pdev->rx_pkt_dump_cb(msdu, peer_id, status);
 		}
 

core/dp/ol/inc/ol_htt_api.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011, 2014-2019-2020 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
@@ -396,7 +397,7 @@ void htt_mark_first_wakeup_packet(htt_pdev_handle pdev, uint8_t value);
 
 typedef void (*tp_rx_pkt_dump_cb)(qdf_nbuf_t msdu, uint8_t peer_id,
 			uint8_t status);
-#ifdef REMOVE_PKT_LOG
+#ifndef CONNECTIVITY_PKTLOG
 static inline
 void htt_register_rx_pkt_dump_callback(struct htt_pdev_t *pdev,
 				       tp_rx_pkt_dump_cb ol_rx_pkt_dump_call)

core/dp/txrx/ol_rx.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2020 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
@@ -1706,7 +1707,7 @@ ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev,
 }
 #endif
 
-#ifndef REMOVE_PKT_LOG
+#ifdef CONNECTIVITY_PKTLOG
 /**
  * ol_rx_pkt_dump_call() - updates status and
  * calls packetdump callback to log rx packet
@@ -1751,7 +1752,7 @@ void ol_rx_pkt_dump_call(
 	if (packetdump_cb &&
 	    wlan_op_mode_sta == peer->vdev->opmode)
 		packetdump_cb(soc_hdl, OL_TXRX_PDEV_ID, peer->vdev->vdev_id,
-			      msdu, status, RX_DATA_PKT);
+			      msdu, status, QDF_RX_DATA_PKT);
 }
 #endif
 

core/dp/txrx/ol_tx_send.c

@@ -959,6 +959,53 @@ static void ol_tx_update_connectivity_stats(struct ol_tx_desc_t *tx_desc,
 	}
 }
 
+#ifdef CONNECTIVITY_PKTLOG
+static inline enum qdf_dp_tx_rx_status
+htt_qdf_status_map(enum htt_tx_status status)
+{
+	switch (status) {
+	case HTT_TX_COMPL_IND_STAT_OK:
+		return QDF_TX_RX_STATUS_OK;
+	case HTT_TX_COMPL_IND_STAT_DISCARD:
+		return RX_PKT_FATE_FW_DROP_OTHER;
+	case HTT_TX_COMPL_IND_STAT_NO_ACK:
+		return QDF_TX_RX_STATUS_NO_ACK;
+	case HTT_TX_COMPL_IND_STAT_DROP:
+		return RX_PKT_FATE_DRV_DROP_OTHER;
+	case HTT_HOST_ONLY_STATUS_CODE_START:
+		return RX_PKT_FATE_DRV_DROP_OTHER;
+	default:
+		return RX_PKT_FATE_DRV_DROP_OTHER;
+	}
+}
+
+static inline void
+ol_tx_send_pktlog(struct ol_txrx_soc_t *soc, ol_txrx_pdev_handle pdev,
+		  struct ol_tx_desc_t *tx_desc, qdf_nbuf_t netbuf,
+		  enum htt_tx_status status, enum qdf_pkt_type pkt_type)
+{
+	ol_txrx_pktdump_cb packetdump_cb;
+	enum qdf_dp_tx_rx_status tx_status;
+
+	if (tx_desc->pkt_type != OL_TX_FRM_TSO) {
+		packetdump_cb = pdev->ol_tx_packetdump_cb;
+		if (packetdump_cb) {
+			tx_status = htt_qdf_status_map(status);
+			packetdump_cb((void *)soc, pdev->id,
+				      tx_desc->vdev_id,
+				      netbuf, tx_status, pkt_type);
+		}
+	}
+}
+#else
+static inline void
+ol_tx_send_pktlog(struct ol_txrx_soc_t *soc, ol_txrx_pdev_handle pdev,
+		  struct ol_tx_desc_t *tx_desc, qdf_nbuf_t netbuf,
+		  enum htt_tx_status status, enum qdf_pkt_type pkt_type)
+{
+}
+#endif
+
 /**
  * WARNING: ol_tx_inspect_handler()'s behavior is similar to that of
  * ol_tx_completion_handler().
@@ -975,9 +1022,6 @@ 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;
-#if !defined(REMOVE_PKT_LOG)
-	ol_txrx_pktdump_cb packetdump_cb;
-#endif
 	struct ol_txrx_soc_t *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	uint32_t is_tx_desc_freed = 0;
 	struct htt_tx_compl_ind_append_tx_tstamp *txtstamp_list = NULL;
@@ -1061,15 +1105,9 @@ ol_tx_completion_handler(ol_txrx_pdev_handle pdev,
 						status);
 		ol_tx_update_ack_count(tx_desc, status);
 
-#if !defined(REMOVE_PKT_LOG)
-		if (tx_desc->pkt_type != OL_TX_FRM_TSO) {
-			packetdump_cb = pdev->ol_tx_packetdump_cb;
-			if (packetdump_cb)
-				packetdump_cb((void *)soc, pdev->id,
-					      tx_desc->vdev_id,
-					      netbuf, status, TX_DATA_PKT);
-		}
-#endif
+		ol_tx_send_pktlog(soc, pdev, tx_desc, netbuf, status,
+				  QDF_TX_DATA_PKT);
+
 		dp_status = ol_tx_comp_hw_to_qdf_status(status);
 
 		DPTRACE(qdf_dp_trace_ptr(netbuf,
@@ -1305,10 +1343,7 @@ ol_tx_single_completion_handler(ol_txrx_pdev_handle pdev,
 {
 	struct ol_tx_desc_t *tx_desc;
 	qdf_nbuf_t netbuf;
-#if !defined(REMOVE_PKT_LOG)
-	ol_txrx_pktdump_cb packetdump_cb;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
-#endif
 
 	tx_desc = ol_tx_desc_find_check(pdev, tx_desc_id);
 	if (!tx_desc) {
@@ -1323,12 +1358,7 @@ ol_tx_single_completion_handler(ol_txrx_pdev_handle pdev,
 	/* Do one shot statistics */
 	TXRX_STATS_UPDATE_TX_STATS(pdev, status, 1, qdf_nbuf_len(netbuf));
 
-#if !defined(REMOVE_PKT_LOG)
-	packetdump_cb = pdev->ol_tx_packetdump_cb;
-	if (packetdump_cb)
-		packetdump_cb(soc, pdev->id, tx_desc->vdev_id,
-			      netbuf, status, TX_MGMT_PKT);
-#endif
+	ol_tx_send_pktlog(soc, pdev, tx_desc, netbuf, status, QDF_TX_MGMT_PKT);
 
 	if (OL_TX_DESC_NO_REFS(tx_desc)) {
 		ol_tx_desc_frame_free_nonstd(pdev, tx_desc,