fw-api: CL 17146895 - update fw common interface files

HTT: add rx_mon_global_en + tx_mon_global_en flags
add flags to enable rx + tx monitor mode, also fix errors in existing bitfield set macro defs

Change-Id: Ida129c372a25cfd4b7ad64dfbd0ab95f2f6bcd72
CRs-Fixed: 2262693
This commit is contained in:
spuligil
2022-02-04 18:00:56 -08:00
gecommit door Madan Koyyalamudi
bovenliggende 8aa63826c1
commit 445e2c769d

Bestand weergeven

@@ -5543,7 +5543,9 @@ enum htt_srng_ring_id {
* configuration fields are valid
* b'27 - drop_thresh_valid (DT): flag to indicate if the
* rx_drop_threshold field is valid
* b'28:31 - rsvd1: reserved for future use
* b'28 - rx_mon_global_en: Enable/Disable global register
8 configuration in Rx monitor module.
* b'29:31 - rsvd1: reserved for future use
* dword1 - b'0:15 - ring_buffer_size: size of bufferes referenced by rx ring,
* in byte units.
* Valid only for HW_TO_SW_RING and SW_TO_HW_RING
@@ -5699,7 +5701,8 @@ PREPACK struct htt_rx_ring_selection_cfg_t {
pkt_swap: 1,
rx_offsets_valid: 1,
drop_thresh_valid: 1,
rsvd1: 4;
rx_mon_global_en: 1,
rsvd1: 3;
A_UINT32 ring_buffer_size: 16,
config_length_mgmt:3,
config_length_ctrl:3,
@@ -5811,6 +5814,17 @@ PREPACK struct htt_rx_ring_selection_cfg_t {
((_var) |= ((_val) << HTT_RX_RING_SELECTION_CFG_DROP_THRESHOLD_VALID_S)); \
} while (0)
#define HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN_M 0x10000000
#define HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN_S 28
#define HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN_GET(_var) \
(((_var) & HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN_M) >> \
HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN_S)
#define HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN_SET(_var, _val) \
do { \
HTT_CHECK_SET_VAL(HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN, _val); \
((_var) |= ((_val) << HTT_RX_RING_SELECTION_CFG_RX_MON_GLOBAL_EN_S)); \
} while (0)
#define HTT_RX_RING_SELECTION_CFG_RING_BUFFER_SIZE_M 0x0000ffff
#define HTT_RX_RING_SELECTION_CFG_RING_BUFFER_SIZE_S 0
#define HTT_RX_RING_SELECTION_CFG_RING_BUFFER_SIZE_GET(_var) \
@@ -5830,7 +5844,7 @@ PREPACK struct htt_rx_ring_selection_cfg_t {
#define HTT_RX_RING_SELECTION_CFG_CONFIG_LENGTH_MGMT_SET(_var, _val) \
do { \
HTT_CHECK_SET_VAL(HTT_RX_RING_SELECTION_CFG_CONFIG_LENGTH_MGMT, _val); \
((_var) |= ((_val) << HTT_TX_MONITOR_CFG_CONFIG_LENGTH_MGMT_S)); \
((_var) |= ((_val) << HTT_RX_RING_SELECTION_CFG_CONFIG_LENGTH_MGMT_S)); \
} while (0)
#define HTT_RX_RING_SELECTION_CFG_CONFIG_LENGTH_CTRL_M 0x00380000
@@ -6701,7 +6715,9 @@ PREPACK struct htt_rx_ring_selection_cfg_t {
* b'25 - pkt_swap (PS): 1 is to swap packet TLV - refer to
* BUF_RING_CFG_0 defs within HW .h files,
* e.g. wmac_top_reg_seq_hwioreg.h
* b'26:31 - rsvd1: reserved for future use
* b'26 - tx_mon_global_en: Enable/Disable global register
* configuration in Tx monitor module.
* b'27:31 - rsvd1: reserved for future use
* dword1 - b'0:15 - ring_buffer_size: size of bufferes referenced by rx ring,
* in byte units.
* Valid only for HW_TO_SW_RING and SW_TO_HW_RING
@@ -6846,7 +6862,8 @@ PREPACK struct htt_tx_monitor_cfg_t {
ring_id: 8,
status_swap: 1,
pkt_swap: 1,
rsvd1: 6;
tx_mon_global_en: 1,
rsvd1: 5;
A_UINT32 ring_buffer_size: 16,
config_length_mgmt: 3,
config_length_ctrl: 3,
@@ -6930,6 +6947,17 @@ PREPACK struct htt_tx_monitor_cfg_t {
((_var) |= ((_val) << HTT_TX_MONITOR_CFG_PKT_SWAP_S)); \
} while (0)
#define HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN_M 0x04000000
#define HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN_S 26
#define HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN_GET(_var) \
(((_var) & HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN_M) >> \
HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN_S)
#define HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN_SET(_var, _val) \
do { \
HTT_CHECK_SET_VAL(HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN, _val); \
((_var) |= ((_val) << HTT_TX_MONITOR_CFG_TX_MON_GLOBAL_EN_S)); \
} while (0)
#define HTT_TX_MONITOR_CFG_RING_BUFFER_SIZE_M 0x0000ffff
#define HTT_TX_MONITOR_CFG_RING_BUFFER_SIZE_S 0
#define HTT_TX_MONITOR_CFG_RING_BUFFER_SIZE_GET(_var) \
@@ -7005,7 +7033,7 @@ PREPACK struct htt_tx_monitor_cfg_t {
do { \
HTT_CHECK_SET_VAL(HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_START_CTRL, _val); \
((_var) |= ((_val) << HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_START_CTRL_S)); \
} while (0
} while (0)
#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_START_DATA_M 0x00000020
#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_START_DATA_S 5
@@ -7038,7 +7066,7 @@ PREPACK struct htt_tx_monitor_cfg_t {
do { \
HTT_CHECK_SET_VAL(HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_START_CTRL, _val); \
((_var) |= ((_val) << HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_START_CTRL_S)); \
} while (0
} while (0)
#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_START_DATA_M 0x00000100
#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_START_DATA_S 8
@@ -7071,7 +7099,7 @@ PREPACK struct htt_tx_monitor_cfg_t {
do { \
HTT_CHECK_SET_VAL(HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_END_CTRL, _val); \
((_var) |= ((_val) << HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_END_CTRL_S)); \
} while (0
} while (0)
#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_END_DATA_M 0x00000800
#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MPDU_END_DATA_S 11
@@ -7104,7 +7132,7 @@ PREPACK struct htt_tx_monitor_cfg_t {
do { \
HTT_CHECK_SET_VAL(HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_END_CTRL, _val); \
((_var) |= ((_val) << HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_END_CTRL_S)); \
} while (0
} while (0)
#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_END_DATA_M 0x00004000
#define HTT_TX_MONITOR_CFG_FILTER_IN_TX_MSDU_END_DATA_S 14