qcacmn: Move RX 2.0 code under WLAN_PKT_CAPTURE_RX_2_0 macro

Move RX 2.0 specific code under WLAN_PKT_CAPTURE_RX_2_0 macro.

Change-Id: Ic07bde8868850b8889941fc9054ad988617b5296
CRs-Fixed: 3415779
This commit is contained in:
Srinivas Girigowda
2022-12-14 16:45:55 -08:00
committed by Madan Koyyalamudi
parent ec3b9bdbce
commit f5321447c2
7 changed files with 10 additions and 10 deletions

View File

@@ -1524,7 +1524,7 @@ rel_da_peer:
#endif /* WLAN_MLO_MULTI_CHIP */ #endif /* WLAN_MLO_MULTI_CHIP */
#endif /* INTRA_BSS_FWD_OFFLOAD */ #endif /* INTRA_BSS_FWD_OFFLOAD */
#if defined(QCA_MONITOR_2_0_SUPPORT) || defined(CONFIG_WORD_BASED_TLV) #if defined(WLAN_PKT_CAPTURE_RX_2_0) || defined(CONFIG_WORD_BASED_TLV)
void dp_rx_word_mask_subscribe_be(struct dp_soc *soc, void dp_rx_word_mask_subscribe_be(struct dp_soc *soc,
uint32_t *msg_word, uint32_t *msg_word,
void *rx_filter) void *rx_filter)

View File

@@ -706,7 +706,7 @@ struct htt_rx_ring_tlv_filter {
u_int32_t phy_err_mask; u_int32_t phy_err_mask;
u_int32_t phy_err_mask_cont; u_int32_t phy_err_mask_cont;
#endif #endif
#if defined(QCA_MONITOR_2_0_SUPPORT) || defined(CONFIG_WORD_BASED_TLV) || \ #if defined(WLAN_PKT_CAPTURE_RX_2_0) || defined(CONFIG_WORD_BASED_TLV) || \
defined(CONFIG_MON_WORD_BASED_TLV) defined(CONFIG_MON_WORD_BASED_TLV)
uint32_t rx_mpdu_start_wmask; uint32_t rx_mpdu_start_wmask;
uint16_t rx_mpdu_end_wmask; uint16_t rx_mpdu_end_wmask;

View File

@@ -2326,7 +2326,7 @@ hal_rx_parse_receive_user_info(struct hal_soc *hal_soc, uint8_t *tlv,
return HAL_TLV_STATUS_PPDU_NOT_DONE; return HAL_TLV_STATUS_PPDU_NOT_DONE;
} }
#ifdef QCA_MONITOR_2_0_SUPPORT #ifdef WLAN_PKT_CAPTURE_RX_2_0
static inline void static inline void
hal_rx_status_get_mpdu_retry_cnt(struct hal_rx_ppdu_info *ppdu_info, hal_rx_status_get_mpdu_retry_cnt(struct hal_rx_ppdu_info *ppdu_info,
hal_rx_mon_ppdu_end_user_t *rx_ppdu_end_user) hal_rx_mon_ppdu_end_user_t *rx_ppdu_end_user)

View File

