diff --git a/hal/wifi3.0/hal_generic_api.h b/hal/wifi3.0/hal_generic_api.h index 2f0c46cf8277..92d2b1cbe397 100644 --- a/hal/wifi3.0/hal_generic_api.h +++ b/hal/wifi3.0/hal_generic_api.h @@ -1710,92 +1710,27 @@ static inline void hal_rx_dump_mpdu_start_tlv_generic(void *mpdustart, (struct rx_mpdu_info *)&mpdu_start->rx_mpdu_info_details; QDF_TRACE(QDF_MODULE_ID_DP, dbg_level, - "rx_mpdu_start tlv - " - "rxpcu_mpdu_filter_in_category: %d " - "sw_frame_group_id: %d " - "ndp_frame: %d " - "phy_err: %d " - "phy_err_during_mpdu_header: %d " - "protocol_version_err: %d " - "ast_based_lookup_valid: %d " - "phy_ppdu_id: %d " - "ast_index: %d " - "sw_peer_id: %d " - "mpdu_frame_control_valid: %d " - "mpdu_duration_valid: %d " - "mac_addr_ad1_valid: %d " - "mac_addr_ad2_valid: %d " - "mac_addr_ad3_valid: %d " - "mac_addr_ad4_valid: %d " - "mpdu_sequence_control_valid: %d " - "mpdu_qos_control_valid: %d " - "mpdu_ht_control_valid: %d " - "frame_encryption_info_valid: %d " - "fr_ds: %d " - "to_ds: %d " - "encrypted: %d " - "mpdu_retry: %d " - "mpdu_sequence_number: %d " - "epd_en: %d " - "all_frames_shall_be_encrypted: %d " - "encrypt_type: %d " - "mesh_sta: %d " - "bssid_hit: %d " - "bssid_number: %d " - "tid: %d " - "pn_31_0: %d " - "pn_63_32: %d " - "pn_95_64: %d " - "pn_127_96: %d " - "peer_meta_data: %d " - "rxpt_classify_info.reo_destination_indication: %d " - "rxpt_classify_info.use_flow_id_toeplitz_clfy: %d " - "rx_reo_queue_desc_addr_31_0: %d " - "rx_reo_queue_desc_addr_39_32: %d " - "receive_queue_number: %d " - "pre_delim_err_warning: %d " - "first_delim_err: %d " - "key_id_octet: %d " - "new_peer_entry: %d " - "decrypt_needed: %d " - "decap_type: %d " - "rx_insert_vlan_c_tag_padding: %d " - "rx_insert_vlan_s_tag_padding: %d " - "strip_vlan_c_tag_decap: %d " - "strip_vlan_s_tag_decap: %d " - "pre_delim_count: %d " - "ampdu_flag: %d " - "bar_frame: %d " - "mpdu_length: %d " - "first_mpdu: %d " - "mcast_bcast: %d " - "ast_index_not_found: %d " - "ast_index_timeout: %d " - "power_mgmt: %d " - "non_qos: %d " - "null_data: %d " - "mgmt_type: %d " - "ctrl_type: %d " - "more_data: %d " - "eosp: %d " - "fragment_flag: %d " - "order: %d " - "u_apsd_trigger: %d " - "encrypt_required: %d " - "directed: %d " - "mpdu_frame_control_field: %d " - "mpdu_duration_field: %d " - "mac_addr_ad1_31_0: %d " - "mac_addr_ad1_47_32: %d " - "mac_addr_ad2_15_0: %d " - "mac_addr_ad2_47_16: %d " - "mac_addr_ad3_31_0: %d " - "mac_addr_ad3_47_32: %d " - "mpdu_sequence_control_field: %d " - "mac_addr_ad4_31_0: %d " - "mac_addr_ad4_47_32: %d " - "mpdu_qos_control_field: %d " - "mpdu_ht_control_field: %d ", + "rx_mpdu_start tlv (1/5) - " + "rxpcu_mpdu_filter_in_category: %x " + "sw_frame_group_id: %x " + "ndp_frame: %x " + "phy_err: %x " + "phy_err_during_mpdu_header: %x " + "protocol_version_err: %x " + "ast_based_lookup_valid: %x " + "phy_ppdu_id: %x " + "ast_index: %x " + "sw_peer_id: %x " + "mpdu_frame_control_valid: %x " + "mpdu_duration_valid: %x " + "mac_addr_ad1_valid: %x " + "mac_addr_ad2_valid: %x " + "mac_addr_ad3_valid: %x " + "mac_addr_ad4_valid: %x " + "mpdu_sequence_control_valid: %x " + "mpdu_qos_control_valid: %x " + "mpdu_ht_control_valid: %x " + "frame_encryption_info_valid: %x ", mpdu_info->rxpcu_mpdu_filter_in_category, mpdu_info->sw_frame_group_id, mpdu_info->ndp_frame, @@ -1815,7 +1750,30 @@ static inline void hal_rx_dump_mpdu_start_tlv_generic(void *mpdustart, mpdu_info->mpdu_sequence_control_valid, mpdu_info->mpdu_qos_control_valid, mpdu_info->mpdu_ht_control_valid, - mpdu_info->frame_encryption_info_valid, + mpdu_info->frame_encryption_info_valid); + + QDF_TRACE(QDF_MODULE_ID_DP, dbg_level, + "rx_mpdu_start tlv (2/5) - " + "fr_ds: %x " + "to_ds: %x " + "encrypted: %x " + "mpdu_retry: %x " + "mpdu_sequence_number: %x " + "epd_en: %x " + "all_frames_shall_be_encrypted: %x " + "encrypt_type: %x " + "mesh_sta: %x " + "bssid_hit: %x " + "bssid_number: %x " + "tid: %x " + "pn_31_0: %x " + "pn_63_32: %x " + "pn_95_64: %x " + "pn_127_96: %x " + "peer_meta_data: %x " + "rxpt_classify_info.reo_destination_indication: %x " + "rxpt_classify_info.use_flow_id_toeplitz_clfy: %x " + "rx_reo_queue_desc_addr_31_0: %x ", mpdu_info->fr_ds, mpdu_info->to_ds, mpdu_info->encrypted, @@ -1835,7 +1793,30 @@ static inline void hal_rx_dump_mpdu_start_tlv_generic(void *mpdustart, mpdu_info->peer_meta_data, mpdu_info->rxpt_classify_info_details.reo_destination_indication, mpdu_info->rxpt_classify_info_details.use_flow_id_toeplitz_clfy, - mpdu_info->rx_reo_queue_desc_addr_31_0, + mpdu_info->rx_reo_queue_desc_addr_31_0); + + QDF_TRACE(QDF_MODULE_ID_DP, dbg_level, + "rx_mpdu_start tlv (3/5) - " + "rx_reo_queue_desc_addr_39_32: %x " + "receive_queue_number: %x " + "pre_delim_err_warning: %x " + "first_delim_err: %x " + "key_id_octet: %x " + "new_peer_entry: %x " + "decrypt_needed: %x " + "decap_type: %x " + "rx_insert_vlan_c_tag_padding: %x " + "rx_insert_vlan_s_tag_padding: %x " + "strip_vlan_c_tag_decap: %x " + "strip_vlan_s_tag_decap: %x " + "pre_delim_count: %x " + "ampdu_flag: %x " + "bar_frame: %x " + "mpdu_length: %x " + "first_mpdu: %x " + "mcast_bcast: %x " + "ast_index_not_found: %x " + "ast_index_timeout: %x ", mpdu_info->rx_reo_queue_desc_addr_39_32, mpdu_info->receive_queue_number, mpdu_info->pre_delim_err_warning, @@ -1855,7 +1836,30 @@ static inline void hal_rx_dump_mpdu_start_tlv_generic(void *mpdustart, mpdu_info->first_mpdu, mpdu_info->mcast_bcast, mpdu_info->ast_index_not_found, - mpdu_info->ast_index_timeout, + mpdu_info->ast_index_timeout); + + QDF_TRACE(QDF_MODULE_ID_DP, dbg_level, + "rx_mpdu_start tlv (4/5) - " + "power_mgmt: %x " + "non_qos: %x " + "null_data: %x " + "mgmt_type: %x " + "ctrl_type: %x " + "more_data: %x " + "eosp: %x " + "fragment_flag: %x " + "order: %x " + "u_apsd_trigger: %x " + "encrypt_required: %x " + "directed: %x " + "mpdu_frame_control_field: %x " + "mpdu_duration_field: %x " + "mac_addr_ad1_31_0: %x " + "mac_addr_ad1_47_32: %x " + "mac_addr_ad2_15_0: %x " + "mac_addr_ad2_47_16: %x " + "mac_addr_ad3_31_0: %x " + "mac_addr_ad3_47_32: %x ", mpdu_info->power_mgmt, mpdu_info->non_qos, mpdu_info->null_data, @@ -1875,7 +1879,15 @@ static inline void hal_rx_dump_mpdu_start_tlv_generic(void *mpdustart, mpdu_info->mac_addr_ad2_15_0, mpdu_info->mac_addr_ad2_47_16, mpdu_info->mac_addr_ad3_31_0, - mpdu_info->mac_addr_ad3_47_32, + mpdu_info->mac_addr_ad3_47_32); + + QDF_TRACE(QDF_MODULE_ID_DP, dbg_level, + "rx_mpdu_start tlv (5/5) - " + "mpdu_sequence_control_field: %x " + "mac_addr_ad4_31_0: %x " + "mac_addr_ad4_47_32: %x " + "mpdu_qos_control_field: %x " + "mpdu_ht_control_field: %x ", mpdu_info->mpdu_sequence_control_field, mpdu_info->mac_addr_ad4_31_0, mpdu_info->mac_addr_ad4_47_32, diff --git a/hal/wifi3.0/hal_rx.h b/hal/wifi3.0/hal_rx.h index 2298fdbfe99b..24efe0030598 100644 --- a/hal/wifi3.0/hal_rx.h +++ b/hal/wifi3.0/hal_rx.h @@ -2381,57 +2381,35 @@ static inline void hal_rx_dump_rx_attention_tlv(struct rx_attention *rx_attn, uint8_t dbg_level) { QDF_TRACE(QDF_MODULE_ID_DP, dbg_level, - "rx_attention tlv=" - "rxpcu_mpdu_filter_in_category: %d " - "sw_frame_group_id: %d " - "reserved_0: %d " - "phy_ppdu_id: %d " - "first_mpdu : %d " - "reserved_1a: %d " - "mcast_bcast: %d " - "ast_index_not_found: %d " - "ast_index_timeout: %d " - "power_mgmt: %d " - "non_qos: %d " - "null_data: %d " - "mgmt_type: %d " - "ctrl_type: %d " - "more_data: %d " - "eosp: %d " - "a_msdu_error: %d " - "fragment_flag: %d " - "order: %d " - "cce_match: %d " - "overflow_err: %d " - "msdu_length_err: %d " - "tcp_udp_chksum_fail: %d " - "ip_chksum_fail: %d " - "sa_idx_invalid: %d " - "da_idx_invalid: %d " - "reserved_1b: %d " - "rx_in_tx_decrypt_byp: %d " - "encrypt_required: %d " - "directed: %d " - "buffer_fragment: %d " - "mpdu_length_err: %d " - "tkip_mic_err: %d " - "decrypt_err: %d " - "unencrypted_frame_err: %d " - "fcs_err: %d " - "flow_idx_timeout: %d " - "flow_idx_invalid: %d " - "wifi_parser_error: %d " - "amsdu_parser_error: %d " - "sa_idx_timeout: %d " - "da_idx_timeout: %d " - "msdu_limit_error: %d " - "da_is_valid: %d " - "da_is_mcbc: %d " - "sa_is_valid: %d " - "decrypt_status_code: %d " - "rx_bitmap_not_updated: %d " - "reserved_2: %d " - "msdu_done: %d ", + "rx_attention tlv (1/2) - " + "rxpcu_mpdu_filter_in_category: %x " + "sw_frame_group_id: %x " + "reserved_0: %x " + "phy_ppdu_id: %x " + "first_mpdu : %x " + "reserved_1a: %x " + "mcast_bcast: %x " + "ast_index_not_found: %x " + "ast_index_timeout: %x " + "power_mgmt: %x " + "non_qos: %x " + "null_data: %x " + "mgmt_type: %x " + "ctrl_type: %x " + "more_data: %x " + "eosp: %x " + "a_msdu_error: %x " + "fragment_flag: %x " + "order: %x " + "cce_match: %x " + "overflow_err: %x " + "msdu_length_err: %x " + "tcp_udp_chksum_fail: %x " + "ip_chksum_fail: %x " + "sa_idx_invalid: %x " + "da_idx_invalid: %x " + "reserved_1b: %x " + "rx_in_tx_decrypt_byp: %x ", rx_attn->rxpcu_mpdu_filter_in_category, rx_attn->sw_frame_group_id, rx_attn->reserved_0, @@ -2459,7 +2437,32 @@ static inline void hal_rx_dump_rx_attention_tlv(struct rx_attention *rx_attn, rx_attn->sa_idx_invalid, rx_attn->da_idx_invalid, rx_attn->reserved_1b, - rx_attn->rx_in_tx_decrypt_byp, + rx_attn->rx_in_tx_decrypt_byp); + + QDF_TRACE(QDF_MODULE_ID_DP, dbg_level, + "rx_attention tlv (2/2) - " + "encrypt_required: %x " + "directed: %x " + "buffer_fragment: %x " + "mpdu_length_err: %x " + "tkip_mic_err: %x " + "decrypt_err: %x " + "unencrypted_frame_err: %x " + "fcs_err: %x " + "flow_idx_timeout: %x " + "flow_idx_invalid: %x " + "wifi_parser_error: %x " + "amsdu_parser_error: %x " + "sa_idx_timeout: %x " + "da_idx_timeout: %x " + "msdu_limit_error: %x " + "da_is_valid: %x " + "da_is_mcbc: %x " + "sa_is_valid: %x " + "decrypt_status_code: %x " + "rx_bitmap_not_updated: %x " + "reserved_2: %x " + "msdu_done: %x ", rx_attn->encrypt_required, rx_attn->directed, rx_attn->buffer_fragment, @@ -2482,8 +2485,6 @@ static inline void hal_rx_dump_rx_attention_tlv(struct rx_attention *rx_attn, rx_attn->rx_bitmap_not_updated, rx_attn->reserved_2, rx_attn->msdu_done); - - } static inline void hal_rx_dump_mpdu_start_tlv(struct rx_mpdu_start *mpdu_start, @@ -2521,23 +2522,23 @@ static inline void hal_rx_dump_mpdu_end_tlv(struct rx_mpdu_end *mpdu_end, { QDF_TRACE(QDF_MODULE_ID_DP, dbg_level, "rx_mpdu_end tlv - " - "rxpcu_mpdu_filter_in_category: %d " - "sw_frame_group_id: %d " - "phy_ppdu_id: %d " - "unsup_ktype_short_frame: %d " - "rx_in_tx_decrypt_byp: %d " - "overflow_err: %d " - "mpdu_length_err: %d " - "tkip_mic_err: %d " - "decrypt_err: %d " - "unencrypted_frame_err: %d " - "pn_fields_contain_valid_info: %d " - "fcs_err: %d " - "msdu_length_err: %d " - "rxdma0_destination_ring: %d " - "rxdma1_destination_ring: %d " - "decrypt_status_code: %d " - "rx_bitmap_not_updated: %d ", + "rxpcu_mpdu_filter_in_category: %x " + "sw_frame_group_id: %x " + "phy_ppdu_id: %x " + "unsup_ktype_short_frame: %x " + "rx_in_tx_decrypt_byp: %x " + "overflow_err: %x " + "mpdu_length_err: %x " + "tkip_mic_err: %x " + "decrypt_err: %x " + "unencrypted_frame_err: %x " + "pn_fields_contain_valid_info: %x " + "fcs_err: %x " + "msdu_length_err: %x " + "rxdma0_destination_ring: %x " + "rxdma1_destination_ring: %x " + "decrypt_status_code: %x " + "rx_bitmap_not_updated: %x ", mpdu_end->rxpcu_mpdu_filter_in_category, mpdu_end->sw_frame_group_id, mpdu_end->phy_ppdu_id, diff --git a/hal/wifi3.0/qca6390/hal_6390_rx.h b/hal/wifi3.0/qca6390/hal_6390_rx.h index 98ab431ec1ca..2ace8eb6d9bb 100644 --- a/hal/wifi3.0/qca6390/hal_6390_rx.h +++ b/hal/wifi3.0/qca6390/hal_6390_rx.h @@ -167,36 +167,35 @@ static void hal_rx_dump_msdu_start_tlv_6390(void *msdustart, uint8_t dbg_level) struct rx_msdu_start *msdu_start = (struct rx_msdu_start *)msdustart; QDF_TRACE(QDF_MODULE_ID_DP, dbg_level, - "rx_msdu_start tlv - " - "rxpcu_mpdu_filter_in_category: %d " - "sw_frame_group_id: %d " - "phy_ppdu_id: %d " - "msdu_length: %d " - "ipsec_esp: %d " - "l3_offset: %d " - "ipsec_ah: %d " - "l4_offset: %d " - "msdu_number: %d " - "decap_format: %d " - "ipv4_proto: %d " - "ipv6_proto: %d " - "tcp_proto: %d " - "udp_proto: %d " - "ip_frag: %d " - "tcp_only_ack: %d " - "da_is_bcast_mcast: %d " - "ip4_protocol_ip6_next_header: %d " - "toeplitz_hash_2_or_4: %d " - "flow_id_toeplitz: %d " - "user_rssi: %d " - "pkt_type: %d " - "stbc: %d " - "sgi: %d " - "rate_mcs: %d " - "receive_bandwidth: %d " - "reception_type: %d " - "ppdu_start_timestamp: %d " - "sw_phy_meta_data: %d ", + "rx_msdu_start tlv (1/2) - " + "rxpcu_mpdu_filter_in_category: %x " + "sw_frame_group_id: %x " + "phy_ppdu_id: %x " + "msdu_length: %x " + "ipsec_esp: %x " + "l3_offset: %x " + "ipsec_ah: %x " + "l4_offset: %x " + "msdu_number: %x " + "decap_format: %x " + "ipv4_proto: %x " + "ipv6_proto: %x " + "tcp_proto: %x " + "udp_proto: %x " + "ip_frag: %x " + "tcp_only_ack: %x " + "da_is_bcast_mcast: %x " + "ip4_protocol_ip6_next_header: %x " + "toeplitz_hash_2_or_4: %x " + "flow_id_toeplitz: %x " + "user_rssi: %x " + "pkt_type: %x " + "stbc: %x " + "sgi: %x " + "rate_mcs: %x " + "receive_bandwidth: %x " + "reception_type: %x " + "ppdu_start_timestamp: %u ", msdu_start->rxpcu_mpdu_filter_in_category, msdu_start->sw_frame_group_id, msdu_start->phy_ppdu_id, @@ -224,8 +223,12 @@ static void hal_rx_dump_msdu_start_tlv_6390(void *msdustart, uint8_t dbg_level) msdu_start->rate_mcs, msdu_start->receive_bandwidth, msdu_start->reception_type, - msdu_start->ppdu_start_timestamp, - msdu_start->sw_phy_meta_data); + msdu_start->ppdu_start_timestamp); + + QDF_TRACE(QDF_MODULE_ID_DP, dbg_level, + "rx_msdu_start tlv (2/2) - " + "sw_phy_meta_data: %x ", + msdu_start->sw_phy_meta_data); } /** @@ -242,53 +245,29 @@ static void hal_rx_dump_msdu_end_tlv_6390(void *msduend, struct rx_msdu_end *msdu_end = (struct rx_msdu_end *)msduend; QDF_TRACE(QDF_MODULE_ID_DP, dbg_level, - "rx_msdu_end tlv - " - "rxpcu_mpdu_filter_in_category: %d " - "sw_frame_group_id: %d " - "phy_ppdu_id: %d " - "ip_hdr_chksum: %d " - "tcp_udp_chksum: %d " - "key_id_octet: %d " - "cce_super_rule: %d " - "cce_classify_not_done_truncat: %d " - "cce_classify_not_done_cce_dis: %d " - "ext_wapi_pn_63_48: %d " - "ext_wapi_pn_95_64: %d " - "ext_wapi_pn_127_96: %d " - "reported_mpdu_length: %d " - "first_msdu: %d " - "last_msdu: %d " - "sa_idx_timeout: %d " - "da_idx_timeout: %d " - "msdu_limit_error: %d " - "flow_idx_timeout: %d " - "flow_idx_invalid: %d " - "wifi_parser_error: %d " - "amsdu_parser_error: %d " - "sa_is_valid: %d " - "da_is_valid: %d " - "da_is_mcbc: %d " - "l3_header_padding: %d " - "ipv6_options_crc: %d " - "tcp_seq_number: %d " - "tcp_ack_number: %d " - "tcp_flag: %d " - "lro_eligible: %d " - "window_size: %d " - "da_offset: %d " - "sa_offset: %d " - "da_offset_valid: %d " - "sa_offset_valid: %d " - "rule_indication_31_0: %d " - "rule_indication_63_32: %d " - "sa_idx: %d " - "da_idx: %d " - "msdu_drop: %d " - "reo_destination_indication: %d " - "flow_idx: %d " - "fse_metadata: %d " - "cce_metadata: %d " - "sa_sw_peer_id: %d ", + "rx_msdu_end tlv (1/2) - " + "rxpcu_mpdu_filter_in_category: %x " + "sw_frame_group_id: %x " + "phy_ppdu_id: %x " + "ip_hdr_chksum: %x " + "tcp_udp_chksum: %x " + "key_id_octet: %x " + "cce_super_rule: %x " + "cce_classify_not_done_truncat: %x " + "cce_classify_not_done_cce_dis: %x " + "ext_wapi_pn_63_48: %x " + "ext_wapi_pn_95_64: %x " + "ext_wapi_pn_127_96: %x " + "reported_mpdu_length: %x " + "first_msdu: %x " + "last_msdu: %x " + "sa_idx_timeout: %x " + "da_idx_timeout: %x " + "msdu_limit_error: %x " + "flow_idx_timeout: %x " + "flow_idx_invalid: %x " + "wifi_parser_error: %x " + "amsdu_parser_error: %x", msdu_end->rxpcu_mpdu_filter_in_category, msdu_end->sw_frame_group_id, msdu_end->phy_ppdu_id, @@ -310,7 +289,34 @@ static void hal_rx_dump_msdu_end_tlv_6390(void *msduend, msdu_end->flow_idx_timeout, msdu_end->flow_idx_invalid, msdu_end->wifi_parser_error, - msdu_end->amsdu_parser_error, + msdu_end->amsdu_parser_error); + + QDF_TRACE(QDF_MODULE_ID_DP, dbg_level, + "rx_msdu_end tlv (2/2)- " + "sa_is_valid: %x " + "da_is_valid: %x " + "da_is_mcbc: %x " + "l3_header_padding: %x " + "ipv6_options_crc: %x " + "tcp_seq_number: %x " + "tcp_ack_number: %x " + "tcp_flag: %x " + "lro_eligible: %x " + "window_size: %x " + "da_offset: %x " + "sa_offset: %x " + "da_offset_valid: %x " + "sa_offset_valid: %x " + "rule_indication_31_0: %x " + "rule_indication_63_32: %x " + "sa_idx: %x " + "da_idx: %x " + "msdu_drop: %x " + "reo_destination_indication: %x " + "flow_idx: %x " + "fse_metadata: %x " + "cce_metadata: %x " + "sa_sw_peer_id: %x ", msdu_end->sa_is_valid, msdu_end->da_is_valid, msdu_end->da_is_mcbc,