samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Move TX 2.0 code under WLAN_PKT_CAPTURE_TX_2_0 macro

Browse Source 
Move TX 2.0 specific code under WLAN_PKT_CAPTURE_TX_2_0 macro.

Change-Id: I20bb1e49a902ec085fbc3df6828fef94a7c577d6
CRs-Fixed: 3415780
This commit is contained in:
Srinivas Girigowda
2022-12-14 17:02:55 -08:00
committed by Madan Koyyalamudi
parent f5321447c2
commit 0419d28f6e
14 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dp/wifi3.0/dp_htt.h
View File

@@ -274,7 +274,7 @@ struct htt_soc {
HTT_TX_MUTEX_TYPE htt_tx_mutex;
};
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_TX_2_0
/**
* struct dp_tx_mon_downstream_tlv_config - Enable/Disable TxMon
* downstream TLVs
@@ -596,7 +596,7 @@ struct htt_tx_ring_tlv_filter {
data_mpdu_log:1;
uint8_t enable:1;
};
#endif /* QCA_MONITOR_2_0_SUPPORT */
#endif /* WLAN_PKT_CAPTURE_TX_2_0 */
/**
* struct htt_rx_ring_tlv_filter - Rx ring TLV filter

4
dp/wifi3.0/monitor/2.0/dp_mon_2.0.h
View File

@@ -133,7 +133,7 @@ enum dp_mpdu_filter_category {
*/
struct dp_mon_filter_be {
struct dp_mon_filter rx_tlv_filter;
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_TX_2_0
struct htt_tx_ring_tlv_filter tx_tlv_filter;
#endif
bool tx_valid;
@@ -527,7 +527,7 @@ qdf_size_t dp_mon_get_context_size_be(enum dp_context_type context_type)
}
#endif
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_TX_2_0
/**
* dp_get_be_mon_soc_from_dp_mon_soc() - get dp_mon_soc_be from dp_mon_soc
* @soc: dp_mon_soc pointer

2
dp/wifi3.0/monitor/2.0/dp_tx_mon_status_2.0.c
View File

@@ -108,7 +108,7 @@ dp_tx_mon_status_free_packet_buf(struct dp_pdev *pdev,
} while ((tx_tlv - tx_tlv_start) < end_offset);
}
#if defined(WLAN_TX_PKT_CAPTURE_ENH_BE) && defined(QCA_MONITOR_2_0_SUPPORT)
#if defined(WLAN_TX_PKT_CAPTURE_ENH_BE) && defined(WLAN_PKT_CAPTURE_TX_2_0)
/**
* dp_tx_mon_status_queue_free() - API to free status buffer
* @pdev: pdev Handle

2
dp/wifi3.0/monitor/dp_mon.h
View File

@@ -535,7 +535,7 @@ bool dp_ppdu_stats_ind_handler(struct htt_soc *soc,
#endif
#if defined(QCA_ENHANCED_STATS_SUPPORT) && \
(!defined(WLAN_TX_PKT_CAPTURE_ENH) || defined(QCA_MONITOR_2_0_SUPPORT))
(!defined(WLAN_TX_PKT_CAPTURE_ENH) || defined(WLAN_PKT_CAPTURE_TX_2_0))
/**
* dp_ppdu_desc_deliver(): Function to deliver Tx PPDU status descriptor
* to upper layer

8
hal/wifi3.0/be/hal_be_api_mon.h
View File

@@ -19,7 +19,7 @@
#define _HAL_BE_API_MON_H_
#include "hal_be_hw_headers.h"
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_TX_2_0
#include <mon_ingress_ring.h>
#include <mon_destination_ring.h>
#include <mon_drop.h>
@@ -30,7 +30,7 @@
#include <hal_generic_api.h>
#include <hal_api_mon.h>
#if defined(QCA_MONITOR_2_0_SUPPORT) || \
#if defined(WLAN_PKT_CAPTURE_TX_2_0) || \
defined(QCA_SINGLE_WIFI_3_0)
#define HAL_MON_BUFFER_ADDR_INFO_0_BUFFER_ADDR_31_0_OFFSET 0x00000000
#define HAL_MON_BUFFER_ADDR_INFO_0_BUFFER_ADDR_31_0_LSB 0
@@ -707,7 +707,7 @@ struct hal_mon_buf_addr_status {
uint32_t tlv64_padding;
};
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_TX_2_0
/**
* hal_be_get_mon_dest_status() - Get monitor descriptor status
* @hal_soc: HAL Soc handle
@@ -949,7 +949,7 @@ hal_update_frame_type_cnt(hal_rx_mon_mpdu_start_t *rx_mpdu_start,
}
#endif
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_TX_2_0
/**
* hal_mon_buff_addr_info_set() - set desc address in cookie
* @hal_soc_hdl: HAL Soc handle

6
hal/wifi3.0/be/hal_be_generic_api.h
View File

@@ -32,7 +32,7 @@
*/
#define SHOW_DEFINED(x) do {} while (0)
#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)
typedef struct tx_fes_setup hal_tx_fes_setup_t;
typedef struct tx_peer_entry hal_tx_peer_entry_t;
typedef struct tx_queue_extension hal_tx_queue_ext_t;
@@ -338,7 +338,7 @@ hal_rx_fst_get_fse_size_be(void)
* TX MONITOR
*/
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_TX_2_0
/**
* hal_txmon_is_mon_buf_addr_tlv_generic_be() - api to find mon buffer tlv
* @tx_tlv_hdr: pointer to TLV header
@@ -3243,7 +3243,7 @@ hal_txmon_status_parse_tlv_generic_be(void *data_ppdu_info,
return status;
}
#endif /* QCA_MONITOR_2_0_SUPPORT */
#endif /* WLAN_PKT_CAPTURE_TX_2_0 */
#ifdef REO_SHARED_QREF_TABLE_EN
static void hal_reo_shared_qaddr_cache_clear_be(hal_soc_handle_t hal_soc_hdl)

