From 6eaf41462a2b8e799b95d760c1bee046c7e470c4 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Mon, 1 May 2023 19:40:51 -0700 Subject: [PATCH] qcacmn: Add context to the logs Logs without meaningful message or values serves no purpose in debugging. Hence, add more context to the logs. Change-Id: Ia463d239a9bf26f292a11bcc71cb1379374c45e4 CRs-Fixed: 3492593 --- dp/wifi3.0/be/dp_be.c | 2 +- dp/wifi3.0/dp_htt.c | 2 +- dp/wifi3.0/dp_main.c | 12 ++++++------ dp/wifi3.0/dp_rx.c | 12 ++++++++---- dp/wifi3.0/dp_stats.c | 2 +- dp/wifi3.0/dp_txrx_wds.c | 2 +- dp/wifi3.0/dp_umac_reset.c | 5 +++-- dp/wifi3.0/monitor/dp_mon.c | 14 +++++++------- dp/wifi3.0/rh/dp_rh_rx.c | 4 ++-- 9 files changed, 30 insertions(+), 25 deletions(-) diff --git a/dp/wifi3.0/be/dp_be.c b/dp/wifi3.0/be/dp_be.c index 7b7a87c653..34425b022c 100644 --- a/dp/wifi3.0/be/dp_be.c +++ b/dp/wifi3.0/be/dp_be.c @@ -2959,7 +2959,7 @@ dp_primary_link_migration(struct dp_soc *soc, void *cb_ctxt, mld_peer = DP_GET_MLD_PEER_FROM_PEER(new_primary_peer); if (!mld_peer) { - dp_htt_err("Invalid peer"); + dp_htt_err("MLD peer is NULL"); qdf_mem_free(pr_peer_info); return; } diff --git a/dp/wifi3.0/dp_htt.c b/dp/wifi3.0/dp_htt.c index b16fa957b9..d8fb7583f8 100644 --- a/dp/wifi3.0/dp_htt.c +++ b/dp/wifi3.0/dp_htt.c @@ -4729,7 +4729,7 @@ dp_peer_update_inactive_time(struct dp_pdev *pdev, uint32_t tag_type, } break; default: - qdf_err("Invalid tag_type"); + qdf_err("Invalid tag_type: %u", tag_type); } } diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index a7595d8c11..a126c78862 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -6074,7 +6074,7 @@ char *dp_srng_get_str_from_hal_ring_type(enum hal_ring_type ring_type) case TX_MONITOR_BUF: return "tx_monitor_buf"; default: - dp_err("Invalid ring type"); + dp_err("Invalid ring type: %u", ring_type); break; } return "Invalid"; @@ -7779,7 +7779,7 @@ static QDF_STATUS dp_get_psoc_param(struct cdp_soc_t *cdp_soc, val->cdp_umac_rst_skel = dp_umac_rst_skel_enable_get(soc); break; default: - dp_warn("Invalid param"); + dp_warn("Invalid param: %u", param); break; } @@ -8607,7 +8607,7 @@ QDF_STATUS dp_txrx_stats_request(struct cdp_soc_t *soc_handle, } if (req->mac_id >= WLAN_CFG_MAC_PER_TARGET) { - dp_err("Invalid mac id request"); + dp_err("Invalid mac_id: %u request", req->mac_id); status = QDF_STATUS_E_INVAL; goto fail0; } @@ -9760,7 +9760,7 @@ dp_get_peer_extd_rate_link_stats(struct cdp_soc_t *soc_hdl, uint8_t *mac_addr) peer = dp_peer_hash_find_wrapper(soc, &peer_info, DP_MOD_ID_CDP); if (!peer) { - dp_err("Invalid peer"); + dp_err("Peer is NULL"); return QDF_STATUS_E_FAILURE; } @@ -9806,7 +9806,7 @@ dp_get_peer_extd_rate_link_stats(struct cdp_soc_t *soc_hdl, uint8_t *mac_addr) peer = dp_peer_find_hash_find(soc, mac_addr, 0, DP_VDEV_ALL, DP_MOD_ID_CDP); if (!peer) { - dp_err("Invalid peer"); + dp_err("Peer is NULL"); return QDF_STATUS_E_FAILURE; } @@ -12200,7 +12200,7 @@ dp_get_cfr_dbg_stats(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, struct dp_pdev *pdev = dp_get_pdev_from_soc_pdev_id_wifi3(soc, pdev_id); if (!pdev) { - dp_err("Invalid pdev"); + dp_err("pdev is NULL"); return; } diff --git a/dp/wifi3.0/dp_rx.c b/dp/wifi3.0/dp_rx.c index a8eeb68c58..3a87c3a900 100644 --- a/dp/wifi3.0/dp_rx.c +++ b/dp/wifi3.0/dp_rx.c @@ -1502,6 +1502,7 @@ uint8_t dp_rx_process_invalid_peer(struct dp_soc *soc, qdf_nbuf_t mpdu, uint8_t *rx_tlv_hdr = qdf_nbuf_data(mpdu); uint8_t *rx_pkt_hdr = NULL; int i = 0; + uint32_t nbuf_len; if (!HAL_IS_DECAP_FORMAT_RAW(soc->hal_soc, rx_tlv_hdr)) { dp_rx_debug("%pK: Drop decapped frames", soc); @@ -1517,8 +1518,9 @@ uint8_t dp_rx_process_invalid_peer(struct dp_soc *soc, qdf_nbuf_t mpdu, goto free; } - if (qdf_nbuf_len(mpdu) < sizeof(struct ieee80211_frame)) { - dp_rx_err("%pK: Invalid nbuf length", soc); + nbuf_len = qdf_nbuf_len(mpdu); + if (nbuf_len < sizeof(struct ieee80211_frame)) { + dp_rx_err("%pK: Invalid nbuf length: %u", soc, nbuf_len); goto free; } @@ -1624,6 +1626,7 @@ uint8_t dp_rx_process_invalid_peer(struct dp_soc *soc, qdf_nbuf_t mpdu, struct dp_peer *peer = NULL; uint8_t *rx_tlv_hdr = qdf_nbuf_data(mpdu); uint8_t *rx_pkt_hdr = hal_rx_pkt_hdr_get(soc->hal_soc, rx_tlv_hdr); + uint32_t nbuf_len; wh = (struct ieee80211_frame *)rx_pkt_hdr; @@ -1633,8 +1636,9 @@ uint8_t dp_rx_process_invalid_peer(struct dp_soc *soc, qdf_nbuf_t mpdu, goto free; } - if (qdf_nbuf_len(mpdu) < sizeof(struct ieee80211_frame)) { - dp_rx_info_rl("%pK: Invalid nbuf length", soc); + nbuf_len = qdf_nbuf_len(mpdu); + if (nbuf_len < sizeof(struct ieee80211_frame)) { + dp_rx_info_rl("%pK: Invalid nbuf length: %u", soc, nbuf_len); goto free; } diff --git a/dp/wifi3.0/dp_stats.c b/dp/wifi3.0/dp_stats.c index ba522b835d..df2bb066dd 100644 --- a/dp/wifi3.0/dp_stats.c +++ b/dp/wifi3.0/dp_stats.c @@ -5119,7 +5119,7 @@ dp_accumulate_tid_stats(struct dp_pdev *pdev, uint8_t tid, break; } default: - qdf_err("Invalid stats type"); + qdf_err("Invalid stats type: %d", type); break; } } diff --git a/dp/wifi3.0/dp_txrx_wds.c b/dp/wifi3.0/dp_txrx_wds.c index ad19ce1e1e..c38ad9cb12 100644 --- a/dp/wifi3.0/dp_txrx_wds.c +++ b/dp/wifi3.0/dp_txrx_wds.c @@ -861,7 +861,7 @@ dp_get_completion_indication_for_stack(struct dp_soc *soc, if (!txrx_peer) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - FL("Peer Invalid")); + FL("txrx_peer is NULL")); return QDF_STATUS_E_INVAL; } diff --git a/dp/wifi3.0/dp_umac_reset.c b/dp/wifi3.0/dp_umac_reset.c index cceffb185f..6e8ab3bfef 100644 --- a/dp/wifi3.0/dp_umac_reset.c +++ b/dp/wifi3.0/dp_umac_reset.c @@ -587,7 +587,8 @@ QDF_STATUS dp_umac_reset_interrupt_attach(struct dp_soc *soc) } else { if (umac_reset_ctx->intr_offset < 0 || umac_reset_ctx->intr_offset >= WLAN_CFG_INT_NUM_CONTEXTS) { - dp_umac_reset_err("Invalid interrupt offset"); + dp_umac_reset_err("Invalid interrupt offset: %d", + umac_reset_ctx->intr_offset); return QDF_STATUS_E_FAILURE; } @@ -880,7 +881,7 @@ QDF_STATUS dp_umac_reset_notify_action_completion( break; default: - dp_umac_reset_err("Invalid action"); + dp_umac_reset_err("Invalid action: %u", action); return QDF_STATUS_E_FAILURE; } diff --git a/dp/wifi3.0/monitor/dp_mon.c b/dp/wifi3.0/monitor/dp_mon.c index 94de173970..375da61bcf 100644 --- a/dp/wifi3.0/monitor/dp_mon.c +++ b/dp/wifi3.0/monitor/dp_mon.c @@ -630,7 +630,7 @@ dp_config_debug_sniffer(struct dp_pdev *pdev, int val) default: QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "Invalid value, mode not supported"); + "Invalid value, mode: %d not supported", val); status = QDF_STATUS_E_INVAL; break; } @@ -1863,7 +1863,7 @@ QDF_STATUS dp_peer_qos_stats_notify(struct dp_pdev *dp_pdev, struct cdp_interface_peer_qos_stats qos_stats_intf = {0}; if (qdf_unlikely(ppdu_user->peer_id == HTT_INVALID_PEER)) { - dp_mon_warn("Invalid peer id"); + dp_mon_warn("Invalid peer id: %u", ppdu_user->peer_id); return QDF_STATUS_E_FAILURE; } @@ -1922,7 +1922,7 @@ dp_enable_peer_based_pktlog(struct cdp_soc_t *soc, uint8_t pdev_id, 0, DP_VDEV_ALL, DP_MOD_ID_CDP); if (!peer) { - dp_mon_err("Invalid Peer"); + dp_mon_err("Peer is NULL"); return QDF_STATUS_E_FAILURE; } @@ -2293,7 +2293,7 @@ int dp_set_filter_neigh_peers(struct dp_pdev *pdev, void dp_set_atf_stats_enable(struct dp_pdev *pdev, bool value) { if (!pdev) { - dp_cdp_err("Invalid pdev"); + dp_cdp_err("pdev is NULL"); return; } @@ -4182,7 +4182,7 @@ static void dp_process_ppdu_stats_user_common_array_tlv( if (!dp_peer_find_by_id_valid(pdev->soc, peer_id)) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, - "Invalid peer"); + "Peer with peer_id: %u not found", peer_id); return; } @@ -6336,7 +6336,7 @@ void dp_mon_peer_get_stats(struct dp_peer *peer, void *arg, break; } default: - dp_mon_err("Invalid stats_update_type"); + dp_mon_err("Invalid stats_update_type: %u", type); } } @@ -6395,7 +6395,7 @@ dp_mon_peer_get_stats_param(struct dp_peer *peer, enum cdp_peer_stats_type type, buf->rx_snr = mon_peer->stats.rx.snr; break; default: - dp_err("Invalid stats type requested"); + dp_err("Invalid stats type: %u requested", type); ret = QDF_STATUS_E_FAILURE; } diff --git a/dp/wifi3.0/rh/dp_rh_rx.c b/dp/wifi3.0/rh/dp_rh_rx.c index 698a73d590..4219655ec2 100644 --- a/dp/wifi3.0/rh/dp_rh_rx.c +++ b/dp/wifi3.0/rh/dp_rh_rx.c @@ -57,7 +57,7 @@ static inline uint8_t dp_rx_get_ctx_id_frm_napiid(uint8_t napi_id) case 12: return 2; default: - dp_err("Invalid napi id, this should not happen"); + dp_err("Invalid napi id: %u, this should not happen", napi_id); qdf_assert_always(0); break; } @@ -690,7 +690,7 @@ static QDF_STATUS dp_rx_err_handler_rh(struct dp_soc *soc, error_code, rx_desc->pool_id); default: - dp_err("Invalid error packet rcvd"); + dp_err("Invalid error packet rcvd, code: %u", error_code); dp_rx_desc_dump(rx_desc); qdf_assert_always(0); dp_rx_nbuf_free(rx_desc->nbuf);