From c1e00a21ba022aa1a02dcc9534695452f07760ef Mon Sep 17 00:00:00 2001 From: Shikha Bakshi Date: Mon, 9 Nov 2020 15:43:58 +0530 Subject: [PATCH] qcacmn: Modify logs for QDF_MODULE_ID_DP_PEER Add macros dp_peer_info, dp_peer_info_low, dp_peer_info_high, dp_peer_alert, dp_peer_err, dp_tx_capture_debug to define logs. Change-Id: Icf71595c10b1a4f0dca53f6953af4df19210e924 CRs-Fixed: 2832004 --- dp/wifi3.0/dp_main.c | 11 +- dp/wifi3.0/dp_peer.c | 287 +++++++++++++++++-------------------------- dp/wifi3.0/dp_peer.h | 7 ++ 3 files changed, 123 insertions(+), 182 deletions(-) diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index 34d7e3dc0d..a524481c2b 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -9462,9 +9462,8 @@ dp_txrx_get_peer_stats_param(struct cdp_soc_t *soc, uint8_t vdev_id, DP_MOD_ID_CDP); if (!peer) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "Invalid Peer for Mac "QDF_MAC_ADDR_FMT, - QDF_MAC_ADDR_REF(peer_mac)); + dp_peer_err("%pK: Invalid Peer for Mac " QDF_MAC_ADDR_FMT, + soc, QDF_MAC_ADDR_REF(peer_mac)); return QDF_STATUS_E_FAILURE; } else if (type < cdp_peer_stats_max) { switch (type) { @@ -9511,14 +9510,12 @@ dp_txrx_get_peer_stats_param(struct cdp_soc_t *soc, uint8_t vdev_id, buf->rx_avg_rssi = peer->stats.rx.avg_rssi; break; default: - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "Invalid value"); + dp_peer_err("%pK: Invalid value", soc); ret = QDF_STATUS_E_FAILURE; break; } } else { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "Invalid value"); + dp_peer_err("%pK: Invalid value", soc); ret = QDF_STATUS_E_FAILURE; } diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c index a2bd201691..994f452ad3 100644 --- a/dp/wifi3.0/dp_peer.c +++ b/dp/wifi3.0/dp_peer.c @@ -75,9 +75,8 @@ dp_set_ssn_valid_flag(struct hal_reo_cmd_params *params, { params->u.upd_queue_params.update_svld = 1; params->u.upd_queue_params.svld = valid; - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: Setting SSN valid bit to %d", - __func__, valid); + dp_peer_debug("Setting SSN valid bit to %d", + valid); } static inline int dp_peer_find_mac_addr_cmp( @@ -102,13 +101,11 @@ static int dp_peer_ast_table_attach(struct dp_soc *soc) max_ast_index = wlan_cfg_get_max_ast_idx(soc->wlan_cfg_ctx); /* allocate ast_table for ast entry to ast_index map */ - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, - "\n<=== cfg max ast idx %d ====>", max_ast_index); + dp_peer_info("\n%pK:<=== cfg max ast idx %d ====>", soc, max_ast_index); soc->ast_table = qdf_mem_malloc(max_ast_index * sizeof(struct dp_ast_entry *)); if (!soc->ast_table) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "%s: ast_table memory allocation failed", __func__); + dp_peer_err("%pK: ast_table memory allocation failed", soc); return QDF_STATUS_E_NOMEM; } return 0; /* success */ @@ -126,13 +123,11 @@ static int dp_peer_find_map_attach(struct dp_soc *soc) max_peers = soc->max_peers; /* allocate the peer ID -> peer object map */ - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, - "\n<=== cfg max peer id %d ====>", max_peers); + dp_peer_info("\n%pK:<=== cfg max peer id %d ====>", soc, max_peers); peer_map_size = max_peers * sizeof(soc->peer_id_to_obj_map[0]); soc->peer_id_to_obj_map = qdf_mem_malloc(peer_map_size); if (!soc->peer_id_to_obj_map) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "%s: peer map memory allocation failed", __func__); + dp_peer_err("%pK: peer map memory allocation failed", soc); return QDF_STATUS_E_NOMEM; } @@ -321,9 +316,8 @@ void dp_peer_vdev_list_remove(struct dp_soc *soc, struct dp_vdev *vdev, vdev->num_peers--; } else { /*Ignoring the remove operation as peer not found*/ - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "peer:%pK not found in vdev:%pK peerlist:%pK", - peer, vdev, &peer->vdev->peer_list); + dp_peer_debug("%pK: peer:%pK not found in vdev:%pK peerlist:%pK" + , soc, peer, vdev, &peer->vdev->peer_list); } qdf_spin_unlock_bh(&vdev->peer_list_lock); } @@ -444,9 +438,8 @@ static int dp_peer_ast_hash_attach(struct dp_soc *soc) soc->ast_hash.mask = hash_elems - 1; soc->ast_hash.idx_bits = log2; - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, - "ast hash_elems: %d, max_ast_idx: %d", - hash_elems, max_ast_idx); + dp_peer_info("%pK: ast hash_elems: %d, max_ast_idx: %d", + soc, hash_elems, max_ast_idx); /* allocate an array of TAILQ peer object lists */ soc->ast_hash.bins = qdf_mem_malloc( @@ -715,10 +708,9 @@ static inline QDF_STATUS dp_peer_map_ast(struct dp_soc *soc, return QDF_STATUS_E_INVAL; } - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "%s: peer %pK ID %d vid %d mac "QDF_MAC_ADDR_FMT, - __func__, peer, hw_peer_id, vdev_id, - QDF_MAC_ADDR_REF(mac_addr)); + dp_peer_err("%pK: peer %pK ID %d vid %d mac " QDF_MAC_ADDR_FMT, + soc, peer, hw_peer_id, vdev_id, + QDF_MAC_ADDR_REF(mac_addr)); qdf_spin_lock_bh(&soc->ast_lock); @@ -760,11 +752,11 @@ static inline QDF_STATUS dp_peer_map_ast(struct dp_soc *soc, } } else { qdf_spin_unlock_bh(&soc->ast_lock); - dp_alert("AST entry not found with peer %pK peer_id %u peer_mac "QDF_MAC_ADDR_FMT" mac_addr "QDF_MAC_ADDR_FMT" vdev_id %u next_hop %u", - peer, peer->peer_id, - QDF_MAC_ADDR_REF(peer->mac_addr.raw), - QDF_MAC_ADDR_REF(mac_addr), - vdev_id, is_wds); + dp_peer_alert("AST entry not found with peer %pK peer_id %u peer_mac " QDF_MAC_ADDR_FMT " mac_addr " QDF_MAC_ADDR_FMT " vdev_id %u next_hop %u", + peer, peer->peer_id, + QDF_MAC_ADDR_REF(peer->mac_addr.raw), + QDF_MAC_ADDR_REF(mac_addr), + vdev_id, is_wds); } err = QDF_STATUS_E_INVAL; @@ -797,8 +789,7 @@ static inline QDF_STATUS dp_peer_map_ast(struct dp_soc *soc, mac_addr, peer_type, ast_hash); } } else { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "AST entry not found"); + dp_peer_err("%pK: AST entry not found", soc); err = QDF_STATUS_E_NOENT; } @@ -871,8 +862,7 @@ QDF_STATUS dp_peer_add_ast(struct dp_soc *soc, vdev = peer->vdev; if (!vdev) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - FL("Peers vdev is NULL")); + dp_peer_err("%pK: Peers vdev is NULL", soc); QDF_ASSERT(0); return QDF_STATUS_E_INVAL; } @@ -891,19 +881,16 @@ QDF_STATUS dp_peer_add_ast(struct dp_soc *soc, } } - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: pdevid: %u vdev: %u ast_entry->type: %d flags: 0x%x peer_mac: "QDF_MAC_ADDR_FMT" peer: %pK mac "QDF_MAC_ADDR_FMT, - __func__, pdev->pdev_id, vdev->vdev_id, type, flags, - QDF_MAC_ADDR_REF(peer->mac_addr.raw), peer, - QDF_MAC_ADDR_REF(mac_addr)); - + dp_peer_debug("%pK: pdevid: %u vdev: %u ast_entry->type: %d flags: 0x%x peer_mac: " QDF_MAC_ADDR_FMT " peer: %pK mac " QDF_MAC_ADDR_FMT, + soc, pdev->pdev_id, vdev->vdev_id, type, flags, + QDF_MAC_ADDR_REF(peer->mac_addr.raw), peer, + QDF_MAC_ADDR_REF(mac_addr)); /* fw supports only 2 times the max_peers ast entries */ if (soc->num_ast_entries >= wlan_cfg_get_max_ast_idx(soc->wlan_cfg_ctx)) { qdf_spin_unlock_bh(&soc->ast_lock); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - FL("Max ast entries reached")); + dp_peer_err("%pK: Max ast entries reached", soc); return QDF_STATUS_E_RESOURCES; } @@ -1038,8 +1025,7 @@ add_ast_entry: if (!ast_entry) { qdf_spin_unlock_bh(&soc->ast_lock); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - FL("fail to allocate ast_entry")); + dp_peer_err("%pK: fail to allocate ast_entry", soc); QDF_ASSERT(0); return QDF_STATUS_E_NOMEM; } @@ -1095,8 +1081,7 @@ add_ast_entry: ast_entry->type = CDP_TXRX_AST_TYPE_DA; break; default: - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - FL("Incorrect AST entry type")); + dp_peer_err("%pK: Incorrect AST entry type", soc); } ast_entry->is_active = TRUE; @@ -1303,12 +1288,11 @@ int dp_peer_update_ast(struct dp_soc *soc, struct dp_peer *peer, int ret = -1; struct dp_peer *old_peer; - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: ast_entry->type: %d pdevid: %u vdevid: %u flags: 0x%x mac_addr: "QDF_MAC_ADDR_FMT" peer_mac: "QDF_MAC_ADDR_FMT"\n", - __func__, ast_entry->type, peer->vdev->pdev->pdev_id, - peer->vdev->vdev_id, flags, - QDF_MAC_ADDR_REF(ast_entry->mac_addr.raw), - QDF_MAC_ADDR_REF(peer->mac_addr.raw)); + dp_peer_debug("%pK: ast_entry->type: %d pdevid: %u vdevid: %u flags: 0x%x mac_addr: " QDF_MAC_ADDR_FMT " peer_mac: " QDF_MAC_ADDR_FMT "\n", + soc, ast_entry->type, peer->vdev->pdev->pdev_id, + peer->vdev->vdev_id, flags, + QDF_MAC_ADDR_REF(ast_entry->mac_addr.raw), + QDF_MAC_ADDR_REF(peer->mac_addr.raw)); /* Do not send AST update in below cases * 1) Ast entry delete has already triggered @@ -1966,18 +1950,16 @@ static inline struct dp_peer *dp_peer_find_add_id(struct dp_soc *soc, /* check if there's already a peer object with this MAC address */ peer = dp_peer_find_hash_find(soc, peer_mac_addr, 0 /* is aligned */, vdev_id, DP_MOD_ID_CONFIG); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "%s: peer %pK ID %d vid %d mac "QDF_MAC_ADDR_FMT, - __func__, peer, peer_id, vdev_id, - QDF_MAC_ADDR_REF(peer_mac_addr)); + dp_peer_err("%pK: peer %pK ID %d vid %d mac " QDF_MAC_ADDR_FMT, + soc, peer, peer_id, vdev_id, + QDF_MAC_ADDR_REF(peer_mac_addr)); if (peer) { /* peer's ref count was already incremented by * peer_find_hash_find */ - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, - "%s: ref_cnt: %d", __func__, - qdf_atomic_read(&peer->ref_cnt)); + dp_peer_info("%pK: ref_cnt: %d", soc, + qdf_atomic_read(&peer->ref_cnt)); /* * if peer is in logical delete CP triggered delete before map @@ -2056,8 +2038,7 @@ dp_rx_peer_map_handler(struct dp_soc *soc, uint16_t peer_id, if ((hw_peer_id < 0) || (hw_peer_id >= wlan_cfg_get_max_ast_idx(soc->wlan_cfg_ctx))) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "invalid hw_peer_id: %d", hw_peer_id); + dp_peer_err("%pK: invalid hw_peer_id: %d", soc, hw_peer_id); qdf_assert_always(0); } @@ -2069,7 +2050,7 @@ dp_rx_peer_map_handler(struct dp_soc *soc, uint16_t peer_id, qdf_mem_cmp(peer->mac_addr.raw, peer->vdev->mac_addr.raw, QDF_MAC_ADDR_SIZE) != 0) { - dp_info("STA vdev bss_peer!!!!"); + dp_peer_info("%pK: STA vdev bss_peer!!!!", soc); peer->bss_peer = 1; } @@ -2201,11 +2182,9 @@ static void dp_rx_tid_update_cb(struct dp_soc *soc, void *cb_ctxt, (reo_status->rx_queue_status.header.status != HAL_REO_CMD_DRAIN)) { /* Should not happen normally. Just print error for now */ - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "%s: Rx tid HW desc update failed(%d): tid %d", - __func__, - reo_status->rx_queue_status.header.status, - rx_tid->tid); + dp_peer_err("%pK: Rx tid HW desc update failed(%d): tid %d", + soc, reo_status->rx_queue_status.header.status, + rx_tid->tid); } } @@ -2217,7 +2196,7 @@ static bool dp_get_peer_vdev_roaming_in_progress(struct dp_peer *peer) struct cdp_soc_t *soc; if (!peer) { - dp_info("Peer is NULL. No roaming possible"); + dp_peer_info("Peer is NULL. No roaming possible"); return false; } @@ -2229,8 +2208,8 @@ static bool dp_get_peer_vdev_roaming_in_progress(struct dp_peer *peer) is_roaming = ol_ops->is_roam_inprogress(vdev_id); } - dp_info("peer: "QDF_MAC_ADDR_FMT", vdev_id: %d, is_roaming: %d", - QDF_MAC_ADDR_REF(peer->mac_addr.raw), vdev_id, is_roaming); + dp_peer_info("peer: " QDF_MAC_ADDR_FMT ", vdev_id: %d, is_roaming: %d", + QDF_MAC_ADDR_REF(peer->mac_addr.raw), vdev_id, is_roaming); return is_roaming; } @@ -2297,16 +2276,13 @@ static void dp_reo_desc_free(struct dp_soc *soc, void *cb_ctxt, HAL_REO_CMD_SUCCESS) && (reo_status->fl_cache_status.header.status != HAL_REO_CMD_DRAIN)) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "%s: Rx tid HW desc flush failed(%d): tid %d", - __func__, - reo_status->rx_queue_status.header.status, - freedesc->rx_tid.tid); + dp_peer_err("%pK: Rx tid HW desc flush failed(%d): tid %d", + soc, reo_status->rx_queue_status.header.status, + freedesc->rx_tid.tid); } - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH, - "%s:%lu hw_qdesc_paddr: %pK, tid:%d", __func__, - curr_ts, - (void *)(rx_tid->hw_qdesc_paddr), rx_tid->tid); + dp_peer_info("%pK: %lu hw_qdesc_paddr: %pK, tid:%d", soc, + curr_ts, (void *)(rx_tid->hw_qdesc_paddr), + rx_tid->tid); qdf_mem_unmap_nbytes_single(soc->osdev, rx_tid->hw_qdesc_paddr, QDF_DMA_BIDIRECTIONAL, @@ -2398,9 +2374,8 @@ try_desc_alloc: qdf_mem_malloc(rx_tid->hw_qdesc_alloc_size); if (!rx_tid->hw_qdesc_vaddr_unaligned) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "%s: Rx tid HW desc alloc failed: tid %d", - __func__, tid); + dp_peer_err("%pK: Rx tid HW desc alloc failed: tid %d", + soc, tid); return QDF_STATUS_E_NOMEM; } @@ -2415,9 +2390,8 @@ try_desc_alloc: hw_qdesc_align - 1); if (!rx_tid->hw_qdesc_vaddr_unaligned) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "%s: Rx tid HW desc alloc failed: tid %d", - __func__, tid); + dp_peer_err("%pK: Rx tid HW desc alloc failed: tid %d", + soc, tid); return QDF_STATUS_E_NOMEM; } @@ -2425,10 +2399,9 @@ try_desc_alloc: rx_tid->hw_qdesc_vaddr_unaligned, hw_qdesc_align); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: Total Size %d Aligned Addr %pK", - __func__, rx_tid->hw_qdesc_alloc_size, - hw_qdesc_vaddr); + dp_peer_debug("%pK: Total Size %d Aligned Addr %pK", + soc, rx_tid->hw_qdesc_alloc_size, + hw_qdesc_vaddr); } else { hw_qdesc_vaddr = rx_tid->hw_qdesc_vaddr_unaligned; @@ -2471,9 +2444,8 @@ try_desc_alloc: rx_tid->hw_qdesc_vaddr_unaligned = NULL; goto try_desc_alloc; } else { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "%s: Rx tid HW desc alloc failed (lowmem): tid %d", - __func__, tid); + dp_peer_err("%pK: Rx tid HW desc alloc failed (lowmem): tid %d", + soc, tid); err = QDF_STATUS_E_NOMEM; goto error; } @@ -2491,9 +2463,8 @@ try_desc_alloc: peer->vdev->vdev_id, peer->mac_addr.raw, rx_tid->hw_qdesc_paddr, tid, tid, 1, ba_window_size)) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "%s: Failed to send reo queue setup to FW - tid %d\n", - __func__, tid); + dp_peer_err("%pK: Failed to send reo queue setup to FW - tid %d\n", + soc, tid); err = QDF_STATUS_E_FAILURE; goto error; } @@ -2664,10 +2635,9 @@ void dp_rx_tid_delete_cb(struct dp_soc *soc, void *cb_ctxt, freedesc->rx_tid.tid); } - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW, - "%s: rx_tid: %d status: %d", __func__, - freedesc->rx_tid.tid, - reo_status->rx_queue_status.header.status); + dp_peer_info("%pK: rx_tid: %d status: %d", + soc, freedesc->rx_tid.tid, + reo_status->rx_queue_status.header.status); qdf_spin_lock_bh(&soc->reo_desc_freelist_lock); freedesc->free_ts = curr_ts; @@ -2792,9 +2762,8 @@ static int dp_rx_tid_delete_wifi3(struct dp_peer *peer, int tid) qdf_mem_malloc(sizeof(*freedesc)); if (!freedesc) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "%s: malloc failed for freedesc: tid %d", - __func__, tid); + dp_peer_err("%pK: malloc failed for freedesc: tid %d", + soc, tid); return -ENOMEM; } @@ -2837,9 +2806,8 @@ static void dp_peer_setup_remaining_tids(struct dp_peer *peer) for (tid = 1; tid < DP_MAX_TIDS-1; tid++) { dp_rx_tid_setup_wifi3(peer, tid, 1, 0); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "Setting up TID %d for peer %pK peer->local_id %d", - tid, peer, peer->local_id); + dp_peer_debug("Setting up TID %d for peer %pK peer->local_id %d", + tid, peer, peer->local_id); } } #else @@ -3093,8 +3061,7 @@ int dp_addba_resp_tx_completion_wifi3(struct cdp_soc_t *cdp_soc, struct dp_rx_tid *rx_tid = NULL; if (!peer) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: Peer is NULL!\n", __func__); + dp_peer_debug("%pK: Peer is NULL!\n", cdp_soc); goto fail; } rx_tid = &peer->rx_tid[tid]; @@ -3113,17 +3080,15 @@ int dp_addba_resp_tx_completion_wifi3(struct cdp_soc_t *cdp_soc, rx_tid->num_addba_rsp_success++; if (rx_tid->ba_status == DP_RX_BA_INACTIVE) { qdf_spin_unlock_bh(&rx_tid->tid_lock); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "%s: Rx Tid- %d hw qdesc is not in IN_PROGRESS", - __func__, tid); + dp_peer_err("%pK: Rx Tid- %d hw qdesc is not in IN_PROGRESS", + cdp_soc, tid); goto fail; } if (!qdf_atomic_read(&peer->is_default_route_set)) { qdf_spin_unlock_bh(&rx_tid->tid_lock); - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: default route is not set for peer: "QDF_MAC_ADDR_FMT, - __func__, QDF_MAC_ADDR_REF(peer->mac_addr.raw)); + dp_peer_debug("%pK: default route is not set for peer: " QDF_MAC_ADDR_FMT, + cdp_soc, QDF_MAC_ADDR_REF(peer->mac_addr.raw)); goto fail; } @@ -3196,8 +3161,7 @@ dp_addba_responsesetup_wifi3(struct cdp_soc_t *cdp_soc, uint8_t *peer_mac, DP_MOD_ID_CDP); if (!peer) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: Peer is NULL!\n", __func__); + dp_peer_debug("%pK: Peer is NULL!\n", cdp_soc); return QDF_STATUS_E_FAILURE; } rx_tid = &peer->rx_tid[tid]; @@ -3289,8 +3253,7 @@ int dp_addba_requestprocess_wifi3(struct cdp_soc_t *cdp_soc, DP_MOD_ID_CDP); if (!peer) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: Peer is NULL!\n", __func__); + dp_peer_debug("%pK: Peer is NULL!\n", cdp_soc); return QDF_STATUS_E_FAILURE; } rx_tid = &peer->rx_tid[tid]; @@ -3301,9 +3264,8 @@ int dp_addba_requestprocess_wifi3(struct cdp_soc_t *cdp_soc, dp_rx_tid_update_wifi3(peer, tid, 1, IEEE80211_SEQ_MAX); rx_tid->ba_status = DP_RX_BA_INACTIVE; peer->active_ba_session_cnt--; - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: Rx Tid- %d hw qdesc is already setup", - __func__, tid); + dp_peer_debug("%pK: Rx Tid- %d hw qdesc is already setup", + cdp_soc, tid); } if (rx_tid->ba_status == DP_RX_BA_IN_PROGRESS) { @@ -3319,21 +3281,18 @@ int dp_addba_requestprocess_wifi3(struct cdp_soc_t *cdp_soc, } if (rx_tid->rx_ba_win_size_override == DP_RX_BA_SESSION_DISABLE) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, - "%s disable BA session", - __func__); + dp_peer_info("%pK: disable BA session", + cdp_soc); buffersize = 1; } else if (rx_tid->rx_ba_win_size_override) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, - "%s override BA win to %d", __func__, - rx_tid->rx_ba_win_size_override); + dp_peer_info("%pK: override BA win to %d", cdp_soc, + rx_tid->rx_ba_win_size_override); buffersize = rx_tid->rx_ba_win_size_override; } else { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, - "%s restore BA win %d based on addba req", - __func__, buffersize); + dp_peer_info("%pK: restore BA win %d based on addba req", cdp_soc, + buffersize); } dp_check_ba_buffersize(peer, tid, buffersize); @@ -3385,8 +3344,7 @@ dp_set_addba_response(struct cdp_soc_t *cdp_soc, uint8_t *peer_mac, struct dp_rx_tid *rx_tid; if (!peer) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: Peer is NULL!\n", __func__); + dp_peer_debug("%pK: Peer is NULL!\n", cdp_soc); return QDF_STATUS_E_FAILURE; } @@ -3419,8 +3377,7 @@ int dp_delba_process_wifi3(struct cdp_soc_t *cdp_soc, uint8_t *peer_mac, DP_MOD_ID_CDP); if (!peer) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: Peer is NULL!\n", __func__); + dp_peer_debug("%pK: Peer is NULL!\n", cdp_soc); return QDF_STATUS_E_FAILURE; } rx_tid = &peer->rx_tid[tid]; @@ -3470,8 +3427,7 @@ int dp_delba_tx_completion_wifi3(struct cdp_soc_t *cdp_soc, uint8_t *peer_mac, DP_MOD_ID_CDP); if (!peer) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: Peer is NULL!", __func__); + dp_peer_debug("%pK: Peer is NULL!", cdp_soc); return QDF_STATUS_E_FAILURE; } rx_tid = &peer->rx_tid[tid]; @@ -3545,16 +3501,14 @@ dp_set_pn_check_wifi3(struct cdp_soc_t *soc, uint8_t vdev_id, DP_MOD_ID_CDP); if (!peer) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: Peer is NULL!\n", __func__); + dp_peer_debug("%pK: Peer is NULL!\n", soc); return QDF_STATUS_E_FAILURE; } vdev = peer->vdev; if (!vdev) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: VDEV is NULL!\n", __func__); + dp_peer_debug("%pK: VDEV is NULL!\n", soc); dp_peer_unref_delete(peer, DP_MOD_ID_CDP); return QDF_STATUS_E_FAILURE; } @@ -3609,11 +3563,9 @@ dp_set_pn_check_wifi3(struct cdp_soc_t *soc, uint8_t vdev_id, (uint64_t)(rx_tid->hw_qdesc_paddr) >> 32; if (pn_size) { - QDF_TRACE(QDF_MODULE_ID_DP, - QDF_TRACE_LEVEL_INFO_HIGH, - "%s PN set for TID:%d pn:%x:%x:%x:%x", - __func__, i, rx_pn[3], rx_pn[2], - rx_pn[1], rx_pn[0]); + dp_peer_info("%pK: PN set for TID:%d pn:%x:%x:%x:%x", + soc, i, rx_pn[3], rx_pn[2], + rx_pn[1], rx_pn[0]); params.u.upd_queue_params.update_pn_valid = 1; params.u.upd_queue_params.pn_31_0 = rx_pn[0]; params.u.upd_queue_params.pn_63_32 = rx_pn[1]; @@ -3632,8 +3584,7 @@ dp_set_pn_check_wifi3(struct cdp_soc_t *soc, uint8_t vdev_id, rx.err.reo_cmd_send_fail, 1); } } else { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH, - "PN Check not setup for TID :%d ", i); + dp_peer_info("%pK: PN Check not setup for TID :%d ", soc, i); } qdf_spin_unlock_bh(&rx_tid->tid_lock); } @@ -3667,17 +3618,13 @@ dp_set_key_sec_type_wifi3(struct cdp_soc_t *soc, uint8_t vdev_id, int sec_index; if (!peer) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s: Peer is NULL!\n", __func__); + dp_peer_debug("%pK: Peer is NULL!\n", soc); return QDF_STATUS_E_FAILURE; } - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH, - "key sec spec for peer %pK "QDF_MAC_ADDR_FMT": %s key of type %d", - peer, - QDF_MAC_ADDR_REF(peer->mac_addr.raw), - is_unicast ? "ucast" : "mcast", - sec_type); + dp_peer_info("%pK: key sec spec for peer %pK " QDF_MAC_ADDR_FMT ": %s key of type %d", + soc, peer, QDF_MAC_ADDR_REF(peer->mac_addr.raw), + is_unicast ? "ucast" : "mcast", sec_type); sec_index = is_unicast ? dp_sec_ucast : dp_sec_mcast; peer->security[sec_index].sec_type = sec_type; @@ -3698,17 +3645,13 @@ dp_rx_sec_ind_handler(struct dp_soc *soc, uint16_t peer_id, peer = dp_peer_get_ref_by_id(soc, peer_id, DP_MOD_ID_HTT); if (!peer) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "Couldn't find peer from ID %d - skipping security inits", - peer_id); + dp_peer_err("Couldn't find peer from ID %d - skipping security inits", + peer_id); return; } - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH, - "sec spec for peer %pK "QDF_MAC_ADDR_FMT": %s key of type %d", - peer, - QDF_MAC_ADDR_REF(peer->mac_addr.raw), - is_unicast ? "ucast" : "mcast", - sec_type); + dp_peer_info("%pK: sec spec for peer %pK " QDF_MAC_ADDR_FMT ": %s key of type %d", + soc, peer, QDF_MAC_ADDR_REF(peer->mac_addr.raw), + is_unicast ? "ucast" : "mcast", sec_type); sec_index = is_unicast ? dp_sec_ucast : dp_sec_mcast; peer->security[sec_index].sec_type = sec_type; #ifdef notyet /* TODO: See if this is required for defrag support */ @@ -3844,9 +3787,8 @@ dp_rx_delba_ind_handler(void *soc_handle, uint16_t peer_id, peer = dp_peer_get_ref_by_id(soc, peer_id, DP_MOD_ID_HTT); if (!peer) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "Couldn't find peer from ID %d", - peer_id); + dp_peer_err("%pK: Couldn't find peer from ID %d", + soc, peer_id); return QDF_STATUS_E_FAILURE; } @@ -3856,9 +3798,8 @@ dp_rx_delba_ind_handler(void *soc_handle, uint16_t peer_id, if (rx_tid->hw_qdesc_vaddr_unaligned) { if (!rx_tid->delba_tx_status) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, - "%s: PEER_ID: %d TID: %d, BA win: %d ", - __func__, peer_id, tid, win_sz); + dp_peer_info("%pK: PEER_ID: %d TID: %d, BA win: %d ", + soc, peer_id, tid, win_sz); qdf_spin_lock_bh(&rx_tid->tid_lock); @@ -3881,8 +3822,7 @@ dp_rx_delba_ind_handler(void *soc_handle, uint16_t peer_id, rx_tid->delba_rcode); } } else { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "BA session is not setup for TID:%d ", tid); + dp_peer_err("%pK: BA session is not setup for TID:%d ", soc, tid); status = QDF_STATUS_E_FAILURE; } @@ -3941,9 +3881,8 @@ QDF_STATUS dp_peer_state_update(struct cdp_soc_t *soc_hdl, uint8_t *peer_mac, peer = dp_peer_find_hash_find(soc, peer_mac, 0, DP_VDEV_ALL, DP_MOD_ID_CDP); if (!peer) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "Failed to find peer for: ["QDF_MAC_ADDR_FMT"]", - QDF_MAC_ADDR_REF(peer_mac)); + dp_peer_err("%pK: Failed to find peer for: [" QDF_MAC_ADDR_FMT "]", + soc, QDF_MAC_ADDR_REF(peer_mac)); return QDF_STATUS_E_FAILURE; } peer->state = state; @@ -3988,9 +3927,8 @@ dp_get_vdev_by_peer_addr(struct cdp_pdev *pdev_handle, struct cdp_vdev *vdev = NULL; if (!pdev) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH, - "PDEV not found for peer_addr: "QDF_MAC_ADDR_FMT, - QDF_MAC_ADDR_REF(peer_addr.bytes)); + dp_peer_info("PDEV not found for peer_addr: " QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(peer_addr.bytes)); return NULL; } @@ -4279,8 +4217,7 @@ dp_set_michael_key(struct cdp_soc_t *soc, DP_MOD_ID_CDP); if (!peer) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "peer not found "); + dp_peer_err("%pK: peer not found ", soc); return QDF_STATUS_E_FAILURE; } diff --git a/dp/wifi3.0/dp_peer.h b/dp/wifi3.0/dp_peer.h index 451fe3e44d..9b66985d54 100644 --- a/dp/wifi3.0/dp_peer.h +++ b/dp/wifi3.0/dp_peer.h @@ -26,6 +26,13 @@ #define DP_FW_PEER_STATS_CMP_TIMEOUT_MSEC 5000 +#define dp_peer_alert(params...) QDF_TRACE_FATAL(QDF_MODULE_ID_DP_PEER, params) +#define dp_peer_err(params...) QDF_TRACE_ERROR(QDF_MODULE_ID_DP_PEER, params) +#define dp_peer_warn(params...) QDF_TRACE_WARN(QDF_MODULE_ID_DP_PEER, params) +#define dp_peer_info(params...) \ + __QDF_TRACE_FL(QDF_TRACE_LEVEL_INFO_HIGH, QDF_MODULE_ID_DP_PEER, ## params) +#define dp_peer_debug(params...) QDF_TRACE_DEBUG(QDF_MODULE_ID_DP_PEER, params) + typedef void dp_peer_iter_func(struct dp_soc *soc, struct dp_peer *peer, void *arg); void dp_peer_unref_delete(struct dp_peer *peer, enum dp_mod_id id);