7
hal/wifi3.0/be/hal_be_hw_headers.h
View File

@@ -1,6 +1,6 @@
/*
* Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2021-2023 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
@@ -34,7 +34,7 @@
#include "phyrx_common_user_info.h"
/* TX MONITOR */
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_TX_2_0
#include "mon_buffer_addr.h"
/* FES WINDOW OPEN */
#include "tx_fes_setup.h"
@@ -99,7 +99,6 @@
#include "coex_tx_status.h"
/* WIFIR2R_STATUS_END_E */
#include "rx_preamble.h"
#include "mactx_service.h"
#include "mactx_u_sig_eht_su_mu.h"
#include "mactx_u_sig_eht_tb.h"
#include "mactx_eht_sig_usr_ofdma.h"
@@ -139,7 +138,7 @@
#include "rx_trig_info.h"
#include "expected_response.h"
/* WIFITRIGGER_RESPONSE_TX_DONE_E */
#endif /* QCA_MONITOR_2_0_SUPPORT */
#endif /* WLAN_PKT_CAPTURE_TX_2_0 */
#include <reo_descriptor_threshold_reached_status.h>
#include <reo_flush_queue.h>

4
hal/wifi3.0/hal_api_mon.h
View File

@@ -1444,7 +1444,7 @@ hal_clear_rx_status_done(uint8_t *rx_tlv)
return QDF_STATUS_SUCCESS;
}
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_TX_2_0
/**
* struct hal_txmon_word_mask_config - hal tx monitor word mask filter setting
* @pcu_ppdu_setup_init: PCU_PPDU_SETUP TLV word mask
@@ -1477,5 +1477,5 @@ struct hal_txmon_word_mask_config {
* typedef hal_txmon_word_mask_config_t - handle for tx monitor word mask
*/
typedef struct hal_txmon_word_mask_config hal_txmon_word_mask_config_t;
#endif /* QCA_MONITOR_2_0_SUPPORT */
#endif /* WLAN_PKT_CAPTURE_TX_2_0 */
#endif

