qcacmn: Add Waikiki monitor HAL processing

Add Waikiki monitor HAL processing

CRs-Fixed: 3073467
Change-Id: I2b1768b827f34785effed6c076a099628870e2a5

dp/wifi3.0/monitor/2.0/dp_rx_mon_status_2.0.c

@@ -43,7 +43,7 @@ dp_rx_process_pktlog_be(struct dp_soc *soc, struct dp_pdev *pdev,
 	qdf_nbuf_t nbuf = NULL;
 	enum WDI_EVENT pktlog_mode = WDI_NO_VAL;
 
-	if (mon_pdev->dp_peer_based_pktlog &&
+	if (!mon_pdev->dp_peer_based_pktlog &&
 	    (mon_pdev->rx_pktlog_mode == DP_RX_PKTLOG_DISABLED)) {
 		return QDF_STATUS_E_INVAL;
 	}

hal/wifi3.0/be/hal_be_api_mon.h

@@ -18,19 +18,19 @@
 #ifndef _HAL_BE_API_MON_H_
 #define _HAL_BE_API_MON_H_
 
-#ifdef QCA_MONITOR_2_0_SUPPORT
-
-#include <mon_ingress_ring.h>
-#include <mon_destination_ring.h>
 #include "hal_be_hw_headers.h"
+#ifdef QCA_MONITOR_2_0_SUPPORT
 #include <mon_ingress_ring.h>
 #include <mon_destination_ring.h>
+#endif
 #include <hal_be_hw_headers.h>
 #include "hal_api_mon.h"
 #include <hal_generic_api.h>
 #include <hal_generic_api.h>
 #include <hal_api_mon.h>
 
+#if defined(QCA_MONITOR_2_0_SUPPORT) || \
+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
 #define HAL_MON_BUFFER_ADDR_INFO_0_BUFFER_ADDR_31_0_MASK 0xffffffff
@@ -73,11 +73,268 @@
 		((vaddr_hi) << HAL_MON_MON_INGRESS_RING_BUFFER_VIRT_ADDR_63_32_LSB) & \
 		HAL_MON_MON_INGRESS_RING_BUFFER_VIRT_ADDR_63_32_MASK)
 
-enum hal_dest_desc_end_reason {
-	HAL_TX_MON_STATUS_BUFFER_FULL = 0,
-	HAL_TX_MON_FLUSH_DETECTED,
-	HAL_TX_MON_END_OF_PPDU,
-	HAL_TX_MON_PPDU_TRUNCATED
+#define UNIFIED_RXPCU_PPDU_END_INFO_8_RX_PPDU_DURATION_OFFSET \
+	RXPCU_PPDU_END_INFO_RX_PPDU_DURATION_OFFSET
+#define UNIFIED_RXPCU_PPDU_END_INFO_8_RX_PPDU_DURATION_MASK \
+	RXPCU_PPDU_END_INFO_RX_PPDU_DURATION_MASK
+#define UNIFIED_RXPCU_PPDU_END_INFO_8_RX_PPDU_DURATION_LSB \
+	RXPCU_PPDU_END_INFO_RX_PPDU_DURATION_LSB
+#define UNIFIED_PHYRX_HT_SIG_0_HT_SIG_INFO_PHYRX_HT_SIG_INFO_DETAILS_OFFSET \
+	PHYRX_HT_SIG_PHYRX_HT_SIG_INFO_DETAILS_MCS_OFFSET
+#define UNIFIED_PHYRX_L_SIG_B_0_L_SIG_B_INFO_PHYRX_L_SIG_B_INFO_DETAILS_OFFSET \
+	PHYRX_L_SIG_B_PHYRX_L_SIG_B_INFO_DETAILS_RATE_OFFSET
+#define UNIFIED_PHYRX_L_SIG_A_0_L_SIG_A_INFO_PHYRX_L_SIG_A_INFO_DETAILS_OFFSET \
+	PHYRX_L_SIG_A_PHYRX_L_SIG_A_INFO_DETAILS_RATE_OFFSET
+#define UNIFIED_PHYRX_VHT_SIG_A_0_VHT_SIG_A_INFO_PHYRX_VHT_SIG_A_INFO_DETAILS_OFFSET \
+	PHYRX_VHT_SIG_A_PHYRX_VHT_SIG_A_INFO_DETAILS_BANDWIDTH_OFFSET
+#define UNIFIED_PHYRX_HE_SIG_A_SU_0_HE_SIG_A_SU_INFO_PHYRX_HE_SIG_A_SU_INFO_DETAILS_OFFSET \
+	PHYRX_HE_SIG_A_SU_PHYRX_HE_SIG_A_SU_INFO_DETAILS_FORMAT_INDICATION_OFFSET
+#define UNIFIED_PHYRX_HE_SIG_A_MU_DL_0_HE_SIG_A_MU_DL_INFO_PHYRX_HE_SIG_A_MU_DL_INFO_DETAILS_OFFSET \
+	PHYRX_HE_SIG_A_MU_DL_PHYRX_HE_SIG_A_MU_DL_INFO_DETAILS_DL_UL_FLAG_OFFSET
+#define UNIFIED_PHYRX_HE_SIG_B1_MU_0_HE_SIG_B1_MU_INFO_PHYRX_HE_SIG_B1_MU_INFO_DETAILS_OFFSET \
+	PHYRX_HE_SIG_B1_MU_PHYRX_HE_SIG_B1_MU_INFO_DETAILS_RU_ALLOCATION_OFFSET
+#define UNIFIED_PHYRX_HE_SIG_B2_MU_0_HE_SIG_B2_MU_INFO_PHYRX_HE_SIG_B2_MU_INFO_DETAILS_OFFSET \
+	PHYRX_HE_SIG_B2_MU_PHYRX_HE_SIG_B2_MU_INFO_DETAILS_STA_ID_OFFSET
+#define UNIFIED_PHYRX_HE_SIG_B2_OFDMA_0_HE_SIG_B2_OFDMA_INFO_PHYRX_HE_SIG_B2_OFDMA_INFO_DETAILS_OFFSET \
+	PHYRX_HE_SIG_B2_OFDMA_PHYRX_HE_SIG_B2_OFDMA_INFO_DETAILS_STA_ID_OFFSET
+#define UNIFIED_PHYRX_RSSI_LEGACY_3_RECEIVE_RSSI_INFO_PRE_RSSI_INFO_DETAILS_OFFSET \
+	PHYRX_RSSI_LEGACY_PRE_RSSI_INFO_DETAILS_RSSI_PRI20_CHAIN0_OFFSET
+#define UNIFIED_PHYRX_RSSI_LEGACY_19_RECEIVE_RSSI_INFO_PREAMBLE_RSSI_INFO_DETAILS_OFFSET \
+	PHYRX_RSSI_LEGACY_PREAMBLE_RSSI_INFO_DETAILS_RSSI_PRI20_CHAIN0_OFFSET
+#endif
+
+#ifdef CONFIG_MON_WORD_BASED_TLV
+#ifndef BIG_ENDIAN_HOST
+struct rx_mpdu_start_mon_data {
+	uint32_t rxpcu_mpdu_filter_in_category     : 2,
+		 sw_frame_group_id                 : 7,
+		 ndp_frame                         : 1,
+		 phy_err                           : 1,
+		 phy_err_during_mpdu_header        : 1,
+		 protocol_version_err              : 1,
+		 ast_based_lookup_valid            : 1,
+		 reserved_0a                       : 2,
+		 phy_ppdu_id                       : 16;
+	uint32_t ast_index                         : 16,
+		 sw_peer_id                        : 16;
+	uint32_t mpdu_frame_control_valid          : 1,
+		 mpdu_duration_valid               : 1,
+		 mac_addr_ad1_valid                : 1,
+		 mac_addr_ad2_valid                : 1,
+		 mac_addr_ad3_valid                : 1,
+		 mac_addr_ad4_valid                : 1,
+		 mpdu_sequence_control_valid       : 1,
+		 mpdu_qos_control_valid            : 1,
+		 mpdu_ht_control_valid             : 1,
+		 frame_encryption_info_valid       : 1,
+		 mpdu_fragment_number              : 4,
+		 more_fragment_flag                : 1,
+		 reserved_11a                      : 1,
+		 fr_ds                             : 1,
+		 to_ds                             : 1,
+		 encrypted                         : 1,
+		 mpdu_retry                        : 1,
+		 mpdu_sequence_number              : 12;
+	uint32_t mpdu_length                       : 14,
+		 first_mpdu                        : 1,
+		 mcast_bcast                       : 1,
+		 ast_index_not_found               : 1,
+		 ast_index_timeout                 : 1,
+		 power_mgmt                        : 1,
+		 non_qos                           : 1,
+		 null_data                         : 1,
+		 mgmt_type                         : 1,
+		 ctrl_type                         : 1,
+		 more_data                         : 1,
+		 eosp                              : 1,
+		 fragment_flag                     : 1,
+		 order                             : 1,
+		 u_apsd_trigger                    : 1,
+		 encrypt_required                  : 1,
+		 directed                          : 1,
+		 amsdu_present                     : 1,
+		 reserved_13                       : 1;
+	uint32_t mpdu_frame_control_field          : 16,
+		 mpdu_duration_field               : 16;
+	uint32_t mac_addr_ad1_31_0                 : 32;
+	uint32_t mac_addr_ad1_47_32                : 16,
+		 mac_addr_ad2_15_0                 : 16;
+};
+
+struct rx_msdu_end_mon_data {
+	uint32_t rxpcu_mpdu_filter_in_category     : 2,
+		 sw_frame_group_id                 : 7,
+		 reserved_0                        : 7,
+		 phy_ppdu_id                       : 16;
+	uint32_t tcp_udp_chksum                    : 16,
+		 sa_idx_timeout                    : 1,
+		 da_idx_timeout                    : 1,
+		 msdu_limit_error                  : 1,
+		 flow_idx_timeout                  : 1,
+		 flow_idx_invalid                  : 1,
+		 wifi_parser_error                 : 1,
+		 amsdu_parser_error                : 1,
+		 sa_is_valid                       : 1,
+		 da_is_valid                       : 1,
+		 da_is_mcbc                        : 1,
+		 l3_header_padding                 : 2,
+		 first_msdu                        : 1,
+		 last_msdu                         : 1,
+		 tcp_udp_chksum_fail               : 1,
+		 ip_chksum_fail                    : 1;
+	uint32_t msdu_drop                         : 1,
+		 reo_destination_indication        : 5,
+		 flow_idx                          : 20,
+		 reserved_12a                      : 6;
+	uint32_t fse_metadata                      : 32;
+	uint32_t cce_metadata                      : 16,
+		 sa_sw_peer_id                     : 16;
+};
+#else
+struct rx_mpdu_start_mon_data {
+	uint32_t phy_ppdu_id                       : 16;
+		 reserved_0a                       : 2,
+		 ast_based_lookup_valid            : 1,
+		 protocol_version_err              : 1,
+		 phy_err_during_mpdu_header        : 1,
+		 phy_err                           : 1,
+		 ndp_frame                         : 1,
+		 sw_frame_group_id                 : 7,
+		 rxpcu_mpdu_filter_in_category     : 2,
+	uint32_t sw_peer_id                        : 16;
+		 ast_index                         : 16,
+	uint32_t mpdu_sequence_number              : 12;
+		 mpdu_retry                        : 1,
+		 encrypted                         : 1,
+		 to_ds                             : 1,
+		 fr_ds                             : 1,
+		 reserved_11a                      : 1,
+		 more_fragment_flag                : 1,
+		 mpdu_fragment_number              : 4,
+		 frame_encryption_info_valid       : 1,
+		 mpdu_ht_control_valid             : 1,
+		 mpdu_qos_control_valid            : 1,
+		 mpdu_sequence_control_valid       : 1,
+		 mac_addr_ad4_valid                : 1,
+		 mac_addr_ad3_valid                : 1,
+		 mac_addr_ad2_valid                : 1,
+		 mac_addr_ad1_valid                : 1,
+		 mpdu_duration_valid               : 1,
+		 mpdu_frame_control_valid          : 1,
+	uint32_t reserved_13                       : 1;
+		 amsdu_present                     : 1,
+		 directed                          : 1,
+		 encrypt_required                  : 1,
+		 u_apsd_trigger                    : 1,
+		 order                             : 1,
+		 fragment_flag                     : 1,
+		 eosp                              : 1,
+		 more_data                         : 1,
+		 ctrl_type                         : 1,
+		 mgmt_type                         : 1,
+		 null_data                         : 1,
+		 non_qos                           : 1,
+		 power_mgmt                        : 1,
+		 ast_index_timeout                 : 1,
+		 ast_index_not_found               : 1,
+		 mcast_bcast                       : 1,
+		 first_mpdu                        : 1,
+		 mpdu_length                       : 14,
+	uint32_t mpdu_duration_field               : 16;
+		 mpdu_frame_control_field          : 16,
+	uint32_t mac_addr_ad1_31_0                 : 32;
+	uint32_t mac_addr_ad2_15_0                 : 16;
+		 mac_addr_ad1_47_32                : 16,
+};
+
+struct rx_msdu_end_mon_data {
+	uint32_t phy_ppdu_id                       : 16;
+		 reserved_0                        : 7,
+		 sw_frame_group_id                 : 7,
+		 rxpcu_mpdu_filter_in_category     : 2,
+	uint32_t ip_chksum_fail                    : 1;
+		 tcp_udp_chksum_fail               : 1,
+		 last_msdu                         : 1,
+		 first_msdu                        : 1,
+		 l3_header_padding                 : 2,
+		 da_is_mcbc                        : 1,
+		 da_is_valid                       : 1,
+		 sa_is_valid                       : 1,
+		 amsdu_parser_error                : 1,
+		 wifi_parser_error                 : 1,
+		 flow_idx_invalid                  : 1,
+		 flow_idx_timeout                  : 1,
+		 msdu_limit_error                  : 1,
+		 da_idx_timeout                    : 1,
+		 sa_idx_timeout                    : 1,
+		 tcp_udp_chksum                    : 16,
+	uint32_t reserved_12a                      : 6;
+		 flow_idx                          : 20,
+		 reo_destination_indication        : 5,
+		 msdu_drop                         : 1,
+	uint32_t fse_metadata                      : 32;
+	uint32_t sa_sw_peer_id                     : 16;
+		 cce_metadata                      : 16,
+};
+#endif
+
+/* TLV struct for word based Tlv */
+typedef struct rx_mpdu_start_mon_data hal_rx_mon_mpdu_start_t;
+typedef struct rx_msdu_end_mon_data hal_rx_mon_msdu_end_t;
+
+#else
+
+typedef struct rx_mpdu_start hal_rx_mon_mpdu_start_t;
+typedef struct rx_msdu_end hal_rx_mon_msdu_end_t;
+#endif
+
+#define HAL_MON_BUFFER_ADDR_31_0_GET(buff_addr_info)	\
+	(_HAL_MS((*_OFFSET_TO_WORD_PTR(buff_addr_info,	\
+		HAL_BUFFER_ADDR_INFO_BUFFER_ADDR_31_0_OFFSET)),	\
+		HAL_BUFFER_ADDR_INFO_BUFFER_ADDR_31_0_MASK,	\
+		HAL_BUFFER_ADDR_INFO_BUFFER_ADDR_31_0_LSB))
+
+#define HAL_MON_BUFFER_ADDR_39_32_GET(buff_addr_info)			\
+	(_HAL_MS((*_OFFSET_TO_WORD_PTR(buff_addr_info,			\
+		HAL_BUFFER_ADDR_INFO_BUFFER_ADDR_39_32_OFFSET)),	\
+		HAL_BUFFER_ADDR_INFO_BUFFER_ADDR_39_32_MASK,		\
+		HAL_BUFFER_ADDR_INFO_BUFFER_ADDR_39_32_LSB))
+
+/**
+ * struct hal_rx_status_buffer_done - status buffer done tlv
+ * placeholder structure
+ *
+ * @ppdu_start_offset: ppdu start
+ * @first_ppdu_start_user_info_offset:
+ * @mult_ppdu_start_user_info:
+ * @end_offset:
+ * @ppdu_end_detected:
+ * @flush_detected:
+ * @rsvd:
+ */
+struct hal_rx_status_buffer_done {
+	uint32_t ppdu_start_offset : 3,
+		 first_ppdu_start_user_info_offset : 6,
+		 mult_ppdu_start_user_info : 1,
+		 end_offset : 13,
+		 ppdu_end_detected : 1,
+		 flush_detected : 1,
+		 rsvd : 7;
+};
+
+/**
+ * hal_mon_status_end_reason : ppdu status buffer end reason
+ *
+ * @HAL_MON_STATUS_BUFFER_FULL: status buffer full
+ * @HAL_MON_FLUSH_DETECTED: flush detected
+ * @HAL_MON_END_OF_PPDU: end of ppdu detected
+ * HAL_MON_PPDU_truncated: truncated ppdu status
+ */
+enum hal_mon_status_end_reason {
+	HAL_MON_STATUS_BUFFER_FULL,
+	HAL_MON_FLUSH_DETECTED,
+	HAL_MON_END_OF_PPDU,
+	HAL_MON_PPDU_TRUNCATED,
 };
 
 /**
@@ -101,6 +358,12 @@ enum hal_dest_desc_end_reason {
  * @ring_id: ring id for debugging
  * @looping_count: count to indicate number of times producer
  *			of entries has looped around the ring
+ * @flush_detected: if flush detected
+ * @end_reason: ppdu end reason
+ * @end_of_ppdu_dropped: if end_of_ppdu is dropped
+ * @ppdu_drop_count: PPDU drop count
+ * @mpdu_drop_count: MPDU drop count
+ * @tlv_drop_count: TLV drop count
  */
 struct hal_mon_desc {
 	uint64_t buf_addr;
@@ -112,6 +375,11 @@ struct hal_mon_desc {
 		 empty_descriptor:1,
 		 ring_id:8,
 		 looping_count:4;
+	uint16_t flush_detected:1,
+		 end_of_ppdu_dropped:1;
+	uint32_t ppdu_drop_count;
+	uint32_t mpdu_drop_count;
+	uint32_t tlv_drop_count;
 };
 
 typedef struct hal_mon_desc *hal_mon_desc_t;
@@ -137,6 +405,7 @@ struct hal_mon_buf_addr_status {
 	uint32_t tlv64_padding;
 };
 
+#ifdef QCA_MONITOR_2_0_SUPPORT
 /**
  * hal_be_get_mon_dest_status() - Get monitor descriptor
  * @hal_soc_hdl: HAL Soc handle
@@ -164,7 +433,220 @@ hal_be_get_mon_dest_status(hal_soc_handle_t hal_soc,
 	status->empty_descriptor = desc->empty_descriptor;
 	status->looping_count = desc->looping_count;
 }
+#endif
+
+#if defined(RX_PPDU_END_USER_STATS_OFDMA_INFO_VALID_OFFSET) && \
+defined(RX_PPDU_END_USER_STATS_SW_RESPONSE_REFERENCE_PTR_EXT_OFFSET)
+
+static inline void
+hal_rx_handle_mu_ul_info(void *rx_tlv,
+			 struct mon_rx_user_status *mon_rx_user_status)
+{
+	mon_rx_user_status->mu_ul_user_v0_word0 =
+		HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+			      SW_RESPONSE_REFERENCE_PTR);
+
+	mon_rx_user_status->mu_ul_user_v0_word1 =
+		HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+			      SW_RESPONSE_REFERENCE_PTR_EXT);
+}
+
+static inline void
+hal_rx_populate_byte_count(void *rx_tlv, void *ppduinfo,
+			   struct mon_rx_user_status *mon_rx_user_status)
+{
+	uint32_t mpdu_ok_byte_count;
+	uint32_t mpdu_err_byte_count;
+
+	mpdu_ok_byte_count = HAL_RX_GET_64(rx_tlv,
+					   RX_PPDU_END_USER_STATS,
+					   MPDU_OK_BYTE_COUNT);
+	mpdu_err_byte_count = HAL_RX_GET_64(rx_tlv,
+					    RX_PPDU_END_USER_STATS,
+					    MPDU_ERR_BYTE_COUNT);
+
+	mon_rx_user_status->mpdu_ok_byte_count = mpdu_ok_byte_count;
+	mon_rx_user_status->mpdu_err_byte_count = mpdu_err_byte_count;
+}
+#else
+static inline void
+hal_rx_handle_mu_ul_info(void *rx_tlv,
+			 struct mon_rx_user_status *mon_rx_user_status)
+{
+}
+
+static inline void
+hal_rx_populate_byte_count(void *rx_tlv, void *ppduinfo,
+			   struct mon_rx_user_status *mon_rx_user_status)
+{
+	struct hal_rx_ppdu_info *ppdu_info =
+			(struct hal_rx_ppdu_info *)ppduinfo;
+
+	/* HKV1: doesn't support mpdu byte count */
+	mon_rx_user_status->mpdu_ok_byte_count = ppdu_info->rx_status.ppdu_len;
+	mon_rx_user_status->mpdu_err_byte_count = 0;
+}
+#endif
+
+static inline void
+hal_rx_populate_mu_user_info(void *rx_tlv, void *ppduinfo, uint32_t user_id,
+			     struct mon_rx_user_status *mon_rx_user_status)
+{
+	struct mon_rx_info *mon_rx_info;
+	struct mon_rx_user_info *mon_rx_user_info;
+	struct hal_rx_ppdu_info *ppdu_info =
+			(struct hal_rx_ppdu_info *)ppduinfo;
+
+	mon_rx_info = &ppdu_info->rx_info;
+	mon_rx_user_info = &ppdu_info->rx_user_info[user_id];
+	mon_rx_user_info->qos_control_info_valid =
+		mon_rx_info->qos_control_info_valid;
+	mon_rx_user_info->qos_control =  mon_rx_info->qos_control;
+
+	mon_rx_user_status->ast_index = ppdu_info->rx_status.ast_index;
+	mon_rx_user_status->tid = ppdu_info->rx_status.tid;
+	mon_rx_user_status->tcp_msdu_count =
+		ppdu_info->rx_status.tcp_msdu_count;
+	mon_rx_user_status->udp_msdu_count =
+		ppdu_info->rx_status.udp_msdu_count;
+	mon_rx_user_status->other_msdu_count =
+		ppdu_info->rx_status.other_msdu_count;
+	mon_rx_user_status->frame_control = ppdu_info->rx_status.frame_control;
+	mon_rx_user_status->frame_control_info_valid =
+		ppdu_info->rx_status.frame_control_info_valid;
+	mon_rx_user_status->data_sequence_control_info_valid =
+		ppdu_info->rx_status.data_sequence_control_info_valid;
+	mon_rx_user_status->first_data_seq_ctrl =
+		ppdu_info->rx_status.first_data_seq_ctrl;
+	mon_rx_user_status->preamble_type = ppdu_info->rx_status.preamble_type;
+	mon_rx_user_status->ht_flags = ppdu_info->rx_status.ht_flags;
+	mon_rx_user_status->rtap_flags = ppdu_info->rx_status.rtap_flags;
+	mon_rx_user_status->vht_flags = ppdu_info->rx_status.vht_flags;
+	mon_rx_user_status->he_flags = ppdu_info->rx_status.he_flags;
+	mon_rx_user_status->rs_flags = ppdu_info->rx_status.rs_flags;
 
+	mon_rx_user_status->mpdu_cnt_fcs_ok =
+		ppdu_info->com_info.mpdu_cnt_fcs_ok;
+	mon_rx_user_status->mpdu_cnt_fcs_err =
+		ppdu_info->com_info.mpdu_cnt_fcs_err;
+	qdf_mem_copy(&mon_rx_user_status->mpdu_fcs_ok_bitmap,
+		     &ppdu_info->com_info.mpdu_fcs_ok_bitmap,
+		     HAL_RX_NUM_WORDS_PER_PPDU_BITMAP *
+		     sizeof(ppdu_info->com_info.mpdu_fcs_ok_bitmap[0]));
+
+	hal_rx_populate_byte_count(rx_tlv, ppdu_info, mon_rx_user_status);
+}
+
+#define HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(chain, \
+					ppdu_info, rssi_info_tlv) \
+	{						\
+	ppdu_info->rx_status.rssi_chain[chain][0] = \
+			HAL_RX_GET(rssi_info_tlv, RECEIVE_RSSI_INFO,\
+				   RSSI_PRI20_CHAIN##chain); \
+	ppdu_info->rx_status.rssi_chain[chain][1] = \
+			HAL_RX_GET(rssi_info_tlv, RECEIVE_RSSI_INFO,\
+				   RSSI_EXT20_CHAIN##chain); \
+	ppdu_info->rx_status.rssi_chain[chain][2] = \
+			HAL_RX_GET(rssi_info_tlv, RECEIVE_RSSI_INFO,\
+				   RSSI_EXT40_LOW20_CHAIN##chain); \
+	ppdu_info->rx_status.rssi_chain[chain][3] = \
+			HAL_RX_GET(rssi_info_tlv, RECEIVE_RSSI_INFO,\
+				   RSSI_EXT40_HIGH20_CHAIN##chain); \
+	}						\
+
+#define HAL_RX_PPDU_UPDATE_RSSI(ppdu_info, rssi_info_tlv) \
+	{HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(0, ppdu_info, rssi_info_tlv) \
+	HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(1, ppdu_info, rssi_info_tlv) \
+	HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(2, ppdu_info, rssi_info_tlv) \
+	HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(3, ppdu_info, rssi_info_tlv) \
+	} \
+
+static inline uint32_t
+hal_rx_update_rssi_chain(struct hal_rx_ppdu_info *ppdu_info,
+			 uint8_t *rssi_info_tlv)
+{
+	HAL_RX_PPDU_UPDATE_RSSI(ppdu_info, rssi_info_tlv)
+	return 0;
+}
+
+#ifdef WLAN_TX_PKT_CAPTURE_ENH
+static inline void
+hal_get_qos_control(void *rx_tlv,
+		    struct hal_rx_ppdu_info *ppdu_info)
+{
+	ppdu_info->rx_info.qos_control_info_valid =
+		HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+			      QOS_CONTROL_INFO_VALID);
+
+	if (ppdu_info->rx_info.qos_control_info_valid)
+		ppdu_info->rx_info.qos_control =
+			HAL_RX_GET_64(rx_tlv,
+				      RX_PPDU_END_USER_STATS,
+				      QOS_CONTROL_FIELD);
+}
+
+static inline void
+hal_get_mac_addr1(hal_rx_mon_mpdu_start_t *rx_mpdu_start,
+		  struct hal_rx_ppdu_info *ppdu_info)
+{
+	if ((ppdu_info->sw_frame_group_id
+	     == HAL_MPDU_SW_FRAME_GROUP_MGMT_PROBE_REQ) ||
+	    (ppdu_info->sw_frame_group_id ==
+	     HAL_MPDU_SW_FRAME_GROUP_CTRL_RTS)) {
+		ppdu_info->rx_info.mac_addr1_valid =
+			rx_mpdu_start->rx_mpdu_info_details.mac_addr_ad1_valid;
+
+		*(uint32_t *)&ppdu_info->rx_info.mac_addr1[0] =
+			rx_mpdu_start->rx_mpdu_info_details.mac_addr_ad1_31_0;
+		if (ppdu_info->sw_frame_group_id ==
+		    HAL_MPDU_SW_FRAME_GROUP_CTRL_RTS) {
+			*(uint32_t *)&ppdu_info->rx_info.mac_addr1[4] =
+				rx_mpdu_start->rx_mpdu_info_details.mac_addr_ad1_47_32;
+		}
+	}
+}
+#else
+static inline void
+hal_get_qos_control(void *rx_tlv,
+		    struct hal_rx_ppdu_info *ppdu_info)
+{
+}
+
+static inline void
+hal_get_mac_addr1(hal_rx_mon_mpdu_start_t *rx_mpdu_start,
+		  struct hal_rx_ppdu_info *ppdu_info)
+{
+}
+#endif
+
+#ifdef QCA_SUPPORT_SCAN_SPCL_VAP_STATS
+static inline void
+hal_update_frame_type_cnt(hal_rx_mon_mpdu_start_t *rx_mpdu_start,
+			  struct hal_rx_ppdu_info *ppdu_info)
+{
+	uint16_t frame_ctrl;
+	uint8_t fc_type;
+
+	if (rx_mpdu_start->rx_mpdu_info_details.mpdu_frame_control_valid) {
+		frame_ctrl = rx_mpdu_start->rx_mpdu_info_details.mpdu_frame_control_field;
+		fc_type = HAL_RX_GET_FRAME_CTRL_TYPE(frame_ctrl);
+		if (fc_type == HAL_RX_FRAME_CTRL_TYPE_MGMT)
+			ppdu_info->frm_type_info.rx_mgmt_cnt++;
+		else if (fc_type == HAL_RX_FRAME_CTRL_TYPE_CTRL)
+			ppdu_info->frm_type_info.rx_ctrl_cnt++;
+		else if (fc_type == HAL_RX_FRAME_CTRL_TYPE_DATA)
+			ppdu_info->frm_type_info.rx_data_cnt++;
+	}
+}
+#else
+static inline void
+hal_update_frame_type_cnt(hal_rx_mon_mpdu_start_t *rx_mpdu_start,
+			  struct hal_rx_ppdu_info *ppdu_info)
+{
+}
+#endif
+
+#ifdef QCA_MONITOR_2_0_SUPPORT
 /**
  * hal_mon_buff_addr_info_set() - set desc address in cookie
  * @hal_soc_hdl: HAL Soc handle
@@ -425,5 +907,1940 @@ hal_tx_status_get_tlv_tag(void *tx_tlv_hdr)
 
 	return tlv_tag;
 }
-#endif /* QCA_MONITOR_2_0_SUPPORT */
+#endif
+
+static inline uint32_t
+hal_rx_parse_u_sig_cmn(struct hal_soc *hal_soc, void *rx_tlv,
+		       struct hal_rx_ppdu_info *ppdu_info)
+{
+	struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv;
+	struct hal_mon_usig_cmn *usig_1 = &usig->usig_1;
+	uint8_t bad_usig_crc;
+
+	bad_usig_crc = HAL_RX_MON_USIG_GET_RX_INTEGRITY_CHECK_PASSED(rx_tlv) ?
+			0 : 1;
+	ppdu_info->rx_status.usig_common |=
+			QDF_MON_STATUS_USIG_PHY_VERSION_KNOWN |
+			QDF_MON_STATUS_USIG_BW_KNOWN |
+			QDF_MON_STATUS_USIG_UL_DL_KNOWN |
+			QDF_MON_STATUS_USIG_BSS_COLOR_KNOWN |
+			QDF_MON_STATUS_USIG_TXOP_KNOWN;
+
+	ppdu_info->rx_status.usig_common |= (usig_1->phy_version <<
+				   QDF_MON_STATUS_USIG_PHY_VERSION_SHIFT);
+	ppdu_info->rx_status.usig_common |= (usig_1->bw <<
+					   QDF_MON_STATUS_USIG_BW_SHIFT);
+	ppdu_info->rx_status.usig_common |= (usig_1->ul_dl <<
+					   QDF_MON_STATUS_USIG_UL_DL_SHIFT);
+	ppdu_info->rx_status.usig_common |= (usig_1->bss_color <<
+					   QDF_MON_STATUS_USIG_BSS_COLOR_SHIFT);
+	ppdu_info->rx_status.usig_common |= (usig_1->txop <<
+					   QDF_MON_STATUS_USIG_TXOP_SHIFT);
+	ppdu_info->rx_status.usig_common |= bad_usig_crc;
+
+	ppdu_info->u_sig_info.ul_dl = usig_1->ul_dl;
+	ppdu_info->u_sig_info.bw = usig_1->bw;
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+static inline uint32_t
+hal_rx_parse_u_sig_tb(struct hal_soc *hal_soc, void *rx_tlv,
+		      struct hal_rx_ppdu_info *ppdu_info)
+{
+	struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv;
+	struct hal_mon_usig_tb *usig_tb = &usig->usig_2.tb;
+
+	ppdu_info->rx_status.usig_mask |=
+			QDF_MON_STATUS_USIG_DISREGARD_KNOWN |
+			QDF_MON_STATUS_USIG_PPDU_TYPE_N_COMP_MODE_KNOWN |
+			QDF_MON_STATUS_USIG_VALIDATE_KNOWN |
+			QDF_MON_STATUS_USIG_TB_SPATIAL_REUSE_1_KNOWN |
+			QDF_MON_STATUS_USIG_TB_SPATIAL_REUSE_2_KNOWN |
+			QDF_MON_STATUS_USIG_TB_DISREGARD1_KNOWN |
+			QDF_MON_STATUS_USIG_CRC_KNOWN |
+			QDF_MON_STATUS_USIG_TAIL_KNOWN;
+
+	ppdu_info->rx_status.usig_value |= (0x3F <<
+				QDF_MON_STATUS_USIG_DISREGARD_SHIFT);
+	ppdu_info->rx_status.usig_value |= (usig_tb->ppdu_type_comp_mode <<
+			QDF_MON_STATUS_USIG_PPDU_TYPE_N_COMP_MODE_SHIFT);
+	ppdu_info->rx_status.usig_value |= (0x1 <<
+				QDF_MON_STATUS_USIG_VALIDATE_SHIFT);
+	ppdu_info->rx_status.usig_value |= (usig_tb->spatial_reuse_1 <<
+				QDF_MON_STATUS_USIG_TB_SPATIAL_REUSE_1_SHIFT);
+	ppdu_info->rx_status.usig_value |= (usig_tb->spatial_reuse_2 <<
+				QDF_MON_STATUS_USIG_TB_SPATIAL_REUSE_2_SHIFT);
+	ppdu_info->rx_status.usig_value |= (0x1F <<
+				QDF_MON_STATUS_USIG_TB_DISREGARD1_SHIFT);
+	ppdu_info->rx_status.usig_value |= (usig_tb->crc <<
+				QDF_MON_STATUS_USIG_CRC_SHIFT);
+	ppdu_info->rx_status.usig_value |= (usig_tb->tail <<
+				QDF_MON_STATUS_USIG_TAIL_SHIFT);
+
+	ppdu_info->u_sig_info.ppdu_type_comp_mode =
+						usig_tb->ppdu_type_comp_mode;
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+static inline uint32_t
+hal_rx_parse_u_sig_mu(struct hal_soc *hal_soc, void *rx_tlv,
+		      struct hal_rx_ppdu_info *ppdu_info)
+{
+	struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv;
+	struct hal_mon_usig_mu *usig_mu = &usig->usig_2.mu;
+
+	ppdu_info->rx_status.usig_mask |=
+			QDF_MON_STATUS_USIG_DISREGARD_KNOWN |
+			QDF_MON_STATUS_USIG_PPDU_TYPE_N_COMP_MODE_KNOWN |
+			QDF_MON_STATUS_USIG_VALIDATE_KNOWN |
+			QDF_MON_STATUS_USIG_MU_VALIDATE1_SHIFT |
+			QDF_MON_STATUS_USIG_MU_PUNCTURE_CH_INFO_KNOWN |
+			QDF_MON_STATUS_USIG_MU_VALIDATE2_SHIFT |
+			QDF_MON_STATUS_USIG_MU_EHT_SIG_MCS_KNOWN |
+			QDF_MON_STATUS_USIG_MU_NUM_EHT_SIG_SYM_KNOWN |
+			QDF_MON_STATUS_USIG_CRC_KNOWN |
+			QDF_MON_STATUS_USIG_TAIL_KNOWN;
+
+	ppdu_info->rx_status.usig_value |= (0x1F <<
+				QDF_MON_STATUS_USIG_DISREGARD_SHIFT);
+	ppdu_info->rx_status.usig_value |= (0x1 <<
+				QDF_MON_STATUS_USIG_MU_VALIDATE1_SHIFT);
+	ppdu_info->rx_status.usig_value |= (usig_mu->ppdu_type_comp_mode <<
+			QDF_MON_STATUS_USIG_PPDU_TYPE_N_COMP_MODE_SHIFT);
+	ppdu_info->rx_status.usig_value |= (0x1 <<
+				QDF_MON_STATUS_USIG_VALIDATE_SHIFT);
+	ppdu_info->rx_status.usig_value |= (usig_mu->punc_ch_info <<
+				QDF_MON_STATUS_USIG_MU_PUNCTURE_CH_INFO_SHIFT);
+	ppdu_info->rx_status.usig_value |= (0x1 <<
+				QDF_MON_STATUS_USIG_MU_VALIDATE2_SHIFT);
+	ppdu_info->rx_status.usig_value |= (usig_mu->eht_sig_mcs <<
+				QDF_MON_STATUS_USIG_MU_EHT_SIG_MCS_SHIFT);
+	ppdu_info->rx_status.usig_value |= (usig_mu->num_eht_sig_sym <<
+				QDF_MON_STATUS_USIG_MU_NUM_EHT_SIG_SYM_SHIFT);
+	ppdu_info->rx_status.usig_value |= (usig_mu->crc <<
+				QDF_MON_STATUS_USIG_CRC_SHIFT);
+	ppdu_info->rx_status.usig_value |= (usig_mu->tail <<
+				QDF_MON_STATUS_USIG_TAIL_SHIFT);
+
+	ppdu_info->u_sig_info.ppdu_type_comp_mode =
+						usig_mu->ppdu_type_comp_mode;
+	ppdu_info->u_sig_info.eht_sig_mcs = usig_mu->eht_sig_mcs;
+	ppdu_info->u_sig_info.num_eht_sig_sym = usig_mu->num_eht_sig_sym;
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+static inline uint32_t
+hal_rx_parse_u_sig_hdr(struct hal_soc *hal_soc, void *rx_tlv,
+		       struct hal_rx_ppdu_info *ppdu_info)
+{
+	struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv;
+	struct hal_mon_usig_cmn *usig_1 = &usig->usig_1;
+
+	ppdu_info->rx_status.usig_flags = 1;
+
+	hal_rx_parse_u_sig_cmn(hal_soc, rx_tlv, ppdu_info);
+
+	if (HAL_RX_MON_USIG_GET_PPDU_TYPE_N_COMP_MODE(rx_tlv) == 0 &&
+	    usig_1->ul_dl == 1)
+		return hal_rx_parse_u_sig_tb(hal_soc, rx_tlv, ppdu_info);
+	else
+		return hal_rx_parse_u_sig_mu(hal_soc, rx_tlv, ppdu_info);
+}
+
+static inline uint32_t
+hal_rx_parse_usig_overflow(struct hal_soc *hal_soc, void *tlv,
+			   struct hal_rx_ppdu_info *ppdu_info)
+{
+	struct hal_eht_sig_cc_usig_overflow *usig_ovflow =
+		(struct hal_eht_sig_cc_usig_overflow *)tlv;
+
+	ppdu_info->rx_status.eht_known |=
+		QDF_MON_STATUS_EHT_SPATIAL_REUSE_KNOWN |
+		QDF_MON_STATUS_EHT_EHT_LTF_KNOWN |
+		QDF_MON_STATUS_EHT_LDPC_EXTRA_SYMBOL_SEG_KNOWN |
+		QDF_MON_STATUS_EHT_PRE_FEC_PADDING_FACTOR_KNOWN |
+		QDF_MON_STATUS_EHT_PE_DISAMBIGUITY_KNOWN |
+		QDF_MON_STATUS_EHT_DISREARD_KNOWN;
+
+	ppdu_info->rx_status.eht_data[0] |= (usig_ovflow->spatial_reuse <<
+				QDF_MON_STATUS_EHT_SPATIAL_REUSE_SHIFT);
+	/*
+	 * GI and LTF size are separately indicated in radiotap header
+	 * and hence will be parsed from other TLV
+	 **/
+	ppdu_info->rx_status.eht_data[0] |= (usig_ovflow->num_ltf_sym <<
+				QDF_MON_STATUS_EHT_EHT_LTF_SHIFT);
+	ppdu_info->rx_status.eht_data[0] |= (usig_ovflow->ldpc_extra_sym <<
+				QDF_MON_STATUS_EHT_LDPC_EXTRA_SYMBOL_SEG_SHIFT);
+	ppdu_info->rx_status.eht_data[0] |= (usig_ovflow->pre_fec_pad_factor <<
+			QDF_MON_STATUS_EHT_PRE_FEC_PADDING_FACTOR_SHIFT);
+	ppdu_info->rx_status.eht_data[0] |= (usig_ovflow->pe_disambiguity <<
+				QDF_MON_STATUS_EHT_PE_DISAMBIGUITY_SHIFT);
+	ppdu_info->rx_status.eht_data[0] |= (0xF <<
+				QDF_MON_STATUS_EHT_DISREGARD_SHIFT);
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+static inline uint32_t
+hal_rx_parse_non_ofdma_users(struct hal_soc *hal_soc, void *tlv,
+			     struct hal_rx_ppdu_info *ppdu_info)
+{
+	struct hal_eht_sig_non_ofdma_cmn_eb *non_ofdma_cmn_eb =
+				(struct hal_eht_sig_non_ofdma_cmn_eb *)tlv;
+
+	ppdu_info->rx_status.eht_known |=
+				QDF_MON_STATUS_EHT_NUM_NON_OFDMA_USERS_KNOWN;
+
+	ppdu_info->rx_status.eht_data[4] |= (non_ofdma_cmn_eb->num_users <<
+				QDF_MON_STATUS_EHT_NUM_NON_OFDMA_USERS_SHIFT);
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+static inline uint32_t
+hal_rx_parse_ru_allocation(struct hal_soc *hal_soc, void *tlv,
+			   struct hal_rx_ppdu_info *ppdu_info)
+{
+	uint64_t *ehtsig_tlv = (uint64_t *)tlv;
+	struct hal_eht_sig_ofdma_cmn_eb1 *ofdma_cmn_eb1;
+	struct hal_eht_sig_ofdma_cmn_eb2 *ofdma_cmn_eb2;
+	uint8_t num_ru_allocation_known = 0;
+
+	ofdma_cmn_eb1 = (struct hal_eht_sig_ofdma_cmn_eb1 *)ehtsig_tlv;
+	ofdma_cmn_eb2 = (struct hal_eht_sig_ofdma_cmn_eb2 *)(ehtsig_tlv + 1);
+
+	switch (ppdu_info->u_sig_info.bw) {
+	case HAL_EHT_BW_320_2:
+	case HAL_EHT_BW_320_1:
+		num_ru_allocation_known += 4;
+
+		ppdu_info->rx_status.eht_data[3] |=
+				(ofdma_cmn_eb2->ru_allocation2_6 <<
+				 QDF_MON_STATUS_EHT_RU_ALLOCATION2_6_SHIFT);
+		ppdu_info->rx_status.eht_data[3] |=
+				(ofdma_cmn_eb2->ru_allocation2_5 <<
+				 QDF_MON_STATUS_EHT_RU_ALLOCATION2_5_SHIFT);
+		ppdu_info->rx_status.eht_data[3] |=
+				(ofdma_cmn_eb2->ru_allocation2_4 <<
+				 QDF_MON_STATUS_EHT_RU_ALLOCATION2_4_SHIFT);
+		ppdu_info->rx_status.eht_data[2] |=
+				(ofdma_cmn_eb2->ru_allocation2_3 <<
+				 QDF_MON_STATUS_EHT_RU_ALLOCATION2_3_SHIFT);
+		/* fallthrough */
+	case HAL_EHT_BW_160:
+		num_ru_allocation_known += 2;
+
+		ppdu_info->rx_status.eht_data[2] |=
+				(ofdma_cmn_eb2->ru_allocation2_2 <<
+				 QDF_MON_STATUS_EHT_RU_ALLOCATION2_2_SHIFT);
+		ppdu_info->rx_status.eht_data[2] |=
+				(ofdma_cmn_eb2->ru_allocation2_1 <<
+				 QDF_MON_STATUS_EHT_RU_ALLOCATION2_1_SHIFT);
+		/* fallthrough */
+	case HAL_EHT_BW_80:
+		num_ru_allocation_known += 1;
+
+		ppdu_info->rx_status.eht_data[1] |=
+				(ofdma_cmn_eb1->ru_allocation1_2 <<
+				 QDF_MON_STATUS_EHT_RU_ALLOCATION1_2_SHIFT);
+		/* fallthrough */
+	case HAL_EHT_BW_40:
+	case HAL_EHT_BW_20:
+		num_ru_allocation_known += 1;
+
+		ppdu_info->rx_status.eht_data[1] |=
+				(ofdma_cmn_eb1->ru_allocation1_1 <<
+				 QDF_MON_STATUS_EHT_RU_ALLOCATION1_1_SHIFT);
+		break;
+	default:
+		break;
+	}
+
+	ppdu_info->rx_status.eht_known |= (num_ru_allocation_known <<
+			QDF_MON_STATUS_EHT_NUM_KNOWN_RU_ALLOCATIONS_SHIFT);
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+static inline uint32_t
+hal_rx_parse_eht_sig_mumimo_user_info(struct hal_soc *hal_soc, void *tlv,
+				      struct hal_rx_ppdu_info *ppdu_info)
+{
+	struct hal_eht_sig_mu_mimo_user_info *user_info;
+	uint32_t user_idx = ppdu_info->rx_status.num_eht_user_info_valid;
+
+	user_info = (struct hal_eht_sig_mu_mimo_user_info *)tlv;
+
+	ppdu_info->rx_status.eht_user_info[user_idx] |=
+				QDF_MON_STATUS_EHT_USER_STA_ID_KNOWN |
+				QDF_MON_STATUS_EHT_USER_MCS_KNOWN |
+				QDF_MON_STATUS_EHT_USER_CODING_KNOWN |
+				QDF_MON_STATUS_EHT_USER_SPATIAL_CONFIG_KNOWN;
+
+	ppdu_info->rx_status.eht_user_info[user_idx] |= (user_info->sta_id <<
+				QDF_MON_STATUS_EHT_USER_STA_ID_SHIFT);
+	ppdu_info->rx_status.eht_user_info[user_idx] |= (user_info->mcs <<
+				QDF_MON_STATUS_EHT_USER_MCS_SHIFT);
+
+	ppdu_info->rx_status.eht_user_info[user_idx] |= (user_info->coding <<
+					QDF_MON_STATUS_EHT_USER_CODING_SHIFT);
+	ppdu_info->rx_status.eht_user_info[user_idx] |=
+				(user_info->spatial_coding <<
+				QDF_MON_STATUS_EHT_USER_SPATIAL_CONFIG_SHIFT);
+
+	/* CRC for matched user block */
+	ppdu_info->rx_status.eht_known |=
+			QDF_MON_STATUS_EHT_USER_ENC_BLOCK_CRC_KNOWN |
+			QDF_MON_STATUS_EHT_USER_ENC_BLOCK_TAIL_KNOWN;
+	ppdu_info->rx_status.eht_data[4] |= (user_info->crc <<
+				QDF_MON_STATUS_EHT_USER_ENC_BLOCK_CRC_SHIFT);
+
+	ppdu_info->rx_status.num_eht_user_info_valid++;
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+static inline uint32_t
+hal_rx_parse_eht_sig_non_mumimo_user_info(struct hal_soc *hal_soc, void *tlv,
+					  struct hal_rx_ppdu_info *ppdu_info)
+{
+	struct hal_eht_sig_non_mu_mimo_user_info *user_info;
+	uint32_t user_idx = ppdu_info->rx_status.num_eht_user_info_valid;
+
+	user_info = (struct hal_eht_sig_non_mu_mimo_user_info *)tlv;
+
+	ppdu_info->rx_status.eht_user_info[user_idx] |=
+				QDF_MON_STATUS_EHT_USER_STA_ID_KNOWN |
+				QDF_MON_STATUS_EHT_USER_MCS_KNOWN |
+				QDF_MON_STATUS_EHT_USER_CODING_KNOWN |
+				QDF_MON_STATUS_EHT_USER_NSS_KNOWN |
+				QDF_MON_STATUS_EHT_USER_BEAMFORMING_KNOWN;
+
+	ppdu_info->rx_status.eht_user_info[user_idx] |= (user_info->sta_id <<
+				QDF_MON_STATUS_EHT_USER_STA_ID_SHIFT);
+	ppdu_info->rx_status.eht_user_info[user_idx] |= (user_info->mcs <<
+				QDF_MON_STATUS_EHT_USER_MCS_SHIFT);
+	ppdu_info->rx_status.eht_user_info[user_idx] |= (user_info->nss <<
+					QDF_MON_STATUS_EHT_USER_NSS_SHIFT);
+	ppdu_info->rx_status.eht_user_info[user_idx] |=
+				(user_info->beamformed <<
+				QDF_MON_STATUS_EHT_USER_BEAMFORMING_SHIFT);
+	ppdu_info->rx_status.eht_user_info[user_idx] |= (user_info->coding <<
+					QDF_MON_STATUS_EHT_USER_CODING_SHIFT);
+
+	/* CRC for matched user block */
+	ppdu_info->rx_status.eht_known |=
+			QDF_MON_STATUS_EHT_USER_ENC_BLOCK_CRC_KNOWN |
+			QDF_MON_STATUS_EHT_USER_ENC_BLOCK_TAIL_KNOWN;
+	ppdu_info->rx_status.eht_data[4] |= (user_info->crc <<
+				QDF_MON_STATUS_EHT_USER_ENC_BLOCK_CRC_SHIFT);
+
+	ppdu_info->rx_status.num_eht_user_info_valid++;
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+static inline bool hal_rx_is_ofdma(struct hal_soc *hal_soc,
+				   struct hal_rx_ppdu_info *ppdu_info)
+{
+	if (ppdu_info->u_sig_info.ppdu_type_comp_mode == 0 &&
+	    ppdu_info->u_sig_info.ul_dl == 0)
+		return true;
+
+	return false;
+}
+
+static inline bool hal_rx_is_non_ofdma(struct hal_soc *hal_soc,
+				       struct hal_rx_ppdu_info *ppdu_info)
+{
+	uint32_t ppdu_type_comp_mode =
+				ppdu_info->u_sig_info.ppdu_type_comp_mode;
+	uint32_t ul_dl = ppdu_info->u_sig_info.ul_dl;
+
+	if ((ppdu_type_comp_mode == 0 && ul_dl == 1) ||
+	    (ppdu_type_comp_mode == 0 && ul_dl == 2) ||
+	    (ppdu_type_comp_mode == 1 && ul_dl == 1))
+		return true;
+
+	return false;
+}
+
+static inline bool hal_rx_is_mu_mimo_user(struct hal_soc *hal_soc,
+					  struct hal_rx_ppdu_info *ppdu_info)
+{
+	if (ppdu_info->u_sig_info.ppdu_type_comp_mode == 0 &&
+	    ppdu_info->u_sig_info.ul_dl == 2)
+		return true;
+
+	return false;
+}
+
+static inline bool
+hal_rx_is_frame_type_ndp(struct hal_soc *hal_soc,
+			 struct hal_rx_ppdu_info *ppdu_info)
+{
+	if (ppdu_info->u_sig_info.ppdu_type_comp_mode == 1 &&
+	    ppdu_info->u_sig_info.eht_sig_mcs == 0 &&
+	    ppdu_info->u_sig_info.num_eht_sig_sym == 0)
+		return true;
+
+	return false;
+}
+
+static inline uint32_t
+hal_rx_parse_eht_sig_ndp(struct hal_soc *hal_soc, void *tlv,
+			 struct hal_rx_ppdu_info *ppdu_info)
+{
+	struct hal_eht_sig_ndp_cmn_eb *eht_sig_ndp =
+				(struct hal_eht_sig_ndp_cmn_eb *)tlv;
+
+	ppdu_info->rx_status.eht_known |=
+		QDF_MON_STATUS_EHT_SPATIAL_REUSE_KNOWN |
+		QDF_MON_STATUS_EHT_EHT_LTF_KNOWN |
+		QDF_MON_STATUS_EHT_NDP_NSS_KNOWN |
+		QDF_MON_STATUS_EHT_NDP_BEAMFORMED_KNOWN |
+		QDF_MON_STATUS_EHT_NDP_DISREGARD_KNOWN |
+		QDF_MON_STATUS_EHT_CRC1_KNOWN |
+		QDF_MON_STATUS_EHT_TAIL1_KNOWN;
+
+	ppdu_info->rx_status.eht_data[0] |= (eht_sig_ndp->spatial_reuse <<
+				QDF_MON_STATUS_EHT_SPATIAL_REUSE_SHIFT);
+	/*
+	 * GI and LTF size are separately indicated in radiotap header
+	 * and hence will be parsed from other TLV
+	 **/
+	ppdu_info->rx_status.eht_data[0] |= (eht_sig_ndp->num_ltf_sym <<
+				QDF_MON_STATUS_EHT_EHT_LTF_SHIFT);
+	ppdu_info->rx_status.eht_data[0] |= (0xF <<
+				QDF_MON_STATUS_EHT_NDP_DISREGARD_SHIFT);
+
+	ppdu_info->rx_status.eht_data[4] |= (eht_sig_ndp->nss <<
+				QDF_MON_STATUS_EHT_NDP_NSS_SHIFT);
+	ppdu_info->rx_status.eht_data[4] |= (eht_sig_ndp->beamformed <<
+				QDF_MON_STATUS_EHT_NDP_BEAMFORMED_SHIFT);
+
+	ppdu_info->rx_status.eht_data[0] |= (eht_sig_ndp->crc <<
+					QDF_MON_STATUS_EHT_CRC1_SHIFT);
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+static inline uint32_t
+hal_rx_parse_eht_sig_non_ofdma(struct hal_soc *hal_soc, void *tlv,
+			       struct hal_rx_ppdu_info *ppdu_info)
+{
+	hal_rx_parse_usig_overflow(hal_soc, tlv, ppdu_info);
+	hal_rx_parse_non_ofdma_users(hal_soc, tlv, ppdu_info);
+
+	if (hal_rx_is_mu_mimo_user(hal_soc, ppdu_info))
+		hal_rx_parse_eht_sig_mumimo_user_info(hal_soc, tlv,
+						      ppdu_info);
+	else
+		hal_rx_parse_eht_sig_non_mumimo_user_info(hal_soc, tlv,
+							  ppdu_info);
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+static inline uint32_t
+hal_rx_parse_eht_sig_ofdma(struct hal_soc *hal_soc, void *tlv,
+			   struct hal_rx_ppdu_info *ppdu_info)
+{
+	uint64_t *eht_sig_tlv = (uint64_t *)tlv;
+	void *user_info = (void *)(eht_sig_tlv + 2);
+
+	hal_rx_parse_usig_overflow(hal_soc, tlv, ppdu_info);
+	hal_rx_parse_ru_allocation(hal_soc, tlv, ppdu_info);
+	hal_rx_parse_eht_sig_non_mumimo_user_info(hal_soc, user_info,
+						  ppdu_info);
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+static inline uint32_t
+hal_rx_parse_eht_sig_hdr(struct hal_soc *hal_soc, uint8_t *tlv,
+			 struct hal_rx_ppdu_info *ppdu_info)
+{
+	ppdu_info->rx_status.eht_flags = 1;
+
+	if (hal_rx_is_frame_type_ndp(hal_soc, ppdu_info))
+		hal_rx_parse_eht_sig_ndp(hal_soc, tlv, ppdu_info);
+	else if (hal_rx_is_non_ofdma(hal_soc, ppdu_info))
+		hal_rx_parse_eht_sig_non_ofdma(hal_soc, tlv, ppdu_info);
+	else if (hal_rx_is_ofdma(hal_soc, ppdu_info))
+		hal_rx_parse_eht_sig_ofdma(hal_soc, tlv, ppdu_info);
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+#ifdef WLAN_RX_MON_PARSE_CMN_USER_INFO
+static inline uint32_t
+hal_rx_parse_cmn_usr_info(struct hal_soc *hal_soc, uint8_t *tlv,
+			  struct hal_rx_ppdu_info *ppdu_info)
+{
+	struct phyrx_common_user_info *cmn_usr_info =
+				(struct phyrx_common_user_info *)tlv;
+
+	ppdu_info->rx_status.eht_known |=
+				QDF_MON_STATUS_EHT_GUARD_INTERVAL_KNOWN |
+				QDF_MON_STATUS_EHT_LTF_KNOWN;
+
+	ppdu_info->rx_status.eht_data[0] |= (cmn_usr_info->cp_setting <<
+					     QDF_MON_STATUS_EHT_GI_SHIFT);
+	ppdu_info->rx_status.eht_data[0] |= (cmn_usr_info->ltf_size <<
+					     QDF_MON_STATUS_EHT_LTF_SHIFT);
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+#else
+static inline uint32_t
+hal_rx_parse_cmn_usr_info(struct hal_soc *hal_soc, uint8_t *tlv,
+			  struct hal_rx_ppdu_info *ppdu_info)
+{
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+#endif
+
+static inline enum ieee80211_eht_ru_size
+hal_rx_mon_hal_ru_size_to_ieee80211_ru_size(struct hal_soc *hal_soc,
+					    uint32_t hal_ru_size)
+{
+	switch (hal_ru_size) {
+	case HAL_EHT_RU_26:
+		return IEEE80211_EHT_RU_26;
+	case HAL_EHT_RU_52:
+		return IEEE80211_EHT_RU_52;
+	case HAL_EHT_RU_78:
+		return IEEE80211_EHT_RU_52_26;
+	case HAL_EHT_RU_106:
+		return IEEE80211_EHT_RU_106;
+	case HAL_EHT_RU_132:
+		return IEEE80211_EHT_RU_106_26;
+	case HAL_EHT_RU_242:
+		return IEEE80211_EHT_RU_242;
+	case HAL_EHT_RU_484:
+		return IEEE80211_EHT_RU_484;
+	case HAL_EHT_RU_726:
+		return IEEE80211_EHT_RU_484_242;
+	case HAL_EHT_RU_996:
+		return IEEE80211_EHT_RU_996;
+	case HAL_EHT_RU_996x2:
+		return IEEE80211_EHT_RU_996x2;
+	case HAL_EHT_RU_996x3:
+		return IEEE80211_EHT_RU_996x3;
+	case HAL_EHT_RU_996x4:
+		return IEEE80211_EHT_RU_996x4;
+	case HAL_EHT_RU_NONE:
+		return IEEE80211_EHT_RU_INVALID;
+	case HAL_EHT_RU_996_484:
+		return IEEE80211_EHT_RU_996_484;
+	case HAL_EHT_RU_996x2_484:
+		return IEEE80211_EHT_RU_996x2_484;
+	case HAL_EHT_RU_996x3_484:
+		return IEEE80211_EHT_RU_996x3_484;
+	case HAL_EHT_RU_996_484_242:
+		return IEEE80211_EHT_RU_996_484_242;
+	default:
+		return IEEE80211_EHT_RU_INVALID;
+	}
+}
+
+#define HAL_SET_RU_PER80(ru_320mhz, ru_per80, ru_idx_per80mhz, num_80mhz) \
+	((ru_320mhz) |= ((uint64_t)(ru_per80) << \
+		       (((num_80mhz) * NUM_RU_BITS_PER80) + \
+			((ru_idx_per80mhz) * NUM_RU_BITS_PER20))))
+
+static inline uint32_t
+hal_rx_parse_receive_user_info(struct hal_soc *hal_soc, uint8_t *tlv,
+			       struct hal_rx_ppdu_info *ppdu_info)
+{
+	struct receive_user_info *rx_usr_info = (struct receive_user_info *)tlv;
+	uint64_t ru_index_320mhz = 0;
+	uint16_t ru_index_per80mhz;
+	uint32_t ru_size = 0, num_80mhz_with_ru = 0;
+	uint32_t ru_index = HAL_EHT_RU_INVALID;
+	uint32_t rtap_ru_size = IEEE80211_EHT_RU_INVALID;
+
+	ppdu_info->rx_status.eht_known |=
+				QDF_MON_STATUS_EHT_CONTENT_CH_INDEX_KNOWN;
+	ppdu_info->rx_status.eht_data[0] |=
+				(rx_usr_info->dl_ofdma_content_channel <<
+				 QDF_MON_STATUS_EHT_CONTENT_CH_INDEX_SHIFT);
+
+	if (!(rx_usr_info->reception_type == HAL_RX_TYPE_MU_MIMO ||
+	      rx_usr_info->reception_type == HAL_RX_TYPE_MU_OFDMA ||
+	      rx_usr_info->reception_type == HAL_RX_TYPE_MU_OFMDA_MIMO))
+		return HAL_TLV_STATUS_PPDU_NOT_DONE;
+
+	/* RU allocation present only for OFDMA reception */
+	if (rx_usr_info->ru_type_80_0 != HAL_EHT_RU_NONE) {
+		ru_size += rx_usr_info->ru_type_80_0;
+		ru_index = ru_index_per80mhz = rx_usr_info->ru_start_index_80_0;
+		HAL_SET_RU_PER80(ru_index_320mhz, rx_usr_info->ru_type_80_0,
+				 ru_index_per80mhz, 0);
+		num_80mhz_with_ru++;
+	}
+
+	if (rx_usr_info->ru_type_80_1 != HAL_EHT_RU_NONE) {
+		ru_size += rx_usr_info->ru_type_80_1;
+		ru_index = ru_index_per80mhz = rx_usr_info->ru_start_index_80_1;
+		HAL_SET_RU_PER80(ru_index_320mhz, rx_usr_info->ru_type_80_1,
+				 ru_index_per80mhz, 1);
+		num_80mhz_with_ru++;
+	}
+
+	if (rx_usr_info->ru_type_80_2 != HAL_EHT_RU_NONE) {
+		ru_size += rx_usr_info->ru_type_80_2;
+		ru_index = ru_index_per80mhz = rx_usr_info->ru_start_index_80_2;
+		HAL_SET_RU_PER80(ru_index_320mhz, rx_usr_info->ru_type_80_2,
+				 ru_index_per80mhz, 2);
+		num_80mhz_with_ru++;
+	}
+
+	if (rx_usr_info->ru_type_80_3 != HAL_EHT_RU_NONE) {
+		ru_size += rx_usr_info->ru_type_80_3;
+		ru_index = ru_index_per80mhz = rx_usr_info->ru_start_index_80_3;
+		HAL_SET_RU_PER80(ru_index_320mhz, rx_usr_info->ru_type_80_3,
+				 ru_index_per80mhz, 3);
+		num_80mhz_with_ru++;
+	}
+
+	if (num_80mhz_with_ru > 1) {
+		/* Calculate the MRU index */
+		switch (ru_index_320mhz) {
+		case HAL_EHT_RU_996_484_0:
+		case HAL_EHT_RU_996x2_484_0:
+		case HAL_EHT_RU_996x3_484_0:
+			ru_index = 0;
+			break;
+		case HAL_EHT_RU_996_484_1:
+		case HAL_EHT_RU_996x2_484_1:
+		case HAL_EHT_RU_996x3_484_1:
+			ru_index = 1;
+			break;
+		case HAL_EHT_RU_996_484_2:
+		case HAL_EHT_RU_996x2_484_2:
+		case HAL_EHT_RU_996x3_484_2:
+			ru_index = 2;
+			break;
+		case HAL_EHT_RU_996_484_3:
+		case HAL_EHT_RU_996x2_484_3:
+		case HAL_EHT_RU_996x3_484_3:
+			ru_index = 3;
+			break;
+		case HAL_EHT_RU_996_484_4:
+		case HAL_EHT_RU_996x2_484_4:
+		case HAL_EHT_RU_996x3_484_4:
+			ru_index = 4;
+			break;
+		case HAL_EHT_RU_996_484_5:
+		case HAL_EHT_RU_996x2_484_5:
+		case HAL_EHT_RU_996x3_484_5:
+			ru_index = 5;
+			break;
+		case HAL_EHT_RU_996_484_6:
+		case HAL_EHT_RU_996x2_484_6:
+		case HAL_EHT_RU_996x3_484_6:
+			ru_index = 6;
+			break;
+		case HAL_EHT_RU_996_484_7:
+		case HAL_EHT_RU_996x2_484_7:
+		case HAL_EHT_RU_996x3_484_7:
+			ru_index = 7;
+			break;
+		case HAL_EHT_RU_996x2_484_8:
+			ru_index = 8;
+			break;
+		case HAL_EHT_RU_996x2_484_9:
+			ru_index = 9;
+			break;
+		case HAL_EHT_RU_996x2_484_10:
+			ru_index = 10;
+			break;
+		case HAL_EHT_RU_996x2_484_11:
+			ru_index = 11;
+			break;
+		default:
+			ru_index = HAL_EHT_RU_INVALID;
+			dp_debug("Invalid RU index");
+			qdf_assert(0);
+			break;
+		}
+		ru_size += 4;
+	}
+
+	rtap_ru_size = hal_rx_mon_hal_ru_size_to_ieee80211_ru_size(hal_soc,
+								   ru_size);
+	if (rtap_ru_size != IEEE80211_EHT_RU_INVALID) {
+		ppdu_info->rx_status.eht_known |=
+					QDF_MON_STATUS_EHT_RU_MRU_SIZE_KNOWN;
+		ppdu_info->rx_status.eht_data[1] |= (rtap_ru_size <<
+					QDF_MON_STATUS_EHT_RU_MRU_SIZE_SHIFT);
+	}
+
+	if (ru_index != HAL_EHT_RU_INVALID) {
+		ppdu_info->rx_status.eht_known |=
+					QDF_MON_STATUS_EHT_RU_MRU_INDEX_KNOWN;
+		ppdu_info->rx_status.eht_data[1] |= (ru_index <<
+					QDF_MON_STATUS_EHT_RU_MRU_INDEX_SHIFT);
+	}
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+/**
+ * hal_rx_status_get_tlv_info() - process receive info TLV
+ * @rx_tlv_hdr: pointer to TLV header
+ * @ppdu_info: pointer to ppdu_info
+ *
+ * Return: HAL_TLV_STATUS_PPDU_NOT_DONE or HAL_TLV_STATUS_PPDU_DONE from tlv
+ */
+static inline uint32_t
+hal_rx_status_get_tlv_info_generic_be(void *rx_tlv_hdr, void *ppduinfo,
+				      hal_soc_handle_t hal_soc_hdl,
+				      qdf_nbuf_t nbuf)
+{
+	struct hal_soc *hal = (struct hal_soc *)hal_soc_hdl;
+	uint32_t tlv_tag, user_id, tlv_len, value;
+	uint8_t group_id = 0;
+	uint8_t he_dcm = 0;
+	uint8_t he_stbc = 0;
+	uint16_t he_gi = 0;
+	uint16_t he_ltf = 0;
+	void *rx_tlv;
+	struct mon_rx_user_status *mon_rx_user_status;
+	struct hal_rx_ppdu_info *ppdu_info =
+			(struct hal_rx_ppdu_info *)ppduinfo;
+
+	tlv_tag = HAL_RX_GET_USER_TLV64_TYPE(rx_tlv_hdr);
+	user_id = HAL_RX_GET_USER_TLV64_USERID(rx_tlv_hdr);
+	tlv_len = HAL_RX_GET_USER_TLV64_LEN(rx_tlv_hdr);
+
+	rx_tlv = (uint8_t *)rx_tlv_hdr + HAL_RX_TLV64_HDR_SIZE;
+
+	qdf_trace_hex_dump(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
+			   rx_tlv, tlv_len);
+
+	switch (tlv_tag) {
+	case WIFIRX_PPDU_START_E:
+	{
+		if (qdf_unlikely(ppdu_info->com_info.last_ppdu_id ==
+		    HAL_RX_GET_64(rx_tlv, RX_PPDU_START, PHY_PPDU_ID)))
+			hal_err("Matching ppdu_id(%u) detected",
+				ppdu_info->com_info.last_ppdu_id);
+
+		/* Reset ppdu_info before processing the ppdu */
+		qdf_mem_zero(ppdu_info,
+			     sizeof(struct hal_rx_ppdu_info));
+
+		ppdu_info->com_info.last_ppdu_id =
+			ppdu_info->com_info.ppdu_id =
+				HAL_RX_GET_64(rx_tlv, RX_PPDU_START,
+					      PHY_PPDU_ID);
+
+		/* channel number is set in PHY meta data */
+		ppdu_info->rx_status.chan_num =
+			(HAL_RX_GET_64(rx_tlv, RX_PPDU_START,
+				       SW_PHY_META_DATA) & 0x0000FFFF);
+		ppdu_info->rx_status.chan_freq =
+			(HAL_RX_GET_64(rx_tlv, RX_PPDU_START,
+				       SW_PHY_META_DATA) & 0xFFFF0000) >> 16;
+		if (ppdu_info->rx_status.chan_num &&
+		    ppdu_info->rx_status.chan_freq) {
+			ppdu_info->rx_status.chan_freq =
+				hal_rx_radiotap_num_to_freq(
+				ppdu_info->rx_status.chan_num,
+				ppdu_info->rx_status.chan_freq);
+		}
+
+		ppdu_info->com_info.ppdu_timestamp =
+			HAL_RX_GET_64(rx_tlv, RX_PPDU_START,
+				      PPDU_START_TIMESTAMP_31_0);
+		ppdu_info->rx_status.ppdu_timestamp =
+			ppdu_info->com_info.ppdu_timestamp;
+		ppdu_info->rx_state = HAL_RX_MON_PPDU_START;
+
+		break;
+	}
+
+	case WIFIRX_PPDU_START_USER_INFO_E:
+		hal_rx_parse_receive_user_info(hal, rx_tlv, ppdu_info);
+		break;
+
+	case WIFIRX_PPDU_END_E:
+		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
+			  "[%s][%d] ppdu_end_e len=%d",
+			  __func__, __LINE__, tlv_len);
+		/* This is followed by sub-TLVs of PPDU_END */
+		ppdu_info->rx_state = HAL_RX_MON_PPDU_END;
+		break;
+
+	case WIFIPHYRX_LOCATION_E:
+		hal_rx_get_rtt_info(hal_soc_hdl, rx_tlv, ppdu_info);
+		break;
+
+	case WIFIRXPCU_PPDU_END_INFO_E:
+		ppdu_info->rx_status.rx_antenna =
+			HAL_RX_GET_64(rx_tlv, RXPCU_PPDU_END_INFO, RX_ANTENNA);
+		ppdu_info->rx_status.tsft =
+			HAL_RX_GET_64(rx_tlv, RXPCU_PPDU_END_INFO,
+				      WB_TIMESTAMP_UPPER_32);
+		ppdu_info->rx_status.tsft = (ppdu_info->rx_status.tsft << 32) |
+			HAL_RX_GET_64(rx_tlv, RXPCU_PPDU_END_INFO,
+				      WB_TIMESTAMP_LOWER_32);
+		ppdu_info->rx_status.duration =
+			HAL_RX_GET_64(rx_tlv, UNIFIED_RXPCU_PPDU_END_INFO_8,
+				      RX_PPDU_DURATION);
+		hal_rx_get_bb_info(hal_soc_hdl, rx_tlv, ppdu_info);
+		break;
+
+	/*
+	 * WIFIRX_PPDU_END_USER_STATS_E comes for each user received.
+	 * for MU, based on num users we see this tlv that many times.
+	 */
+	case WIFIRX_PPDU_END_USER_STATS_E:
+	{
+		unsigned long tid = 0;
+		uint16_t seq = 0;
+
+		ppdu_info->rx_status.ast_index =
+				HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+					      AST_INDEX);
+
+		tid = HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+				    RECEIVED_QOS_DATA_TID_BITMAP);
+		ppdu_info->rx_status.tid = qdf_find_first_bit(&tid,
+							      sizeof(tid) * 8);
+
+		if (ppdu_info->rx_status.tid == (sizeof(tid) * 8))
+			ppdu_info->rx_status.tid = HAL_TID_INVALID;
+
+		ppdu_info->rx_status.tcp_msdu_count =
+			HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+				      TCP_MSDU_COUNT) +
+			HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+				      TCP_ACK_MSDU_COUNT);
+		ppdu_info->rx_status.udp_msdu_count =
+			HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+				      UDP_MSDU_COUNT);
+		ppdu_info->rx_status.other_msdu_count =
+			HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+				      OTHER_MSDU_COUNT);
+
+		if (ppdu_info->sw_frame_group_id
+		    != HAL_MPDU_SW_FRAME_GROUP_NULL_DATA) {
+			ppdu_info->rx_status.frame_control_info_valid =
+				HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+					      FRAME_CONTROL_INFO_VALID);
+
+			if (ppdu_info->rx_status.frame_control_info_valid)
+				ppdu_info->rx_status.frame_control =
+					HAL_RX_GET_64(rx_tlv,
+						      RX_PPDU_END_USER_STATS,
+						      FRAME_CONTROL_FIELD);
+
+			hal_get_qos_control(rx_tlv, ppdu_info);
+		}
+
+		ppdu_info->rx_status.data_sequence_control_info_valid =
+			HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+				      DATA_SEQUENCE_CONTROL_INFO_VALID);
+
+		seq = HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+				    FIRST_DATA_SEQ_CTRL);
+		if (ppdu_info->rx_status.data_sequence_control_info_valid)
+			ppdu_info->rx_status.first_data_seq_ctrl = seq;
+
+		ppdu_info->rx_status.preamble_type =
+			HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+				      HT_CONTROL_FIELD_PKT_TYPE);
+		switch (ppdu_info->rx_status.preamble_type) {
+		case HAL_RX_PKT_TYPE_11N:
+			ppdu_info->rx_status.ht_flags = 1;
+			ppdu_info->rx_status.rtap_flags |= HT_SGI_PRESENT;
+			break;
+		case HAL_RX_PKT_TYPE_11AC:
+			ppdu_info->rx_status.vht_flags = 1;
+			break;
+		case HAL_RX_PKT_TYPE_11AX:
+			ppdu_info->rx_status.he_flags = 1;
+			break;
+		default:
+			break;
+		}
+
+		ppdu_info->com_info.mpdu_cnt_fcs_ok =
+			HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+				      MPDU_CNT_FCS_OK);
+		ppdu_info->com_info.mpdu_cnt_fcs_err =
+			HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+				      MPDU_CNT_FCS_ERR);
+		if ((ppdu_info->com_info.mpdu_cnt_fcs_ok |
+			ppdu_info->com_info.mpdu_cnt_fcs_err) > 1)
+			ppdu_info->rx_status.rs_flags |= IEEE80211_AMPDU_FLAG;
+		else
+			ppdu_info->rx_status.rs_flags &=
+				(~IEEE80211_AMPDU_FLAG);
+
+		ppdu_info->com_info.mpdu_fcs_ok_bitmap[0] =
+				HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+					      FCS_OK_BITMAP_31_0);
+
+		ppdu_info->com_info.mpdu_fcs_ok_bitmap[1] =
+				HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS,
+					      FCS_OK_BITMAP_63_32);
+
+		if (user_id < HAL_MAX_UL_MU_USERS) {
+			mon_rx_user_status =
+				&ppdu_info->rx_user_status[user_id];
+
+			hal_rx_handle_mu_ul_info(rx_tlv, mon_rx_user_status);
+
+			ppdu_info->com_info.num_users++;
+
+			hal_rx_populate_mu_user_info(rx_tlv, ppdu_info,
+						     user_id,
+						     mon_rx_user_status);
+		}
+		break;
+	}
+
+	case WIFIRX_PPDU_END_USER_STATS_EXT_E:
+		ppdu_info->com_info.mpdu_fcs_ok_bitmap[2] =
+			HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS_EXT,
+				      FCS_OK_BITMAP_95_64);
+
+		ppdu_info->com_info.mpdu_fcs_ok_bitmap[3] =
+			 HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS_EXT,
+				       FCS_OK_BITMAP_127_96);
+
+		ppdu_info->com_info.mpdu_fcs_ok_bitmap[4] =
+			HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS_EXT,
+				      FCS_OK_BITMAP_159_128);
+
+		ppdu_info->com_info.mpdu_fcs_ok_bitmap[5] =
+			 HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS_EXT,
+				       FCS_OK_BITMAP_191_160);
+
+		ppdu_info->com_info.mpdu_fcs_ok_bitmap[6] =
+			HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS_EXT,
+				      FCS_OK_BITMAP_223_192);
+
+		ppdu_info->com_info.mpdu_fcs_ok_bitmap[7] =
+			 HAL_RX_GET_64(rx_tlv, RX_PPDU_END_USER_STATS_EXT,
+				       FCS_OK_BITMAP_255_224);
+		break;
+
+	case WIFIRX_PPDU_END_STATUS_DONE_E:
+		return HAL_TLV_STATUS_PPDU_DONE;
+
+	case WIFIPHYRX_PKT_END_E:
+		break;
+
+	case WIFIDUMMY_E:
+		return HAL_TLV_STATUS_BUF_DONE;
+
+	case WIFIPHYRX_HT_SIG_E:
+	{
+		uint8_t *ht_sig_info = (uint8_t *)rx_tlv +
+				HAL_RX_OFFSET(UNIFIED_PHYRX_HT_SIG_0,
+					      HT_SIG_INFO_PHYRX_HT_SIG_INFO_DETAILS);
+		value = HAL_RX_GET(ht_sig_info, HT_SIG_INFO, FEC_CODING);
+		ppdu_info->rx_status.ldpc = (value == HAL_SU_MU_CODING_LDPC) ?
+			1 : 0;
+		ppdu_info->rx_status.mcs = HAL_RX_GET(ht_sig_info,
+						      HT_SIG_INFO, MCS);
+		ppdu_info->rx_status.ht_mcs = ppdu_info->rx_status.mcs;
+		ppdu_info->rx_status.bw = HAL_RX_GET(ht_sig_info,
+						     HT_SIG_INFO, CBW);
+		ppdu_info->rx_status.sgi = HAL_RX_GET(ht_sig_info,
+						      HT_SIG_INFO, SHORT_GI);
+		ppdu_info->rx_status.reception_type = HAL_RX_TYPE_SU;
+		ppdu_info->rx_status.nss = ((ppdu_info->rx_status.mcs) >>
+				HT_SIG_SU_NSS_SHIFT) + 1;
+		ppdu_info->rx_status.mcs &= ((1 << HT_SIG_SU_NSS_SHIFT) - 1);
+		break;
+	}
+
+	case WIFIPHYRX_L_SIG_B_E:
+	{
+		uint8_t *l_sig_b_info = (uint8_t *)rx_tlv +
+				HAL_RX_OFFSET(UNIFIED_PHYRX_L_SIG_B_0,
+					      L_SIG_B_INFO_PHYRX_L_SIG_B_INFO_DETAILS);
+
+		value = HAL_RX_GET(l_sig_b_info, L_SIG_B_INFO, RATE);
+		ppdu_info->rx_status.l_sig_b_info = *((uint32_t *)l_sig_b_info);
+		switch (value) {
+		case 1:
+			ppdu_info->rx_status.rate = HAL_11B_RATE_3MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS3;
+			break;
+		case 2:
+			ppdu_info->rx_status.rate = HAL_11B_RATE_2MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS2;
+			break;
+		case 3:
+			ppdu_info->rx_status.rate = HAL_11B_RATE_1MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS1;
+			break;
+		case 4:
+			ppdu_info->rx_status.rate = HAL_11B_RATE_0MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS0;
+			break;
+		case 5:
+			ppdu_info->rx_status.rate = HAL_11B_RATE_6MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS6;
+			break;
+		case 6:
+			ppdu_info->rx_status.rate = HAL_11B_RATE_5MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS5;
+			break;
+		case 7:
+			ppdu_info->rx_status.rate = HAL_11B_RATE_4MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS4;
+			break;
+		default:
+			break;
+		}
+		ppdu_info->rx_status.cck_flag = 1;
+		ppdu_info->rx_status.reception_type = HAL_RX_TYPE_SU;
+	break;
+	}
+
+	case WIFIPHYRX_L_SIG_A_E:
+	{
+		uint8_t *l_sig_a_info = (uint8_t *)rx_tlv +
+				HAL_RX_OFFSET(UNIFIED_PHYRX_L_SIG_A_0,
+					      L_SIG_A_INFO_PHYRX_L_SIG_A_INFO_DETAILS);
+
+		value = HAL_RX_GET(l_sig_a_info, L_SIG_A_INFO, RATE);
+		ppdu_info->rx_status.l_sig_a_info = *((uint32_t *)l_sig_a_info);
+		switch (value) {
+		case 8:
+			ppdu_info->rx_status.rate = HAL_11A_RATE_0MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS0;
+			break;
+		case 9:
+			ppdu_info->rx_status.rate = HAL_11A_RATE_1MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS1;
+			break;
+		case 10:
+			ppdu_info->rx_status.rate = HAL_11A_RATE_2MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS2;
+			break;
+		case 11:
+			ppdu_info->rx_status.rate = HAL_11A_RATE_3MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS3;
+			break;
+		case 12:
+			ppdu_info->rx_status.rate = HAL_11A_RATE_4MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS4;
+			break;
+		case 13:
+			ppdu_info->rx_status.rate = HAL_11A_RATE_5MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS5;
+			break;
+		case 14:
+			ppdu_info->rx_status.rate = HAL_11A_RATE_6MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS6;
+			break;
+		case 15:
+			ppdu_info->rx_status.rate = HAL_11A_RATE_7MCS;
+			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS7;
+			break;
+		default:
+			break;
+		}
+		ppdu_info->rx_status.ofdm_flag = 1;
+		ppdu_info->rx_status.reception_type = HAL_RX_TYPE_SU;
+	break;
+	}
+
+	case WIFIPHYRX_VHT_SIG_A_E:
+	{
+		uint8_t *vht_sig_a_info = (uint8_t *)rx_tlv +
+				HAL_RX_OFFSET(UNIFIED_PHYRX_VHT_SIG_A_0,
+					      VHT_SIG_A_INFO_PHYRX_VHT_SIG_A_INFO_DETAILS);
+
+		value = HAL_RX_GET(vht_sig_a_info, VHT_SIG_A_INFO,
+				   SU_MU_CODING);
+		ppdu_info->rx_status.ldpc = (value == HAL_SU_MU_CODING_LDPC) ?
+			1 : 0;
+		group_id = HAL_RX_GET(vht_sig_a_info, VHT_SIG_A_INFO, GROUP_ID);
+		ppdu_info->rx_status.vht_flag_values5 = group_id;
+		ppdu_info->rx_status.mcs = HAL_RX_GET(vht_sig_a_info,
+						      VHT_SIG_A_INFO, MCS);
+		ppdu_info->rx_status.sgi = HAL_RX_GET(vht_sig_a_info,
+						      VHT_SIG_A_INFO,
+						      GI_SETTING);
+
+		switch (hal->target_type) {
+		case TARGET_TYPE_QCA8074:
+		case TARGET_TYPE_QCA8074V2:
+		case TARGET_TYPE_QCA6018:
+		case TARGET_TYPE_QCA5018:
+		case TARGET_TYPE_QCN9000:
+		case TARGET_TYPE_QCN6122:
+#ifdef QCA_WIFI_QCA6390
+		case TARGET_TYPE_QCA6390:
+#endif
+			ppdu_info->rx_status.is_stbc =
+				HAL_RX_GET(vht_sig_a_info,
+					   VHT_SIG_A_INFO, STBC);
+			value =  HAL_RX_GET(vht_sig_a_info,
+					    VHT_SIG_A_INFO, N_STS);
+			value = value & VHT_SIG_SU_NSS_MASK;
+			if (ppdu_info->rx_status.is_stbc && (value > 0))
+				value = ((value + 1) >> 1) - 1;
+			ppdu_info->rx_status.nss =
+				((value & VHT_SIG_SU_NSS_MASK) + 1);
+
+			break;
+		case TARGET_TYPE_QCA6290:
+#if !defined(QCA_WIFI_QCA6290_11AX)
+			ppdu_info->rx_status.is_stbc =
+				HAL_RX_GET(vht_sig_a_info,
+					   VHT_SIG_A_INFO, STBC);
+			value =  HAL_RX_GET(vht_sig_a_info,
+					    VHT_SIG_A_INFO, N_STS);
+			value = value & VHT_SIG_SU_NSS_MASK;
+			if (ppdu_info->rx_status.is_stbc && (value > 0))
+				value = ((value + 1) >> 1) - 1;
+			ppdu_info->rx_status.nss =
+				((value & VHT_SIG_SU_NSS_MASK) + 1);
+#else
+			ppdu_info->rx_status.nss = 0;
+#endif
+			break;
+		case TARGET_TYPE_QCA6490:
+		case TARGET_TYPE_QCA6750:
+		case TARGET_TYPE_KIWI:
+			ppdu_info->rx_status.nss = 0;
+			break;
+		default:
+			break;
+		}
+		ppdu_info->rx_status.vht_flag_values3[0] =
+				(((ppdu_info->rx_status.mcs) << 4)
+				| ppdu_info->rx_status.nss);
+		ppdu_info->rx_status.bw = HAL_RX_GET(vht_sig_a_info,
+						     VHT_SIG_A_INFO, BANDWIDTH);
+		ppdu_info->rx_status.vht_flag_values2 =
+			ppdu_info->rx_status.bw;
+		ppdu_info->rx_status.vht_flag_values4 =
+			HAL_RX_GET(vht_sig_a_info,
+				   VHT_SIG_A_INFO, SU_MU_CODING);
+
+		ppdu_info->rx_status.beamformed = HAL_RX_GET(vht_sig_a_info,
+							     VHT_SIG_A_INFO,
+							     BEAMFORMED);
+		if (group_id == 0 || group_id == 63)
+			ppdu_info->rx_status.reception_type = HAL_RX_TYPE_SU;
+		else
+			ppdu_info->rx_status.reception_type =
+				HAL_RX_TYPE_MU_MIMO;
+
+		break;
+	}
+	case WIFIPHYRX_HE_SIG_A_SU_E:
+	{
+		uint8_t *he_sig_a_su_info = (uint8_t *)rx_tlv +
+			HAL_RX_OFFSET(UNIFIED_PHYRX_HE_SIG_A_SU_0,
+				      HE_SIG_A_SU_INFO_PHYRX_HE_SIG_A_SU_INFO_DETAILS);
+		ppdu_info->rx_status.he_flags = 1;
+		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO,
+				   FORMAT_INDICATION);
+		if (value == 0) {
+			ppdu_info->rx_status.he_data1 =
+				QDF_MON_STATUS_HE_TRIG_FORMAT_TYPE;
+		} else {
+			ppdu_info->rx_status.he_data1 =
+				 QDF_MON_STATUS_HE_SU_FORMAT_TYPE;
+		}
+
+		/* data1 */
+		ppdu_info->rx_status.he_data1 |=
+			QDF_MON_STATUS_HE_BSS_COLOR_KNOWN |
+			QDF_MON_STATUS_HE_BEAM_CHANGE_KNOWN |
+			QDF_MON_STATUS_HE_DL_UL_KNOWN |
+			QDF_MON_STATUS_HE_MCS_KNOWN |
+			QDF_MON_STATUS_HE_DCM_KNOWN |
+			QDF_MON_STATUS_HE_CODING_KNOWN |
+			QDF_MON_STATUS_HE_LDPC_EXTRA_SYMBOL_KNOWN |
+			QDF_MON_STATUS_HE_STBC_KNOWN |
+			QDF_MON_STATUS_HE_DATA_BW_RU_KNOWN |
+			QDF_MON_STATUS_HE_DOPPLER_KNOWN;
+
+		/* data2 */
+		ppdu_info->rx_status.he_data2 =
+			QDF_MON_STATUS_HE_GI_KNOWN;
+		ppdu_info->rx_status.he_data2 |=
+			QDF_MON_STATUS_TXBF_KNOWN |
+			QDF_MON_STATUS_PE_DISAMBIGUITY_KNOWN |
+			QDF_MON_STATUS_TXOP_KNOWN |
+			QDF_MON_STATUS_LTF_SYMBOLS_KNOWN |
+			QDF_MON_STATUS_PRE_FEC_PADDING_KNOWN |
+			QDF_MON_STATUS_MIDABLE_PERIODICITY_KNOWN;
+
+		/* data3 */
+		value = HAL_RX_GET(he_sig_a_su_info,
+				   HE_SIG_A_SU_INFO, BSS_COLOR_ID);
+		ppdu_info->rx_status.he_data3 = value;
+		value = HAL_RX_GET(he_sig_a_su_info,
+				   HE_SIG_A_SU_INFO, BEAM_CHANGE);
+		value = value << QDF_MON_STATUS_BEAM_CHANGE_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+		value = HAL_RX_GET(he_sig_a_su_info,
+				   HE_SIG_A_SU_INFO, DL_UL_FLAG);
+		value = value << QDF_MON_STATUS_DL_UL_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+
+		value = HAL_RX_GET(he_sig_a_su_info,
+				   HE_SIG_A_SU_INFO, TRANSMIT_MCS);
+		ppdu_info->rx_status.mcs = value;
+		value = value << QDF_MON_STATUS_TRANSMIT_MCS_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+
+		value = HAL_RX_GET(he_sig_a_su_info,
+				   HE_SIG_A_SU_INFO, DCM);
+		he_dcm = value;
+		value = value << QDF_MON_STATUS_DCM_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+		value = HAL_RX_GET(he_sig_a_su_info,
+				   HE_SIG_A_SU_INFO, CODING);
+		ppdu_info->rx_status.ldpc = (value == HAL_SU_MU_CODING_LDPC) ?
+			1 : 0;
+		value = value << QDF_MON_STATUS_CODING_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+		value = HAL_RX_GET(he_sig_a_su_info,
+				   HE_SIG_A_SU_INFO,
+				   LDPC_EXTRA_SYMBOL);
+		value = value << QDF_MON_STATUS_LDPC_EXTRA_SYMBOL_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+		value = HAL_RX_GET(he_sig_a_su_info,
+				   HE_SIG_A_SU_INFO, STBC);
+		he_stbc = value;
+		value = value << QDF_MON_STATUS_STBC_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+
+		/* data4 */
+		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO,
+				   SPATIAL_REUSE);
+		ppdu_info->rx_status.he_data4 = value;
+
+		/* data5 */
+		value = HAL_RX_GET(he_sig_a_su_info,
+				   HE_SIG_A_SU_INFO, TRANSMIT_BW);
+		ppdu_info->rx_status.he_data5 = value;
+		ppdu_info->rx_status.bw = value;
+		value = HAL_RX_GET(he_sig_a_su_info,
+				   HE_SIG_A_SU_INFO, CP_LTF_SIZE);
+		switch (value) {
+		case 0:
+				he_gi = HE_GI_0_8;
+				he_ltf = HE_LTF_1_X;
+				break;
+		case 1:
+				he_gi = HE_GI_0_8;
+				he_ltf = HE_LTF_2_X;
+				break;
+		case 2:
+				he_gi = HE_GI_1_6;
+				he_ltf = HE_LTF_2_X;
+				break;
+		case 3:
+				if (he_dcm && he_stbc) {
+					he_gi = HE_GI_0_8;
+					he_ltf = HE_LTF_4_X;
+				} else {
+					he_gi = HE_GI_3_2;
+					he_ltf = HE_LTF_4_X;
+				}
+				break;
+		}
+		ppdu_info->rx_status.sgi = he_gi;
+		ppdu_info->rx_status.ltf_size = he_ltf;
+		hal_get_radiotap_he_gi_ltf(&he_gi, &he_ltf);
+		value = he_gi << QDF_MON_STATUS_GI_SHIFT;
+		ppdu_info->rx_status.he_data5 |= value;
+		value = he_ltf << QDF_MON_STATUS_HE_LTF_SIZE_SHIFT;
+		ppdu_info->rx_status.he_data5 |= value;
+
+		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO, NSTS);
+		value = (value << QDF_MON_STATUS_HE_LTF_SYM_SHIFT);
+		ppdu_info->rx_status.he_data5 |= value;
+
+		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO,
+				   PACKET_EXTENSION_A_FACTOR);
+		value = value << QDF_MON_STATUS_PRE_FEC_PAD_SHIFT;
+		ppdu_info->rx_status.he_data5 |= value;
+
+		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO, TXBF);
+		value = value << QDF_MON_STATUS_TXBF_SHIFT;
+		ppdu_info->rx_status.he_data5 |= value;
+		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO,
+				   PACKET_EXTENSION_PE_DISAMBIGUITY);
+		value = value << QDF_MON_STATUS_PE_DISAMBIGUITY_SHIFT;
+		ppdu_info->rx_status.he_data5 |= value;
+
+		/* data6 */
+		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO, NSTS);
+		value++;
+		ppdu_info->rx_status.nss = value;
+		ppdu_info->rx_status.he_data6 = value;
+		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO,
+				   DOPPLER_INDICATION);
+		value = value << QDF_MON_STATUS_DOPPLER_SHIFT;
+		ppdu_info->rx_status.he_data6 |= value;
+		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO,
+				   TXOP_DURATION);
+		value = value << QDF_MON_STATUS_TXOP_SHIFT;
+		ppdu_info->rx_status.he_data6 |= value;
+
+		ppdu_info->rx_status.beamformed = HAL_RX_GET(he_sig_a_su_info,
+							     HE_SIG_A_SU_INFO,
+							     TXBF);
+		ppdu_info->rx_status.reception_type = HAL_RX_TYPE_SU;
+		break;
+	}
+	case WIFIPHYRX_HE_SIG_A_MU_DL_E:
+	{
+		uint8_t *he_sig_a_mu_dl_info = (uint8_t *)rx_tlv +
+			HAL_RX_OFFSET(UNIFIED_PHYRX_HE_SIG_A_MU_DL_0,
+				      HE_SIG_A_MU_DL_INFO_PHYRX_HE_SIG_A_MU_DL_INFO_DETAILS);
+
+		ppdu_info->rx_status.he_mu_flags = 1;
+
+		/* HE Flags */
+		/*data1*/
+		ppdu_info->rx_status.he_data1 =
+					QDF_MON_STATUS_HE_MU_FORMAT_TYPE;
+		ppdu_info->rx_status.he_data1 |=
+			QDF_MON_STATUS_HE_BSS_COLOR_KNOWN |
+			QDF_MON_STATUS_HE_DL_UL_KNOWN |
+			QDF_MON_STATUS_HE_LDPC_EXTRA_SYMBOL_KNOWN |
+			QDF_MON_STATUS_HE_STBC_KNOWN |
+			QDF_MON_STATUS_HE_DATA_BW_RU_KNOWN |
+			QDF_MON_STATUS_HE_DOPPLER_KNOWN;
+
+		/* data2 */
+		ppdu_info->rx_status.he_data2 =
+			QDF_MON_STATUS_HE_GI_KNOWN;
+		ppdu_info->rx_status.he_data2 |=
+			QDF_MON_STATUS_LTF_SYMBOLS_KNOWN |
+			QDF_MON_STATUS_PRE_FEC_PADDING_KNOWN |
+			QDF_MON_STATUS_PE_DISAMBIGUITY_KNOWN |
+			QDF_MON_STATUS_TXOP_KNOWN |
+			QDF_MON_STATUS_MIDABLE_PERIODICITY_KNOWN;
+
+		/*data3*/
+		value = HAL_RX_GET(he_sig_a_mu_dl_info,
+				   HE_SIG_A_MU_DL_INFO, BSS_COLOR_ID);
+		ppdu_info->rx_status.he_data3 = value;
+
+		value = HAL_RX_GET(he_sig_a_mu_dl_info,
+				   HE_SIG_A_MU_DL_INFO, DL_UL_FLAG);
+		value = value << QDF_MON_STATUS_DL_UL_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+
+		value = HAL_RX_GET(he_sig_a_mu_dl_info,
+				   HE_SIG_A_MU_DL_INFO,
+				   LDPC_EXTRA_SYMBOL);
+		value = value << QDF_MON_STATUS_LDPC_EXTRA_SYMBOL_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+
+		value = HAL_RX_GET(he_sig_a_mu_dl_info,
+				   HE_SIG_A_MU_DL_INFO, STBC);
+		he_stbc = value;
+		value = value << QDF_MON_STATUS_STBC_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+
+		/*data4*/
+		value = HAL_RX_GET(he_sig_a_mu_dl_info, HE_SIG_A_MU_DL_INFO,
+				   SPATIAL_REUSE);
+		ppdu_info->rx_status.he_data4 = value;
+
+		/*data5*/
+		value = HAL_RX_GET(he_sig_a_mu_dl_info,
+				   HE_SIG_A_MU_DL_INFO, TRANSMIT_BW);
+		ppdu_info->rx_status.he_data5 = value;
+		ppdu_info->rx_status.bw = value;
+
+		value = HAL_RX_GET(he_sig_a_mu_dl_info,
+				   HE_SIG_A_MU_DL_INFO, CP_LTF_SIZE);
+		switch (value) {
+		case 0:
+			he_gi = HE_GI_0_8;
+			he_ltf = HE_LTF_4_X;
+			break;
+		case 1:
+			he_gi = HE_GI_0_8;
+			he_ltf = HE_LTF_2_X;
+			break;
+		case 2:
+			he_gi = HE_GI_1_6;
+			he_ltf = HE_LTF_2_X;
+			break;
+		case 3:
+			he_gi = HE_GI_3_2;
+			he_ltf = HE_LTF_4_X;
+			break;
+		}
+		ppdu_info->rx_status.sgi = he_gi;
+		ppdu_info->rx_status.ltf_size = he_ltf;
+		hal_get_radiotap_he_gi_ltf(&he_gi, &he_ltf);
+		value = he_gi << QDF_MON_STATUS_GI_SHIFT;
+		ppdu_info->rx_status.he_data5 |= value;
+
+		value = he_ltf << QDF_MON_STATUS_HE_LTF_SIZE_SHIFT;
+		ppdu_info->rx_status.he_data5 |= value;
+
+		value = HAL_RX_GET(he_sig_a_mu_dl_info,
+				   HE_SIG_A_MU_DL_INFO, NUM_LTF_SYMBOLS);
+		value = (value << QDF_MON_STATUS_HE_LTF_SYM_SHIFT);
+		ppdu_info->rx_status.he_data5 |= value;
+
+		value = HAL_RX_GET(he_sig_a_mu_dl_info, HE_SIG_A_MU_DL_INFO,
+				   PACKET_EXTENSION_A_FACTOR);
+		value = value << QDF_MON_STATUS_PRE_FEC_PAD_SHIFT;
+		ppdu_info->rx_status.he_data5 |= value;
+
+		value = HAL_RX_GET(he_sig_a_mu_dl_info, HE_SIG_A_MU_DL_INFO,
+				   PACKET_EXTENSION_PE_DISAMBIGUITY);
+		value = value << QDF_MON_STATUS_PE_DISAMBIGUITY_SHIFT;
+		ppdu_info->rx_status.he_data5 |= value;
+
+		/*data6*/
+		value = HAL_RX_GET(he_sig_a_mu_dl_info, HE_SIG_A_MU_DL_INFO,
+				   DOPPLER_INDICATION);
+		value = value << QDF_MON_STATUS_DOPPLER_SHIFT;
+		ppdu_info->rx_status.he_data6 |= value;
+
+		value = HAL_RX_GET(he_sig_a_mu_dl_info, HE_SIG_A_MU_DL_INFO,
+				   TXOP_DURATION);
+		value = value << QDF_MON_STATUS_TXOP_SHIFT;
+		ppdu_info->rx_status.he_data6 |= value;
+
+		/* HE-MU Flags */
+		/* HE-MU-flags1 */
+		ppdu_info->rx_status.he_flags1 =
+			QDF_MON_STATUS_SIG_B_MCS_KNOWN |
+			QDF_MON_STATUS_SIG_B_DCM_KNOWN |
+			QDF_MON_STATUS_SIG_B_COMPRESSION_FLAG_1_KNOWN |
+			QDF_MON_STATUS_SIG_B_SYM_NUM_KNOWN |
+			QDF_MON_STATUS_RU_0_KNOWN;
+
+		value = HAL_RX_GET(he_sig_a_mu_dl_info,
+				   HE_SIG_A_MU_DL_INFO, MCS_OF_SIG_B);
+		ppdu_info->rx_status.he_flags1 |= value;
+		value = HAL_RX_GET(he_sig_a_mu_dl_info,
+				   HE_SIG_A_MU_DL_INFO, DCM_OF_SIG_B);
+		value = value << QDF_MON_STATUS_DCM_FLAG_1_SHIFT;
+		ppdu_info->rx_status.he_flags1 |= value;
+
+		/* HE-MU-flags2 */
+		ppdu_info->rx_status.he_flags2 =
+			QDF_MON_STATUS_BW_KNOWN;
+
+		value = HAL_RX_GET(he_sig_a_mu_dl_info,
+				   HE_SIG_A_MU_DL_INFO, TRANSMIT_BW);
+		ppdu_info->rx_status.he_flags2 |= value;
+		value = HAL_RX_GET(he_sig_a_mu_dl_info,
+				   HE_SIG_A_MU_DL_INFO, COMP_MODE_SIG_B);
+		value = value << QDF_MON_STATUS_SIG_B_COMPRESSION_FLAG_2_SHIFT;
+		ppdu_info->rx_status.he_flags2 |= value;
+		value = HAL_RX_GET(he_sig_a_mu_dl_info,
+				   HE_SIG_A_MU_DL_INFO, NUM_SIG_B_SYMBOLS);
+		value = value - 1;
+		value = value << QDF_MON_STATUS_NUM_SIG_B_SYMBOLS_SHIFT;
+		ppdu_info->rx_status.he_flags2 |= value;
+		ppdu_info->rx_status.reception_type = HAL_RX_TYPE_MU_MIMO;
+		break;
+	}
+	case WIFIPHYRX_HE_SIG_B1_MU_E:
+	{
+		uint8_t *he_sig_b1_mu_info = (uint8_t *)rx_tlv +
+			HAL_RX_OFFSET(UNIFIED_PHYRX_HE_SIG_B1_MU_0,
+				      HE_SIG_B1_MU_INFO_PHYRX_HE_SIG_B1_MU_INFO_DETAILS);
+
+		ppdu_info->rx_status.he_sig_b_common_known |=
+			QDF_MON_STATUS_HE_SIG_B_COMMON_KNOWN_RU0;
+		/* TODO: Check on the availability of other fields in
+		 * sig_b_common
+		 */
+
+		value = HAL_RX_GET(he_sig_b1_mu_info,
+				   HE_SIG_B1_MU_INFO, RU_ALLOCATION);
+		ppdu_info->rx_status.he_RU[0] = value;
+		ppdu_info->rx_status.reception_type = HAL_RX_TYPE_MU_MIMO;
+		break;
+	}
+	case WIFIPHYRX_HE_SIG_B2_MU_E:
+	{
+		uint8_t *he_sig_b2_mu_info = (uint8_t *)rx_tlv +
+			HAL_RX_OFFSET(UNIFIED_PHYRX_HE_SIG_B2_MU_0,
+				      HE_SIG_B2_MU_INFO_PHYRX_HE_SIG_B2_MU_INFO_DETAILS);
+		/*
+		 * Not all "HE" fields can be updated from
+		 * WIFIPHYRX_HE_SIG_A_MU_DL_E TLV. Use WIFIPHYRX_HE_SIG_B2_MU_E
+		 * to populate rest of the "HE" fields for MU scenarios.
+		 */
+
+		/* HE-data1 */
+		ppdu_info->rx_status.he_data1 |=
+			QDF_MON_STATUS_HE_MCS_KNOWN |
+			QDF_MON_STATUS_HE_CODING_KNOWN;
+
+		/* HE-data2 */
+
+		/* HE-data3 */
+		value = HAL_RX_GET(he_sig_b2_mu_info,
+				   HE_SIG_B2_MU_INFO, STA_MCS);
+		ppdu_info->rx_status.mcs = value;
+		value = value << QDF_MON_STATUS_TRANSMIT_MCS_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+
+		value = HAL_RX_GET(he_sig_b2_mu_info,
+				   HE_SIG_B2_MU_INFO, STA_CODING);
+		value = value << QDF_MON_STATUS_CODING_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+
+		/* HE-data4 */
+		value = HAL_RX_GET(he_sig_b2_mu_info,
+				   HE_SIG_B2_MU_INFO, STA_ID);
+		value = value << QDF_MON_STATUS_STA_ID_SHIFT;
+		ppdu_info->rx_status.he_data4 |= value;
+
+		/* HE-data5 */
+
+		/* HE-data6 */
+		value = HAL_RX_GET(he_sig_b2_mu_info,
+				   HE_SIG_B2_MU_INFO, NSTS);
+		/* value n indicates n+1 spatial streams */
+		value++;
+		ppdu_info->rx_status.nss = value;
+		ppdu_info->rx_status.he_data6 |= value;
+
+		break;
+	}
+	case WIFIPHYRX_HE_SIG_B2_OFDMA_E:
+	{
+		uint8_t *he_sig_b2_ofdma_info =
+		(uint8_t *)rx_tlv +
+		HAL_RX_OFFSET(UNIFIED_PHYRX_HE_SIG_B2_OFDMA_0,
+			      HE_SIG_B2_OFDMA_INFO_PHYRX_HE_SIG_B2_OFDMA_INFO_DETAILS);
+
+		/*
+		 * Not all "HE" fields can be updated from
+		 * WIFIPHYRX_HE_SIG_A_MU_DL_E TLV. Use WIFIPHYRX_HE_SIG_B2_MU_E
+		 * to populate rest of "HE" fields for MU OFDMA scenarios.
+		 */
+
+		/* HE-data1 */
+		ppdu_info->rx_status.he_data1 |=
+			QDF_MON_STATUS_HE_MCS_KNOWN |
+			QDF_MON_STATUS_HE_DCM_KNOWN |
+			QDF_MON_STATUS_HE_CODING_KNOWN;
+
+		/* HE-data2 */
+		ppdu_info->rx_status.he_data2 |=
+					QDF_MON_STATUS_TXBF_KNOWN;
+
+		/* HE-data3 */
+		value = HAL_RX_GET(he_sig_b2_ofdma_info,
+				   HE_SIG_B2_OFDMA_INFO, STA_MCS);
+		ppdu_info->rx_status.mcs = value;
+		value = value << QDF_MON_STATUS_TRANSMIT_MCS_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+
+		value = HAL_RX_GET(he_sig_b2_ofdma_info,
+				   HE_SIG_B2_OFDMA_INFO, STA_DCM);
+		he_dcm = value;
+		value = value << QDF_MON_STATUS_DCM_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+
+		value = HAL_RX_GET(he_sig_b2_ofdma_info,
+				   HE_SIG_B2_OFDMA_INFO, STA_CODING);
+		value = value << QDF_MON_STATUS_CODING_SHIFT;
+		ppdu_info->rx_status.he_data3 |= value;
+
+		/* HE-data4 */
+		value = HAL_RX_GET(he_sig_b2_ofdma_info,
+				   HE_SIG_B2_OFDMA_INFO, STA_ID);
+		value = value << QDF_MON_STATUS_STA_ID_SHIFT;
+		ppdu_info->rx_status.he_data4 |= value;
+
+		/* HE-data5 */
+		value = HAL_RX_GET(he_sig_b2_ofdma_info,
+				   HE_SIG_B2_OFDMA_INFO, TXBF);
+		value = value << QDF_MON_STATUS_TXBF_SHIFT;
+		ppdu_info->rx_status.he_data5 |= value;
+
+		/* HE-data6 */
+		value = HAL_RX_GET(he_sig_b2_ofdma_info,
+				   HE_SIG_B2_OFDMA_INFO, NSTS);
+		/* value n indicates n+1 spatial streams */
+		value++;
+		ppdu_info->rx_status.nss = value;
+		ppdu_info->rx_status.he_data6 |= value;
+		ppdu_info->rx_status.reception_type = HAL_RX_TYPE_MU_OFDMA;
+		break;
+	}
+	case WIFIPHYRX_RSSI_LEGACY_E:
+	{
+		uint8_t reception_type;
+		int8_t rssi_value;
+		uint8_t *rssi_info_tlv = (uint8_t *)rx_tlv +
+			HAL_RX_OFFSET(UNIFIED_PHYRX_RSSI_LEGACY_19,
+				      RECEIVE_RSSI_INFO_PREAMBLE_RSSI_INFO_DETAILS);
+
+		ppdu_info->rx_status.rssi_comb =
+			HAL_RX_GET_64(rx_tlv,
+				      PHYRX_RSSI_LEGACY, RSSI_COMB);
+		ppdu_info->rx_status.bw = hal->ops->hal_rx_get_tlv(rx_tlv);
+		ppdu_info->rx_status.he_re = 0;
+
+		reception_type = HAL_RX_GET_64(rx_tlv,
+					       PHYRX_RSSI_LEGACY,
+					       RECEPTION_TYPE);
+		switch (reception_type) {
+		case QDF_RECEPTION_TYPE_ULOFMDA:
+			ppdu_info->rx_status.reception_type =
+				HAL_RX_TYPE_MU_OFDMA;
+			ppdu_info->rx_status.ulofdma_flag = 1;
+			ppdu_info->rx_status.he_data1 =
+				QDF_MON_STATUS_HE_TRIG_FORMAT_TYPE;
+			break;
+		case QDF_RECEPTION_TYPE_ULMIMO:
+			ppdu_info->rx_status.reception_type =
+				HAL_RX_TYPE_MU_MIMO;
+			ppdu_info->rx_status.he_data1 =
+				QDF_MON_STATUS_HE_MU_FORMAT_TYPE;
+			break;
+		default:
+			ppdu_info->rx_status.reception_type =
+				HAL_RX_TYPE_SU;
+			break;
+		}
+		hal_rx_update_rssi_chain(ppdu_info, rssi_info_tlv);
+		rssi_value = HAL_RX_GET_64(rssi_info_tlv,
+					   RECEIVE_RSSI_INFO,
+					   RSSI_PRI20_CHAIN0);
+		ppdu_info->rx_status.rssi[0] = rssi_value;
+		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
+			  "RSSI_PRI20_CHAIN0: %d\n", rssi_value);
+
+		rssi_value = HAL_RX_GET_64(rssi_info_tlv,
+					   RECEIVE_RSSI_INFO,
+					   RSSI_PRI20_CHAIN1);
+		ppdu_info->rx_status.rssi[1] = rssi_value;
+		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
+			  "RSSI_PRI20_CHAIN1: %d\n", rssi_value);
+
+		rssi_value = HAL_RX_GET_64(rssi_info_tlv,
+					   RECEIVE_RSSI_INFO,
+					   RSSI_PRI20_CHAIN2);
+		ppdu_info->rx_status.rssi[2] = rssi_value;
+		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
+			  "RSSI_PRI20_CHAIN2: %d\n", rssi_value);
+
+		rssi_value = HAL_RX_GET_64(rssi_info_tlv,
+					   RECEIVE_RSSI_INFO,
+					   RSSI_PRI20_CHAIN3);
+		ppdu_info->rx_status.rssi[3] = rssi_value;
+		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
+			  "RSSI_PRI20_CHAIN3: %d\n", rssi_value);
+
+#ifdef DP_BE_NOTYET_WAR
+		// TODO - this is not preset for kiwi
+		rssi_value = HAL_RX_GET_64(rssi_info_tlv,
+					   RECEIVE_RSSI_INFO,
+					   RSSI_PRI20_CHAIN4);
+		ppdu_info->rx_status.rssi[4] = rssi_value;
+		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
+			  "RSSI_PRI20_CHAIN4: %d\n", rssi_value);
+
+		rssi_value = HAL_RX_GET_64(rssi_info_tlv,
+					   RECEIVE_RSSI_INFO,
+					   RSSI_PRI20_CHAIN5);
+		ppdu_info->rx_status.rssi[5] = rssi_value;
+		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
+			  "RSSI_PRI20_CHAIN5: %d\n", rssi_value);
+
+		rssi_value = HAL_RX_GET_64(rssi_info_tlv,
+					   RECEIVE_RSSI_INFO,
+					   RSSI_PRI20_CHAIN6);
+		ppdu_info->rx_status.rssi[6] = rssi_value;
+		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
+			  "RSSI_PRI20_CHAIN6: %d\n", rssi_value);
+
+		rssi_value = HAL_RX_GET_64(rssi_info_tlv,
+					   RECEIVE_RSSI_INFO,
+					   RSSI_PRI20_CHAIN7);
+		ppdu_info->rx_status.rssi[7] = rssi_value;
+#endif
+		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
+			  "RSSI_PRI20_CHAIN7: %d\n", rssi_value);
+		break;
+	}
+	case WIFIPHYRX_OTHER_RECEIVE_INFO_E:
+		hal_rx_proc_phyrx_other_receive_info_tlv(hal, rx_tlv_hdr,
+							 ppdu_info);
+		break;
+	case WIFIPHYRX_GENERIC_U_SIG_E:
+		hal_rx_parse_u_sig_hdr(hal, rx_tlv, ppdu_info);
+		break;
+	case WIFIPHYRX_COMMON_USER_INFO_E:
+		hal_rx_parse_cmn_usr_info(hal, rx_tlv, ppdu_info);
+		break;
+	case WIFIRX_HEADER_E:
+	{
+		struct hal_rx_ppdu_common_info *com_info = &ppdu_info->com_info;
+
+		if (ppdu_info->fcs_ok_cnt >=
+		    HAL_RX_MAX_MPDU_H_PER_STATUS_BUFFER) {
+			hal_err("Number of MPDUs(%d) per status buff exceeded",
+				ppdu_info->fcs_ok_cnt);
+			break;
+		}
+
+		/* Update first_msdu_payload for every mpdu and increment
+		 * com_info->mpdu_cnt for every WIFIRX_HEADER_E TLV
+		 */
+		ppdu_info->ppdu_msdu_info[ppdu_info->fcs_ok_cnt].first_msdu_payload =
+			rx_tlv;
+		ppdu_info->ppdu_msdu_info[ppdu_info->fcs_ok_cnt].payload_len = tlv_len;
+		ppdu_info->msdu_info.first_msdu_payload = rx_tlv;
+		ppdu_info->msdu_info.payload_len = tlv_len;
+		ppdu_info->user_id = user_id;
+		ppdu_info->hdr_len = tlv_len;
+		ppdu_info->data = rx_tlv;
+		ppdu_info->data += 4;
+
+		/* for every RX_HEADER TLV increment mpdu_cnt */
+		com_info->mpdu_cnt++;
+		return HAL_TLV_STATUS_HEADER;
+	}
+	case WIFIRX_MPDU_START_E:
+	{
+		hal_rx_mon_mpdu_start_t *rx_mpdu_start = rx_tlv;
+		uint32_t ppdu_id = rx_mpdu_start->rx_mpdu_info_details.phy_ppdu_id;
+		uint8_t filter_category = 0;
+
+		ppdu_info->nac_info.fc_valid =
+				rx_mpdu_start->rx_mpdu_info_details.mpdu_frame_control_valid;
+
+		ppdu_info->nac_info.to_ds_flag =
+				rx_mpdu_start->rx_mpdu_info_details.to_ds;
+
+		ppdu_info->nac_info.frame_control =
+			rx_mpdu_start->rx_mpdu_info_details.mpdu_frame_control_field;
+
+		ppdu_info->sw_frame_group_id =
+			rx_mpdu_start->rx_mpdu_info_details.sw_frame_group_id;
+
+		ppdu_info->rx_user_status[user_id].sw_peer_id =
+			rx_mpdu_start->rx_mpdu_info_details.sw_peer_id;
+
+		if (ppdu_info->sw_frame_group_id ==
+		    HAL_MPDU_SW_FRAME_GROUP_NULL_DATA) {
+			ppdu_info->rx_status.frame_control_info_valid =
+				ppdu_info->nac_info.fc_valid;
+			ppdu_info->rx_status.frame_control =
+				ppdu_info->nac_info.frame_control;
+		}
+
+		hal_get_mac_addr1(rx_mpdu_start,
+				  ppdu_info);
+
+		ppdu_info->nac_info.mac_addr2_valid =
+				rx_mpdu_start->rx_mpdu_info_details.mac_addr_ad2_valid;
+
+		*(uint16_t *)&ppdu_info->nac_info.mac_addr2[0] =
+			 rx_mpdu_start->rx_mpdu_info_details.mac_addr_ad2_15_0;
+
+		*(uint32_t *)&ppdu_info->nac_info.mac_addr2[2] =
+			rx_mpdu_start->rx_mpdu_info_details.mac_addr_ad2_47_16;
+
+		if (ppdu_info->rx_status.prev_ppdu_id != ppdu_id) {
+			ppdu_info->rx_status.prev_ppdu_id = ppdu_id;
+			ppdu_info->rx_status.ppdu_len =
+				rx_mpdu_start->rx_mpdu_info_details.mpdu_length;
+		} else {
+			ppdu_info->rx_status.ppdu_len +=
+				rx_mpdu_start->rx_mpdu_info_details.mpdu_length;
+		}
+
+		filter_category =
+			rx_mpdu_start->rx_mpdu_info_details.rxpcu_mpdu_filter_in_category;
+
+		if (filter_category == 0)
+			ppdu_info->rx_status.rxpcu_filter_pass = 1;
+		else if (filter_category == 1)
+			ppdu_info->rx_status.monitor_direct_used = 1;
+
+		ppdu_info->nac_info.mcast_bcast =
+			rx_mpdu_start->rx_mpdu_info_details.mcast_bcast;
+		break;
+	}
+	case WIFIRX_MPDU_END_E:
+		ppdu_info->user_id = user_id;
+		ppdu_info->fcs_err =
+			HAL_RX_GET_64(rx_tlv, RX_MPDU_END,
+				      FCS_ERR);
+		return HAL_TLV_STATUS_MPDU_END;
+	case WIFIRX_MSDU_END_E: {
+		hal_rx_mon_msdu_end_t *rx_msdu_end = rx_tlv;
+
+		if (user_id < HAL_MAX_UL_MU_USERS) {
+			ppdu_info->rx_msdu_info[user_id].cce_metadata =
+				rx_msdu_end->cce_metadata;
+			ppdu_info->rx_msdu_info[user_id].fse_metadata =
+				rx_msdu_end->fse_metadata;
+			ppdu_info->rx_msdu_info[user_id].is_flow_idx_timeout =
+				rx_msdu_end->flow_idx_timeout;
+			ppdu_info->rx_msdu_info[user_id].is_flow_idx_invalid =
+				rx_msdu_end->flow_idx_invalid;
+			ppdu_info->rx_msdu_info[user_id].flow_idx =
+				rx_msdu_end->flow_idx;
+		}
+		return HAL_TLV_STATUS_MSDU_END;
+		}
+	case WIFIMON_BUFFER_ADDR_E:
+	{
+		return HAL_TLV_STATUS_MON_BUF_ADDR;
+	}
+	case 0:
+		return HAL_TLV_STATUS_PPDU_DONE;
+
+	default:
+		qdf_debug("unhandled tlv tag %d", tlv_tag);
+	}
+
+	qdf_trace_hex_dump(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
+			   rx_tlv, tlv_len);
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+static uint32_t
+hal_rx_status_process_aggr_tlv(struct hal_soc *hal_soc,
+			       struct hal_rx_ppdu_info *ppdu_info)
+{
+	uint32_t aggr_tlv_tag = ppdu_info->tlv_aggr.tlv_tag;
+
+	switch (aggr_tlv_tag) {
+	case WIFIPHYRX_GENERIC_EHT_SIG_E:
+		hal_rx_parse_eht_sig_hdr(hal_soc, ppdu_info->tlv_aggr.buf,
+					 ppdu_info);
+		break;
+	default:
+		/* Aggregated TLV cannot be handled */
+		qdf_assert(0);
+		break;
+	}
+
+	ppdu_info->tlv_aggr.in_progress = 0;
+	ppdu_info->tlv_aggr.cur_len = 0;
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+static inline bool
+hal_rx_status_tlv_should_aggregate(struct hal_soc *hal_soc, uint32_t tlv_tag)
+{
+	switch (tlv_tag) {
+	case WIFIPHYRX_GENERIC_EHT_SIG_E:
+		return true;
+	}
+
+	return false;
+}
+
+static inline uint32_t
+hal_rx_status_aggr_tlv(struct hal_soc *hal_soc, void *rx_tlv_hdr,
+		       struct hal_rx_ppdu_info *ppdu_info,
+		       qdf_nbuf_t nbuf)
+{
+	uint32_t tlv_tag, user_id, tlv_len;
+	void *rx_tlv;
+
+	tlv_tag = HAL_RX_GET_USER_TLV64_TYPE(rx_tlv_hdr);
+	user_id = HAL_RX_GET_USER_TLV64_USERID(rx_tlv_hdr);
+	tlv_len = HAL_RX_GET_USER_TLV64_LEN(rx_tlv_hdr);
+
+	rx_tlv = (uint8_t *)rx_tlv_hdr + HAL_RX_TLV64_HDR_SIZE;
+
+	if (tlv_len <= HAL_RX_MON_MAX_AGGR_SIZE - ppdu_info->tlv_aggr.cur_len) {
+		qdf_mem_copy(ppdu_info->tlv_aggr.buf +
+			     ppdu_info->tlv_aggr.cur_len,
+			     rx_tlv, tlv_len);
+		ppdu_info->tlv_aggr.cur_len += tlv_len;
+	} else {
+		dp_err("Length of TLV exceeds max aggregation length");
+		qdf_assert(0);
+	}
+
+	return HAL_TLV_STATUS_PPDU_NOT_DONE;
+}
+
+static inline uint32_t
+hal_rx_status_start_new_aggr_tlv(struct hal_soc *hal_soc, void *rx_tlv_hdr,
+				 struct hal_rx_ppdu_info *ppdu_info,
+				 qdf_nbuf_t nbuf)
+{
+	uint32_t tlv_tag, user_id, tlv_len;
+
+	tlv_tag = HAL_RX_GET_USER_TLV64_TYPE(rx_tlv_hdr);
+	user_id = HAL_RX_GET_USER_TLV64_USERID(rx_tlv_hdr);
+	tlv_len = HAL_RX_GET_USER_TLV64_LEN(rx_tlv_hdr);
+
+	ppdu_info->tlv_aggr.in_progress = 1;
+	ppdu_info->tlv_aggr.tlv_tag = tlv_tag;
+	ppdu_info->tlv_aggr.cur_len = 0;
+
+	return hal_rx_status_aggr_tlv(hal_soc, rx_tlv_hdr, ppdu_info, nbuf);
+}
+
+static inline uint32_t
+hal_rx_status_get_tlv_info_wrapper_be(void *rx_tlv_hdr, void *ppduinfo,
+				      hal_soc_handle_t hal_soc_hdl,
+				      qdf_nbuf_t nbuf)
+{
+	struct hal_soc *hal = (struct hal_soc *)hal_soc_hdl;
+	uint32_t tlv_tag, user_id, tlv_len;
+	struct hal_rx_ppdu_info *ppdu_info =
+			(struct hal_rx_ppdu_info *)ppduinfo;
+
+	tlv_tag = HAL_RX_GET_USER_TLV64_TYPE(rx_tlv_hdr);
+	user_id = HAL_RX_GET_USER_TLV64_USERID(rx_tlv_hdr);
+	tlv_len = HAL_RX_GET_USER_TLV64_LEN(rx_tlv_hdr);
+
+	/*
+	 * Handle the case where aggregation is in progress
+	 * or the current TLV is one of the TLVs which should be
+	 * aggregated
+	 */
+	if (ppdu_info->tlv_aggr.in_progress) {
+		if (ppdu_info->tlv_aggr.tlv_tag == tlv_tag) {
+			return hal_rx_status_aggr_tlv(hal, rx_tlv_hdr,
+						      ppdu_info, nbuf);
+		} else {
+			/* Finish aggregation of current TLV */
+			hal_rx_status_process_aggr_tlv(hal, ppdu_info);
+		}
+	}
+
+	if (hal_rx_status_tlv_should_aggregate(hal, tlv_tag)) {
+		return hal_rx_status_start_new_aggr_tlv(hal, rx_tlv_hdr,
+							ppduinfo, nbuf);
+	}
+
+	return hal_rx_status_get_tlv_info_generic_be(rx_tlv_hdr, ppduinfo,
+						     hal_soc_hdl, nbuf);
+}
 #endif /* _HAL_BE_API_MON_H_ */

hal/wifi3.0/be/hal_be_generic_api.h

@@ -101,2236 +101,6 @@ hal_tx_comp_get_status_generic_be(void *desc, void *ts1,
 			TX_RATE_STATS_INFO_TX_RATE_STATS);
 }
 