@@ -1316,7 +1316,7 @@ struct hal_rx_ppdu_info {
struct hal_rx_mon_mpdu_info mpdu_info[HAL_MAX_UL_MU_USERS]; struct hal_rx_mon_mpdu_info mpdu_info[HAL_MAX_UL_MU_USERS];
/* placeholder to hold packet buffer info */ /* placeholder to hold packet buffer info */
struct hal_mon_packet_info packet_info; struct hal_mon_packet_info packet_info;
#ifdef QCA_MONITOR_2_0_SUPPORT #ifdef WLAN_PKT_CAPTURE_RX_2_0
/* per user per MPDU queue */ /* per user per MPDU queue */
qdf_nbuf_queue_t mpdu_q[HAL_MAX_UL_MU_USERS]; qdf_nbuf_queue_t mpdu_q[HAL_MAX_UL_MU_USERS];
#endif #endif

View File

@@ -1383,7 +1383,7 @@ static void hal_hw_txrx_ops_attach_qca5332(struct hal_soc *hal_soc)
hal_rx_link_desc_msdu0_ptr_5332; hal_rx_link_desc_msdu0_ptr_5332;
hal_soc->ops->hal_reo_status_get_header = hal_soc->ops->hal_reo_status_get_header =
hal_reo_status_get_header_5332; hal_reo_status_get_header_5332;
#ifdef QCA_MONITOR_2_0_SUPPORT #ifdef WLAN_PKT_CAPTURE_RX_2_0
hal_soc->ops->hal_rx_status_get_tlv_info = hal_soc->ops->hal_rx_status_get_tlv_info =
hal_rx_status_get_tlv_info_wrapper_be; hal_rx_status_get_tlv_info_wrapper_be;
#endif #endif
@@ -1949,7 +1949,7 @@ struct hal_hw_srng_config hw_srng_table_5332[] = {
.reg_size = {}, .reg_size = {},
.max_size = HAL_RXDMA_MAX_RING_SIZE, .max_size = HAL_RXDMA_MAX_RING_SIZE,
}, },
#ifdef QCA_MONITOR_2_0_SUPPORT #ifdef WLAN_PKT_CAPTURE_RX_2_0
{ /* RXDMA_MONITOR_BUF */ { /* RXDMA_MONITOR_BUF */
.start_ring_id = HAL_SRNG_WMAC1_SW2RXDMA2_BUF, .start_ring_id = HAL_SRNG_WMAC1_SW2RXDMA2_BUF,
.max_rings = 1, .max_rings = 1,
@@ -1979,7 +1979,7 @@ struct hal_hw_srng_config hw_srng_table_5332[] = {
.reg_size = {}, .reg_size = {},
.max_size = HAL_RXDMA_MAX_RING_SIZE, .max_size = HAL_RXDMA_MAX_RING_SIZE,
}, },
#ifdef QCA_MONITOR_2_0_SUPPORT #ifdef WLAN_PKT_CAPTURE_RX_2_0
{ /* RXDMA_MONITOR_DST */ { /* RXDMA_MONITOR_DST */
.start_ring_id = HAL_SRNG_WMAC1_RXMON2SW0, .start_ring_id = HAL_SRNG_WMAC1_RXMON2SW0,
.max_rings = 2, .max_rings = 2,

View File

@@ -1588,7 +1588,7 @@ static void hal_hw_txrx_ops_attach_qcn9224(struct hal_soc *hal_soc)
hal_rx_link_desc_msdu0_ptr_9224; hal_rx_link_desc_msdu0_ptr_9224;
hal_soc->ops->hal_reo_status_get_header = hal_soc->ops->hal_reo_status_get_header =
hal_reo_status_get_header_9224; hal_reo_status_get_header_9224;
#ifdef QCA_MONITOR_2_0_SUPPORT #ifdef WLAN_PKT_CAPTURE_RX_2_0
hal_soc->ops->hal_rx_status_get_tlv_info = hal_soc->ops->hal_rx_status_get_tlv_info =
hal_rx_status_get_tlv_info_wrapper_be; hal_rx_status_get_tlv_info_wrapper_be;
#endif #endif

View File

@@ -358,7 +358,7 @@ struct hal_hw_srng_config hw_srng_table_9224v2[] = {
.reg_size = {}, .reg_size = {},
.max_size = HAL_RXDMA_MAX_RING_SIZE, .max_size = HAL_RXDMA_MAX_RING_SIZE,
}, },
#ifdef QCA_MONITOR_2_0_SUPPORT #ifdef WLAN_PKT_CAPTURE_RX_2_0
{ /* RXDMA_MONITOR_BUF */ { /* RXDMA_MONITOR_BUF */
.start_ring_id = HAL_SRNG_WMAC1_SW2RXDMA2_BUF, .start_ring_id = HAL_SRNG_WMAC1_SW2RXDMA2_BUF,
.max_rings = 1, .max_rings = 1,
@@ -388,7 +388,7 @@ struct hal_hw_srng_config hw_srng_table_9224v2[] = {
.reg_size = {}, .reg_size = {},
.max_size = HAL_RXDMA_MAX_RING_SIZE, .max_size = HAL_RXDMA_MAX_RING_SIZE,
}, },
#ifdef QCA_MONITOR_2_0_SUPPORT #ifdef WLAN_PKT_CAPTURE_RX_2_0
{ /* RXDMA_MONITOR_DST */ { /* RXDMA_MONITOR_DST */
.start_ring_id = HAL_SRNG_WMAC1_RXMON2SW0, .start_ring_id = HAL_SRNG_WMAC1_RXMON2SW0,
.max_rings = 2, .max_rings = 2,