Prechádzať zdrojové kódy

qcacmn: Use hal_verbose_debug() to print msgs which come excessively

Some of the print messages in HAL module come very excessively.
Use hal_verbose_debug() API to print them.

CRs-fixed: 2405028
Change-Id: I4b4754af65c00edb571de898527026b6183ef15f
Krunal Soni 6 rokov pred
rodič
commit
9911b44343

+ 5 - 0
dp/wifi3.0/dp_main.c

@@ -2609,6 +2609,11 @@ static void dp_enable_verbose_debug(struct dp_soc *soc)
 
 	if (soc_cfg_ctx->per_pkt_trace & dp_verbose_debug_mask)
 		is_dp_verbose_debug_enabled = true;
+
+	if (soc_cfg_ctx->per_pkt_trace & hal_verbose_debug_mask)
+		hal_set_verbose_debug(true);
+	else
+		hal_set_verbose_debug(false);
 }
 #else
 static void dp_enable_verbose_debug(struct dp_soc *soc)

+ 8 - 0
hal/wifi3.0/hal_api.h

@@ -43,6 +43,14 @@
 #define FORCE_WAKE_DELAY_TIMEOUT 50
 #define FORCE_WAKE_DELAY_MS 5
 
+#ifdef ENABLE_VERBOSE_DEBUG
+static inline void
+hal_set_verbose_debug(bool flag)
+{
+	is_hal_verbose_debug_enabled = flag;
+}
+#endif
+
 #ifndef QCA_WIFI_QCA6390
 static inline int hal_force_wake_request(struct hal_soc *soc)
 {

+ 184 - 184
hal/wifi3.0/hal_generic_api.h

@@ -1734,190 +1734,190 @@ static inline void hal_rx_dump_mpdu_start_tlv_generic(void *mpdustart,
 	struct rx_mpdu_info *mpdu_info =
 		(struct rx_mpdu_info *)&mpdu_start->rx_mpdu_info_details;
 
-	QDF_TRACE(QDF_MODULE_ID_DP, dbg_level,
-			"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,
-			mpdu_info->phy_err,
-			mpdu_info->phy_err_during_mpdu_header,
-			mpdu_info->protocol_version_err,
-			mpdu_info->ast_based_lookup_valid,
-			mpdu_info->phy_ppdu_id,
-			mpdu_info->ast_index,
-			mpdu_info->sw_peer_id,
-			mpdu_info->mpdu_frame_control_valid,
-			mpdu_info->mpdu_duration_valid,
-			mpdu_info->mac_addr_ad1_valid,
-			mpdu_info->mac_addr_ad2_valid,
-			mpdu_info->mac_addr_ad3_valid,
-			mpdu_info->mac_addr_ad4_valid,
-			mpdu_info->mpdu_sequence_control_valid,
-			mpdu_info->mpdu_qos_control_valid,
-			mpdu_info->mpdu_ht_control_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,
-			mpdu_info->mpdu_retry,
-			mpdu_info->mpdu_sequence_number,
-			mpdu_info->epd_en,
-			mpdu_info->all_frames_shall_be_encrypted,
-			mpdu_info->encrypt_type,
-			mpdu_info->mesh_sta,
-			mpdu_info->bssid_hit,
-			mpdu_info->bssid_number,
-			mpdu_info->tid,
-			mpdu_info->pn_31_0,
-			mpdu_info->pn_63_32,
-			mpdu_info->pn_95_64,
-			mpdu_info->pn_127_96,
-			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);
-
-	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,
-			mpdu_info->first_delim_err,
-			mpdu_info->key_id_octet,
-			mpdu_info->new_peer_entry,
-			mpdu_info->decrypt_needed,
-			mpdu_info->decap_type,
-			mpdu_info->rx_insert_vlan_c_tag_padding,
-			mpdu_info->rx_insert_vlan_s_tag_padding,
-			mpdu_info->strip_vlan_c_tag_decap,
-			mpdu_info->strip_vlan_s_tag_decap,
-			mpdu_info->pre_delim_count,
-			mpdu_info->ampdu_flag,
-			mpdu_info->bar_frame,
-			mpdu_info->mpdu_length,
-			mpdu_info->first_mpdu,
-			mpdu_info->mcast_bcast,
-			mpdu_info->ast_index_not_found,
-			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,
-			mpdu_info->mgmt_type,
-			mpdu_info->ctrl_type,
-			mpdu_info->more_data,
-			mpdu_info->eosp,
-			mpdu_info->fragment_flag,
-			mpdu_info->order,
-			mpdu_info->u_apsd_trigger,
-			mpdu_info->encrypt_required,
-			mpdu_info->directed,
-			mpdu_info->mpdu_frame_control_field,
-			mpdu_info->mpdu_duration_field,
-			mpdu_info->mac_addr_ad1_31_0,
-			mpdu_info->mac_addr_ad1_47_32,
-			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);
-
-	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,
-			mpdu_info->mpdu_qos_control_field,
-			mpdu_info->mpdu_ht_control_field);
+	hal_verbose_debug(
+			  "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,
+			  mpdu_info->phy_err,
+			  mpdu_info->phy_err_during_mpdu_header,
+			  mpdu_info->protocol_version_err,
+			  mpdu_info->ast_based_lookup_valid,
+			  mpdu_info->phy_ppdu_id,
+			  mpdu_info->ast_index,
+			  mpdu_info->sw_peer_id,
+			  mpdu_info->mpdu_frame_control_valid,
+			  mpdu_info->mpdu_duration_valid,
+			  mpdu_info->mac_addr_ad1_valid,
+			  mpdu_info->mac_addr_ad2_valid,
+			  mpdu_info->mac_addr_ad3_valid,
+			  mpdu_info->mac_addr_ad4_valid,
+			  mpdu_info->mpdu_sequence_control_valid,
+			  mpdu_info->mpdu_qos_control_valid,
+			  mpdu_info->mpdu_ht_control_valid,
+			  mpdu_info->frame_encryption_info_valid);
+
+	hal_verbose_debug(
+			  "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,
+			  mpdu_info->mpdu_retry,
+			  mpdu_info->mpdu_sequence_number,
+			  mpdu_info->epd_en,
+			  mpdu_info->all_frames_shall_be_encrypted,
+			  mpdu_info->encrypt_type,
+			  mpdu_info->mesh_sta,
+			  mpdu_info->bssid_hit,
+			  mpdu_info->bssid_number,
+			  mpdu_info->tid,
+			  mpdu_info->pn_31_0,
+			  mpdu_info->pn_63_32,
+			  mpdu_info->pn_95_64,
+			  mpdu_info->pn_127_96,
+			  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);
+
+	hal_verbose_debug(
+			  "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,
+			  mpdu_info->first_delim_err,
+			  mpdu_info->key_id_octet,
+			  mpdu_info->new_peer_entry,
+			  mpdu_info->decrypt_needed,
+			  mpdu_info->decap_type,
+			  mpdu_info->rx_insert_vlan_c_tag_padding,
+			  mpdu_info->rx_insert_vlan_s_tag_padding,
+			  mpdu_info->strip_vlan_c_tag_decap,
+			  mpdu_info->strip_vlan_s_tag_decap,
+			  mpdu_info->pre_delim_count,
+			  mpdu_info->ampdu_flag,
+			  mpdu_info->bar_frame,
+			  mpdu_info->mpdu_length,
+			  mpdu_info->first_mpdu,
+			  mpdu_info->mcast_bcast,
+			  mpdu_info->ast_index_not_found,
+			  mpdu_info->ast_index_timeout);
+
+	hal_verbose_debug(
+			  "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,
+			  mpdu_info->mgmt_type,
+			  mpdu_info->ctrl_type,
+			  mpdu_info->more_data,
+			  mpdu_info->eosp,
+			  mpdu_info->fragment_flag,
+			  mpdu_info->order,
+			  mpdu_info->u_apsd_trigger,
+			  mpdu_info->encrypt_required,
+			  mpdu_info->directed,
+			  mpdu_info->mpdu_frame_control_field,
+			  mpdu_info->mpdu_duration_field,
+			  mpdu_info->mac_addr_ad1_31_0,
+			  mpdu_info->mac_addr_ad1_47_32,
+			  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);
+
+	hal_verbose_debug(
+			  "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,
+			  mpdu_info->mpdu_qos_control_field,
+			  mpdu_info->mpdu_ht_control_field);
 }
 #endif
 