4
hal/wifi3.0/hal_internal.h
View File

@@ -1398,7 +1398,7 @@ struct hal_hw_txrx_ops {
void (*hal_txmon_populate_packet_info)(void *tx_tlv_hdr,
void *pkt_info);
/* TX MONITOR */
#ifdef QCA_MONITOR_2_0_SUPPORT
#ifdef WLAN_PKT_CAPTURE_TX_2_0
uint32_t (*hal_txmon_status_parse_tlv)(void *data_ppdu_info,
void *prot_ppdu_info,
void *data_status_info,
@@ -1408,7 +1408,7 @@ struct hal_hw_txrx_ops {
uint32_t (*hal_txmon_status_get_num_users)(void *tx_tlv_hdr,
uint8_t *num_users);
void (*hal_txmon_get_word_mask)(void *wmask);
#endif /* QCA_MONITOR_2_0_SUPPORT */
#endif /* WLAN_PKT_CAPTURE_TX_2_0 */
QDF_STATUS (*hal_reo_shared_qaddr_setup)(hal_soc_handle_t hal_soc_hdl,
struct reo_queue_ref_table
*reo_qref);

8
hal/wifi3.0/qca5332/hal_5332.c
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
@@ -1563,7 +1563,7 @@ static void hal_hw_txrx_ops_attach_qca5332(struct hal_soc *hal_soc)
hal_get_rx_max_ba_window_qca5332;
hal_soc->ops->hal_get_reo_qdesc_size = hal_qca5332_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 =
@@ -1579,7 +1579,7 @@ static void hal_hw_txrx_ops_attach_qca5332(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;
@@ -2050,7 +2050,7 @@ struct hal_hw_srng_config hw_srng_table_5332[] = {
{},
/* PPE_RELEASE */
{},
#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,

4
hal/wifi3.0/qca5332/hal_5332_tx.h
View File

@@ -252,7 +252,7 @@ hal_tx_init_cmd_credit_ring_5332(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_5332 hal_tx_fes_setup_t;
@@ -479,5 +479,5 @@ void hal_txmon_get_word_mask_qca5332(void *wmask)
word_mask->response_end_status = RESPONSE_END_STATUS_MASK;
word_mask->tx_fes_status_prot = TX_FES_STATUS_PROT_MASK;
}
#endif /* QCA_MONITOR_2_0_SUPPORT && TX_MONITOR_WORD_MASK */
#endif /* WLAN_PKT_CAPTURE_TX_2_0 && TX_MONITOR_WORD_MASK */
#endif /* _HAL_5332_TX_H_ */

6
hal/wifi3.0/qcn9224/hal_9224.h
View File

@@ -39,7 +39,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
@@ -1770,7 +1770,7 @@ static void hal_hw_txrx_ops_attach_qcn9224(struct hal_soc *hal_soc)
hal_get_rx_max_ba_window_qcn9224;
hal_soc->ops->hal_get_reo_qdesc_size = hal_qcn9224_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 =
@@ -1786,7 +1786,7 @@ static void hal_hw_txrx_ops_attach_qcn9224(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;

2
hal/wifi3.0/qcn9224/hal_9224_tx.h
View File

@@ -350,7 +350,7 @@ hal_tx_init_cmd_credit_ring_9224(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_9224 hal_tx_fes_setup_t;

2
hal/wifi3.0/qcn9224/v2/hal_9224v2.c
View File

@@ -502,7 +502,7 @@ struct hal_hw_srng_config hw_srng_table_9224v2[] = {
HWIO_WBM_R0_PPE_RELEASE_RING_BASE_MSB_RING_SIZE_BMSK >>
HWIO_WBM_R0_PPE_RELEASE_RING_BASE_MSB_RING_SIZE_SHFT,
},
#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,