-#if defined(QCA_WIFI_QCA6290_11AX_MU_UL) && defined(QCA_WIFI_QCA6290_11AX)
-/**
- * hal_rx_handle_other_tlvs() - handle special TLVs like MU_UL
- * tlv_tag: Taf of the TLVs
- * rx_tlv: the pointer to the TLVs
- * @ppdu_info: pointer to ppdu_info
- *
- * Return: true if the tlv is handled, false if not
- */
-static inline bool
-hal_rx_handle_other_tlvs(uint32_t tlv_tag, void *rx_tlv,
-			 struct hal_rx_ppdu_info *ppdu_info)
-{
-	uint32_t value;
-
-	switch (tlv_tag) {
-	case WIFIPHYRX_HE_SIG_A_MU_UL_E:
-	{
-		uint8_t *he_sig_a_mu_ul_info =
-			(uint8_t *)rx_tlv +
-			HAL_RX_OFFSET(PHYRX_HE_SIG_A_MU_UL,
-				      HE_SIG_A_MU_UL_INFO_PHYRX_HE_SIG_A_MU_UL_INFO_DETAILS);
-		ppdu_info->rx_status.he_flags = 1;
-
-		value = HAL_RX_GET(he_sig_a_mu_ul_info, HE_SIG_A_MU_UL_INFO,
-				   FORMAT_INDICATION);
-		if (value == 0) {
-			ppdu_info->rx_status.he_data1 =
-				QDF_MON_STATUS_HE_TRIG_FORMAT_TYPE;
-		} else {
-			ppdu_info->rx_status.he_data1 =
-				QDF_MON_STATUS_HE_SU_FORMAT_TYPE;
-		}
-
-		/* data1 */
-		ppdu_info->rx_status.he_data1 |=
-			QDF_MON_STATUS_HE_BSS_COLOR_KNOWN |
-			QDF_MON_STATUS_HE_DL_UL_KNOWN |
-			QDF_MON_STATUS_HE_DATA_BW_RU_KNOWN;
-
-		/* data2 */
-		ppdu_info->rx_status.he_data2 |=
-			QDF_MON_STATUS_TXOP_KNOWN;
-
-		/*data3*/
-		value = HAL_RX_GET(he_sig_a_mu_ul_info,
-				   HE_SIG_A_MU_UL_INFO, BSS_COLOR_ID);
-		ppdu_info->rx_status.he_data3 = value;
-		/* 1 for UL and 0 for DL */
-		value = 1;
-		value = value << QDF_MON_STATUS_DL_UL_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-
-		/*data4*/
-		value = HAL_RX_GET(he_sig_a_mu_ul_info, HE_SIG_A_MU_UL_INFO,
-				   SPATIAL_REUSE);
-		ppdu_info->rx_status.he_data4 = value;
-
-		/*data5*/
-		value = HAL_RX_GET(he_sig_a_mu_ul_info,
-				   HE_SIG_A_MU_UL_INFO, TRANSMIT_BW);
-		ppdu_info->rx_status.he_data5 = value;
-		ppdu_info->rx_status.bw = value;
-
-		/*data6*/
-		value = HAL_RX_GET(he_sig_a_mu_ul_info, HE_SIG_A_MU_UL_INFO,
-				   TXOP_DURATION);
-		value = value << QDF_MON_STATUS_TXOP_SHIFT;
-		ppdu_info->rx_status.he_data6 |= value;
-		return true;
-	}
-	default:
-		return false;
-	}
-}
-#else
-static inline bool
-hal_rx_handle_other_tlvs(uint32_t tlv_tag, void *rx_tlv,
-			 struct hal_rx_ppdu_info *ppdu_info)
-{
-	return false;
-}
-#endif /* QCA_WIFI_QCA6290_11AX_MU_UL && QCA_WIFI_QCA6290_11AX */
-
-#if defined(RX_PPDU_END_USER_STATS_OFDMA_INFO_VALID_OFFSET) && \
-defined(RX_PPDU_END_USER_STATS_SW_RESPONSE_REFERENCE_PTR_EXT_OFFSET)
-
-static inline void
-hal_rx_handle_mu_ul_info(void *rx_tlv,
-			 struct mon_rx_user_status *mon_rx_user_status)
-{
-	mon_rx_user_status->mu_ul_user_v0_word0 =
-		HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-			   SW_RESPONSE_REFERENCE_PTR);
-
-	mon_rx_user_status->mu_ul_user_v0_word1 =
-		HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-			   SW_RESPONSE_REFERENCE_PTR_EXT);
-}
-
-static inline void
-hal_rx_populate_byte_count(void *rx_tlv, void *ppduinfo,
-			   struct mon_rx_user_status *mon_rx_user_status)
-{
-	uint32_t mpdu_ok_byte_count;
-	uint32_t mpdu_err_byte_count;
-
-	mpdu_ok_byte_count = HAL_RX_GET(rx_tlv,
-					RX_PPDU_END_USER_STATS,
-					MPDU_OK_BYTE_COUNT);
-	mpdu_err_byte_count = HAL_RX_GET(rx_tlv,
-					 RX_PPDU_END_USER_STATS,
-					 MPDU_ERR_BYTE_COUNT);
-
-	mon_rx_user_status->mpdu_ok_byte_count = mpdu_ok_byte_count;
-	mon_rx_user_status->mpdu_err_byte_count = mpdu_err_byte_count;
-}
-#else
-static inline void
-hal_rx_handle_mu_ul_info(void *rx_tlv,
-			 struct mon_rx_user_status *mon_rx_user_status)
-{
-}
-
-static inline void
-hal_rx_populate_byte_count(void *rx_tlv, void *ppduinfo,
-			   struct mon_rx_user_status *mon_rx_user_status)
-{
-	struct hal_rx_ppdu_info *ppdu_info =
-			(struct hal_rx_ppdu_info *)ppduinfo;
-
-	/* HKV1: doesn't support mpdu byte count */
-	mon_rx_user_status->mpdu_ok_byte_count = ppdu_info->rx_status.ppdu_len;
-	mon_rx_user_status->mpdu_err_byte_count = 0;
-}
-#endif
-
-static inline void
-hal_rx_populate_mu_user_info(void *rx_tlv, void *ppduinfo, uint32_t user_id,
-			     struct mon_rx_user_status *mon_rx_user_status)
-{
-	struct mon_rx_info *mon_rx_info;
-	struct mon_rx_user_info *mon_rx_user_info;
-	struct hal_rx_ppdu_info *ppdu_info =
-			(struct hal_rx_ppdu_info *)ppduinfo;
-
-	mon_rx_info = &ppdu_info->rx_info;
-	mon_rx_user_info = &ppdu_info->rx_user_info[user_id];
-	mon_rx_user_info->qos_control_info_valid =
-		mon_rx_info->qos_control_info_valid;
-	mon_rx_user_info->qos_control =  mon_rx_info->qos_control;
-
-	mon_rx_user_status->ast_index = ppdu_info->rx_status.ast_index;
-	mon_rx_user_status->tid = ppdu_info->rx_status.tid;
-	mon_rx_user_status->tcp_msdu_count =
-		ppdu_info->rx_status.tcp_msdu_count;
-	mon_rx_user_status->udp_msdu_count =
-		ppdu_info->rx_status.udp_msdu_count;
-	mon_rx_user_status->other_msdu_count =
-		ppdu_info->rx_status.other_msdu_count;
-	mon_rx_user_status->frame_control = ppdu_info->rx_status.frame_control;
-	mon_rx_user_status->frame_control_info_valid =
-		ppdu_info->rx_status.frame_control_info_valid;
-	mon_rx_user_status->data_sequence_control_info_valid =
-		ppdu_info->rx_status.data_sequence_control_info_valid;
-	mon_rx_user_status->first_data_seq_ctrl =
-		ppdu_info->rx_status.first_data_seq_ctrl;
-	mon_rx_user_status->preamble_type = ppdu_info->rx_status.preamble_type;
-	mon_rx_user_status->ht_flags = ppdu_info->rx_status.ht_flags;
-	mon_rx_user_status->rtap_flags = ppdu_info->rx_status.rtap_flags;
-	mon_rx_user_status->vht_flags = ppdu_info->rx_status.vht_flags;
-	mon_rx_user_status->he_flags = ppdu_info->rx_status.he_flags;
-	mon_rx_user_status->rs_flags = ppdu_info->rx_status.rs_flags;
-
-	mon_rx_user_status->mpdu_cnt_fcs_ok =
-		ppdu_info->com_info.mpdu_cnt_fcs_ok;
-	mon_rx_user_status->mpdu_cnt_fcs_err =
-		ppdu_info->com_info.mpdu_cnt_fcs_err;
-	qdf_mem_copy(&mon_rx_user_status->mpdu_fcs_ok_bitmap,
-		     &ppdu_info->com_info.mpdu_fcs_ok_bitmap,
-		     HAL_RX_NUM_WORDS_PER_PPDU_BITMAP *
-		     sizeof(ppdu_info->com_info.mpdu_fcs_ok_bitmap[0]));
-
-	hal_rx_populate_byte_count(rx_tlv, ppdu_info, mon_rx_user_status);
-}
-
-#define HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(chain, \
-					ppdu_info, rssi_info_tlv) \
-	{						\
-	ppdu_info->rx_status.rssi_chain[chain][0] = \
-			HAL_RX_GET(rssi_info_tlv, RECEIVE_RSSI_INFO,\
-				   RSSI_PRI20_CHAIN##chain); \
-	ppdu_info->rx_status.rssi_chain[chain][1] = \
-			HAL_RX_GET(rssi_info_tlv, RECEIVE_RSSI_INFO,\
-				   RSSI_EXT20_CHAIN##chain); \
-	ppdu_info->rx_status.rssi_chain[chain][2] = \
-			HAL_RX_GET(rssi_info_tlv, RECEIVE_RSSI_INFO,\
-				   RSSI_EXT40_LOW20_CHAIN##chain); \
-	ppdu_info->rx_status.rssi_chain[chain][3] = \
-			HAL_RX_GET(rssi_info_tlv, RECEIVE_RSSI_INFO,\
-				   RSSI_EXT40_HIGH20_CHAIN##chain); \
-	ppdu_info->rx_status.rssi_chain[chain][4] = \
-			HAL_RX_GET(rssi_info_tlv, RECEIVE_RSSI_INFO,\
-				   RSSI_EXT80_LOW20_CHAIN##chain); \
-	ppdu_info->rx_status.rssi_chain[chain][5] = \
-			HAL_RX_GET(rssi_info_tlv, RECEIVE_RSSI_INFO,\
-				   RSSI_EXT80_LOW_HIGH20_CHAIN##chain); \
-	ppdu_info->rx_status.rssi_chain[chain][6] = \
-			HAL_RX_GET(rssi_info_tlv, RECEIVE_RSSI_INFO,\
-				   RSSI_EXT80_HIGH_LOW20_CHAIN##chain); \
-	ppdu_info->rx_status.rssi_chain[chain][7] = \
-			HAL_RX_GET(rssi_info_tlv, RECEIVE_RSSI_INFO,\
-				   RSSI_EXT80_HIGH20_CHAIN##chain); \
-	}						\
-
-#define HAL_RX_PPDU_UPDATE_RSSI(ppdu_info, rssi_info_tlv) \
-	{HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(0, ppdu_info, rssi_info_tlv) \
-	HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(1, ppdu_info, rssi_info_tlv) \
-	HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(2, ppdu_info, rssi_info_tlv) \
-	HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(3, ppdu_info, rssi_info_tlv) \
-	HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(4, ppdu_info, rssi_info_tlv) \
-	HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(5, ppdu_info, rssi_info_tlv) \
-	HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(6, ppdu_info, rssi_info_tlv) \
-	HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(7, ppdu_info, rssi_info_tlv)} \
-
-static inline uint32_t
-hal_rx_update_rssi_chain(struct hal_rx_ppdu_info *ppdu_info,
-			 uint8_t *rssi_info_tlv)
-{
-	// TODO - Find all these registers for kiwi
-#if 0
-	HAL_RX_PPDU_UPDATE_RSSI(ppdu_info, rssi_info_tlv)
-#endif
-	return 0;
-}
-
-#ifdef WLAN_TX_PKT_CAPTURE_ENH
-static inline void
-hal_get_qos_control(void *rx_tlv,
-		    struct hal_rx_ppdu_info *ppdu_info)
-{
-	ppdu_info->rx_info.qos_control_info_valid =
-		HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-			   QOS_CONTROL_INFO_VALID);
-
-	if (ppdu_info->rx_info.qos_control_info_valid)
-		ppdu_info->rx_info.qos_control =
-			HAL_RX_GET(rx_tlv,
-				   RX_PPDU_END_USER_STATS,
-				   QOS_CONTROL_FIELD);
-}
-
-static inline void
-hal_get_mac_addr1(uint8_t *rx_mpdu_start,
-		  struct hal_rx_ppdu_info *ppdu_info)
-{
-	if ((ppdu_info->sw_frame_group_id
-	     == HAL_MPDU_SW_FRAME_GROUP_MGMT_PROBE_REQ) ||
-	    (ppdu_info->sw_frame_group_id ==
-	     HAL_MPDU_SW_FRAME_GROUP_CTRL_RTS)) {
-		ppdu_info->rx_info.mac_addr1_valid =
-				HAL_RX_GET_MAC_ADDR1_VALID(rx_mpdu_start);
-
-		*(uint32_t *)&ppdu_info->rx_info.mac_addr1[0] =
-			HAL_RX_GET(rx_mpdu_start,
-				   RX_MPDU_INFO,
-				   MAC_ADDR_AD1_31_0);
-		if (ppdu_info->sw_frame_group_id ==
-		    HAL_MPDU_SW_FRAME_GROUP_CTRL_RTS) {
-			*(uint32_t *)&ppdu_info->rx_info.mac_addr1[4] =
-				HAL_RX_GET(rx_mpdu_start,
-					   RX_MPDU_INFO,
-					   MAC_ADDR_AD1_47_32);
-		}
-	}
-}
-#else
-static inline void
-hal_get_qos_control(void *rx_tlv,
-		    struct hal_rx_ppdu_info *ppdu_info)
-{
-}
-
-static inline void
-hal_get_mac_addr1(uint8_t *rx_mpdu_start,
-		  struct hal_rx_ppdu_info *ppdu_info)
-{
-}
-#endif
-
-static inline uint32_t
-hal_rx_parse_u_sig_cmn(struct hal_soc *hal_soc, void *rx_tlv,
-		       struct hal_rx_ppdu_info *ppdu_info)
-{
-	struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv;
-	struct hal_mon_usig_cmn *usig_1 = &usig->usig_1;
-	uint8_t bad_usig_crc;
-
-	bad_usig_crc = HAL_RX_MON_USIG_GET_RX_INTEGRITY_CHECK_PASSED(rx_tlv) ?
-			0 : 1;
-	ppdu_info->rx_status.usig_common |=
-			QDF_MON_STATUS_USIG_PHY_VERSION_KNOWN |
-			QDF_MON_STATUS_USIG_BW_KNOWN |
-			QDF_MON_STATUS_USIG_UL_DL_KNOWN |
-			QDF_MON_STATUS_USIG_BSS_COLOR_KNOWN |
-			QDF_MON_STATUS_USIG_TXOP_KNOWN;
-
-	ppdu_info->rx_status.usig_common |= (usig_1->phy_version <<
-				   QDF_MON_STATUS_USIG_PHY_VERSION_SHIFT);
-	ppdu_info->rx_status.usig_common |= (usig_1->bw <<
-					   QDF_MON_STATUS_USIG_BW_SHIFT);
-	ppdu_info->rx_status.usig_common |= (usig_1->ul_dl <<
-					   QDF_MON_STATUS_USIG_UL_DL_SHIFT);
-	ppdu_info->rx_status.usig_common |= (usig_1->bss_color <<
-					   QDF_MON_STATUS_USIG_BSS_COLOR_SHIFT);
-	ppdu_info->rx_status.usig_common |= (usig_1->txop <<
-					   QDF_MON_STATUS_USIG_TXOP_SHIFT);
-	ppdu_info->rx_status.usig_common |= bad_usig_crc;
-
-	ppdu_info->u_sig_info.ul_dl = usig_1->ul_dl;
-	ppdu_info->u_sig_info.bw = usig_1->bw;
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-static inline uint32_t
-hal_rx_parse_u_sig_tb(struct hal_soc *hal_soc, void *rx_tlv,
-		      struct hal_rx_ppdu_info *ppdu_info)
-{
-	struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv;
-	struct hal_mon_usig_tb *usig_tb = &usig->usig_2.tb;
-
-	ppdu_info->rx_status.usig_mask |=
-			QDF_MON_STATUS_USIG_DISREGARD_KNOWN |
-			QDF_MON_STATUS_USIG_PPDU_TYPE_N_COMP_MODE_KNOWN |
-			QDF_MON_STATUS_USIG_VALIDATE_KNOWN |
-			QDF_MON_STATUS_USIG_TB_SPATIAL_REUSE_1_KNOWN |
-			QDF_MON_STATUS_USIG_TB_SPATIAL_REUSE_2_KNOWN |
-			QDF_MON_STATUS_USIG_TB_DISREGARD1_KNOWN |
-			QDF_MON_STATUS_USIG_CRC_KNOWN |
-			QDF_MON_STATUS_USIG_TAIL_KNOWN;
-
-	ppdu_info->rx_status.usig_value |= (0x3F <<
-				QDF_MON_STATUS_USIG_DISREGARD_SHIFT);
-	ppdu_info->rx_status.usig_value |= (usig_tb->ppdu_type_comp_mode <<
-			QDF_MON_STATUS_USIG_PPDU_TYPE_N_COMP_MODE_SHIFT);
-	ppdu_info->rx_status.usig_value |= (0x1 <<
-				QDF_MON_STATUS_USIG_VALIDATE_SHIFT);
-	ppdu_info->rx_status.usig_value |= (usig_tb->spatial_reuse_1 <<
-				QDF_MON_STATUS_USIG_TB_SPATIAL_REUSE_1_SHIFT);
-	ppdu_info->rx_status.usig_value |= (usig_tb->spatial_reuse_2 <<
-				QDF_MON_STATUS_USIG_TB_SPATIAL_REUSE_2_SHIFT);
-	ppdu_info->rx_status.usig_value |= (0x1F <<
-				QDF_MON_STATUS_USIG_TB_DISREGARD1_SHIFT);
-	ppdu_info->rx_status.usig_value |= (usig_tb->crc <<
-				QDF_MON_STATUS_USIG_CRC_SHIFT);
-	ppdu_info->rx_status.usig_value |= (usig_tb->tail <<
-				QDF_MON_STATUS_USIG_TAIL_SHIFT);
-
-	ppdu_info->u_sig_info.ppdu_type_comp_mode =
-						usig_tb->ppdu_type_comp_mode;
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-static inline uint32_t
-hal_rx_parse_u_sig_mu(struct hal_soc *hal_soc, void *rx_tlv,
-		      struct hal_rx_ppdu_info *ppdu_info)
-{
-	struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv;
-	struct hal_mon_usig_mu *usig_mu = &usig->usig_2.mu;
-
-	ppdu_info->rx_status.usig_mask |=
-			QDF_MON_STATUS_USIG_DISREGARD_KNOWN |
-			QDF_MON_STATUS_USIG_PPDU_TYPE_N_COMP_MODE_KNOWN |
-			QDF_MON_STATUS_USIG_VALIDATE_KNOWN |
-			QDF_MON_STATUS_USIG_MU_VALIDATE1_SHIFT |
-			QDF_MON_STATUS_USIG_MU_PUNCTURE_CH_INFO_KNOWN |
-			QDF_MON_STATUS_USIG_MU_VALIDATE2_SHIFT |
-			QDF_MON_STATUS_USIG_MU_EHT_SIG_MCS_KNOWN |
-			QDF_MON_STATUS_USIG_MU_NUM_EHT_SIG_SYM_KNOWN |
-			QDF_MON_STATUS_USIG_CRC_KNOWN |
-			QDF_MON_STATUS_USIG_TAIL_KNOWN;
-
-	ppdu_info->rx_status.usig_value |= (0x1F <<
-				QDF_MON_STATUS_USIG_DISREGARD_SHIFT);
-	ppdu_info->rx_status.usig_value |= (0x1 <<
-				QDF_MON_STATUS_USIG_MU_VALIDATE1_SHIFT);
-	ppdu_info->rx_status.usig_value |= (usig_mu->ppdu_type_comp_mode <<
-			QDF_MON_STATUS_USIG_PPDU_TYPE_N_COMP_MODE_SHIFT);
-	ppdu_info->rx_status.usig_value |= (0x1 <<
-				QDF_MON_STATUS_USIG_VALIDATE_SHIFT);
-	ppdu_info->rx_status.usig_value |= (usig_mu->punc_ch_info <<
-				QDF_MON_STATUS_USIG_MU_PUNCTURE_CH_INFO_SHIFT);
-	ppdu_info->rx_status.usig_value |= (0x1 <<
-				QDF_MON_STATUS_USIG_MU_VALIDATE2_SHIFT);
-	ppdu_info->rx_status.usig_value |= (usig_mu->eht_sig_mcs <<
-				QDF_MON_STATUS_USIG_MU_EHT_SIG_MCS_SHIFT);
-	ppdu_info->rx_status.usig_value |= (usig_mu->num_eht_sig_sym <<
-				QDF_MON_STATUS_USIG_MU_NUM_EHT_SIG_SYM_SHIFT);
-	ppdu_info->rx_status.usig_value |= (usig_mu->crc <<
-				QDF_MON_STATUS_USIG_CRC_SHIFT);
-	ppdu_info->rx_status.usig_value |= (usig_mu->tail <<
-				QDF_MON_STATUS_USIG_TAIL_SHIFT);
-
-	ppdu_info->u_sig_info.ppdu_type_comp_mode =
-						usig_mu->ppdu_type_comp_mode;
-	ppdu_info->u_sig_info.eht_sig_mcs = usig_mu->eht_sig_mcs;
-	ppdu_info->u_sig_info.num_eht_sig_sym = usig_mu->num_eht_sig_sym;
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-static inline uint32_t
-hal_rx_parse_u_sig_hdr(struct hal_soc *hal_soc, void *rx_tlv,
-		       struct hal_rx_ppdu_info *ppdu_info)
-{
-	struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv;
-	struct hal_mon_usig_cmn *usig_1 = &usig->usig_1;
-
-	ppdu_info->rx_status.usig_flags = 1;
-
-	hal_rx_parse_u_sig_cmn(hal_soc, rx_tlv, ppdu_info);
-
-	if (HAL_RX_MON_USIG_GET_PPDU_TYPE_N_COMP_MODE(rx_tlv) == 0 &&
-	    usig_1->ul_dl == 1)
-		return hal_rx_parse_u_sig_tb(hal_soc, rx_tlv, ppdu_info);
-	else
-		return hal_rx_parse_u_sig_mu(hal_soc, rx_tlv, ppdu_info);
-}
-
-static inline uint32_t
-hal_rx_parse_usig_overflow(struct hal_soc *hal_soc, void *tlv,
-			   struct hal_rx_ppdu_info *ppdu_info)
-{
-	struct hal_eht_sig_cc_usig_overflow *usig_ovflow =
-		(struct hal_eht_sig_cc_usig_overflow *)tlv;
-
-	ppdu_info->rx_status.eht_known |=
-		QDF_MON_STATUS_EHT_SPATIAL_REUSE_KNOWN |
-		QDF_MON_STATUS_EHT_EHT_LTF_KNOWN |
-		QDF_MON_STATUS_EHT_LDPC_EXTRA_SYMBOL_SEG_KNOWN |
-		QDF_MON_STATUS_EHT_PRE_FEC_PADDING_FACTOR_KNOWN |
-		QDF_MON_STATUS_EHT_PE_DISAMBIGUITY_KNOWN |
-		QDF_MON_STATUS_EHT_DISREARD_KNOWN;
-
-	ppdu_info->rx_status.eht_data[0] |= (usig_ovflow->spatial_reuse <<
-				QDF_MON_STATUS_EHT_SPATIAL_REUSE_SHIFT);
-	/*
-	 * GI and LTF size are separately indicated in radiotap header
-	 * and hence will be parsed from other TLV
-	 **/
-	ppdu_info->rx_status.eht_data[0] |= (usig_ovflow->num_ltf_sym <<
-				QDF_MON_STATUS_EHT_EHT_LTF_SHIFT);
-	ppdu_info->rx_status.eht_data[0] |= (usig_ovflow->ldpc_extra_sym <<
-				QDF_MON_STATUS_EHT_LDPC_EXTRA_SYMBOL_SEG_SHIFT);
-	ppdu_info->rx_status.eht_data[0] |= (usig_ovflow->pre_fec_pad_factor <<
-			QDF_MON_STATUS_EHT_PRE_FEC_PADDING_FACTOR_SHIFT);
-	ppdu_info->rx_status.eht_data[0] |= (usig_ovflow->pe_disambiguity <<
-				QDF_MON_STATUS_EHT_PE_DISAMBIGUITY_SHIFT);
-	ppdu_info->rx_status.eht_data[0] |= (0xF <<
-				QDF_MON_STATUS_EHT_DISREGARD_SHIFT);
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-static inline uint32_t
-hal_rx_parse_non_ofdma_users(struct hal_soc *hal_soc, void *tlv,
-			     struct hal_rx_ppdu_info *ppdu_info)
-{
-	struct hal_eht_sig_non_ofdma_cmn_eb *non_ofdma_cmn_eb =
-				(struct hal_eht_sig_non_ofdma_cmn_eb *)tlv;
-
-	ppdu_info->rx_status.eht_known |=
-				QDF_MON_STATUS_EHT_NUM_NON_OFDMA_USERS_KNOWN;
-
-	ppdu_info->rx_status.eht_data[4] |= (non_ofdma_cmn_eb->num_users <<
-				QDF_MON_STATUS_EHT_NUM_NON_OFDMA_USERS_SHIFT);
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-static inline uint32_t
-hal_rx_parse_ru_allocation(struct hal_soc *hal_soc, void *tlv,
-			   struct hal_rx_ppdu_info *ppdu_info)
-{
-	uint64_t *ehtsig_tlv = (uint64_t *)tlv;
-	struct hal_eht_sig_ofdma_cmn_eb1 *ofdma_cmn_eb1;
-	struct hal_eht_sig_ofdma_cmn_eb2 *ofdma_cmn_eb2;
-	uint8_t num_ru_allocation_known = 0;
-
-	ofdma_cmn_eb1 = (struct hal_eht_sig_ofdma_cmn_eb1 *)ehtsig_tlv;
-	ofdma_cmn_eb2 = (struct hal_eht_sig_ofdma_cmn_eb2 *)(ehtsig_tlv + 1);
-
-	switch (ppdu_info->u_sig_info.bw) {
-	case HAL_EHT_BW_320_2:
-	case HAL_EHT_BW_320_1:
-		num_ru_allocation_known += 4;
-
-		ppdu_info->rx_status.eht_data[3] |=
-				(ofdma_cmn_eb2->ru_allocation2_6 <<
-				 QDF_MON_STATUS_EHT_RU_ALLOCATION2_6_SHIFT);
-		ppdu_info->rx_status.eht_data[3] |=
-				(ofdma_cmn_eb2->ru_allocation2_5 <<
-				 QDF_MON_STATUS_EHT_RU_ALLOCATION2_5_SHIFT);
-		ppdu_info->rx_status.eht_data[3] |=
-				(ofdma_cmn_eb2->ru_allocation2_4 <<
-				 QDF_MON_STATUS_EHT_RU_ALLOCATION2_4_SHIFT);
-		ppdu_info->rx_status.eht_data[2] |=
-				(ofdma_cmn_eb2->ru_allocation2_3 <<
-				 QDF_MON_STATUS_EHT_RU_ALLOCATION2_3_SHIFT);
-		/* fallthrough */
-	case HAL_EHT_BW_160:
-		num_ru_allocation_known += 2;
-
-		ppdu_info->rx_status.eht_data[2] |=
-				(ofdma_cmn_eb2->ru_allocation2_2 <<
-				 QDF_MON_STATUS_EHT_RU_ALLOCATION2_2_SHIFT);
-		ppdu_info->rx_status.eht_data[2] |=
-				(ofdma_cmn_eb2->ru_allocation2_1 <<
-				 QDF_MON_STATUS_EHT_RU_ALLOCATION2_1_SHIFT);
-		/* fallthrough */
-	case HAL_EHT_BW_80:
-		num_ru_allocation_known += 1;
-
-		ppdu_info->rx_status.eht_data[1] |=
-				(ofdma_cmn_eb1->ru_allocation1_2 <<
-				 QDF_MON_STATUS_EHT_RU_ALLOCATION1_2_SHIFT);
-		/* fallthrough */
-	case HAL_EHT_BW_40:
-	case HAL_EHT_BW_20:
-		num_ru_allocation_known += 1;
-
-		ppdu_info->rx_status.eht_data[1] |=
-				(ofdma_cmn_eb1->ru_allocation1_1 <<
-				 QDF_MON_STATUS_EHT_RU_ALLOCATION1_1_SHIFT);
-		break;
-	default:
-		break;
-	}
-
-	ppdu_info->rx_status.eht_known |= (num_ru_allocation_known <<
-			QDF_MON_STATUS_EHT_NUM_KNOWN_RU_ALLOCATIONS_SHIFT);
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-static inline uint32_t
-hal_rx_parse_eht_sig_mumimo_user_info(struct hal_soc *hal_soc, void *tlv,
-				      struct hal_rx_ppdu_info *ppdu_info)
-{
-	struct hal_eht_sig_mu_mimo_user_info *user_info;
-	uint32_t user_idx = ppdu_info->rx_status.num_eht_user_info_valid;
-
-	user_info = (struct hal_eht_sig_mu_mimo_user_info *)tlv;
-
-	ppdu_info->rx_status.eht_user_info[user_idx] |=
-				QDF_MON_STATUS_EHT_USER_STA_ID_KNOWN |
-				QDF_MON_STATUS_EHT_USER_MCS_KNOWN |
-				QDF_MON_STATUS_EHT_USER_CODING_KNOWN |
-				QDF_MON_STATUS_EHT_USER_SPATIAL_CONFIG_KNOWN;
-
-	ppdu_info->rx_status.eht_user_info[user_idx] |= (user_info->sta_id <<
-				QDF_MON_STATUS_EHT_USER_STA_ID_SHIFT);
-	ppdu_info->rx_status.eht_user_info[user_idx] |= (user_info->mcs <<
-				QDF_MON_STATUS_EHT_USER_MCS_SHIFT);
-
-	ppdu_info->rx_status.eht_user_info[user_idx] |= (user_info->coding <<
-					QDF_MON_STATUS_EHT_USER_CODING_SHIFT);
-	ppdu_info->rx_status.eht_user_info[user_idx] |=
-				(user_info->spatial_coding <<
-				QDF_MON_STATUS_EHT_USER_SPATIAL_CONFIG_SHIFT);
-
-	/* CRC for matched user block */
-	ppdu_info->rx_status.eht_known |=
-			QDF_MON_STATUS_EHT_USER_ENC_BLOCK_CRC_KNOWN |
-			QDF_MON_STATUS_EHT_USER_ENC_BLOCK_TAIL_KNOWN;
-	ppdu_info->rx_status.eht_data[4] |= (user_info->crc <<
-				QDF_MON_STATUS_EHT_USER_ENC_BLOCK_CRC_SHIFT);
-
-	ppdu_info->rx_status.num_eht_user_info_valid++;
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-static inline uint32_t
-hal_rx_parse_eht_sig_non_mumimo_user_info(struct hal_soc *hal_soc, void *tlv,
-					  struct hal_rx_ppdu_info *ppdu_info)
-{
-	struct hal_eht_sig_non_mu_mimo_user_info *user_info;
-	uint32_t user_idx = ppdu_info->rx_status.num_eht_user_info_valid;
-
-	user_info = (struct hal_eht_sig_non_mu_mimo_user_info *)tlv;
-
-	ppdu_info->rx_status.eht_user_info[user_idx] |=
-				QDF_MON_STATUS_EHT_USER_STA_ID_KNOWN |
-				QDF_MON_STATUS_EHT_USER_MCS_KNOWN |
-				QDF_MON_STATUS_EHT_USER_CODING_KNOWN |
-				QDF_MON_STATUS_EHT_USER_NSS_KNOWN |
-				QDF_MON_STATUS_EHT_USER_BEAMFORMING_KNOWN;
-
-	ppdu_info->rx_status.eht_user_info[user_idx] |= (user_info->sta_id <<
-				QDF_MON_STATUS_EHT_USER_STA_ID_SHIFT);
-	ppdu_info->rx_status.eht_user_info[user_idx] |= (user_info->mcs <<
-				QDF_MON_STATUS_EHT_USER_MCS_SHIFT);
-	ppdu_info->rx_status.eht_user_info[user_idx] |= (user_info->nss <<
-					QDF_MON_STATUS_EHT_USER_NSS_SHIFT);
-	ppdu_info->rx_status.eht_user_info[user_idx] |=
-				(user_info->beamformed <<
-				QDF_MON_STATUS_EHT_USER_BEAMFORMING_SHIFT);
-	ppdu_info->rx_status.eht_user_info[user_idx] |= (user_info->coding <<
-					QDF_MON_STATUS_EHT_USER_CODING_SHIFT);
-
-	/* CRC for matched user block */
-	ppdu_info->rx_status.eht_known |=
-			QDF_MON_STATUS_EHT_USER_ENC_BLOCK_CRC_KNOWN |
-			QDF_MON_STATUS_EHT_USER_ENC_BLOCK_TAIL_KNOWN;
-	ppdu_info->rx_status.eht_data[4] |= (user_info->crc <<
-				QDF_MON_STATUS_EHT_USER_ENC_BLOCK_CRC_SHIFT);
-
-	ppdu_info->rx_status.num_eht_user_info_valid++;
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-static inline bool hal_rx_is_ofdma(struct hal_soc *hal_soc,
-				   struct hal_rx_ppdu_info *ppdu_info)
-{
-	if (ppdu_info->u_sig_info.ppdu_type_comp_mode == 0 &&
-	    ppdu_info->u_sig_info.ul_dl == 0)
-		return true;
-
-	return false;
-}
-
-static inline bool hal_rx_is_non_ofdma(struct hal_soc *hal_soc,
-				       struct hal_rx_ppdu_info *ppdu_info)
-{
-	uint32_t ppdu_type_comp_mode =
-				ppdu_info->u_sig_info.ppdu_type_comp_mode;
-	uint32_t ul_dl = ppdu_info->u_sig_info.ul_dl;
-
-	if ((ppdu_type_comp_mode == 0 && ul_dl == 1) ||
-	    (ppdu_type_comp_mode == 0 && ul_dl == 2) ||
-	    (ppdu_type_comp_mode == 1 && ul_dl == 1))
-		return true;
-
-	return false;
-}
-
-static inline bool hal_rx_is_mu_mimo_user(struct hal_soc *hal_soc,
-					  struct hal_rx_ppdu_info *ppdu_info)
-{
-	if (ppdu_info->u_sig_info.ppdu_type_comp_mode == 0 &&
-	    ppdu_info->u_sig_info.ul_dl == 2)
-		return true;
-
-	return false;
-}
-
-static inline bool
-hal_rx_is_frame_type_ndp(struct hal_soc *hal_soc,
-			 struct hal_rx_ppdu_info *ppdu_info)
-{
-	if (ppdu_info->u_sig_info.ppdu_type_comp_mode == 1 &&
-	    ppdu_info->u_sig_info.eht_sig_mcs == 0 &&
-	    ppdu_info->u_sig_info.num_eht_sig_sym == 0)
-		return true;
-
-	return false;
-}
-
-static inline uint32_t
-hal_rx_parse_eht_sig_ndp(struct hal_soc *hal_soc, void *tlv,
-			 struct hal_rx_ppdu_info *ppdu_info)
-{
-	struct hal_eht_sig_ndp_cmn_eb *eht_sig_ndp =
-				(struct hal_eht_sig_ndp_cmn_eb *)tlv;
-
-	ppdu_info->rx_status.eht_known |=
-		QDF_MON_STATUS_EHT_SPATIAL_REUSE_KNOWN |
-		QDF_MON_STATUS_EHT_EHT_LTF_KNOWN |
-		QDF_MON_STATUS_EHT_NDP_NSS_KNOWN |
-		QDF_MON_STATUS_EHT_NDP_BEAMFORMED_KNOWN |
-		QDF_MON_STATUS_EHT_NDP_DISREGARD_KNOWN |
-		QDF_MON_STATUS_EHT_CRC1_KNOWN |
-		QDF_MON_STATUS_EHT_TAIL1_KNOWN;
-
-	ppdu_info->rx_status.eht_data[0] |= (eht_sig_ndp->spatial_reuse <<
-				QDF_MON_STATUS_EHT_SPATIAL_REUSE_SHIFT);
-	/*
-	 * GI and LTF size are separately indicated in radiotap header
-	 * and hence will be parsed from other TLV
-	 **/
-	ppdu_info->rx_status.eht_data[0] |= (eht_sig_ndp->num_ltf_sym <<
-				QDF_MON_STATUS_EHT_EHT_LTF_SHIFT);
-	ppdu_info->rx_status.eht_data[0] |= (0xF <<
-				QDF_MON_STATUS_EHT_NDP_DISREGARD_SHIFT);
-
-	ppdu_info->rx_status.eht_data[4] |= (eht_sig_ndp->nss <<
-				QDF_MON_STATUS_EHT_NDP_NSS_SHIFT);
-	ppdu_info->rx_status.eht_data[4] |= (eht_sig_ndp->beamformed <<
-				QDF_MON_STATUS_EHT_NDP_BEAMFORMED_SHIFT);
-
-	ppdu_info->rx_status.eht_data[0] |= (eht_sig_ndp->crc <<
-					QDF_MON_STATUS_EHT_CRC1_SHIFT);
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-static inline uint32_t
-hal_rx_parse_eht_sig_non_ofdma(struct hal_soc *hal_soc, void *tlv,
-			       struct hal_rx_ppdu_info *ppdu_info)
-{
-	hal_rx_parse_usig_overflow(hal_soc, tlv, ppdu_info);
-	hal_rx_parse_non_ofdma_users(hal_soc, tlv, ppdu_info);
-
-	if (hal_rx_is_mu_mimo_user(hal_soc, ppdu_info))
-		hal_rx_parse_eht_sig_mumimo_user_info(hal_soc, tlv,
-						      ppdu_info);
-	else
-		hal_rx_parse_eht_sig_non_mumimo_user_info(hal_soc, tlv,
-							  ppdu_info);
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-static inline uint32_t
-hal_rx_parse_eht_sig_ofdma(struct hal_soc *hal_soc, void *tlv,
-			   struct hal_rx_ppdu_info *ppdu_info)
-{
-	uint64_t *eht_sig_tlv = (uint64_t *)tlv;
-	void *user_info = (void *)(eht_sig_tlv + 2);
-
-	hal_rx_parse_usig_overflow(hal_soc, tlv, ppdu_info);
-	hal_rx_parse_ru_allocation(hal_soc, tlv, ppdu_info);
-	hal_rx_parse_eht_sig_non_mumimo_user_info(hal_soc, user_info,
-						  ppdu_info);
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-static inline uint32_t
-hal_rx_parse_eht_sig_hdr(struct hal_soc *hal_soc, uint8_t *tlv,
-			 struct hal_rx_ppdu_info *ppdu_info)
-{
-	ppdu_info->rx_status.eht_flags = 1;
-
-	if (hal_rx_is_frame_type_ndp(hal_soc, ppdu_info))
-		hal_rx_parse_eht_sig_ndp(hal_soc, tlv, ppdu_info);
-	else if (hal_rx_is_non_ofdma(hal_soc, ppdu_info))
-		hal_rx_parse_eht_sig_non_ofdma(hal_soc, tlv, ppdu_info);
-	else if (hal_rx_is_ofdma(hal_soc, ppdu_info))
-		hal_rx_parse_eht_sig_ofdma(hal_soc, tlv, ppdu_info);
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-#ifdef WLAN_RX_MON_PARSE_CMN_USER_INFO
-static inline uint32_t
-hal_rx_parse_cmn_usr_info(struct hal_soc *hal_soc, uint8_t *tlv,
-			  struct hal_rx_ppdu_info *ppdu_info)
-{
-	struct phyrx_common_user_info *cmn_usr_info =
-				(struct phyrx_common_user_info *)tlv;
-
-	ppdu_info->rx_status.eht_known |=
-				QDF_MON_STATUS_EHT_GUARD_INTERVAL_KNOWN |
-				QDF_MON_STATUS_EHT_LTF_KNOWN;
-
-	ppdu_info->rx_status.eht_data[0] |= (cmn_usr_info->cp_setting <<
-					     QDF_MON_STATUS_EHT_GI_SHIFT);
-	ppdu_info->rx_status.eht_data[0] |= (cmn_usr_info->ltf_size <<
-					     QDF_MON_STATUS_EHT_LTF_SHIFT);
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-#else
-static inline uint32_t
-hal_rx_parse_cmn_usr_info(struct hal_soc *hal_soc, uint8_t *tlv,
-			  struct hal_rx_ppdu_info *ppdu_info)
-{
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-#endif
-
-static inline enum ieee80211_eht_ru_size
-hal_rx_mon_hal_ru_size_to_ieee80211_ru_size(struct hal_soc *hal_soc,
-					    uint32_t hal_ru_size)
-{
-	switch (hal_ru_size) {
-	case HAL_EHT_RU_26:
-		return IEEE80211_EHT_RU_26;
-	case HAL_EHT_RU_52:
-		return IEEE80211_EHT_RU_52;
-	case HAL_EHT_RU_78:
-		return IEEE80211_EHT_RU_52_26;
-	case HAL_EHT_RU_106:
-		return IEEE80211_EHT_RU_106;
-	case HAL_EHT_RU_132:
-		return IEEE80211_EHT_RU_106_26;
-	case HAL_EHT_RU_242:
-		return IEEE80211_EHT_RU_242;
-	case HAL_EHT_RU_484:
-		return IEEE80211_EHT_RU_484;
-	case HAL_EHT_RU_726:
-		return IEEE80211_EHT_RU_484_242;
-	case HAL_EHT_RU_996:
-		return IEEE80211_EHT_RU_996;
-	case HAL_EHT_RU_996x2:
-		return IEEE80211_EHT_RU_996x2;
-	case HAL_EHT_RU_996x3:
-		return IEEE80211_EHT_RU_996x3;
-	case HAL_EHT_RU_996x4:
-		return IEEE80211_EHT_RU_996x4;
-	case HAL_EHT_RU_NONE:
-		return IEEE80211_EHT_RU_INVALID;
-	case HAL_EHT_RU_996_484:
-		return IEEE80211_EHT_RU_996_484;
-	case HAL_EHT_RU_996x2_484:
-		return IEEE80211_EHT_RU_996x2_484;
-	case HAL_EHT_RU_996x3_484:
-		return IEEE80211_EHT_RU_996x3_484;
-	case HAL_EHT_RU_996_484_242:
-		return IEEE80211_EHT_RU_996_484_242;
-	default:
-		return IEEE80211_EHT_RU_INVALID;
-	}
-}
-
-#define HAL_SET_RU_PER80(ru_320mhz, ru_per80, ru_idx_per80mhz, num_80mhz) \
-	((ru_320mhz) |= ((uint64_t)(ru_per80) << \
-		       (((num_80mhz) * NUM_RU_BITS_PER80) + \
-			((ru_idx_per80mhz) * NUM_RU_BITS_PER20))))
-
-static inline uint32_t
-hal_rx_parse_receive_user_info(struct hal_soc *hal_soc, uint8_t *tlv,
-			       struct hal_rx_ppdu_info *ppdu_info)
-{
-	struct receive_user_info *rx_usr_info = (struct receive_user_info *)tlv;
-	uint64_t ru_index_320mhz = 0;
-	uint16_t ru_index_per80mhz;
-	uint32_t ru_size = 0, num_80mhz_with_ru = 0;
-	uint32_t ru_index = HAL_EHT_RU_INVALID;
-	uint32_t rtap_ru_size = IEEE80211_EHT_RU_INVALID;
-
-	ppdu_info->rx_status.eht_known |=
-				QDF_MON_STATUS_EHT_CONTENT_CH_INDEX_KNOWN;
-	ppdu_info->rx_status.eht_data[0] |=
-				(rx_usr_info->dl_ofdma_content_channel <<
-				 QDF_MON_STATUS_EHT_CONTENT_CH_INDEX_SHIFT);
-
-	if (!(rx_usr_info->reception_type == HAL_RX_TYPE_MU_MIMO ||
-	      rx_usr_info->reception_type == HAL_RX_TYPE_MU_OFDMA ||
-	      rx_usr_info->reception_type == HAL_RX_TYPE_MU_OFMDA_MIMO))
-		return HAL_TLV_STATUS_PPDU_NOT_DONE;
-
-	/* RU allocation present only for OFDMA reception */
-	if (rx_usr_info->ru_type_80_0 != HAL_EHT_RU_NONE) {
-		ru_size += rx_usr_info->ru_type_80_0;
-		ru_index = ru_index_per80mhz = rx_usr_info->ru_start_index_80_0;
-		HAL_SET_RU_PER80(ru_index_320mhz, rx_usr_info->ru_type_80_0,
-				 ru_index_per80mhz, 0);
-		num_80mhz_with_ru++;
-	}
-
-	if (rx_usr_info->ru_type_80_1 != HAL_EHT_RU_NONE) {
-		ru_size += rx_usr_info->ru_type_80_1;
-		ru_index = ru_index_per80mhz = rx_usr_info->ru_start_index_80_1;
-		HAL_SET_RU_PER80(ru_index_320mhz, rx_usr_info->ru_type_80_1,
-				 ru_index_per80mhz, 1);
-		num_80mhz_with_ru++;
-	}
-
-	if (rx_usr_info->ru_type_80_2 != HAL_EHT_RU_NONE) {
-		ru_size += rx_usr_info->ru_type_80_2;
-		ru_index = ru_index_per80mhz = rx_usr_info->ru_start_index_80_2;
-		HAL_SET_RU_PER80(ru_index_320mhz, rx_usr_info->ru_type_80_2,
-				 ru_index_per80mhz, 2);
-		num_80mhz_with_ru++;
-	}
-
-	if (rx_usr_info->ru_type_80_3 != HAL_EHT_RU_NONE) {
-		ru_size += rx_usr_info->ru_type_80_3;
-		ru_index = ru_index_per80mhz = rx_usr_info->ru_start_index_80_3;
-		HAL_SET_RU_PER80(ru_index_320mhz, rx_usr_info->ru_type_80_3,
-				 ru_index_per80mhz, 3);
-		num_80mhz_with_ru++;
-	}
-
-	if (num_80mhz_with_ru > 1) {
-		/* Calculate the MRU index */
-		switch (ru_index_320mhz) {
-		case HAL_EHT_RU_996_484_0:
-		case HAL_EHT_RU_996x2_484_0:
-		case HAL_EHT_RU_996x3_484_0:
-			ru_index = 0;
-			break;
-		case HAL_EHT_RU_996_484_1:
-		case HAL_EHT_RU_996x2_484_1:
-		case HAL_EHT_RU_996x3_484_1:
-			ru_index = 1;
-			break;
-		case HAL_EHT_RU_996_484_2:
-		case HAL_EHT_RU_996x2_484_2:
-		case HAL_EHT_RU_996x3_484_2:
-			ru_index = 2;
-			break;
-		case HAL_EHT_RU_996_484_3:
-		case HAL_EHT_RU_996x2_484_3:
-		case HAL_EHT_RU_996x3_484_3:
-			ru_index = 3;
-			break;
-		case HAL_EHT_RU_996_484_4:
-		case HAL_EHT_RU_996x2_484_4:
-		case HAL_EHT_RU_996x3_484_4:
-			ru_index = 4;
-			break;
-		case HAL_EHT_RU_996_484_5:
-		case HAL_EHT_RU_996x2_484_5:
-		case HAL_EHT_RU_996x3_484_5:
-			ru_index = 5;
-			break;
-		case HAL_EHT_RU_996_484_6:
-		case HAL_EHT_RU_996x2_484_6:
-		case HAL_EHT_RU_996x3_484_6:
-			ru_index = 6;
-			break;
-		case HAL_EHT_RU_996_484_7:
-		case HAL_EHT_RU_996x2_484_7:
-		case HAL_EHT_RU_996x3_484_7:
-			ru_index = 7;
-			break;
-		case HAL_EHT_RU_996x2_484_8:
-			ru_index = 8;
-			break;
-		case HAL_EHT_RU_996x2_484_9:
-			ru_index = 9;
-			break;
-		case HAL_EHT_RU_996x2_484_10:
-			ru_index = 10;
-			break;
-		case HAL_EHT_RU_996x2_484_11:
-			ru_index = 11;
-			break;
-		default:
-			ru_index = HAL_EHT_RU_INVALID;
-			dp_debug("Invalid RU index");
-			qdf_assert(0);
-			break;
-		}
-		ru_size += 4;
-	}
-
-	rtap_ru_size = hal_rx_mon_hal_ru_size_to_ieee80211_ru_size(hal_soc,
-								   ru_size);
-	if (rtap_ru_size != IEEE80211_EHT_RU_INVALID) {
-		ppdu_info->rx_status.eht_known |=
-					QDF_MON_STATUS_EHT_RU_MRU_SIZE_KNOWN;
-		ppdu_info->rx_status.eht_data[1] |= (rtap_ru_size <<
-					QDF_MON_STATUS_EHT_RU_MRU_SIZE_SHIFT);
-	}
-
-	if (ru_index != HAL_EHT_RU_INVALID) {
-		ppdu_info->rx_status.eht_known |=
-					QDF_MON_STATUS_EHT_RU_MRU_INDEX_KNOWN;
-		ppdu_info->rx_status.eht_data[1] |= (ru_index <<
-					QDF_MON_STATUS_EHT_RU_MRU_INDEX_SHIFT);
-	}
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-/**
- * hal_rx_status_get_tlv_info() - process receive info TLV
- * @rx_tlv_hdr: pointer to TLV header
- * @ppdu_info: pointer to ppdu_info
- *
- * Return: HAL_TLV_STATUS_PPDU_NOT_DONE or HAL_TLV_STATUS_PPDU_DONE from tlv
- */
-static inline uint32_t
-hal_rx_status_get_tlv_info_generic_be(void *rx_tlv_hdr, void *ppduinfo,
-				      hal_soc_handle_t hal_soc_hdl,
-				      qdf_nbuf_t nbuf)
-{
-	struct hal_soc *hal = (struct hal_soc *)hal_soc_hdl;
-	uint32_t tlv_tag, user_id, tlv_len, value;
-	uint8_t group_id = 0;
-	uint8_t he_dcm = 0;
-	uint8_t he_stbc = 0;
-	uint16_t he_gi = 0;
-	uint16_t he_ltf = 0;
-	void *rx_tlv;
-	bool unhandled = false;
-	struct mon_rx_user_status *mon_rx_user_status;
-	struct hal_rx_ppdu_info *ppdu_info =
-			(struct hal_rx_ppdu_info *)ppduinfo;
-
-	tlv_tag = HAL_RX_GET_USER_TLV64_TYPE(rx_tlv_hdr);
-	user_id = HAL_RX_GET_USER_TLV64_USERID(rx_tlv_hdr);
-	tlv_len = HAL_RX_GET_USER_TLV64_LEN(rx_tlv_hdr);
-
-	rx_tlv = (uint8_t *)rx_tlv_hdr + HAL_RX_TLV64_HDR_SIZE;
-
-	qdf_trace_hex_dump(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
-			   rx_tlv, tlv_len);
-
-	switch (tlv_tag) {
-	case WIFIRX_PPDU_START_E:
-	{
-		if (qdf_unlikely(ppdu_info->com_info.last_ppdu_id ==
-		    HAL_RX_GET(rx_tlv, RX_PPDU_START, PHY_PPDU_ID)))
-			hal_err("Matching ppdu_id(%u) detected",
-				 ppdu_info->com_info.last_ppdu_id);
-
-		/* Reset ppdu_info before processing the ppdu */
-		qdf_mem_zero(ppdu_info,
-			     sizeof(struct hal_rx_ppdu_info));
-
-		ppdu_info->com_info.last_ppdu_id =
-			ppdu_info->com_info.ppdu_id =
-				HAL_RX_GET(rx_tlv, RX_PPDU_START,
-					PHY_PPDU_ID);
-
-		/* channel number is set in PHY meta data */
-		ppdu_info->rx_status.chan_num =
-			(HAL_RX_GET(rx_tlv, RX_PPDU_START,
-				SW_PHY_META_DATA) & 0x0000FFFF);
-		ppdu_info->rx_status.chan_freq =
-			(HAL_RX_GET(rx_tlv, RX_PPDU_START,
-				SW_PHY_META_DATA) & 0xFFFF0000) >> 16;
-		if (ppdu_info->rx_status.chan_num &&
-		    ppdu_info->rx_status.chan_freq) {
-			ppdu_info->rx_status.chan_freq =
-				hal_rx_radiotap_num_to_freq(
-				ppdu_info->rx_status.chan_num,
-				 ppdu_info->rx_status.chan_freq);
-		}
-
-		ppdu_info->com_info.ppdu_timestamp =
-			HAL_RX_GET(rx_tlv, RX_PPDU_START,
-				PPDU_START_TIMESTAMP_31_0);
-		ppdu_info->rx_status.ppdu_timestamp =
-			ppdu_info->com_info.ppdu_timestamp;
-		ppdu_info->rx_state = HAL_RX_MON_PPDU_START;
-
-		break;
-	}
-
-	case WIFIRX_PPDU_START_USER_INFO_E:
-		hal_rx_parse_receive_user_info(hal, rx_tlv, ppdu_info);
-		break;
-
-	case WIFIRX_PPDU_END_E:
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
-			"[%s][%d] ppdu_end_e len=%d",
-				__func__, __LINE__, tlv_len);
-		/* This is followed by sub-TLVs of PPDU_END */
-		ppdu_info->rx_state = HAL_RX_MON_PPDU_END;
-		break;
-
-	case WIFIPHYRX_LOCATION_E:
-		hal_rx_get_rtt_info(hal_soc_hdl, rx_tlv, ppdu_info);
-		break;
-
-	case WIFIRXPCU_PPDU_END_INFO_E:
-		ppdu_info->rx_status.rx_antenna =
-			HAL_RX_GET(rx_tlv, RXPCU_PPDU_END_INFO, RX_ANTENNA);
-		ppdu_info->rx_status.tsft =
-			HAL_RX_GET(rx_tlv, RXPCU_PPDU_END_INFO,
-				WB_TIMESTAMP_UPPER_32);
-		ppdu_info->rx_status.tsft = (ppdu_info->rx_status.tsft << 32) |
-			HAL_RX_GET(rx_tlv, RXPCU_PPDU_END_INFO,
-				WB_TIMESTAMP_LOWER_32);
-		ppdu_info->rx_status.duration =
-			HAL_RX_GET(rx_tlv, UNIFIED_RXPCU_PPDU_END_INFO_8,
-				RX_PPDU_DURATION);
-		hal_rx_get_bb_info(hal_soc_hdl, rx_tlv, ppdu_info);
-		break;
-
-	/*
-	 * WIFIRX_PPDU_END_USER_STATS_E comes for each user received.
-	 * for MU, based on num users we see this tlv that many times.
-	 */
-	case WIFIRX_PPDU_END_USER_STATS_E:
-	{
-		unsigned long tid = 0;
-		uint16_t seq = 0;
-
-		ppdu_info->rx_status.ast_index =
-				HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-						AST_INDEX);
-
-		tid = HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-				RECEIVED_QOS_DATA_TID_BITMAP);
-		ppdu_info->rx_status.tid = qdf_find_first_bit(&tid,
-							      sizeof(tid) * 8);
-
-		if (ppdu_info->rx_status.tid == (sizeof(tid) * 8))
-			ppdu_info->rx_status.tid = HAL_TID_INVALID;
-
-		ppdu_info->rx_status.tcp_msdu_count =
-			HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-					TCP_MSDU_COUNT) +
-			HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-					TCP_ACK_MSDU_COUNT);
-		ppdu_info->rx_status.udp_msdu_count =
-			HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-						UDP_MSDU_COUNT);
-		ppdu_info->rx_status.other_msdu_count =
-			HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-					OTHER_MSDU_COUNT);
-
-		if (ppdu_info->sw_frame_group_id
-		    != HAL_MPDU_SW_FRAME_GROUP_NULL_DATA) {
-			ppdu_info->rx_status.frame_control_info_valid =
-				HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-					   FRAME_CONTROL_INFO_VALID);
-
-			if (ppdu_info->rx_status.frame_control_info_valid)
-				ppdu_info->rx_status.frame_control =
-					HAL_RX_GET(rx_tlv,
-						   RX_PPDU_END_USER_STATS,
-						   FRAME_CONTROL_FIELD);
-
-			hal_get_qos_control(rx_tlv, ppdu_info);
-		}
-
-		ppdu_info->rx_status.data_sequence_control_info_valid =
-			HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-				   DATA_SEQUENCE_CONTROL_INFO_VALID);
-
-		seq = HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-				 FIRST_DATA_SEQ_CTRL);
-		if (ppdu_info->rx_status.data_sequence_control_info_valid)
-			ppdu_info->rx_status.first_data_seq_ctrl = seq;
-
-		ppdu_info->rx_status.preamble_type =
-			HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-						HT_CONTROL_FIELD_PKT_TYPE);
-		switch (ppdu_info->rx_status.preamble_type) {
-		case HAL_RX_PKT_TYPE_11N:
-			ppdu_info->rx_status.ht_flags = 1;
-			ppdu_info->rx_status.rtap_flags |= HT_SGI_PRESENT;
-			break;
-		case HAL_RX_PKT_TYPE_11AC:
-			ppdu_info->rx_status.vht_flags = 1;
-			break;
-		case HAL_RX_PKT_TYPE_11AX:
-			ppdu_info->rx_status.he_flags = 1;
-			break;
-		default:
-			break;
-		}
-
-		ppdu_info->com_info.mpdu_cnt_fcs_ok =
-			HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-					MPDU_CNT_FCS_OK);
-		ppdu_info->com_info.mpdu_cnt_fcs_err =
-			HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-					MPDU_CNT_FCS_ERR);
-		if ((ppdu_info->com_info.mpdu_cnt_fcs_ok |
-			ppdu_info->com_info.mpdu_cnt_fcs_err) > 1)
-			ppdu_info->rx_status.rs_flags |= IEEE80211_AMPDU_FLAG;
-		else
-			ppdu_info->rx_status.rs_flags &=
-				(~IEEE80211_AMPDU_FLAG);
-
-		ppdu_info->com_info.mpdu_fcs_ok_bitmap[0] =
-				HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-					   FCS_OK_BITMAP_31_0);
-
-		ppdu_info->com_info.mpdu_fcs_ok_bitmap[1] =
-				HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS,
-					   FCS_OK_BITMAP_63_32);
-
-		if (user_id < HAL_MAX_UL_MU_USERS) {
-			mon_rx_user_status =
-				&ppdu_info->rx_user_status[user_id];
-
-			hal_rx_handle_mu_ul_info(rx_tlv, mon_rx_user_status);
-
-			ppdu_info->com_info.num_users++;
-
-			hal_rx_populate_mu_user_info(rx_tlv, ppdu_info,
-						     user_id,
-						     mon_rx_user_status);
-		}
-		break;
-	}
-
-	case WIFIRX_PPDU_END_USER_STATS_EXT_E:
-		ppdu_info->com_info.mpdu_fcs_ok_bitmap[2] =
-			HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS_EXT,
-				   FCS_OK_BITMAP_95_64);
-
-		ppdu_info->com_info.mpdu_fcs_ok_bitmap[3] =
-			 HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS_EXT,
-				    FCS_OK_BITMAP_127_96);
-
-		ppdu_info->com_info.mpdu_fcs_ok_bitmap[4] =
-			HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS_EXT,
-				   FCS_OK_BITMAP_159_128);
-
-		ppdu_info->com_info.mpdu_fcs_ok_bitmap[5] =
-			 HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS_EXT,
-				    FCS_OK_BITMAP_191_160);
-
-		ppdu_info->com_info.mpdu_fcs_ok_bitmap[6] =
-			HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS_EXT,
-				   FCS_OK_BITMAP_223_192);
-
-		ppdu_info->com_info.mpdu_fcs_ok_bitmap[7] =
-			 HAL_RX_GET(rx_tlv, RX_PPDU_END_USER_STATS_EXT,
-				    FCS_OK_BITMAP_255_224);
-		break;
-
-	case WIFIRX_PPDU_END_STATUS_DONE_E:
-		return HAL_TLV_STATUS_PPDU_DONE;
-
-	case WIFIDUMMY_E:
-		return HAL_TLV_STATUS_BUF_DONE;
-
-	case WIFIPHYRX_HT_SIG_E:
-	{
-		uint8_t *ht_sig_info = (uint8_t *)rx_tlv +
-				HAL_RX_OFFSET(UNIFIED_PHYRX_HT_SIG_0,
-				HT_SIG_INFO_PHYRX_HT_SIG_INFO_DETAILS);
-		value = HAL_RX_GET(ht_sig_info, HT_SIG_INFO,
-				FEC_CODING);
-		ppdu_info->rx_status.ldpc = (value == HAL_SU_MU_CODING_LDPC) ?
-			1 : 0;
-		ppdu_info->rx_status.mcs = HAL_RX_GET(ht_sig_info,
-				HT_SIG_INFO, MCS);
-		ppdu_info->rx_status.ht_mcs = ppdu_info->rx_status.mcs;
-		ppdu_info->rx_status.bw = HAL_RX_GET(ht_sig_info,
-				HT_SIG_INFO, CBW);
-		ppdu_info->rx_status.sgi = HAL_RX_GET(ht_sig_info,
-				HT_SIG_INFO, SHORT_GI);
-		ppdu_info->rx_status.reception_type = HAL_RX_TYPE_SU;
-		ppdu_info->rx_status.nss = ((ppdu_info->rx_status.mcs) >>
-				HT_SIG_SU_NSS_SHIFT) + 1;
-		ppdu_info->rx_status.mcs &= ((1 << HT_SIG_SU_NSS_SHIFT) - 1);
-		break;
-	}
-
-	case WIFIPHYRX_L_SIG_B_E:
-	{
-		uint8_t *l_sig_b_info = (uint8_t *)rx_tlv +
-				HAL_RX_OFFSET(UNIFIED_PHYRX_L_SIG_B_0,
-				L_SIG_B_INFO_PHYRX_L_SIG_B_INFO_DETAILS);
-
-		value = HAL_RX_GET(l_sig_b_info, L_SIG_B_INFO, RATE);
-		ppdu_info->rx_status.l_sig_b_info = *((uint32_t *)l_sig_b_info);
-		switch (value) {
-		case 1:
-			ppdu_info->rx_status.rate = HAL_11B_RATE_3MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS3;
-			break;
-		case 2:
-			ppdu_info->rx_status.rate = HAL_11B_RATE_2MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS2;
-			break;
-		case 3:
-			ppdu_info->rx_status.rate = HAL_11B_RATE_1MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS1;
-			break;
-		case 4:
-			ppdu_info->rx_status.rate = HAL_11B_RATE_0MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS0;
-			break;
-		case 5:
-			ppdu_info->rx_status.rate = HAL_11B_RATE_6MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS6;
-			break;
-		case 6:
-			ppdu_info->rx_status.rate = HAL_11B_RATE_5MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS5;
-			break;
-		case 7:
-			ppdu_info->rx_status.rate = HAL_11B_RATE_4MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS4;
-			break;
-		default:
-			break;
-		}
-		ppdu_info->rx_status.cck_flag = 1;
-		ppdu_info->rx_status.reception_type = HAL_RX_TYPE_SU;
-	break;
-	}
-
-	case WIFIPHYRX_L_SIG_A_E:
-	{
-		uint8_t *l_sig_a_info = (uint8_t *)rx_tlv +
-				HAL_RX_OFFSET(UNIFIED_PHYRX_L_SIG_A_0,
-				L_SIG_A_INFO_PHYRX_L_SIG_A_INFO_DETAILS);
-
-		value = HAL_RX_GET(l_sig_a_info, L_SIG_A_INFO, RATE);
-		ppdu_info->rx_status.l_sig_a_info = *((uint32_t *)l_sig_a_info);
-		switch (value) {
-		case 8:
-			ppdu_info->rx_status.rate = HAL_11A_RATE_0MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS0;
-			break;
-		case 9:
-			ppdu_info->rx_status.rate = HAL_11A_RATE_1MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS1;
-			break;
-		case 10:
-			ppdu_info->rx_status.rate = HAL_11A_RATE_2MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS2;
-			break;
-		case 11:
-			ppdu_info->rx_status.rate = HAL_11A_RATE_3MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS3;
-			break;
-		case 12:
-			ppdu_info->rx_status.rate = HAL_11A_RATE_4MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS4;
-			break;
-		case 13:
-			ppdu_info->rx_status.rate = HAL_11A_RATE_5MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS5;
-			break;
-		case 14:
-			ppdu_info->rx_status.rate = HAL_11A_RATE_6MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS6;
-			break;
-		case 15:
-			ppdu_info->rx_status.rate = HAL_11A_RATE_7MCS;
-			ppdu_info->rx_status.mcs = HAL_LEGACY_MCS7;
-			break;
-		default:
-			break;
-		}
-		ppdu_info->rx_status.ofdm_flag = 1;
-		ppdu_info->rx_status.reception_type = HAL_RX_TYPE_SU;
-	break;
-	}
-
-	case WIFIPHYRX_VHT_SIG_A_E:
-	{
-		uint8_t *vht_sig_a_info = (uint8_t *)rx_tlv +
-				HAL_RX_OFFSET(UNIFIED_PHYRX_VHT_SIG_A_0,
-				VHT_SIG_A_INFO_PHYRX_VHT_SIG_A_INFO_DETAILS);
-
-		value = HAL_RX_GET(vht_sig_a_info, VHT_SIG_A_INFO,
-				SU_MU_CODING);
-		ppdu_info->rx_status.ldpc = (value == HAL_SU_MU_CODING_LDPC) ?
-			1 : 0;
-		group_id = HAL_RX_GET(vht_sig_a_info, VHT_SIG_A_INFO, GROUP_ID);
-		ppdu_info->rx_status.vht_flag_values5 = group_id;
-		ppdu_info->rx_status.mcs = HAL_RX_GET(vht_sig_a_info,
-				VHT_SIG_A_INFO, MCS);
-		ppdu_info->rx_status.sgi = HAL_RX_GET(vht_sig_a_info,
-				VHT_SIG_A_INFO, GI_SETTING);
-
-		switch (hal->target_type) {
-		case TARGET_TYPE_QCA8074:
-		case TARGET_TYPE_QCA8074V2:
-		case TARGET_TYPE_QCA6018:
-		case TARGET_TYPE_QCA5018:
-		case TARGET_TYPE_QCN9000:
-		case TARGET_TYPE_QCN6122:
-#ifdef QCA_WIFI_QCA6390
-		case TARGET_TYPE_QCA6390:
-#endif
-			ppdu_info->rx_status.is_stbc =
-				HAL_RX_GET(vht_sig_a_info,
-					   VHT_SIG_A_INFO, STBC);
-			value =  HAL_RX_GET(vht_sig_a_info,
-					    VHT_SIG_A_INFO, N_STS);
-			value = value & VHT_SIG_SU_NSS_MASK;
-			if (ppdu_info->rx_status.is_stbc && (value > 0))
-				value = ((value + 1) >> 1) - 1;
-			ppdu_info->rx_status.nss =
-				((value & VHT_SIG_SU_NSS_MASK) + 1);
-
-			break;
-		case TARGET_TYPE_QCA6290:
-#if !defined(QCA_WIFI_QCA6290_11AX)
-			ppdu_info->rx_status.is_stbc =
-				HAL_RX_GET(vht_sig_a_info,
-					   VHT_SIG_A_INFO, STBC);
-			value =  HAL_RX_GET(vht_sig_a_info,
-					    VHT_SIG_A_INFO, N_STS);
-			value = value & VHT_SIG_SU_NSS_MASK;
-			if (ppdu_info->rx_status.is_stbc && (value > 0))
-				value = ((value + 1) >> 1) - 1;
-			ppdu_info->rx_status.nss =
-				((value & VHT_SIG_SU_NSS_MASK) + 1);
-#else
-			ppdu_info->rx_status.nss = 0;
-#endif
-			break;
-		case TARGET_TYPE_QCA6490:
-		case TARGET_TYPE_QCA6750:
-		case TARGET_TYPE_KIWI:
-			ppdu_info->rx_status.nss = 0;
-			break;
-		default:
-			break;
-		}
-		ppdu_info->rx_status.vht_flag_values3[0] =
-				(((ppdu_info->rx_status.mcs) << 4)
-				| ppdu_info->rx_status.nss);
-		ppdu_info->rx_status.bw = HAL_RX_GET(vht_sig_a_info,
-				VHT_SIG_A_INFO, BANDWIDTH);
-		ppdu_info->rx_status.vht_flag_values2 =
-			ppdu_info->rx_status.bw;
-		ppdu_info->rx_status.vht_flag_values4 =
-			HAL_RX_GET(vht_sig_a_info,
-				  VHT_SIG_A_INFO, SU_MU_CODING);
-
-		ppdu_info->rx_status.beamformed = HAL_RX_GET(vht_sig_a_info,
-				VHT_SIG_A_INFO, BEAMFORMED);
-		if (group_id == 0 || group_id == 63)
-			ppdu_info->rx_status.reception_type = HAL_RX_TYPE_SU;
-		else
-			ppdu_info->rx_status.reception_type =
-				HAL_RX_TYPE_MU_MIMO;
-
-		break;
-	}
-	case WIFIPHYRX_HE_SIG_A_SU_E:
-	{
-		uint8_t *he_sig_a_su_info = (uint8_t *)rx_tlv +
-			HAL_RX_OFFSET(UNIFIED_PHYRX_HE_SIG_A_SU_0,
-			HE_SIG_A_SU_INFO_PHYRX_HE_SIG_A_SU_INFO_DETAILS);
-		ppdu_info->rx_status.he_flags = 1;
-		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO,
-			FORMAT_INDICATION);
-		if (value == 0) {
-			ppdu_info->rx_status.he_data1 =
-				QDF_MON_STATUS_HE_TRIG_FORMAT_TYPE;
-		} else {
-			ppdu_info->rx_status.he_data1 =
-				 QDF_MON_STATUS_HE_SU_FORMAT_TYPE;
-		}
-
-		/* data1 */
-		ppdu_info->rx_status.he_data1 |=
-			QDF_MON_STATUS_HE_BSS_COLOR_KNOWN |
-			QDF_MON_STATUS_HE_BEAM_CHANGE_KNOWN |
-			QDF_MON_STATUS_HE_DL_UL_KNOWN |
-			QDF_MON_STATUS_HE_MCS_KNOWN |
-			QDF_MON_STATUS_HE_DCM_KNOWN |
-			QDF_MON_STATUS_HE_CODING_KNOWN |
-			QDF_MON_STATUS_HE_LDPC_EXTRA_SYMBOL_KNOWN |
-			QDF_MON_STATUS_HE_STBC_KNOWN |
-			QDF_MON_STATUS_HE_DATA_BW_RU_KNOWN |
-			QDF_MON_STATUS_HE_DOPPLER_KNOWN;
-
-		/* data2 */
-		ppdu_info->rx_status.he_data2 =
-			QDF_MON_STATUS_HE_GI_KNOWN;
-		ppdu_info->rx_status.he_data2 |=
-			QDF_MON_STATUS_TXBF_KNOWN |
-			QDF_MON_STATUS_PE_DISAMBIGUITY_KNOWN |
-			QDF_MON_STATUS_TXOP_KNOWN |
-			QDF_MON_STATUS_LTF_SYMBOLS_KNOWN |
-			QDF_MON_STATUS_PRE_FEC_PADDING_KNOWN |
-			QDF_MON_STATUS_MIDABLE_PERIODICITY_KNOWN;
-
-		/* data3 */
-		value = HAL_RX_GET(he_sig_a_su_info,
-				HE_SIG_A_SU_INFO, BSS_COLOR_ID);
-		ppdu_info->rx_status.he_data3 = value;
-		value = HAL_RX_GET(he_sig_a_su_info,
-				HE_SIG_A_SU_INFO, BEAM_CHANGE);
-		value = value << QDF_MON_STATUS_BEAM_CHANGE_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-		value = HAL_RX_GET(he_sig_a_su_info,
-				HE_SIG_A_SU_INFO, DL_UL_FLAG);
-		value = value << QDF_MON_STATUS_DL_UL_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-
-		value = HAL_RX_GET(he_sig_a_su_info,
-				HE_SIG_A_SU_INFO, TRANSMIT_MCS);
-		ppdu_info->rx_status.mcs = value;
-		value = value << QDF_MON_STATUS_TRANSMIT_MCS_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-
-		value = HAL_RX_GET(he_sig_a_su_info,
-				HE_SIG_A_SU_INFO, DCM);
-		he_dcm = value;
-		value = value << QDF_MON_STATUS_DCM_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-		value = HAL_RX_GET(he_sig_a_su_info,
-				HE_SIG_A_SU_INFO, CODING);
-		ppdu_info->rx_status.ldpc = (value == HAL_SU_MU_CODING_LDPC) ?
-			1 : 0;
-		value = value << QDF_MON_STATUS_CODING_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-		value = HAL_RX_GET(he_sig_a_su_info,
-				HE_SIG_A_SU_INFO,
-				LDPC_EXTRA_SYMBOL);
-		value = value << QDF_MON_STATUS_LDPC_EXTRA_SYMBOL_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-		value = HAL_RX_GET(he_sig_a_su_info,
-				HE_SIG_A_SU_INFO, STBC);
-		he_stbc = value;
-		value = value << QDF_MON_STATUS_STBC_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-
-		/* data4 */
-		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO,
-							SPATIAL_REUSE);
-		ppdu_info->rx_status.he_data4 = value;
-
-		/* data5 */
-		value = HAL_RX_GET(he_sig_a_su_info,
-				HE_SIG_A_SU_INFO, TRANSMIT_BW);
-		ppdu_info->rx_status.he_data5 = value;
-		ppdu_info->rx_status.bw = value;
-		value = HAL_RX_GET(he_sig_a_su_info,
-				HE_SIG_A_SU_INFO, CP_LTF_SIZE);
-		switch (value) {
-		case 0:
-				he_gi = HE_GI_0_8;
-				he_ltf = HE_LTF_1_X;
-				break;
-		case 1:
-				he_gi = HE_GI_0_8;
-				he_ltf = HE_LTF_2_X;
-				break;
-		case 2:
-				he_gi = HE_GI_1_6;
-				he_ltf = HE_LTF_2_X;
-				break;
-		case 3:
-				if (he_dcm && he_stbc) {
-					he_gi = HE_GI_0_8;
-					he_ltf = HE_LTF_4_X;
-				} else {
-					he_gi = HE_GI_3_2;
-					he_ltf = HE_LTF_4_X;
-				}
-				break;
-		}
-		ppdu_info->rx_status.sgi = he_gi;
-		ppdu_info->rx_status.ltf_size = he_ltf;
-		hal_get_radiotap_he_gi_ltf(&he_gi, &he_ltf);
-		value = he_gi << QDF_MON_STATUS_GI_SHIFT;
-		ppdu_info->rx_status.he_data5 |= value;
-		value = he_ltf << QDF_MON_STATUS_HE_LTF_SIZE_SHIFT;
-		ppdu_info->rx_status.he_data5 |= value;
-
-		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO, NSTS);
-		value = (value << QDF_MON_STATUS_HE_LTF_SYM_SHIFT);
-		ppdu_info->rx_status.he_data5 |= value;
-
-		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO,
-						PACKET_EXTENSION_A_FACTOR);
-		value = value << QDF_MON_STATUS_PRE_FEC_PAD_SHIFT;
-		ppdu_info->rx_status.he_data5 |= value;
-
-		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO, TXBF);
-		value = value << QDF_MON_STATUS_TXBF_SHIFT;
-		ppdu_info->rx_status.he_data5 |= value;
-		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO,
-					PACKET_EXTENSION_PE_DISAMBIGUITY);
-		value = value << QDF_MON_STATUS_PE_DISAMBIGUITY_SHIFT;
-		ppdu_info->rx_status.he_data5 |= value;
-
-		/* data6 */
-		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO, NSTS);
-		value++;
-		ppdu_info->rx_status.nss = value;
-		ppdu_info->rx_status.he_data6 = value;
-		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO,
-							DOPPLER_INDICATION);
-		value = value << QDF_MON_STATUS_DOPPLER_SHIFT;
-		ppdu_info->rx_status.he_data6 |= value;
-		value = HAL_RX_GET(he_sig_a_su_info, HE_SIG_A_SU_INFO,
-							TXOP_DURATION);
-		value = value << QDF_MON_STATUS_TXOP_SHIFT;
-		ppdu_info->rx_status.he_data6 |= value;
-
-		ppdu_info->rx_status.beamformed = HAL_RX_GET(he_sig_a_su_info,
-					HE_SIG_A_SU_INFO, TXBF);
-		ppdu_info->rx_status.reception_type = HAL_RX_TYPE_SU;
-		break;
-	}
-	case WIFIPHYRX_HE_SIG_A_MU_DL_E:
-	{
-		uint8_t *he_sig_a_mu_dl_info = (uint8_t *)rx_tlv +
-			HAL_RX_OFFSET(UNIFIED_PHYRX_HE_SIG_A_MU_DL_0,
-			HE_SIG_A_MU_DL_INFO_PHYRX_HE_SIG_A_MU_DL_INFO_DETAILS);
-
-		ppdu_info->rx_status.he_mu_flags = 1;
-
-		/* HE Flags */
-		/*data1*/
-		ppdu_info->rx_status.he_data1 =
-					QDF_MON_STATUS_HE_MU_FORMAT_TYPE;
-		ppdu_info->rx_status.he_data1 |=
-			QDF_MON_STATUS_HE_BSS_COLOR_KNOWN |
-			QDF_MON_STATUS_HE_DL_UL_KNOWN |
-			QDF_MON_STATUS_HE_LDPC_EXTRA_SYMBOL_KNOWN |
-			QDF_MON_STATUS_HE_STBC_KNOWN |
-			QDF_MON_STATUS_HE_DATA_BW_RU_KNOWN |
-			QDF_MON_STATUS_HE_DOPPLER_KNOWN;
-
-		/* data2 */
-		ppdu_info->rx_status.he_data2 =
-			QDF_MON_STATUS_HE_GI_KNOWN;
-		ppdu_info->rx_status.he_data2 |=
-			QDF_MON_STATUS_LTF_SYMBOLS_KNOWN |
-			QDF_MON_STATUS_PRE_FEC_PADDING_KNOWN |
-			QDF_MON_STATUS_PE_DISAMBIGUITY_KNOWN |
-			QDF_MON_STATUS_TXOP_KNOWN |
-			QDF_MON_STATUS_MIDABLE_PERIODICITY_KNOWN;
-
-		/*data3*/
-		value = HAL_RX_GET(he_sig_a_mu_dl_info,
-				HE_SIG_A_MU_DL_INFO, BSS_COLOR_ID);
-		ppdu_info->rx_status.he_data3 = value;
-
-		value = HAL_RX_GET(he_sig_a_mu_dl_info,
-				HE_SIG_A_MU_DL_INFO, DL_UL_FLAG);
-		value = value << QDF_MON_STATUS_DL_UL_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-
-		value = HAL_RX_GET(he_sig_a_mu_dl_info,
-				HE_SIG_A_MU_DL_INFO,
-				LDPC_EXTRA_SYMBOL);
-		value = value << QDF_MON_STATUS_LDPC_EXTRA_SYMBOL_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-
-		value = HAL_RX_GET(he_sig_a_mu_dl_info,
-				HE_SIG_A_MU_DL_INFO, STBC);
-		he_stbc = value;
-		value = value << QDF_MON_STATUS_STBC_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-
-		/*data4*/
-		value = HAL_RX_GET(he_sig_a_mu_dl_info, HE_SIG_A_MU_DL_INFO,
-							SPATIAL_REUSE);
-		ppdu_info->rx_status.he_data4 = value;
-
-		/*data5*/
-		value = HAL_RX_GET(he_sig_a_mu_dl_info,
-				HE_SIG_A_MU_DL_INFO, TRANSMIT_BW);
-		ppdu_info->rx_status.he_data5 = value;
-		ppdu_info->rx_status.bw = value;
-
-		value = HAL_RX_GET(he_sig_a_mu_dl_info,
-				HE_SIG_A_MU_DL_INFO, CP_LTF_SIZE);
-		switch (value) {
-		case 0:
-			he_gi = HE_GI_0_8;
-			he_ltf = HE_LTF_4_X;
-			break;
-		case 1:
-			he_gi = HE_GI_0_8;
-			he_ltf = HE_LTF_2_X;
-			break;
-		case 2:
-			he_gi = HE_GI_1_6;
-			he_ltf = HE_LTF_2_X;
-			break;
-		case 3:
-			he_gi = HE_GI_3_2;
-			he_ltf = HE_LTF_4_X;
-			break;
-		}
-		ppdu_info->rx_status.sgi = he_gi;
-		ppdu_info->rx_status.ltf_size = he_ltf;
-		hal_get_radiotap_he_gi_ltf(&he_gi, &he_ltf);
-		value = he_gi << QDF_MON_STATUS_GI_SHIFT;
-		ppdu_info->rx_status.he_data5 |= value;
-
-		value = he_ltf << QDF_MON_STATUS_HE_LTF_SIZE_SHIFT;
-		ppdu_info->rx_status.he_data5 |= value;
-
-		value = HAL_RX_GET(he_sig_a_mu_dl_info,
-				   HE_SIG_A_MU_DL_INFO, NUM_LTF_SYMBOLS);
-		value = (value << QDF_MON_STATUS_HE_LTF_SYM_SHIFT);
-		ppdu_info->rx_status.he_data5 |= value;
-
-		value = HAL_RX_GET(he_sig_a_mu_dl_info, HE_SIG_A_MU_DL_INFO,
-				   PACKET_EXTENSION_A_FACTOR);
-		value = value << QDF_MON_STATUS_PRE_FEC_PAD_SHIFT;
-		ppdu_info->rx_status.he_data5 |= value;
-
-		value = HAL_RX_GET(he_sig_a_mu_dl_info, HE_SIG_A_MU_DL_INFO,
-				   PACKET_EXTENSION_PE_DISAMBIGUITY);
-		value = value << QDF_MON_STATUS_PE_DISAMBIGUITY_SHIFT;
-		ppdu_info->rx_status.he_data5 |= value;
-
-		/*data6*/
-		value = HAL_RX_GET(he_sig_a_mu_dl_info, HE_SIG_A_MU_DL_INFO,
-							DOPPLER_INDICATION);
-		value = value << QDF_MON_STATUS_DOPPLER_SHIFT;
-		ppdu_info->rx_status.he_data6 |= value;
-
-		value = HAL_RX_GET(he_sig_a_mu_dl_info, HE_SIG_A_MU_DL_INFO,
-							TXOP_DURATION);
-		value = value << QDF_MON_STATUS_TXOP_SHIFT;
-		ppdu_info->rx_status.he_data6 |= value;
-
-		/* HE-MU Flags */
-		/* HE-MU-flags1 */
-		ppdu_info->rx_status.he_flags1 =
-			QDF_MON_STATUS_SIG_B_MCS_KNOWN |
-			QDF_MON_STATUS_SIG_B_DCM_KNOWN |
-			QDF_MON_STATUS_SIG_B_COMPRESSION_FLAG_1_KNOWN |
-			QDF_MON_STATUS_SIG_B_SYM_NUM_KNOWN |
-			QDF_MON_STATUS_RU_0_KNOWN;
-
-		value = HAL_RX_GET(he_sig_a_mu_dl_info,
-				HE_SIG_A_MU_DL_INFO, MCS_OF_SIG_B);
-		ppdu_info->rx_status.he_flags1 |= value;
-		value = HAL_RX_GET(he_sig_a_mu_dl_info,
-				HE_SIG_A_MU_DL_INFO, DCM_OF_SIG_B);
-		value = value << QDF_MON_STATUS_DCM_FLAG_1_SHIFT;
-		ppdu_info->rx_status.he_flags1 |= value;
-
-		/* HE-MU-flags2 */
-		ppdu_info->rx_status.he_flags2 =
-			QDF_MON_STATUS_BW_KNOWN;
-
-		value = HAL_RX_GET(he_sig_a_mu_dl_info,
-				HE_SIG_A_MU_DL_INFO, TRANSMIT_BW);
-		ppdu_info->rx_status.he_flags2 |= value;
-		value = HAL_RX_GET(he_sig_a_mu_dl_info,
-				HE_SIG_A_MU_DL_INFO, COMP_MODE_SIG_B);
-		value = value << QDF_MON_STATUS_SIG_B_COMPRESSION_FLAG_2_SHIFT;
-		ppdu_info->rx_status.he_flags2 |= value;
-		value = HAL_RX_GET(he_sig_a_mu_dl_info,
-				HE_SIG_A_MU_DL_INFO, NUM_SIG_B_SYMBOLS);
-		value = value - 1;
-		value = value << QDF_MON_STATUS_NUM_SIG_B_SYMBOLS_SHIFT;
-		ppdu_info->rx_status.he_flags2 |= value;
-		ppdu_info->rx_status.reception_type = HAL_RX_TYPE_MU_MIMO;
-		break;
-	}
-	case WIFIPHYRX_HE_SIG_B1_MU_E:
-	{
-		uint8_t *he_sig_b1_mu_info = (uint8_t *)rx_tlv +
-			HAL_RX_OFFSET(UNIFIED_PHYRX_HE_SIG_B1_MU_0,
-			HE_SIG_B1_MU_INFO_PHYRX_HE_SIG_B1_MU_INFO_DETAILS);
-
-		ppdu_info->rx_status.he_sig_b_common_known |=
-			QDF_MON_STATUS_HE_SIG_B_COMMON_KNOWN_RU0;
-		/* TODO: Check on the availability of other fields in
-		 * sig_b_common
-		 */
-
-		value = HAL_RX_GET(he_sig_b1_mu_info,
-				HE_SIG_B1_MU_INFO, RU_ALLOCATION);
-		ppdu_info->rx_status.he_RU[0] = value;
-		ppdu_info->rx_status.reception_type = HAL_RX_TYPE_MU_MIMO;
-		break;
-	}
-	case WIFIPHYRX_HE_SIG_B2_MU_E:
-	{
-		uint8_t *he_sig_b2_mu_info = (uint8_t *)rx_tlv +
-			HAL_RX_OFFSET(UNIFIED_PHYRX_HE_SIG_B2_MU_0,
-			HE_SIG_B2_MU_INFO_PHYRX_HE_SIG_B2_MU_INFO_DETAILS);
-		/*
-		 * Not all "HE" fields can be updated from
-		 * WIFIPHYRX_HE_SIG_A_MU_DL_E TLV. Use WIFIPHYRX_HE_SIG_B2_MU_E
-		 * to populate rest of the "HE" fields for MU scenarios.
-		 */
-
-		/* HE-data1 */
-		ppdu_info->rx_status.he_data1 |=
-			QDF_MON_STATUS_HE_MCS_KNOWN |
-			QDF_MON_STATUS_HE_CODING_KNOWN;
-
-		/* HE-data2 */
-
-		/* HE-data3 */
-		value = HAL_RX_GET(he_sig_b2_mu_info,
-				HE_SIG_B2_MU_INFO, STA_MCS);
-		ppdu_info->rx_status.mcs = value;
-		value = value << QDF_MON_STATUS_TRANSMIT_MCS_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-
-		value = HAL_RX_GET(he_sig_b2_mu_info,
-				HE_SIG_B2_MU_INFO, STA_CODING);
-		value = value << QDF_MON_STATUS_CODING_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-
-		/* HE-data4 */
-		value = HAL_RX_GET(he_sig_b2_mu_info,
-				HE_SIG_B2_MU_INFO, STA_ID);
-		value = value << QDF_MON_STATUS_STA_ID_SHIFT;
-		ppdu_info->rx_status.he_data4 |= value;
-
-		/* HE-data5 */
-
-		/* HE-data6 */
-		value = HAL_RX_GET(he_sig_b2_mu_info,
-				   HE_SIG_B2_MU_INFO, NSTS);
-		/* value n indicates n+1 spatial streams */
-		value++;
-		ppdu_info->rx_status.nss = value;
-		ppdu_info->rx_status.he_data6 |= value;
-
-		break;
-	}
-	case WIFIPHYRX_HE_SIG_B2_OFDMA_E:
-	{
-		uint8_t *he_sig_b2_ofdma_info =
-		(uint8_t *)rx_tlv +
-		HAL_RX_OFFSET(UNIFIED_PHYRX_HE_SIG_B2_OFDMA_0,
-		HE_SIG_B2_OFDMA_INFO_PHYRX_HE_SIG_B2_OFDMA_INFO_DETAILS);
-
-		/*
-		 * Not all "HE" fields can be updated from
-		 * WIFIPHYRX_HE_SIG_A_MU_DL_E TLV. Use WIFIPHYRX_HE_SIG_B2_MU_E
-		 * to populate rest of "HE" fields for MU OFDMA scenarios.
-		 */
-
-		/* HE-data1 */
-		ppdu_info->rx_status.he_data1 |=
-			QDF_MON_STATUS_HE_MCS_KNOWN |
-			QDF_MON_STATUS_HE_DCM_KNOWN |
-			QDF_MON_STATUS_HE_CODING_KNOWN;
-
-		/* HE-data2 */
-		ppdu_info->rx_status.he_data2 |=
-					QDF_MON_STATUS_TXBF_KNOWN;
-
-		/* HE-data3 */
-		value = HAL_RX_GET(he_sig_b2_ofdma_info,
-				HE_SIG_B2_OFDMA_INFO, STA_MCS);
-		ppdu_info->rx_status.mcs = value;
-		value = value << QDF_MON_STATUS_TRANSMIT_MCS_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-
-		value = HAL_RX_GET(he_sig_b2_ofdma_info,
-				HE_SIG_B2_OFDMA_INFO, STA_DCM);
-		he_dcm = value;
-		value = value << QDF_MON_STATUS_DCM_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-
-		value = HAL_RX_GET(he_sig_b2_ofdma_info,
-				HE_SIG_B2_OFDMA_INFO, STA_CODING);
-		value = value << QDF_MON_STATUS_CODING_SHIFT;
-		ppdu_info->rx_status.he_data3 |= value;
-
-		/* HE-data4 */
-		value = HAL_RX_GET(he_sig_b2_ofdma_info,
-				HE_SIG_B2_OFDMA_INFO, STA_ID);
-		value = value << QDF_MON_STATUS_STA_ID_SHIFT;
-		ppdu_info->rx_status.he_data4 |= value;
-
-		/* HE-data5 */
-		value = HAL_RX_GET(he_sig_b2_ofdma_info,
-				   HE_SIG_B2_OFDMA_INFO, TXBF);
-		value = value << QDF_MON_STATUS_TXBF_SHIFT;
-		ppdu_info->rx_status.he_data5 |= value;
-
-		/* HE-data6 */
-		value = HAL_RX_GET(he_sig_b2_ofdma_info,
-				   HE_SIG_B2_OFDMA_INFO, NSTS);
-		/* value n indicates n+1 spatial streams */
-		value++;
-		ppdu_info->rx_status.nss = value;
-		ppdu_info->rx_status.he_data6 |= value;
-		ppdu_info->rx_status.reception_type = HAL_RX_TYPE_MU_OFDMA;
-		break;
-	}
-	case WIFIPHYRX_RSSI_LEGACY_E:
-	{
-		uint8_t reception_type;
-		int8_t rssi_value;
-		uint8_t *rssi_info_tlv = (uint8_t *)rx_tlv +
-			HAL_RX_OFFSET(UNIFIED_PHYRX_RSSI_LEGACY_19,
-				RECEIVE_RSSI_INFO_PREAMBLE_RSSI_INFO_DETAILS);
-
-		ppdu_info->rx_status.rssi_comb = HAL_RX_GET(rx_tlv,
-			PHYRX_RSSI_LEGACY, RSSI_COMB);
-		ppdu_info->rx_status.bw = hal->ops->hal_rx_get_tlv(rx_tlv);
-		ppdu_info->rx_status.he_re = 0;
-
-		reception_type = HAL_RX_GET(rx_tlv,
-					    PHYRX_RSSI_LEGACY,
-					    RECEPTION_TYPE);
-		switch (reception_type) {
-		case QDF_RECEPTION_TYPE_ULOFMDA:
-			ppdu_info->rx_status.reception_type =
-				HAL_RX_TYPE_MU_OFDMA;
-			ppdu_info->rx_status.ulofdma_flag = 1;
-			ppdu_info->rx_status.he_data1 =
-				QDF_MON_STATUS_HE_TRIG_FORMAT_TYPE;
-			break;
-		case QDF_RECEPTION_TYPE_ULMIMO:
-			ppdu_info->rx_status.reception_type =
-				HAL_RX_TYPE_MU_MIMO;
-			ppdu_info->rx_status.he_data1 =
-				QDF_MON_STATUS_HE_MU_FORMAT_TYPE;
-			break;
-		default:
-			ppdu_info->rx_status.reception_type =
-				HAL_RX_TYPE_SU;
-			break;
-		}
-		hal_rx_update_rssi_chain(ppdu_info, rssi_info_tlv);
-		rssi_value = HAL_RX_GET(rssi_info_tlv,
-					RECEIVE_RSSI_INFO, RSSI_PRI20_CHAIN0);
-		ppdu_info->rx_status.rssi[0] = rssi_value;
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
-			  "RSSI_PRI20_CHAIN0: %d\n", rssi_value);
-
-		rssi_value = HAL_RX_GET(rssi_info_tlv,
-					RECEIVE_RSSI_INFO, RSSI_PRI20_CHAIN1);
-		ppdu_info->rx_status.rssi[1] = rssi_value;
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
-			  "RSSI_PRI20_CHAIN1: %d\n", rssi_value);
-
-		rssi_value = HAL_RX_GET(rssi_info_tlv,
-					RECEIVE_RSSI_INFO, RSSI_PRI20_CHAIN2);
-		ppdu_info->rx_status.rssi[2] = rssi_value;
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
-			  "RSSI_PRI20_CHAIN2: %d\n", rssi_value);
-
-		rssi_value = HAL_RX_GET(rssi_info_tlv,
-					RECEIVE_RSSI_INFO, RSSI_PRI20_CHAIN3);
-		ppdu_info->rx_status.rssi[3] = rssi_value;
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
-			  "RSSI_PRI20_CHAIN3: %d\n", rssi_value);
-
-#ifdef DP_BE_NOTYET_WAR
-		// TODO - this is not preset for kiwi
-		rssi_value = HAL_RX_GET(rssi_info_tlv,
-					RECEIVE_RSSI_INFO, RSSI_PRI20_CHAIN4);
-		ppdu_info->rx_status.rssi[4] = rssi_value;
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
-			  "RSSI_PRI20_CHAIN4: %d\n", rssi_value);
-
-		rssi_value = HAL_RX_GET(rssi_info_tlv,
-					RECEIVE_RSSI_INFO,
-					RSSI_PRI20_CHAIN5);
-		ppdu_info->rx_status.rssi[5] = rssi_value;
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
-			  "RSSI_PRI20_CHAIN5: %d\n", rssi_value);
-
-		rssi_value = HAL_RX_GET(rssi_info_tlv,
-					RECEIVE_RSSI_INFO,
-					RSSI_PRI20_CHAIN6);
-		ppdu_info->rx_status.rssi[6] = rssi_value;
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
-			  "RSSI_PRI20_CHAIN6: %d\n", rssi_value);
-
-		rssi_value = HAL_RX_GET(rssi_info_tlv,
-					RECEIVE_RSSI_INFO,
-					RSSI_PRI20_CHAIN7);
-		ppdu_info->rx_status.rssi[7] = rssi_value;
-#endif
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
-			  "RSSI_PRI20_CHAIN7: %d\n", rssi_value);
-		break;
-	}
-	case WIFIPHYRX_OTHER_RECEIVE_INFO_E:
-		hal_rx_proc_phyrx_other_receive_info_tlv(hal, rx_tlv_hdr,
-								ppdu_info);
-		break;
-	case WIFIPHYRX_GENERIC_U_SIG_E:
-		hal_rx_parse_u_sig_hdr(hal, rx_tlv, ppdu_info);
-		break;
-	case WIFIPHYRX_COMMON_USER_INFO_E:
-		hal_rx_parse_cmn_usr_info(hal, rx_tlv, ppdu_info);
-		break;
-	case WIFIRX_HEADER_E:
-	{
-		struct hal_rx_ppdu_common_info *com_info = &ppdu_info->com_info;
-
-		if (ppdu_info->fcs_ok_cnt >=
-		    HAL_RX_MAX_MPDU_H_PER_STATUS_BUFFER) {
-			hal_err("Number of MPDUs(%d) per status buff exceeded",
-				ppdu_info->fcs_ok_cnt);
-			break;
-		}
-
-		/* Update first_msdu_payload for every mpdu and increment
-		 * com_info->mpdu_cnt for every WIFIRX_HEADER_E TLV
-		 */
-		ppdu_info->ppdu_msdu_info[ppdu_info->fcs_ok_cnt].first_msdu_payload =
-			rx_tlv;
-		ppdu_info->ppdu_msdu_info[ppdu_info->fcs_ok_cnt].payload_len = tlv_len;
-		ppdu_info->msdu_info.first_msdu_payload = rx_tlv;
-		ppdu_info->msdu_info.payload_len = tlv_len;
-		ppdu_info->user_id = user_id;
-		ppdu_info->hdr_len = tlv_len;
-		ppdu_info->data = rx_tlv;
-		ppdu_info->data += 4;
-
-		/* for every RX_HEADER TLV increment mpdu_cnt */
-		com_info->mpdu_cnt++;
-		return HAL_TLV_STATUS_HEADER;
-	}
-	case WIFIRX_MPDU_START_E:
-	{
-		uint8_t *rx_mpdu_start = (uint8_t *)rx_tlv;
-		uint32_t ppdu_id = HAL_RX_GET_PPDU_ID(rx_tlv);
-		uint8_t filter_category = 0;
-
-		ppdu_info->nac_info.fc_valid =
-				HAL_RX_MON_GET_FC_VALID(rx_tlv);
-
-		ppdu_info->nac_info.to_ds_flag =
-				HAL_RX_MON_GET_TO_DS_FLAG(rx_tlv);
-
-		ppdu_info->nac_info.frame_control =
-			HAL_RX_GET(rx_mpdu_start,
-				   RX_MPDU_INFO,
-				   MPDU_FRAME_CONTROL_FIELD);
-
-		ppdu_info->sw_frame_group_id =
-			HAL_RX_GET_SW_FRAME_GROUP_ID(rx_tlv);
-
-		ppdu_info->rx_user_status[user_id].sw_peer_id =
-			HAL_RX_GET(rx_mpdu_start,
-				   RX_MPDU_INFO,
-				   SW_PEER_ID);
-
-		if (ppdu_info->sw_frame_group_id ==
-		    HAL_MPDU_SW_FRAME_GROUP_NULL_DATA) {
-			ppdu_info->rx_status.frame_control_info_valid =
-				ppdu_info->nac_info.fc_valid;
-			ppdu_info->rx_status.frame_control =
-				ppdu_info->nac_info.frame_control;
-		}
-
-		hal_get_mac_addr1(rx_mpdu_start,
-				  ppdu_info);
-
-		ppdu_info->nac_info.mac_addr2_valid =
-				HAL_RX_MON_GET_MAC_ADDR2_VALID(rx_mpdu_start);
-
-		*(uint16_t *)&ppdu_info->nac_info.mac_addr2[0] =
-			HAL_RX_GET(rx_mpdu_start,
-				   RX_MPDU_INFO,
-				   MAC_ADDR_AD2_15_0);
-
-		*(uint32_t *)&ppdu_info->nac_info.mac_addr2[2] =
-			HAL_RX_GET(rx_mpdu_start,
-				   RX_MPDU_INFO,
-				   MAC_ADDR_AD2_47_16);
-
-		if (ppdu_info->rx_status.prev_ppdu_id != ppdu_id) {
-			ppdu_info->rx_status.prev_ppdu_id = ppdu_id;
-			ppdu_info->rx_status.ppdu_len =
-				HAL_RX_GET(rx_mpdu_start, RX_MPDU_INFO,
-					   MPDU_LENGTH);
-		} else {
-			ppdu_info->rx_status.ppdu_len +=
-				HAL_RX_GET(rx_mpdu_start, RX_MPDU_INFO,
-					   MPDU_LENGTH);
-		}
-
-		filter_category =
-				HAL_RX_GET_FILTER_CATEGORY(rx_tlv);
-
-		if (filter_category == 0)
-			ppdu_info->rx_status.rxpcu_filter_pass = 1;
-		else if (filter_category == 1)
-			ppdu_info->rx_status.monitor_direct_used = 1;
-
-		ppdu_info->nac_info.mcast_bcast =
-			HAL_RX_GET(rx_mpdu_start,
-				   RX_MPDU_INFO,
-				   MCAST_BCAST);
-		break;
-	}
-	case WIFIRX_MPDU_END_E:
-		ppdu_info->user_id = user_id;
-		ppdu_info->fcs_err =
-			HAL_RX_GET(rx_tlv, RX_MPDU_END,
-				   FCS_ERR);
-		return HAL_TLV_STATUS_MPDU_END;
-	case WIFIRX_MSDU_END_E:
-		if (user_id < HAL_MAX_UL_MU_USERS) {
-			ppdu_info->rx_msdu_info[user_id].cce_metadata =
-				HAL_RX_TLV_CCE_METADATA_GET(rx_tlv);
-			ppdu_info->rx_msdu_info[user_id].fse_metadata =
-				HAL_RX_TLV_FSE_METADATA_GET(rx_tlv);
-			ppdu_info->rx_msdu_info[user_id].is_flow_idx_timeout =
-				HAL_RX_TLV_FLOW_IDX_TIMEOUT_GET(rx_tlv);
-			ppdu_info->rx_msdu_info[user_id].is_flow_idx_invalid =
-				HAL_RX_TLV_FLOW_IDX_INVALID_GET(rx_tlv);
-			ppdu_info->rx_msdu_info[user_id].flow_idx =
-				HAL_RX_TLV_FLOW_IDX_GET(rx_tlv);
-		}
-		return HAL_TLV_STATUS_MSDU_END;
-	case 0:
-		return HAL_TLV_STATUS_PPDU_DONE;
-
-	default:
-		if (hal_rx_handle_other_tlvs(tlv_tag, rx_tlv, ppdu_info))
-			unhandled = false;
-		else
-			unhandled = true;
-		break;
-	}
-
-	if (!unhandled)
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
-			  "%s TLV type: %d, TLV len:%d %s",
-			  __func__, tlv_tag, tlv_len,
-			  unhandled == true ? "unhandled" : "");
-
-	qdf_trace_hex_dump(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
-				rx_tlv, tlv_len);
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-static uint32_t
-hal_rx_status_process_aggr_tlv(struct hal_soc *hal_soc,
-			       struct hal_rx_ppdu_info *ppdu_info)
-{
-	uint32_t aggr_tlv_tag = ppdu_info->tlv_aggr.tlv_tag;
-
-	switch (aggr_tlv_tag) {
-	case WIFIPHYRX_GENERIC_EHT_SIG_E:
-		hal_rx_parse_eht_sig_hdr(hal_soc, ppdu_info->tlv_aggr.buf,
-					 ppdu_info);
-		break;
-	default:
-		/* Aggregated TLV cannot be handled */
-		qdf_assert(0);
-		break;
-	}
-
-	ppdu_info->tlv_aggr.in_progress = 0;
-	ppdu_info->tlv_aggr.cur_len = 0;
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-static inline bool
-hal_rx_status_tlv_should_aggregate(struct hal_soc *hal_soc, uint32_t tlv_tag)
-{
-	switch (tlv_tag) {
-	case WIFIPHYRX_GENERIC_EHT_SIG_E:
-		return true;
-	}
-
-	return false;
-}
-
-static inline uint32_t
-hal_rx_status_aggr_tlv(struct hal_soc *hal_soc, void *rx_tlv_hdr,
-		       struct hal_rx_ppdu_info *ppdu_info,
-		       qdf_nbuf_t nbuf)
-{
-	uint32_t tlv_tag, user_id, tlv_len;
-	void *rx_tlv;
-
-	tlv_tag = HAL_RX_GET_USER_TLV64_TYPE(rx_tlv_hdr);
-	user_id = HAL_RX_GET_USER_TLV64_USERID(rx_tlv_hdr);
-	tlv_len = HAL_RX_GET_USER_TLV64_LEN(rx_tlv_hdr);
-
-	rx_tlv = (uint8_t *)rx_tlv_hdr + HAL_RX_TLV64_HDR_SIZE;
-
-	if (tlv_len <= HAL_RX_MON_MAX_AGGR_SIZE - ppdu_info->tlv_aggr.cur_len) {
-		qdf_mem_copy(ppdu_info->tlv_aggr.buf +
-			     ppdu_info->tlv_aggr.cur_len,
-			     rx_tlv, tlv_len);
-		ppdu_info->tlv_aggr.cur_len += tlv_len;
-	} else {
-		dp_err("Length of TLV exceeds max aggregation length");
-		qdf_assert(0);
-	}
-
-	return HAL_TLV_STATUS_PPDU_NOT_DONE;
-}
-
-static inline uint32_t
-hal_rx_status_start_new_aggr_tlv(struct hal_soc *hal_soc, void *rx_tlv_hdr,
-				 struct hal_rx_ppdu_info *ppdu_info,
-				 qdf_nbuf_t nbuf)
-{
-	uint32_t tlv_tag, user_id, tlv_len;
-
-	tlv_tag = HAL_RX_GET_USER_TLV64_TYPE(rx_tlv_hdr);
-	user_id = HAL_RX_GET_USER_TLV64_USERID(rx_tlv_hdr);
-	tlv_len = HAL_RX_GET_USER_TLV64_LEN(rx_tlv_hdr);
-
-	ppdu_info->tlv_aggr.in_progress = 1;
-	ppdu_info->tlv_aggr.tlv_tag = tlv_tag;
-	ppdu_info->tlv_aggr.cur_len = 0;
-
-	return hal_rx_status_aggr_tlv(hal_soc, rx_tlv_hdr, ppdu_info, nbuf);
-}
-
-static inline uint32_t
-hal_rx_status_get_tlv_info_wrapper_be(void *rx_tlv_hdr, void *ppduinfo,
-				      hal_soc_handle_t hal_soc_hdl,
-				      qdf_nbuf_t nbuf)
-{
-	struct hal_soc *hal = (struct hal_soc *)hal_soc_hdl;
-	uint32_t tlv_tag, user_id, tlv_len;
-	struct hal_rx_ppdu_info *ppdu_info =
-			(struct hal_rx_ppdu_info *)ppduinfo;
-
-	tlv_tag = HAL_RX_GET_USER_TLV64_TYPE(rx_tlv_hdr);
-	user_id = HAL_RX_GET_USER_TLV64_USERID(rx_tlv_hdr);
-	tlv_len = HAL_RX_GET_USER_TLV64_LEN(rx_tlv_hdr);
-
-	/*
-	 * Handle the case where aggregation is in progress
-	 * or the current TLV is one of the TLVs which should be
-	 * aggregated
-	 */
-	if (ppdu_info->tlv_aggr.in_progress) {
-		if (ppdu_info->tlv_aggr.tlv_tag == tlv_tag) {
-			return hal_rx_status_aggr_tlv(hal, rx_tlv_hdr,
-						      ppdu_info, nbuf);
-		} else {
-			/* Finish aggregation of current TLV */
-			hal_rx_status_process_aggr_tlv(hal, ppdu_info);
-		}
-	}
-
-	if (hal_rx_status_tlv_should_aggregate(hal, tlv_tag)) {
-		return hal_rx_status_start_new_aggr_tlv(hal, rx_tlv_hdr,
-							ppduinfo, nbuf);
-	}
-
-	return hal_rx_status_get_tlv_info_generic_be(rx_tlv_hdr, ppduinfo,
-						     hal_soc_hdl, nbuf);
-}
-
 /**
  * hal_tx_set_pcp_tid_map_generic_be() - Configure default PCP to TID map table
  * @soc: HAL SoC context

hal/wifi3.0/be/hal_be_hw_headers.h

@@ -20,7 +20,6 @@
 #ifndef _HAL_BE_HW_INTERNAL_H_
 #define _HAL_BE_HW_INTERNAL_H_
 
-#include "hal_hw_headers.h"
 #include "wcss_seq_hwioreg_umac.h"
 #include "phyrx_location.h"
 #include "receive_rssi_info.h"

hal/wifi3.0/hal_api_mon.h

@@ -22,6 +22,7 @@
 
 #include "qdf_types.h"
 #include "hal_internal.h"
+#include "hal_rx.h"
 #include "hal_hw_headers.h"
 #include <target_type.h>
 
@@ -77,6 +78,8 @@
 #define HAL_TLV_STATUS_MPDU_END 6
 #define HAL_TLV_STATUS_MSDU_START 7
 #define HAL_TLV_STATUS_MSDU_END 8
+#define HAL_TLV_STATUS_MON_BUF_ADDR 9
+#define HAL_TLV_STATUS_MPDU_START 10
 
 #define HAL_MAX_UL_MU_USERS	37
 
@@ -190,6 +193,100 @@
 #define HAL_RX_FRAME_CTRL_TYPE_CTRL 0x1
 #define HAL_RX_FRAME_CTRL_TYPE_DATA 0x2
 
+/**
+ * hal_dl_ul_flag - flag to indicate UL/DL
+ * @dl_ul_flag_is_dl_or_tdls: DL
+ * @dl_ul_flag_is_ul: UL
+ */
+enum hal_dl_ul_flag {
+	dl_ul_flag_is_dl_or_tdls,
+	dl_ul_flag_is_ul,
+};
+
+/*
+ * hal_eht_ppdu_sig_cmn_type - PPDU type
+ * @eht_ppdu_sig_tb_or_dl_ofdma: TB/DL_OFDMA PPDU
+ * @eht_ppdu_sig_su: SU PPDU
+ * @eht_ppdu_sig_dl_mu_mimo: DL_MU_MIMO PPDU
+ */
+enum hal_eht_ppdu_sig_cmn_type {
+	eht_ppdu_sig_tb_or_dl_ofdma,
+	eht_ppdu_sig_su,
+	eht_ppdu_sig_dl_mu_mimo,
+};
+
+/*
+ * hal_mon_packet_info - packet info
+ * @sw_cookie: 64-bit SW desc virtual address
+ * @dma_length: packet DMA length
+ * @msdu_continuation: msdu continulation in next buffer
+ * @truncated: packet is truncated
+ */
+struct hal_mon_packet_info {
+	uint64_t sw_cookie;
+	uint16_t dma_length;
+	bool msdu_continuation;
+	bool truncated;
+};
+
+/*
+ * hal_rx_mon_msdu_info - msdu info
+ * @first_buffer: first buffer of msdu
+ * @last_buffer: last buffer of msdu
+ * @first_mpdu: first MPDU
+ * @mpdu_length_err: MPDU length error
+ * @fcs_err: FCS error
+ * @first_msdu: first msdu
+ * @decap_type: decap type
+ * @last_msdu: last msdu
+ * @buffer_len: buffer len
+ * @frag_len: frag len
+ * @msdu_len: msdu len
+ * @msdu_index: msdu index
+ * @user_rssi: user rssi
+ * @l3_header_padding: L3 padding header
+ * @stbc: stbc enabled
+ * @sgi: SGI value
+ * @reception_type: reception type
+ */
+struct hal_rx_mon_msdu_info {
+	uint8_t first_buffer;
+	uint8_t last_buffer;
+	uint8_t first_mpdu;
+	uint8_t mpdu_length_err;
+	uint8_t fcs_err;
+	uint8_t first_msdu;
+	uint8_t decap_type;
+	uint8_t last_msdu;
+	uint16_t buffer_len;
+	uint16_t frag_len;
+	uint16_t msdu_len;
+	uint8_t msdu_index;
+	int8_t user_rssi;
+	uint8_t l3_header_padding;
+	uint8_t stbc;
+	uint8_t sgi;
+	uint8_t reception_type;
+};
+
+/*
+ * hal_rx_mon_mpdu_info - MPDU info
+ * @decap_type: decap_type
+ * @mpdu_length_err: MPDU length error
+ * @fcs_err: FCS error
+ * @overflow_err: overflow error
+ * @decrypt_err: decrypt error
+ * @mpdu_start_received: MPDU start received
+ */
+struct hal_rx_mon_mpdu_info {
+	uint8_t decap_type;
+	bool mpdu_length_err;
+	bool fcs_err;
+	bool overflow_err;
+	bool decrypt_err;
+	bool mpdu_start_received;
+};
+
 /**
  * struct hal_rx_mon_desc_info () - HAL Rx Monitor descriptor info
  *
@@ -504,7 +601,7 @@ enum {
  */
 struct hal_rx_ppdu_common_info {
 	uint32_t ppdu_id;
-	uint32_t ppdu_timestamp;
+	uint64_t ppdu_timestamp;
 	uint32_t mpdu_cnt_fcs_ok;
 	uint32_t mpdu_cnt_fcs_err;
 	uint32_t mpdu_fcs_ok_bitmap[HAL_RX_NUM_WORDS_PER_PPDU_BITMAP];
@@ -1126,6 +1223,20 @@ struct hal_rx_ppdu_info {
 	struct hal_rx_tlv_aggr_info tlv_aggr;
 	/* EHT SIG user info */
 	uint32_t eht_sig_user_info;
+	/*per user mpdu count */
+	uint16_t mpdu_count[HAL_MAX_UL_MU_USERS];
+	/*per user msdu count */
+	uint16_t msdu_count[HAL_MAX_UL_MU_USERS];
+	/* Placeholder to update per user last processed msdu’s info */
+	struct hal_rx_mon_msdu_info  msdu[HAL_MAX_UL_MU_USERS];
+	/* Placeholder to update per user last processed mpdu’s info */
+	struct hal_rx_mon_mpdu_info mpdu_info[HAL_MAX_UL_MU_USERS];
+	 /* placeholder to hold packet buffer info */
+	struct hal_mon_packet_info packet_info;
+	 /* per user per MPDU queue */
+	qdf_nbuf_t mpdu_q[HAL_MAX_UL_MU_USERS][HAL_RX_MAX_MPDU];
+	 /* ppdu info list element */
+	TAILQ_ENTRY(hal_rx_ppdu_info) ppdu_list_elem;
 };
 
 static inline uint32_t

hal/wifi3.0/hal_generic_api.h

@@ -20,7 +20,6 @@
 #define _HAL_GENERIC_API_H_
 
 #include <hal_rx.h>
-#include "hal_api_mon.h"
 
 /**
  * hal_get_radiotap_he_gi_ltf() - Convert HE ltf and GI value

hal/wifi3.0/kiwi/hal_kiwi.c

@@ -33,7 +33,6 @@
 #include "rx_flow_search_entry.h"
 #include "hal_rx_flow_info.h"
 #include "hal_be_api.h"
-#include "hal_be_api_mon.h"
 #include "reo_destination_ring_with_pn.h"
 
 #include <hal_be_rx.h>
@@ -124,6 +123,7 @@ struct tcl_data_cmd gtcl_data_symbol __attribute__((used));
 
 #include <hal_generic_api.h>
 #include <hal_be_generic_api.h>
+#include "hal_be_api_mon.h"
 
 #define LINK_DESC_SIZE (NUM_OF_DWORDS_RX_MSDU_LINK << 2)
 

hal/wifi3.0/qcn9224/hal_9224.c

@@ -48,34 +48,6 @@
 
 #include <hal_be_rx.h>
 
-#define UNIFIED_RXPCU_PPDU_END_INFO_8_RX_PPDU_DURATION_OFFSET \
-	RXPCU_PPDU_END_INFO_RX_PPDU_DURATION_OFFSET
-#define UNIFIED_RXPCU_PPDU_END_INFO_8_RX_PPDU_DURATION_MASK \
-	RXPCU_PPDU_END_INFO_RX_PPDU_DURATION_MASK
-#define UNIFIED_RXPCU_PPDU_END_INFO_8_RX_PPDU_DURATION_LSB \
-	RXPCU_PPDU_END_INFO_RX_PPDU_DURATION_LSB
-#define UNIFIED_PHYRX_HT_SIG_0_HT_SIG_INFO_PHYRX_HT_SIG_INFO_DETAILS_OFFSET \
-	PHYRX_HT_SIG_PHYRX_HT_SIG_INFO_DETAILS_MCS_OFFSET
-#define UNIFIED_PHYRX_L_SIG_B_0_L_SIG_B_INFO_PHYRX_L_SIG_B_INFO_DETAILS_OFFSET \
-	PHYRX_L_SIG_B_PHYRX_L_SIG_B_INFO_DETAILS_RATE_OFFSET
-#define UNIFIED_PHYRX_L_SIG_A_0_L_SIG_A_INFO_PHYRX_L_SIG_A_INFO_DETAILS_OFFSET \
-	PHYRX_L_SIG_A_PHYRX_L_SIG_A_INFO_DETAILS_RATE_OFFSET
-#define UNIFIED_PHYRX_VHT_SIG_A_0_VHT_SIG_A_INFO_PHYRX_VHT_SIG_A_INFO_DETAILS_OFFSET \
-	PHYRX_VHT_SIG_A_PHYRX_VHT_SIG_A_INFO_DETAILS_BANDWIDTH_OFFSET
-#define UNIFIED_PHYRX_HE_SIG_A_SU_0_HE_SIG_A_SU_INFO_PHYRX_HE_SIG_A_SU_INFO_DETAILS_OFFSET \
-	PHYRX_HE_SIG_A_SU_PHYRX_HE_SIG_A_SU_INFO_DETAILS_FORMAT_INDICATION_OFFSET
-#define UNIFIED_PHYRX_HE_SIG_A_MU_DL_0_HE_SIG_A_MU_DL_INFO_PHYRX_HE_SIG_A_MU_DL_INFO_DETAILS_OFFSET \
-	PHYRX_HE_SIG_A_MU_DL_PHYRX_HE_SIG_A_MU_DL_INFO_DETAILS_DL_UL_FLAG_OFFSET
-#define UNIFIED_PHYRX_HE_SIG_B1_MU_0_HE_SIG_B1_MU_INFO_PHYRX_HE_SIG_B1_MU_INFO_DETAILS_OFFSET \
-	PHYRX_HE_SIG_B1_MU_PHYRX_HE_SIG_B1_MU_INFO_DETAILS_RU_ALLOCATION_OFFSET
-#define UNIFIED_PHYRX_HE_SIG_B2_MU_0_HE_SIG_B2_MU_INFO_PHYRX_HE_SIG_B2_MU_INFO_DETAILS_OFFSET \
-	PHYRX_HE_SIG_B2_MU_PHYRX_HE_SIG_B2_MU_INFO_DETAILS_STA_ID_OFFSET
-#define UNIFIED_PHYRX_HE_SIG_B2_OFDMA_0_HE_SIG_B2_OFDMA_INFO_PHYRX_HE_SIG_B2_OFDMA_INFO_DETAILS_OFFSET \
-	PHYRX_HE_SIG_B2_OFDMA_PHYRX_HE_SIG_B2_OFDMA_INFO_DETAILS_STA_ID_OFFSET
-#define UNIFIED_PHYRX_RSSI_LEGACY_3_RECEIVE_RSSI_INFO_PRE_RSSI_INFO_DETAILS_OFFSET \
-	PHYRX_RSSI_LEGACY_PRE_RSSI_INFO_DETAILS_RSSI_PRI20_CHAIN0_OFFSET
-#define UNIFIED_PHYRX_RSSI_LEGACY_19_RECEIVE_RSSI_INFO_PREAMBLE_RSSI_INFO_DETAILS_OFFSET \
-	PHYRX_RSSI_LEGACY_PREAMBLE_RSSI_INFO_DETAILS_RSSI_PRI20_CHAIN0_OFFSET
 #define UNIFIED_RX_MPDU_START_0_RX_MPDU_INFO_RX_MPDU_INFO_DETAILS_OFFSET \
 	RX_MPDU_START_RX_MPDU_INFO_DETAILS_RXPCU_MPDU_FILTER_IN_CATEGORY_OFFSET
 #define UNIFIED_RX_MSDU_LINK_8_RX_MSDU_DETAILS_MSDU_0_OFFSET \
@@ -127,6 +99,8 @@
 #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
 
+#include "hal_be_api_mon.h"
+
 #ifdef CONFIG_WIFI_EMULATION_WIFI_3_0
 #define CMEM_REG_BASE 0x0010e000