+ 21 - 1
hal/wifi3.0/hal_internal.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -30,6 +30,26 @@
 #define hal_warn(params...) QDF_TRACE_WARN(QDF_MODULE_ID_TXRX, params)
 #define hal_info(params...) QDF_TRACE_INFO(QDF_MODULE_ID_TXRX, params)
 #define hal_debug(params...) QDF_TRACE_DEBUG(QDF_MODULE_ID_TXRX, params)
+#ifdef ENABLE_VERBOSE_DEBUG
+extern bool is_hal_verbose_debug_enabled;
+#define hal_verbose_debug(params...) \
+	if (unlikely(is_hal_verbose_debug_enabled)) \
+		do {\
+			QDF_TRACE_DEBUG(QDF_MODULE_ID_TXRX, params); \
+		} while (0)
+#define hal_verbose_hex_dump(params...) \
+	if (unlikely(is_hal_verbose_debug_enabled)) \
+		do {\
+			QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_TXRX, \
+					   QDF_TRACE_LEVEL_DEBUG, \
+					   params); \
+		} while (0)
+#else
+#define hal_verbose_debug(params...) QDF_TRACE_DEBUG(QDF_MODULE_ID_TXRX, params)
+#define hal_verbose_hex_dump(params...) \
+		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG, \
+				   params)
+#endif
 
 
 /* TBD: This should be movded to shared HW header file */

