qcacmn: Move TX 2.0 code under WLAN_PKT_CAPTURE_TX_2_0 macro for QCN6432

Move TX 2.0 specific code under WLAN_PKT_CAPTURE_TX_2_0 macro for QCN6432.

Change-Id: Id2d29a21c66df54b401b92e17adb396499c14cce
CRs-Fixed: 3520066
This commit is contained in:
Kannan Saravanan
2023-06-05 20:29:04 +05:30
committed by Rahul Choudhary
parent 9afe71a99a
commit 9253c14181
2 changed files with 11 additions and 7 deletions

View File

@@ -37,7 +37,7 @@
#include <uniform_reo_status_header.h>
#include <wbm_release_ring_tx.h>
#include <phyrx_location.h>
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_TX_2_0
#include <mon_ingress_ring.h>
#include <mon_destination_ring.h>
#endif
@@ -96,7 +96,9 @@
#define UNIFIED_WBM_RELEASE_RING_6_TX_RATE_STATS_INFO_TX_RATE_STATS_LSB \
WBM_RELEASE_RING_TX_TX_RATE_STATS_PPDU_TRANSMISSION_TSF_LSB
#if defined(WLAN_PKT_CAPTURE_TX_2_0) || defined(WLAN_PKT_CAPTURE_RX_2_0)
#include "hal_be_api_mon.h"
#endif
#define CMEM_REG_BASE 0x00100000
@@ -1523,8 +1525,10 @@ static void hal_hw_txrx_ops_attach_qcn6432(struct hal_soc *hal_soc)
hal_rx_link_desc_msdu0_ptr_6432;
hal_soc->ops->hal_reo_status_get_header =
hal_reo_status_get_header_6432;
#ifdef WLAN_PKT_CAPTURE_RX_2_0
hal_soc->ops->hal_rx_status_get_tlv_info =
hal_rx_status_get_tlv_info_wrapper_be;
#endif
hal_soc->ops->hal_rx_wbm_err_info_get =
hal_rx_wbm_err_info_get_generic_be;
hal_soc->ops->hal_tx_set_pcp_tid_map =
@@ -1702,7 +1706,7 @@ static void hal_hw_txrx_ops_attach_qcn6432(struct hal_soc *hal_soc)
hal_get_rx_max_ba_window_qcn6432;
hal_soc->ops->hal_get_reo_qdesc_size = hal_qcn6432_get_reo_qdesc_size;
/* TX MONITOR */
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_TX_2_0
hal_soc->ops->hal_txmon_is_mon_buf_addr_tlv =
hal_txmon_is_mon_buf_addr_tlv_generic_be;
hal_soc->ops->hal_txmon_populate_packet_info =
@@ -1718,7 +1722,7 @@ static void hal_hw_txrx_ops_attach_qcn6432(struct hal_soc *hal_soc)
hal_soc->ops->hal_txmon_get_word_mask =
hal_txmon_get_word_mask_generic_be;
#endif /* TX_MONITOR_WORD_MASK */
#endif /* QCA_MONITOR_2_0_SUPPORT */
#endif /* WLAN_PKT_CAPTURE_TX_2_0 */
hal_soc->ops->hal_compute_reo_remap_ix0 = NULL;
hal_soc->ops->hal_tx_vdev_mismatch_routing_set =
hal_tx_vdev_mismatch_routing_set_generic_be;
@@ -2095,7 +2099,7 @@ struct hal_hw_srng_config hw_srng_table_6432[] = {
.reg_size = {},
.max_size = HAL_RXDMA_MAX_RING_SIZE,
},
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_RX_2_0
{ /* RXDMA_MONITOR_BUF */
.start_ring_id = HAL_SRNG_WMAC1_SW2RXDMA2_BUF,
.max_rings = 1,
@@ -2125,7 +2129,7 @@ struct hal_hw_srng_config hw_srng_table_6432[] = {
.reg_size = {},
.max_size = HAL_RXDMA_MAX_RING_SIZE,
},
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_RX_2_0
{ /* RXDMA_MONITOR_DST */
.start_ring_id = HAL_SRNG_WMAC1_RXMON2SW0,
.max_rings = 2,
@@ -2229,7 +2233,7 @@ struct hal_hw_srng_config hw_srng_table_6432[] = {
.lmac_ring = FALSE,
.ring_dir = HAL_SRNG_SRC_RING,
},
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_TX_2_0
{ /* TX_MONITOR_BUF */
.start_ring_id = HAL_SRNG_SW2TXMON_BUF0,
.max_rings = 1,

View File

@@ -269,7 +269,7 @@ hal_tx_init_cmd_credit_ring_6432(hal_soc_handle_t hal_soc_hdl,
}
/* TX MONITOR */
#if defined(QCA_MONITOR_2_0_SUPPORT) && defined(TX_MONITOR_WORD_MASK)
#if defined(WLAN_PKT_CAPTURE_TX_2_0) && defined(TX_MONITOR_WORD_MASK)
#define TX_FES_SETUP_MASK 0x3
typedef struct tx_fes_setup_compact_6432 hal_tx_fes_setup_t;