diff --git a/core/dp/htt/htt.c b/core/dp/htt/htt.c index b44c6ddf9074..bcb941f52150 100644 --- a/core/dp/htt/htt.c +++ b/core/dp/htt/htt.c @@ -354,14 +354,14 @@ htt_pdev_alloc(ol_txrx_pdev_handle txrx_pdev, pdev->cfg.is_full_reorder_offload = ol_cfg_is_full_reorder_offload(pdev->ctrl_pdev); - QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_DEBUG, - "is_full_reorder_offloaded? %d\n", + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, + "is_full_reorder_offloaded? %d", (int)pdev->cfg.is_full_reorder_offload); pdev->cfg.ce_classify_enabled = ol_cfg_is_ce_classify_enabled(ctrl_pdev); - QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_DEBUG, - "ce_classify_enabled? %d\n", + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, + "ce_classify_enabled? %d", pdev->cfg.ce_classify_enabled); if (pdev->cfg.is_high_latency) { @@ -500,7 +500,8 @@ htt_attach(struct htt_pdev_t *pdev, int desc_pool_size) } else if (frm_type == wlan_frm_fmt_802_3) { pdev->download_len = HTT_TX_HDR_SIZE_ETHERNET; } else { - qdf_print("Unexpected frame type spec: %d\n", frm_type); + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_ERROR, + "Unexpected frame type spec: %d", frm_type); HTT_ASSERT0(0); } @@ -632,7 +633,8 @@ int htt_update_endpoint(struct htt_pdev_t *pdev, hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); if (qdf_unlikely(NULL == hif_ctx)) { QDF_ASSERT(NULL != hif_ctx); - qdf_print("%s:%d: assuming non-tx service.", + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_ERROR, + "%s:%d: assuming non-tx service.", __func__, __LINE__); } else { ul = dl = 0xff; @@ -640,7 +642,8 @@ int htt_update_endpoint(struct htt_pdev_t *pdev, hif_map_service_to_pipe(hif_ctx, service_id, &ul, &dl, &ul_polled, &dl_polled)) - qdf_print("%s:%d: assuming non-tx srv.", + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, + "%s:%d: assuming non-tx srv.", __func__, __LINE__); else tx_service = (ul != 0xff); @@ -750,7 +753,8 @@ int htt_ipa_uc_attach(struct htt_pdev_t *pdev) ol_cfg_ipa_uc_tx_max_buf_cnt(pdev->ctrl_pdev), ol_cfg_ipa_uc_tx_partition_base(pdev->ctrl_pdev)); if (error) { - qdf_print("HTT IPA UC TX attach fail code %d\n", error); + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_ERROR, + "HTT IPA UC TX attach fail code %d", error); HTT_ASSERT0(0); return error; } @@ -759,7 +763,8 @@ int htt_ipa_uc_attach(struct htt_pdev_t *pdev) error = htt_rx_ipa_uc_attach( pdev, qdf_get_pwr2(pdev->rx_ring.fill_level)); if (error) { - qdf_print("HTT IPA UC RX attach fail code %d\n", error); + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_ERROR, + "HTT IPA UC RX attach fail code %d", error); htt_tx_ipa_uc_detach(pdev); HTT_ASSERT0(0); return error; @@ -880,7 +885,8 @@ void htt_mark_first_wakeup_packet(htt_pdev_handle pdev, uint8_t value) { if (!pdev) { - qdf_print("%s: htt pdev is NULL", __func__); + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_ERROR, + "%s: htt pdev is NULL", __func__); return; } diff --git a/core/dp/htt/htt_h2t.c b/core/dp/htt/htt_h2t.c index ab673fac7f3f..a25fca295fd2 100644 --- a/core/dp/htt/htt_h2t.c +++ b/core/dp/htt/htt_h2t.c @@ -306,7 +306,7 @@ QDF_STATUS htt_h2t_rx_ring_rfs_cfg_msg_ll(struct htt_pdev_t *pdev) qdf_nbuf_t msg; uint32_t *msg_word; - QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, "Receive flow steering configuration, disable gEnableFlowSteering(=0) in ini if FW doesnot support it\n"); pkt = htt_htc_pkt_alloc(pdev); if (!pkt) @@ -342,10 +342,10 @@ QDF_STATUS htt_h2t_rx_ring_rfs_cfg_msg_ll(struct htt_pdev_t *pdev) HTT_H2T_MSG_TYPE_SET(*msg_word, HTT_H2T_MSG_TYPE_RFS_CONFIG); if (ol_cfg_is_flow_steering_enabled(pdev->ctrl_pdev)) { HTT_RX_RFS_CONFIG_SET(*msg_word, 1); - QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, "Enable Rx flow steering\n"); } else { - QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, "Disable Rx flow steering\n"); } @@ -369,7 +369,7 @@ QDF_STATUS htt_h2t_rx_ring_rfs_cfg_msg_ll(struct htt_pdev_t *pdev) */ QDF_STATUS htt_h2t_rx_ring_rfs_cfg_msg_ll(struct htt_pdev_t *pdev) { - QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, "Doesnot support receive flow steering configuration\n"); return QDF_STATUS_SUCCESS; } @@ -443,7 +443,7 @@ QDF_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev) tmp = qdf_get_upper_32_bits(pdev->rx_ring.base_paddr); if (tmp & 0xfffffe0) { - QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, "%s:%d paddr > 37 bits!. Trimmed.", __func__, __LINE__); tmp &= 0x01f; @@ -476,10 +476,10 @@ QDF_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev) enable_hdr = 1; enable_ppdu_start = 1; enable_ppdu_end = 1; - QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, "%s : %d Pkt log is enabled\n", __func__, __LINE__); } else { - QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, "%s : %d Pkt log is disabled\n", __func__, __LINE__); enable_ctrl_data = 0; enable_mgmt_data = 0; @@ -507,7 +507,7 @@ QDF_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev) enable_ppdu_start = 1; enable_ppdu_end = 1; /* Disable ASPM for monitor mode */ - QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, "%s : %d Monitor mode is enabled\n", __func__, __LINE__); } @@ -732,7 +732,7 @@ htt_h2t_rx_ring_cfg_msg_hl(struct htt_pdev_t *pdev) */ QDF_STATUS htt_h2t_rx_ring_rfs_cfg_msg_hl(struct htt_pdev_t *pdev) { - QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, "Doesnot support Receive flow steering configuration\n"); return QDF_STATUS_SUCCESS; } @@ -755,7 +755,7 @@ htt_h2t_dbg_stats_get(struct htt_pdev_t *pdev, if (stats_type_upload_mask >= 1 << HTT_DBG_NUM_STATS || stats_type_reset_mask >= 1 << HTT_DBG_NUM_STATS) { /* FIX THIS - add more details? */ - QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_ERROR, "%#x %#x stats not supported\n", stats_type_upload_mask, stats_type_reset_mask); htt_htc_pkt_free(pdev, pkt); diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index 34078b535a5e..6dec0e2f5fc6 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -258,16 +258,16 @@ htt_rx_mpdu_desc_pn_hl( *(word_ptr + 0) = rx_desc->pn_31_0; break; default: - qdf_print( - "Error: invalid length spec (%d bits) for PN\n", - pn_len_bits); + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_ERROR, + "Error: invalid length spec (%d bits) for PN", + pn_len_bits); qdf_assert(0); break; }; } else { /* not first msdu, no pn info */ - qdf_print( - "Error: get pn from a not-first msdu.\n"); + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_ERROR, + "Error: get pn from a not-first msdu."); qdf_assert(0); } } @@ -477,11 +477,11 @@ static void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) } paddr = qdf_nbuf_get_frag_paddr(rx_netbuf, 0); if (pdev->cfg.is_full_reorder_offload) { - if (qdf_unlikely - (htt_rx_hash_list_insert(pdev, paddr, - rx_netbuf))) { - qdf_print("%s: hash insert failed!\n", - __func__); + if (qdf_unlikely(htt_rx_hash_list_insert( + pdev, (uint32_t)paddr, rx_netbuf))) { + QDF_TRACE(QDF_MODULE_ID_HTT, + QDF_TRACE_LEVEL_ERROR, + "%s: hash insert failed!", __func__); #ifdef DEBUG_DMA_DONE qdf_nbuf_unmap(pdev->osdev, rx_netbuf, QDF_DMA_BIDIRECTIONAL); @@ -677,7 +677,8 @@ htt_rx_mpdu_desc_pn_ll(htt_pdev_handle pdev, ((uint64_t) rx_desc->msdu_end.ext_wapi_pn_127_96) << 32; break; default: - qdf_print("Error: invalid length spec (%d bits) for PN\n", + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_ERROR, + "Error: invalid length spec (%d bits) for PN", pn_len_bits); }; } @@ -1054,7 +1055,8 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, int dbg_iter = MAX_DONE_BIT_CHECK_ITER; - qdf_print("malformed frame\n"); + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_ERROR, + "malformed frame"); while (dbg_iter && (!((*(uint32_t *) &rx_desc->attention) & @@ -1065,8 +1067,9 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, (void *)((char *)rx_desc + HTT_RX_STD_DESC_RESERVATION)); - qdf_print("debug iter %d success %d\n", - dbg_iter, + QDF_TRACE(QDF_MODULE_ID_HTT, + QDF_TRACE_LEVEL_INFO, + "debug iter %d success %d", dbg_iter, pdev->rx_ring.dbg_sync_success); dbg_iter--; @@ -1076,7 +1079,10 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, & RX_ATTENTION_0_MSDU_DONE_MASK))) { #ifdef HTT_RX_RESTORE - qdf_print("RX done bit error detected!\n"); + QDF_TRACE(QDF_MODULE_ID_HTT, + QDF_TRACE_LEVEL_ERROR, + "RX done bit error detected!"); + qdf_nbuf_set_next(msdu, NULL); *tail_msdu = msdu; pdev->rx_ring.rx_reset = 1; @@ -1088,7 +1094,8 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, #endif } pdev->rx_ring.dbg_sync_success++; - qdf_print("debug iter %d success %d\n", dbg_iter, + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, + "debug iter %d success %d", dbg_iter, pdev->rx_ring.dbg_sync_success); } #else @@ -1329,8 +1336,9 @@ htt_rx_offload_msdu_pop_hl(htt_pdev_handle pdev, if (msdu_len <= qdf_nbuf_len(buf)) { qdf_nbuf_set_pktlen(buf, msdu_len); } else { - qdf_print("%s: drop frame with invalid msdu len %d %d\n", - __FUNCTION__, msdu_len, (int)qdf_nbuf_len(buf)); + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_ERROR, + "%s: drop frame with invalid msdu len %d %d", + __func__, msdu_len, (int)qdf_nbuf_len(buf)); qdf_nbuf_free(offload_deliver_msg); ret = -1; } @@ -1412,8 +1420,9 @@ htt_rx_offload_paddr_msdu_pop_ll(htt_pdev_handle pdev, if (HTT_RX_IN_ORD_PADDR_IND_MSDU_INFO_GET(*(curr_msdu + 1)) & FW_MSDU_INFO_FIRST_WAKEUP_M) { qdf_nbuf_mark_wakeup_frame(buf); - qdf_print("%s: First packet after WOW Wakeup rcvd\n", - __func__); + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, + "%s: First packet after WOW Wakeup rcvd", + __func__); } } @@ -1482,7 +1491,7 @@ int htt_mon_rx_handle_amsdu_packet(qdf_nbuf_t msdu, htt_pdev_handle pdev, qdf_nbuf_trim_tail(frag_nbuf, HTT_RX_BUF_SIZE - len); HTT_PKT_DUMP(qdf_trace_hex_dump(QDF_MODULE_ID_TXRX, - QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_LEVEL_INFO_HIGH, qdf_nbuf_data(frag_nbuf), qdf_nbuf_len(frag_nbuf))); prev_frag_nbuf = frag_nbuf; @@ -1505,7 +1514,7 @@ int htt_mon_rx_handle_amsdu_packet(qdf_nbuf_t msdu, htt_pdev_handle pdev, amsdu_len -= len; qdf_nbuf_trim_tail(frag_nbuf, HTT_RX_BUF_SIZE - len); HTT_PKT_DUMP(qdf_trace_hex_dump(QDF_MODULE_ID_TXRX, - QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_LEVEL_INFO_HIGH, qdf_nbuf_data(frag_nbuf), qdf_nbuf_len(frag_nbuf))); @@ -1783,7 +1792,7 @@ static int htt_rx_mon_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, msg_word = (uint32_t *)rx_ind_data; HTT_PKT_DUMP(qdf_trace_hex_dump(QDF_MODULE_ID_TXRX, - QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_LEVEL_INFO_HIGH, (void *)rx_ind_data, (int)qdf_nbuf_len(rx_ind_msg))); @@ -1844,7 +1853,7 @@ static int htt_rx_mon_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, HTT_PKT_DUMP(qdf_trace_hex_dump(QDF_MODULE_ID_TXRX, - QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_LEVEL_INFO_HIGH, qdf_nbuf_data(msdu), qdf_nbuf_len(msdu))); last_frag = ((struct htt_rx_in_ord_paddr_ind_msdu_t *) @@ -3234,7 +3243,8 @@ int htt_rx_attach(struct htt_pdev_t *pdev) htt_rx_ring_fill_n(pdev, pdev->rx_ring.fill_level); if (pdev->cfg.is_full_reorder_offload) { - qdf_print("HTT: full reorder offload enabled\n"); + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, + "HTT: full reorder offload enabled"); htt_rx_amsdu_pop = htt_rx_amsdu_rx_in_order_pop_ll; htt_rx_frag_pop = htt_rx_amsdu_rx_in_order_pop_ll; htt_rx_mpdu_desc_list_next = diff --git a/core/dp/htt/htt_t2h.c b/core/dp/htt/htt_t2h.c index fb19075ba917..89589385ac8f 100644 --- a/core/dp/htt/htt_t2h.c +++ b/core/dp/htt/htt_t2h.c @@ -375,7 +375,8 @@ static void htt_t2h_lp_msg_handler(void *context, qdf_nbuf_t htt_t2h_msg, htc_pm_runtime_put(pdev->htc_pdev); HTT_TX_SCHED(pdev); } else { - qdf_print("Ignoring HTT_T2H_MSG_TYPE_MGMT_TX_COMPL_IND indication"); + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, + "Ignoring HTT_T2H_MSG_TYPE_MGMT_TX_COMPL_IND indication"); } break; } @@ -581,8 +582,9 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) msg_type = HTT_T2H_MSG_TYPE_GET(*msg_word); #if defined(HELIUMPLUS_DEBUG) - qdf_print("%s %d: msg_word 0x%x msg_type %d", - __func__, __LINE__, *msg_word, msg_type); + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, + "%s %d: msg_word 0x%x msg_type %d", __func__, __LINE__, + *msg_word, msg_type); #endif switch (msg_type) { diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c index e9f27d9758ec..c786d53dcdc7 100644 --- a/core/dp/htt/htt_tx.c +++ b/core/dp/htt/htt_tx.c @@ -1137,9 +1137,9 @@ static int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, tx_buffer_count_pwr2 = qdf_rounddown_pow_of_two(tx_buffer_count + 1) - 1; if (tx_buffer_count > tx_buffer_count_pwr2) { - qdf_print( - "%s: Allocated Tx buffer count %d is rounded down to %d", - __func__, tx_buffer_count, tx_buffer_count_pwr2); + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, + "%s: Allocated Tx buffer count %d is rounded down to %d", + __func__, tx_buffer_count, tx_buffer_count_pwr2); /* Free over allocated buffers below power of 2 */ for (idx = tx_buffer_count_pwr2; idx < tx_buffer_count; idx++) { @@ -1237,9 +1237,9 @@ static int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, tx_buffer_count_pwr2 = qdf_rounddown_pow_of_two(tx_buffer_count + 1) - 1; if (tx_buffer_count > tx_buffer_count_pwr2) { - qdf_print( - "%s: Allocated Tx buffer count %d is rounded down to %d", - __func__, tx_buffer_count, tx_buffer_count_pwr2); + QDF_TRACE(QDF_MODULE_ID_HTT, QDF_TRACE_LEVEL_INFO, + "%s: Allocated Tx buffer count %d is rounded down to %d", + __func__, tx_buffer_count, tx_buffer_count_pwr2); /* Free over allocated buffers below power of 2 */ for (idx = tx_buffer_count_pwr2; idx < tx_buffer_count; idx++) { @@ -1703,7 +1703,7 @@ htt_tx_desc_init(htt_pdev_handle pdev, ce_pkt_type = htt_to_ce_pkt_type[pkt_type]; if (0xffffffff == ce_pkt_type) { - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH, "Invalid HTT pkt type %d\n", pkt_type); return QDF_STATUS_E_INVAL; }