+ 148 - 149
hal/wifi3.0/hal_rx.h

@@ -2380,111 +2380,111 @@ enum hal_rx_wbm_rxdma_push_reason {
 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 (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,
-			rx_attn->phy_ppdu_id,
-			rx_attn->first_mpdu,
-			rx_attn->reserved_1a,
-			rx_attn->mcast_bcast,
-			rx_attn->ast_index_not_found,
-			rx_attn->ast_index_timeout,
-			rx_attn->power_mgmt,
-			rx_attn->non_qos,
-			rx_attn->null_data,
-			rx_attn->mgmt_type,
-			rx_attn->ctrl_type,
-			rx_attn->more_data,
-			rx_attn->eosp,
-			rx_attn->a_msdu_error,
-			rx_attn->fragment_flag,
-			rx_attn->order,
-			rx_attn->cce_match,
-			rx_attn->overflow_err,
-			rx_attn->msdu_length_err,
-			rx_attn->tcp_udp_chksum_fail,
-			rx_attn->ip_chksum_fail,
-			rx_attn->sa_idx_invalid,
-			rx_attn->da_idx_invalid,
-			rx_attn->reserved_1b,
-			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,
-			rx_attn->mpdu_length_err,
-			rx_attn->tkip_mic_err,
-			rx_attn->decrypt_err,
-			rx_attn->unencrypted_frame_err,
-			rx_attn->fcs_err,
-			rx_attn->flow_idx_timeout,
-			rx_attn->flow_idx_invalid,
-			rx_attn->wifi_parser_error,
-			rx_attn->amsdu_parser_error,
-			rx_attn->sa_idx_timeout,
-			rx_attn->da_idx_timeout,
-			rx_attn->msdu_limit_error,
-			rx_attn->da_is_valid,
-			rx_attn->da_is_mcbc,
-			rx_attn->sa_is_valid,
-			rx_attn->decrypt_status_code,
-			rx_attn->rx_bitmap_not_updated,
-			rx_attn->reserved_2,
-			rx_attn->msdu_done);
+	hal_verbose_debug(
+			  "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,
+			  rx_attn->phy_ppdu_id,
+			  rx_attn->first_mpdu,
+			  rx_attn->reserved_1a,
+			  rx_attn->mcast_bcast,
+			  rx_attn->ast_index_not_found,
+			  rx_attn->ast_index_timeout,
+			  rx_attn->power_mgmt,
+			  rx_attn->non_qos,
+			  rx_attn->null_data,
+			  rx_attn->mgmt_type,
+			  rx_attn->ctrl_type,
+			  rx_attn->more_data,
+			  rx_attn->eosp,
+			  rx_attn->a_msdu_error,
+			  rx_attn->fragment_flag,
+			  rx_attn->order,
+			  rx_attn->cce_match,
+			  rx_attn->overflow_err,
+			  rx_attn->msdu_length_err,
+			  rx_attn->tcp_udp_chksum_fail,
+			  rx_attn->ip_chksum_fail,
+			  rx_attn->sa_idx_invalid,
+			  rx_attn->da_idx_invalid,
+			  rx_attn->reserved_1b,
+			  rx_attn->rx_in_tx_decrypt_byp);
+
+	hal_verbose_debug(
+			  "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,
+			  rx_attn->mpdu_length_err,
+			  rx_attn->tkip_mic_err,
+			  rx_attn->decrypt_err,
+			  rx_attn->unencrypted_frame_err,
+			  rx_attn->fcs_err,
+			  rx_attn->flow_idx_timeout,
+			  rx_attn->flow_idx_invalid,
+			  rx_attn->wifi_parser_error,
+			  rx_attn->amsdu_parser_error,
+			  rx_attn->sa_idx_timeout,
+			  rx_attn->da_idx_timeout,
+			  rx_attn->msdu_limit_error,
+			  rx_attn->da_is_valid,
+			  rx_attn->da_is_mcbc,
+			  rx_attn->sa_is_valid,
+			  rx_attn->decrypt_status_code,
+			  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,
@@ -2520,42 +2520,42 @@ static inline void hal_rx_dump_msdu_end_tlv(struct hal_soc *hal_soc,
 static inline void hal_rx_dump_mpdu_end_tlv(struct rx_mpdu_end *mpdu_end,
 							uint8_t dbg_level)
 {
-	QDF_TRACE(QDF_MODULE_ID_DP, dbg_level,
-			"rx_mpdu_end tlv - "
-			"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,
-			mpdu_end->unsup_ktype_short_frame,
-			mpdu_end->rx_in_tx_decrypt_byp,
-			mpdu_end->overflow_err,
-			mpdu_end->mpdu_length_err,
-			mpdu_end->tkip_mic_err,
-			mpdu_end->decrypt_err,
-			mpdu_end->unencrypted_frame_err,
-			mpdu_end->pn_fields_contain_valid_info,
-			mpdu_end->fcs_err,
-			mpdu_end->msdu_length_err,
-			mpdu_end->rxdma0_destination_ring,
-			mpdu_end->rxdma1_destination_ring,
-			mpdu_end->decrypt_status_code,
-			mpdu_end->rx_bitmap_not_updated);
+	hal_verbose_debug(
+			  "rx_mpdu_end tlv - "
+			  "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,
+			  mpdu_end->unsup_ktype_short_frame,
+			  mpdu_end->rx_in_tx_decrypt_byp,
+			  mpdu_end->overflow_err,
+			  mpdu_end->mpdu_length_err,
+			  mpdu_end->tkip_mic_err,
+			  mpdu_end->decrypt_err,
+			  mpdu_end->unencrypted_frame_err,
+			  mpdu_end->pn_fields_contain_valid_info,
+			  mpdu_end->fcs_err,
+			  mpdu_end->msdu_length_err,
+			  mpdu_end->rxdma0_destination_ring,
+			  mpdu_end->rxdma1_destination_ring,
+			  mpdu_end->decrypt_status_code,
+			  mpdu_end->rx_bitmap_not_updated);
 }
 
 /**
@@ -2568,15 +2568,14 @@ static inline void hal_rx_dump_mpdu_end_tlv(struct rx_mpdu_end *mpdu_end,
 static inline void hal_rx_dump_pkt_hdr_tlv(struct rx_pkt_hdr_tlv  *pkt_hdr_tlv,
 							uint8_t dbg_level)
 {
-	QDF_TRACE(QDF_MODULE_ID_DP, dbg_level,
-			"\n---------------\n"
-			"rx_pkt_hdr_tlv \n"
-			"---------------\n"
-			"phy_ppdu_id %d ",
-			pkt_hdr_tlv->phy_ppdu_id);
+	hal_verbose_debug(
+			  "\n---------------\n"
+			  "rx_pkt_hdr_tlv \n"
+			  "---------------\n"
+			  "phy_ppdu_id %d ",
+			  pkt_hdr_tlv->phy_ppdu_id);
 
-	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_DP, dbg_level,
-			pkt_hdr_tlv->rx_pkt_hdr, 128);
+	hal_verbose_hex_dump(pkt_hdr_tlv->rx_pkt_hdr, 128);
 }
 
 /**

+ 6 - 6
hal/wifi3.0/hal_srng.c

@@ -37,6 +37,10 @@ void hal_qca6390_attach(struct hal_soc *hal);
 void hal_qca6018_attach(struct hal_soc *hal);
 #endif
 
+#ifdef ENABLE_VERBOSE_DEBUG
+bool is_hal_verbose_debug_enabled;
+#endif
+
 /**
  * hal_get_srng_ring_id() - get the ring id of a descriped ring
  * @hal: hal_soc data structure
@@ -529,16 +533,12 @@ void *hal_srng_setup(void *hal_soc, int ring_type, int ring_num,
 	if (ring_id < 0)
 		return NULL;
 
-	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
-		  "%s: mac_id %d ring_id %d",
-		  __func__, mac_id, ring_id);
+	hal_verbose_debug("mac_id %d ring_id %d", mac_id, ring_id);
 
 	srng = hal_get_srng(hal_soc, ring_id);
 
 	if (srng->initialized) {
-		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-			  "%s: Ring (ring_type, ring_num) already initialized",
-			  __func__);
+		hal_verbose_debug("Ring (ring_type, ring_num) already initialized");
 		return NULL;
 	}
 

+ 63 - 63
hal/wifi3.0/qca6390/hal_6390_rx.h

@@ -172,69 +172,69 @@ 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 (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,
-			msdu_start->msdu_length,
-			msdu_start->ipsec_esp,
-			msdu_start->l3_offset,
-			msdu_start->ipsec_ah,
-			msdu_start->l4_offset,
-			msdu_start->msdu_number,
-			msdu_start->decap_format,
-			msdu_start->ipv4_proto,
-			msdu_start->ipv6_proto,
-			msdu_start->tcp_proto,
-			msdu_start->udp_proto,
-			msdu_start->ip_frag,
-			msdu_start->tcp_only_ack,
-			msdu_start->da_is_bcast_mcast,
-			msdu_start->ip4_protocol_ip6_next_header,
-			msdu_start->toeplitz_hash_2_or_4,
-			msdu_start->flow_id_toeplitz,
-			msdu_start->user_rssi,
-			msdu_start->pkt_type,
-			msdu_start->stbc,
-			msdu_start->sgi,
-			msdu_start->rate_mcs,
-			msdu_start->receive_bandwidth,
-			msdu_start->reception_type,
-			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);
+	hal_verbose_debug(
+			  "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,
+			  msdu_start->msdu_length,
+			  msdu_start->ipsec_esp,
+			  msdu_start->l3_offset,
+			  msdu_start->ipsec_ah,
+			  msdu_start->l4_offset,
+			  msdu_start->msdu_number,
+			  msdu_start->decap_format,
+			  msdu_start->ipv4_proto,
+			  msdu_start->ipv6_proto,
+			  msdu_start->tcp_proto,
+			  msdu_start->udp_proto,
+			  msdu_start->ip_frag,
+			  msdu_start->tcp_only_ack,
+			  msdu_start->da_is_bcast_mcast,
+			  msdu_start->ip4_protocol_ip6_next_header,
+			  msdu_start->toeplitz_hash_2_or_4,
+			  msdu_start->flow_id_toeplitz,
+			  msdu_start->user_rssi,
+			  msdu_start->pkt_type,
+			  msdu_start->stbc,
+			  msdu_start->sgi,
+			  msdu_start->rate_mcs,
+			  msdu_start->receive_bandwidth,
+			  msdu_start->reception_type,
+			  msdu_start->ppdu_start_timestamp);
+
+	hal_verbose_debug(
+			  "rx_msdu_start tlv (2/2) - "
+			  "sw_phy_meta_data: %x ",
+			  msdu_start->sw_phy_meta_data);
 }
 
 /**