summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/dp/htt/htt_tx.c23
-rw-r--r--core/dp/txrx/ol_rx.c29
-rw-r--r--core/dp/txrx/ol_rx_defrag.c29
-rw-r--r--core/dp/txrx/ol_rx_fwd.c5
-rw-r--r--core/dp/txrx/ol_rx_pn.c58
-rw-r--r--core/dp/txrx/ol_rx_reorder.c29
-rw-r--r--core/dp/txrx/ol_tx.c27
-rw-r--r--core/dp/txrx/ol_tx_classify.c2
-rw-r--r--core/dp/txrx/ol_tx_desc.c4
-rw-r--r--core/dp/txrx/ol_tx_queue.c23
-rw-r--r--core/dp/txrx/ol_tx_send.c10
-rw-r--r--core/dp/txrx/ol_txrx.c121
-rw-r--r--core/dp/txrx/ol_txrx_flow_control.c72
-rw-r--r--core/dp/txrx/ol_txrx_internal.h69
-rw-r--r--core/dp/txrx/ol_txrx_peer_find.c8
15 files changed, 230 insertions, 279 deletions
diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c
index 09a239a3df61..a7d5c6188a7f 100644
--- a/core/dp/htt/htt_tx.c
+++ b/core/dp/htt/htt_tx.c
@@ -172,8 +172,7 @@ static int htt_tx_frag_desc_attach(struct htt_pdev_t *pdev,
qdf_get_dma_mem_context((&pdev->frag_descs), memctx), false);
if ((0 == pdev->frag_descs.desc_pages.num_pages) ||
(NULL == pdev->frag_descs.desc_pages.dma_pages)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "FRAG descriptor alloc fail");
+ ol_txrx_err("FRAG descriptor alloc fail");
return -ENOBUFS;
}
return 0;
@@ -354,8 +353,7 @@ int htt_tx_attach(struct htt_pdev_t *pdev, int desc_pool_elems)
memctx), true);
if ((0 == pdev->tx_descs.desc_pages.num_pages) ||
(NULL == pdev->tx_descs.desc_pages.cacheable_pages)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "HTT desc alloc fail");
+ ol_txrx_err("HTT desc alloc fail");
goto out_fail;
}
num_page = pdev->tx_descs.desc_pages.num_pages;
@@ -374,8 +372,7 @@ int htt_tx_attach(struct htt_pdev_t *pdev, int desc_pool_elems)
* should point next page
*/
if (!cacheable_pages[i + 1]) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "over flow num link %d\n",
+ ol_txrx_err("over flow num link %d\n",
num_link);
goto free_htt_desc;
}
@@ -394,8 +391,7 @@ int htt_tx_attach(struct htt_pdev_t *pdev, int desc_pool_elems)
*p = NULL;
if (htt_tx_frag_desc_attach(pdev, desc_pool_elems)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "HTT Frag descriptor alloc fail");
+ ol_txrx_err("HTT Frag descriptor alloc fail");
goto free_htt_desc;
}
@@ -526,8 +522,7 @@ int htt_tx_attach(struct htt_pdev_t *pdev, int desc_pool_elems)
qdf_get_dma_mem_context((&pdev->tx_descs), memctx), false);
if ((0 == pdev->tx_descs.desc_pages.num_pages) ||
(NULL == pdev->tx_descs.desc_pages.dma_pages)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "HTT desc alloc fail");
+ ol_txrx_err("HTT desc alloc fail");
goto out_fail;
}
num_page = pdev->tx_descs.desc_pages.num_pages;
@@ -544,8 +539,7 @@ int htt_tx_attach(struct htt_pdev_t *pdev, int desc_pool_elems)
* Last element on this page,
* should pint next page */
if (!page_info->page_v_addr_start) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "over flow num link %d\n",
+ ol_txrx_err("over flow num link %d\n",
num_link);
goto free_htt_desc;
}
@@ -565,8 +559,7 @@ int htt_tx_attach(struct htt_pdev_t *pdev, int desc_pool_elems)
*p = NULL;
if (htt_tx_frag_desc_attach(pdev, desc_pool_elems)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "HTT Frag descriptor alloc fail");
+ ol_txrx_err("HTT Frag descriptor alloc fail");
goto free_htt_desc;
}
@@ -660,7 +653,7 @@ static qdf_dma_addr_t htt_tx_get_paddr(htt_pdev_handle pdev,
}
if (!page_info) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "invalid page_info");
+ ol_txrx_err("invalid page_info");
return 0;
}
diff --git a/core/dp/txrx/ol_rx.c b/core/dp/txrx/ol_rx.c
index 0aae0cf54eae..20b8cb890e44 100644
--- a/core/dp/txrx/ol_rx.c
+++ b/core/dp/txrx/ol_rx.c
@@ -220,8 +220,7 @@ void ol_rx_update_histogram_stats(uint32_t msdu_count, uint8_t frag_ind,
struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "%s pdev is NULL\n", __func__);
+ ol_txrx_err("%s pdev is NULL\n", __func__);
return;
}
@@ -742,13 +741,11 @@ ol_rx_sec_ind_handler(ol_txrx_pdev_handle pdev,
peer = ol_txrx_peer_find_by_id(pdev, peer_id);
if (!peer) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "Couldn't find peer from ID %d - skipping security inits\n",
+ ol_txrx_err("Couldn't find peer from ID %d - skipping security inits\n",
peer_id);
return;
}
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
- "sec spec for peer %p (%02x:%02x:%02x:%02x:%02x:%02x): "
+ ol_txrx_dbg("sec spec for peer %p (%02x:%02x:%02x:%02x:%02x:%02x): "
"%s key of type %d\n",
peer,
peer->mac_addr.raw[0], peer->mac_addr.raw[1],
@@ -1161,8 +1158,7 @@ ol_rx_deliver(struct ol_txrx_vdev_t *vdev,
htt_rx_msdu_first_msdu_flag(htt_pdev, rx_desc);
if (OL_RX_DECAP(vdev, peer, msdu, &info) != A_OK) {
discard = 1;
- TXRX_PRINT(TXRX_PRINT_LEVEL_WARN,
- "decap error %p from peer %p "
+ ol_txrx_dbg("decap error %p from peer %p "
"(%02x:%02x:%02x:%02x:%02x:%02x) len %d\n",
msdu, peer,
peer->mac_addr.raw[0], peer->mac_addr.raw[1],
@@ -1339,8 +1335,7 @@ ol_rx_discard(struct ol_txrx_vdev_t *vdev,
qdf_nbuf_t msdu = msdu_list;
msdu_list = qdf_nbuf_next(msdu_list);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
- "discard rx %p from partly-deleted peer %p "
+ ol_txrx_dbg("discard rx %p from partly-deleted peer %p "
"(%02x:%02x:%02x:%02x:%02x:%02x)\n",
msdu, peer,
peer->mac_addr.raw[0], peer->mac_addr.raw[1],
@@ -1426,8 +1421,7 @@ ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev,
peer = ol_txrx_peer_find_by_id(pdev, peer_id);
htt_pdev = pdev->htt_pdev;
} else {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "%s: Invalid pdev passed!\n", __func__);
+ ol_txrx_err("%s: Invalid pdev passed!\n", __func__);
qdf_assert_always(pdev);
return;
}
@@ -1457,8 +1451,7 @@ ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev,
ol_rx_ind_record_event(status, OL_RX_INDICATION_POP_END);
if (qdf_unlikely(0 == status)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_WARN,
- "%s: Pop status is 0, returning here\n", __func__);
+ ol_txrx_warn("%s: Pop status is 0, returning here\n", __func__);
return;
}
@@ -1482,7 +1475,7 @@ ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev,
if (peer) {
vdev = peer->vdev;
} else {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2,
+ ol_txrx_dbg(
"%s: Couldn't find peer from ID 0x%x\n",
__func__, peer_id);
while (head_msdu) {
@@ -1527,15 +1520,13 @@ void ol_rx_pkt_dump_call(
pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "%s: pdev is NULL", __func__);
+ ol_txrx_err("%s: pdev is NULL", __func__);
return;
}
peer = ol_txrx_peer_find_by_id(pdev, peer_id);
if (!peer) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "%s: peer with peer id %d is NULL", __func__,
+ ol_txrx_err("%s: peer with peer id %d is NULL", __func__,
peer_id);
return;
}
diff --git a/core/dp/txrx/ol_rx_defrag.c b/core/dp/txrx/ol_rx_defrag.c
index fb9726859afd..c22f32deeebd 100644
--- a/core/dp/txrx/ol_rx_defrag.c
+++ b/core/dp/txrx/ol_rx_defrag.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -187,8 +187,7 @@ ol_rx_frag_restructure(
int rx_desc_len)
{
if ((ind_old_position == NULL) || (rx_desc_old_position == NULL)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "ind_old_position,rx_desc_old_position is NULL\n");
+ ol_txrx_err("ind_old_position,rx_desc_old_position is NULL\n");
ASSERT(0);
return;
}
@@ -453,8 +452,7 @@ ol_rx_reorder_store_frag(ol_txrx_pdev_handle pdev,
rx_reorder_array_elem->head);
rx_reorder_array_elem->head = NULL;
rx_reorder_array_elem->tail = NULL;
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "\n ol_rx_reorder_store: %s mismatch \n",
+ ol_txrx_err("\n ol_rx_reorder_store:%s mismatch\n",
(rxseq == frxseq)
? "address"
: "seq number");
@@ -594,8 +592,7 @@ void ol_rx_defrag_waitlist_remove(struct ol_txrx_peer_t *peer, unsigned tid)
rx_reorder->defrag_waitlist_elem.tqe_next = NULL;
rx_reorder->defrag_waitlist_elem.tqe_prev = NULL;
} else if (rx_reorder->defrag_waitlist_elem.tqe_next != NULL) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_FATAL_ERR,
- "waitlist->tqe_prv = NULL\n");
+ ol_txrx_alert("waitlist->tqe_prv = NULL\n");
QDF_ASSERT(0);
rx_reorder->defrag_waitlist_elem.tqe_next = NULL;
}
@@ -673,8 +670,7 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev,
ol_rx_frames_free(htt_pdev, frag_list);
}
ol_rx_frames_free(htt_pdev, tmp_next);
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "ol_rx_defrag: PN Check failed\n");
+ ol_txrx_err("ol_rx_defrag: PN Check failed\n");
return;
}
/* remove FCS from each fragment */
@@ -701,8 +697,7 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev,
if (!ol_rx_frag_tkip_decap(pdev, cur, hdr_space)) {
/* TKIP decap failed, discard frags */
ol_rx_frames_free(htt_pdev, frag_list);
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "\n ol_rx_defrag: TKIP decap failed\n");
+ ol_txrx_err("\n ol_rx_defrag: TKIP decap failed\n");
return;
}
cur = tmp_next;
@@ -715,15 +710,13 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev,
if (!ol_rx_frag_ccmp_demic(pdev, cur, hdr_space)) {
/* CCMP demic failed, discard frags */
ol_rx_frames_free(htt_pdev, frag_list);
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "\n ol_rx_defrag: CCMP demic failed\n");
+ ol_txrx_err("\n ol_rx_defrag: CCMP demic failed\n");
return;
}
if (!ol_rx_frag_ccmp_decap(pdev, cur, hdr_space)) {
/* CCMP decap failed, discard frags */
ol_rx_frames_free(htt_pdev, frag_list);
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "\n ol_rx_defrag: CCMP decap failed\n");
+ ol_txrx_err("\n ol_rx_defrag: CCMP decap failed\n");
return;
}
cur = tmp_next;
@@ -738,8 +731,7 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev,
if (!ol_rx_frag_wep_decap(pdev, cur, hdr_space)) {
/* wep decap failed, discard frags */
ol_rx_frames_free(htt_pdev, frag_list);
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "\n ol_rx_defrag: wep decap failed\n");
+ ol_txrx_err("\n ol_rx_defrag: wep decap failed\n");
return;
}
cur = tmp_next;
@@ -763,8 +755,7 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev,
ol_rx_err(pdev->ctrl_pdev,
vdev->vdev_id, peer->mac_addr.raw, tid, 0,
OL_RX_DEFRAG_ERR, msdu, NULL, 0);
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "\n ol_rx_defrag: TKIP demic failed\n");
+ ol_txrx_err("\n ol_rx_defrag: TKIP demic failed\n");
return;
}
}
diff --git a/core/dp/txrx/ol_rx_fwd.c b/core/dp/txrx/ol_rx_fwd.c
index 5bbe90b0e3f3..929df53475ae 100644
--- a/core/dp/txrx/ol_rx_fwd.c
+++ b/core/dp/txrx/ol_rx_fwd.c
@@ -79,11 +79,8 @@ static inline void ol_ap_fwd_check(struct ol_txrx_vdev_t *vdev, qdf_nbuf_t msdu)
qdf_mem_cmp
(mac_header->i_addr3, vdev->mac_addr.raw,
IEEE80211_ADDR_LEN)) {
-#ifdef DEBUG_HOST_RC
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
- "Exit: %s | Unnecessary to adjust mac header\n",
+ ol_txrx_dbg("Exit: %s | Unnecessary to adjust mac header\n",
__func__);
-#endif
} else {
/* Flip the ToDs bit to FromDs */
mac_header->i_fc[1] &= 0xfe;
diff --git a/core/dp/txrx/ol_rx_pn.c b/core/dp/txrx/ol_rx_pn.c
index 9ecb4eab6d1b..ad243197f49c 100644
--- a/core/dp/txrx/ol_rx_pn.c
+++ b/core/dp/txrx/ol_rx_pn.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011, 2013-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -36,15 +36,19 @@
#include <ol_rx.h> /* ol_rx_deliver */
/* add the MSDUs from this MPDU to the list of good frames */
-#define ADD_MPDU_TO_LIST(head, tail, mpdu, mpdu_tail) do { \
- if (!head) { \
- head = mpdu; \
- } else { \
- qdf_nbuf_set_next(tail, mpdu); \
- } \
- tail = mpdu_tail; \
- } while (0)
-
+static void ol_rx_add_mpdu_to_list(qdf_nbuf_t head,
+ qdf_nbuf_t tail,
+ qdf_nbuf_t mpdu,
+ qdf_nbuf_t mpdu_tail)
+{
+ do {
+ if (!head)
+ head = mpdu;
+ else
+ qdf_nbuf_set_next(tail, mpdu);
+ tail = mpdu_tail;
+ } while (0);
+}
int ol_rx_pn_cmp24(union htt_rx_pn_t *new_pn,
union htt_rx_pn_t *old_pn, int is_unicast, int opmode)
{
@@ -127,8 +131,8 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev,
/* Don't check the PN replay for non-encrypted frames */
if (!htt_rx_mpdu_is_encrypted(pdev->htt_pdev, rx_desc)) {
- ADD_MPDU_TO_LIST(out_list_head, out_list_tail, mpdu,
- mpdu_tail);
+ ol_rx_add_mpdu_to_list(out_list_head, out_list_tail,
+ mpdu, mpdu_tail);
mpdu = next_mpdu;
continue;
}
@@ -149,7 +153,6 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev,
if (pn_is_replay) {
qdf_nbuf_t msdu;
static uint32_t last_pncheck_print_time /* = 0 */;
- int log_level;
uint32_t current_time_ms;
/*
@@ -164,12 +167,26 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev,
if (TXRX_PN_CHECK_FAILURE_PRINT_PERIOD_MS <
(current_time_ms - last_pncheck_print_time)) {
last_pncheck_print_time = current_time_ms;
- log_level = TXRX_PRINT_LEVEL_WARN;
+ ol_txrx_warn(
+ "PN check failed - TID %d, peer %p "
+ "(%02x:%02x:%02x:%02x:%02x:%02x) %s\n"
+ " old PN (u64 x2)= 0x%08llx %08llx (LSBs = %lld)\n"
+ " new PN (u64 x2)= 0x%08llx %08llx (LSBs = %lld)\n"
+ " new seq num = %d\n",
+ tid, peer,
+ peer->mac_addr.raw[0], peer->mac_addr.raw[1],
+ peer->mac_addr.raw[2], peer->mac_addr.raw[3],
+ peer->mac_addr.raw[4], peer->mac_addr.raw[5],
+ (index ==
+ txrx_sec_ucast) ? "ucast" : "mcast",
+ last_pn->pn128[1], last_pn->pn128[0],
+ last_pn->pn128[0] & 0xffffffffffffULL,
+ new_pn.pn128[1], new_pn.pn128[0],
+ new_pn.pn128[0] & 0xffffffffffffULL,
+ htt_rx_mpdu_desc_seq_num(pdev->htt_pdev,
+ rx_desc));
} else {
- log_level = TXRX_PRINT_LEVEL_INFO2;
- }
-
- TXRX_PRINT(log_level,
+ ol_txrx_dbg(
"PN check failed - TID %d, peer %p "
"(%02x:%02x:%02x:%02x:%02x:%02x) %s\n"
" old PN (u64 x2)= 0x%08llx %08llx (LSBs = %lld)\n"
@@ -187,6 +204,7 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev,
new_pn.pn128[0] & 0xffffffffffffULL,
htt_rx_mpdu_desc_seq_num(pdev->htt_pdev,
rx_desc));
+ }
#if defined(ENABLE_RX_PN_TRACE)
ol_rx_pn_trace_display(pdev, 1);
#endif /* ENABLE_RX_PN_TRACE */
@@ -208,8 +226,8 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev,
msdu = next_msdu;
} while (1);
} else {
- ADD_MPDU_TO_LIST(out_list_head, out_list_tail, mpdu,
- mpdu_tail);
+ ol_rx_add_mpdu_to_list(out_list_head, out_list_tail,
+ mpdu, mpdu_tail);
/*
* Remember the new PN.
* For simplicity, just do 2 64-bit word copies to
diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c
index 5116cf0c0a6f..c4c9e446548e 100644
--- a/core/dp/txrx/ol_rx_reorder.c
+++ b/core/dp/txrx/ol_rx_reorder.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -524,8 +524,8 @@ ol_rx_delba_handler(ol_txrx_pdev_handle pdev, uint16_t peer_id, uint8_t tid)
* used for non block-ack cases.
*/
if (rx_reorder->array != &rx_reorder->base) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
- "%s, delete reorder array, tid:%d\n", __func__, tid);
+ ol_txrx_dbg("%s, delete reorder array, tid:%d\n",
+ __func__, tid);
qdf_mem_free(rx_reorder->array);
}
@@ -632,7 +632,6 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev,
static uint32_t last_pncheck_print_time;
/* Do not need to initialize as C does it */
- int log_level;
uint32_t current_time_ms;
union htt_rx_pn_t pn = { 0 };
int index, pn_len;
@@ -660,11 +659,24 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev,
last_pncheck_print_time)) {
last_pncheck_print_time =
current_time_ms;
- log_level = TXRX_PRINT_LEVEL_WARN;
+ ol_txrx_warn(
+ "Tgt PN check failed - TID %d, peer %p "
+ "(%02x:%02x:%02x:%02x:%02x:%02x)\n"
+ " PN (u64 x2)= 0x%08llx %08llx (LSBs = %lld)\n"
+ " new seq num = %d\n",
+ tid, peer,
+ peer->mac_addr.raw[0],
+ peer->mac_addr.raw[1],
+ peer->mac_addr.raw[2],
+ peer->mac_addr.raw[3],
+ peer->mac_addr.raw[4],
+ peer->mac_addr.raw[5], pn.pn128[1],
+ pn.pn128[0],
+ pn.pn128[0] & 0xffffffffffffULL,
+ htt_rx_mpdu_desc_seq_num(htt_pdev,
+ rx_desc));
} else {
- log_level = TXRX_PRINT_LEVEL_INFO2;
- }
- TXRX_PRINT(log_level,
+ ol_txrx_dbg(
"Tgt PN check failed - TID %d, peer %p "
"(%02x:%02x:%02x:%02x:%02x:%02x)\n"
" PN (u64 x2)= 0x%08llx %08llx (LSBs = %lld)\n"
@@ -680,6 +692,7 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev,
pn.pn128[0] & 0xffffffffffffULL,
htt_rx_mpdu_desc_seq_num(htt_pdev,
rx_desc));
+ }
ol_rx_err(pdev->ctrl_pdev, vdev->vdev_id,
peer->mac_addr.raw, tid,
htt_rx_mpdu_desc_tsf32(htt_pdev,
diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c
index 8993aa0a1223..85c608a54fcc 100644
--- a/core/dp/txrx/ol_tx.c
+++ b/core/dp/txrx/ol_tx.c
@@ -215,8 +215,7 @@ qdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev,
qdf_nbuf_t ret;
if (qdf_unlikely(!pdev)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "%s: pdev is NULL", __func__);
+ ol_txrx_err("%s: pdev is NULL", __func__);
return skb;
}
@@ -229,8 +228,7 @@ qdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev,
qdf_nbuf_set_next(skb, NULL);
ret = OL_TX_SEND((struct ol_txrx_vdev_t *)vdev, skb);
if (ret) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_WARN,
- "%s: Failed to tx", __func__);
+ ol_txrx_warn("%s: Failed to tx", __func__);
return ret;
}
@@ -1366,8 +1364,7 @@ struct ol_tx_desc_t *ol_tx_hl_desc_alloc(struct ol_txrx_pdev_t *pdev,
(QDF_NBUF_CB_GET_PACKET_TYPE(msdu) ==
QDF_NBUF_CB_PACKET_TYPE_EAPOL)) {
tx_desc = ol_tx_desc_hl(pdev, vdev, msdu, msdu_info);
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "Provided tx descriptor from reserve pool for DHCP/EAPOL\n");
+ ol_txrx_info("Provided tx descriptor from reserve pool for DHCP/EAPOL\n");
}
}
return tx_desc;
@@ -2028,8 +2025,7 @@ void ol_tso_seg_list_init(struct ol_txrx_pdev_t *pdev, uint32_t num_seg)
/* Host should not allocate any c_element. */
if (num_seg <= 0) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "%s: ERROR: Pool size passed is 0",
+ ol_txrx_err("%s: ERROR: Pool size passed is 0",
__func__);
QDF_BUG(0);
pdev->tso_seg_pool.pool_size = i;
@@ -2041,8 +2037,7 @@ void ol_tso_seg_list_init(struct ol_txrx_pdev_t *pdev, uint32_t num_seg)
pdev->tso_seg_pool.freelist = c_element;
for (i = 0; i < (num_seg - 1); i++) {
if (qdf_unlikely(!c_element)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "%s: ERROR: c_element NULL for seg %d",
+ ol_txrx_err("%s: ERROR: c_element NULL for seg %d",
__func__, i);
QDF_BUG(0);
pdev->tso_seg_pool.pool_size = i;
@@ -2062,8 +2057,7 @@ void ol_tso_seg_list_init(struct ol_txrx_pdev_t *pdev, uint32_t num_seg)
* first c_element if num_seg is equal to 1.
*/
if (qdf_unlikely(!c_element)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "%s: ERROR: c_element NULL for seg %d",
+ ol_txrx_err("%s: ERROR: c_element NULL for seg %d",
__func__, i);
QDF_BUG(0);
pdev->tso_seg_pool.pool_size = i;
@@ -2141,8 +2135,7 @@ void ol_tso_num_seg_list_init(struct ol_txrx_pdev_t *pdev, uint32_t num_seg)
/* Host should not allocate any c_element. */
if (num_seg <= 0) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "%s: ERROR: Pool size passed is 0",
+ ol_txrx_err("%s: ERROR: Pool size passed is 0",
__func__);
QDF_BUG(0);
pdev->tso_num_seg_pool.num_seg_pool_size = i;
@@ -2154,8 +2147,7 @@ void ol_tso_num_seg_list_init(struct ol_txrx_pdev_t *pdev, uint32_t num_seg)
pdev->tso_num_seg_pool.freelist = c_element;
for (i = 0; i < (num_seg - 1); i++) {
if (qdf_unlikely(!c_element)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "%s: ERROR: c_element NULL for num of seg %d",
+ ol_txrx_err("%s: ERROR: c_element NULL for num of seg %d",
__func__, i);
QDF_BUG(0);
pdev->tso_num_seg_pool.num_seg_pool_size = i;
@@ -2173,8 +2165,7 @@ void ol_tso_num_seg_list_init(struct ol_txrx_pdev_t *pdev, uint32_t num_seg)
* first c_element if num_seg is equal to 1.
*/
if (qdf_unlikely(!c_element)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "%s: ERROR: c_element NULL for num of seg %d",
+ ol_txrx_err("%s: ERROR: c_element NULL for num of seg %d",
__func__, i);
QDF_BUG(0);
pdev->tso_num_seg_pool.num_seg_pool_size = i;
diff --git a/core/dp/txrx/ol_tx_classify.c b/core/dp/txrx/ol_tx_classify.c
index 25af6ea049f2..de3d108e7f71 100644
--- a/core/dp/txrx/ol_tx_classify.c
+++ b/core/dp/txrx/ol_tx_classify.c
@@ -609,7 +609,7 @@ ol_tx_classify(
if (IEEE80211_IS_MULTICAST(dest_addr) && vdev->opmode !=
wlan_op_mode_sta && tx_msdu_info->peer !=
NULL) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_dbg(
"%s: remove the peer reference %p\n",
__func__, peer);
/* remove the peer reference added above */
diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c
index 585be2891c43..42cc7fe4d8b6 100644
--- a/core/dp/txrx/ol_tx_desc.c
+++ b/core/dp/txrx/ol_tx_desc.c
@@ -47,7 +47,7 @@ static inline void ol_tx_desc_sanity_checks(struct ol_txrx_pdev_t *pdev,
struct ol_tx_desc_t *tx_desc)
{
if (tx_desc->pkt_type != ol_tx_frm_freed) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s Potential tx_desc corruption pkt_type:0x%x pdev:0x%p",
__func__, tx_desc->pkt_type, pdev);
qdf_assert(0);
@@ -61,7 +61,7 @@ static inline void ol_tx_desc_reset_pkt_type(struct ol_tx_desc_t *tx_desc)
static inline void ol_tx_desc_compute_delay(struct ol_tx_desc_t *tx_desc)
{
if (tx_desc->entry_timestamp_ticks != 0xffffffff) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s Timestamp:0x%x\n",
+ ol_txrx_err("%s Timestamp:0x%x\n",
__func__, tx_desc->entry_timestamp_ticks);
qdf_assert(0);
}
diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c
index 470496affbb1..e1c5a0efd2a2 100644
--- a/core/dp/txrx/ol_tx_queue.c
+++ b/core/dp/txrx/ol_tx_queue.c
@@ -1791,7 +1791,7 @@ ol_txrx_map_to_netif_reason_type(uint32_t reason)
case OL_TXQ_PAUSE_REASON_THERMAL_MITIGATION:
return WLAN_THERMAL_MITIGATION;
default:
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: reason not supported %d\n",
__func__, reason);
return WLAN_REASON_TYPE_MAX;
@@ -1811,8 +1811,7 @@ void ol_txrx_vdev_pause(ol_txrx_vdev_handle vdev, uint32_t reason)
enum netif_reason_type netif_reason;
if (qdf_unlikely((!pdev) || (!pdev->pause_cb))) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "%s: invalid pdev\n", __func__);
+ ol_txrx_err("%s: invalid pdev\n", __func__);
return;
}
@@ -1836,7 +1835,7 @@ void ol_txrx_vdev_unpause(ol_txrx_vdev_handle vdev, uint32_t reason)
enum netif_reason_type netif_reason;
if (qdf_unlikely((!pdev) || (!pdev->pause_cb))) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: invalid pdev\n", __func__);
return;
}
@@ -1958,7 +1957,7 @@ static void ol_tx_pdev_throttle_phase_timer(void *context)
if (pdev->tx_throttle.current_throttle_phase == THROTTLE_PHASE_OFF) {
/* Traffic is stopped */
- TXRX_PRINT(TXRX_PRINT_LEVEL_WARN,
+ ol_txrx_dbg(
"throttle phase --> OFF\n");
ol_txrx_throttle_pause(pdev);
ol_txrx_thermal_pause(pdev);
@@ -1967,14 +1966,14 @@ static void ol_tx_pdev_throttle_phase_timer(void *context)
ms = pdev->tx_throttle.throttle_time_ms[cur_level][cur_phase];
if (pdev->tx_throttle.current_throttle_level !=
THROTTLE_LEVEL_0) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_WARN,
+ ol_txrx_dbg(
"start timer %d ms\n", ms);
qdf_timer_start(&pdev->tx_throttle.
phase_timer, ms);
}
} else {
/* Traffic can go */
- TXRX_PRINT(TXRX_PRINT_LEVEL_WARN,
+ ol_txrx_dbg(
"throttle phase --> ON\n");
ol_txrx_throttle_unpause(pdev);
ol_txrx_thermal_unpause(pdev);
@@ -1983,7 +1982,7 @@ static void ol_tx_pdev_throttle_phase_timer(void *context)
ms = pdev->tx_throttle.throttle_time_ms[cur_level][cur_phase];
if (pdev->tx_throttle.current_throttle_level !=
THROTTLE_LEVEL_0) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_WARN, "start timer %d ms\n",
+ ol_txrx_dbg("start timer %d ms\n",
ms);
qdf_timer_start(&pdev->tx_throttle.phase_timer,
ms);
@@ -2053,13 +2052,13 @@ void ol_tx_throttle_set_level(struct ol_txrx_pdev_t *pdev, int level)
int ms = 0;
if (level >= THROTTLE_LEVEL_MAX) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_WARN,
+ ol_txrx_dbg(
"%s invalid throttle level set %d, ignoring\n",
__func__, level);
return;
}
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Setting throttle level %d\n", level);
+ ol_txrx_info("Setting throttle level %d\n", level);
/* Set the current throttle level */
pdev->tx_throttle.current_throttle_level = (enum throttle_level) level;
@@ -2078,7 +2077,7 @@ void ol_tx_throttle_init_period(struct ol_txrx_pdev_t *pdev, int period,
/* Set the current throttle level */
pdev->tx_throttle.throttle_period_ms = period;
- TXRX_PRINT(TXRX_PRINT_LEVEL_WARN, "level OFF ON\n");
+ ol_txrx_dbg("level OFF ON\n");
for (i = 0; i < THROTTLE_LEVEL_MAX; i++) {
pdev->tx_throttle.throttle_time_ms[i][THROTTLE_PHASE_ON] =
pdev->tx_throttle.throttle_period_ms -
@@ -2088,7 +2087,7 @@ void ol_tx_throttle_init_period(struct ol_txrx_pdev_t *pdev, int period,
pdev->tx_throttle.throttle_period_ms -
pdev->tx_throttle.throttle_time_ms[
i][THROTTLE_PHASE_ON];
- TXRX_PRINT(TXRX_PRINT_LEVEL_WARN, "%d %d %d\n", i,
+ ol_txrx_dbg("%d %d %d\n", i,
pdev->tx_throttle.
throttle_time_ms[i][THROTTLE_PHASE_OFF],
pdev->tx_throttle.
diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c
index 9bb94c36af99..847fa8bba185 100644
--- a/core/dp/txrx/ol_tx_send.c
+++ b/core/dp/txrx/ol_tx_send.c
@@ -274,7 +274,7 @@ ol_tx_send_nonstd(struct ol_txrx_pdev_t *pdev,
QDF_NBUF_UPDATE_TX_PKT_COUNT(msdu, QDF_NBUF_TX_PKT_TXRX);
failed = htt_tx_send_nonstd(pdev->htt_pdev, msdu, id, pkt_type);
if (failed) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"Error: freeing tx frame after htt_tx failed");
ol_tx_target_credit_incr_int(pdev, msdu_credit_consumed);
ol_tx_desc_frame_free_nonstd(pdev, tx_desc, 1 /* had error */);
@@ -516,7 +516,7 @@ void ol_tx_discard_target_frms(ol_txrx_pdev_handle pdev)
* target has never provided a response.
*/
if (qdf_atomic_read(&tx_desc->ref_cnt)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_WARN,
+ ol_txrx_dbg(
"Warning: freeing tx desc %d", tx_desc->id);
ol_tx_desc_frame_free_nonstd(pdev,
tx_desc, 1);
@@ -822,7 +822,7 @@ ol_tx_single_completion_handler(ol_txrx_pdev_handle pdev,
tx_desc = ol_tx_desc_find_check(pdev, tx_desc_id);
if (tx_desc == NULL) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: invalid desc_id(%u), ignore it.\n",
__func__,
tx_desc_id);
@@ -1276,7 +1276,7 @@ void ol_register_packetdump_callback(tp_ol_packetdump_cb ol_tx_packetdump_cb,
ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: pdev is NULL", __func__);
return;
}
@@ -1301,7 +1301,7 @@ void ol_deregister_packetdump_callback(void)
ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: pdev is NULL", __func__);
return;
}
diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c
index e7a23b9ee49a..0f19a2e81c54 100644
--- a/core/dp/txrx/ol_txrx.c
+++ b/core/dp/txrx/ol_txrx.c
@@ -188,7 +188,7 @@ void ol_tx_mark_first_wakeup_packet(uint8_t value)
struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: pdev is NULL\n", __func__);
return;
}
@@ -639,7 +639,7 @@ void ol_tx_set_desc_global_pool_size(uint32_t num_msdu_desc)
pdev->num_msdu_desc = num_msdu_desc;
if (!ol_tx_get_is_mgmt_over_wmi_enabled())
pdev->num_msdu_desc += TX_FLOW_MGMT_POOL_SIZE;
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2, "Global pool size: %d\n",
+ ol_txrx_info("Global pool size: %d\n",
pdev->num_msdu_desc);
return;
}
@@ -1402,7 +1402,7 @@ ol_txrx_pdev_post_attach(ol_txrx_pdev_handle pdev)
/* link SW tx descs into a freelist */
pdev->tx_desc.num_free = desc_pool_size;
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_dbg(
"%s first tx_desc:0x%p Last tx desc:0x%p\n", __func__,
(uint32_t *) pdev->tx_desc.freelist,
(uint32_t *) (pdev->tx_desc.freelist + desc_pool_size));
@@ -1607,7 +1607,7 @@ ol_txrx_pdev_post_attach(ol_txrx_pdev_handle pdev)
OL_RX_REORDER_TIMEOUT_INIT(pdev);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1, "Created pdev %p\n", pdev);
+ ol_txrx_dbg("Created pdev %p\n", pdev);
pdev->cfg.host_addba = ol_cfg_host_addba(pdev->ctrl_pdev);
@@ -1766,7 +1766,7 @@ static void ol_tx_free_descs_inuse(ol_txrx_pdev_handle pdev)
* target has never provided a response.
*/
if (qdf_atomic_read(&tx_desc->ref_cnt)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_WARN,
+ ol_txrx_dbg(
"Warning: freeing tx frame (no compltn)\n");
ol_tx_desc_frame_free_nonstd(pdev,
tx_desc, 1);
@@ -1826,7 +1826,7 @@ void ol_txrx_pdev_pre_detach(ol_txrx_pdev_handle pdev, int force)
* As a side effect, this will complete the deletion of any
* vdevs that are waiting for their peers to finish deletion.
*/
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1, "Force delete for pdev %p\n",
+ ol_txrx_dbg("Force delete for pdev %p\n",
pdev);
ol_txrx_peer_find_hash_erase(pdev);
}
@@ -1906,7 +1906,7 @@ void ol_txrx_pdev_detach(ol_txrx_pdev_handle pdev)
/*checking to ensure txrx pdev structure is not NULL */
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"NULL pdev passed to %s\n", __func__);
return;
}
@@ -2032,7 +2032,7 @@ ol_txrx_vdev_attach(ol_txrx_pdev_handle pdev,
/* add this vdev into the pdev's list */
TAILQ_INSERT_TAIL(&pdev->vdev_list, vdev, vdev_list_elem);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_dbg(
"Created vdev %p (%02x:%02x:%02x:%02x:%02x:%02x)\n",
vdev,
vdev->mac_addr.raw[0], vdev->mac_addr.raw[1],
@@ -2220,7 +2220,7 @@ ol_txrx_vdev_detach(ol_txrx_vdev_handle vdev,
/* check that the vdev has no peers allocated */
if (!TAILQ_EMPTY(&vdev->peer_list)) {
/* debug print - will be removed later */
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_dbg(
"%s: not deleting vdev object %p (%02x:%02x:%02x:%02x:%02x:%02x) until deletion finishes for all its peers\n",
__func__, vdev,
vdev->mac_addr.raw[0], vdev->mac_addr.raw[1],
@@ -2236,7 +2236,7 @@ ol_txrx_vdev_detach(ol_txrx_vdev_handle vdev,
qdf_spin_unlock_bh(&pdev->peer_ref_mutex);
qdf_event_destroy(&vdev->wait_delete_comp);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_dbg(
"%s: deleting vdev obj %p (%02x:%02x:%02x:%02x:%02x:%02x)\n",
__func__, vdev,
vdev->mac_addr.raw[0], vdev->mac_addr.raw[1],
@@ -2383,7 +2383,7 @@ ol_txrx_peer_attach(ol_txrx_vdev_handle vdev, uint8_t *peer_mac_addr)
TAILQ_FOREACH(temp_peer, &vdev->peer_list, peer_list_elem) {
if (!ol_txrx_peer_find_mac_addr_cmp(&temp_peer->mac_addr,
(union ol_txrx_align_mac_addr_t *)peer_mac_addr)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_info(
"vdev_id %d (%02x:%02x:%02x:%02x:%02x:%02x) already exsist.\n",
vdev->vdev_id,
peer_mac_addr[0], peer_mac_addr[1],
@@ -2406,7 +2406,7 @@ ol_txrx_peer_attach(ol_txrx_vdev_handle vdev, uint8_t *peer_mac_addr)
rc = qdf_wait_single_event(&vdev->wait_delete_comp,
PEER_DELETION_TIMEOUT);
if (QDF_STATUS_SUCCESS != rc) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"error waiting for peer(%d) deletion, status %d\n",
vdev->wait_on_peer_id, (int) rc);
/* Added for debugging only */
@@ -2744,7 +2744,7 @@ ol_txrx_remove_peers_for_vdev(ol_txrx_vdev_handle vdev,
}
/* self peer is deleted last */
if (peer == TAILQ_FIRST(&vdev->peer_list)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_info(
"%s: self peer removed by caller ",
__func__);
break;
@@ -2778,7 +2778,7 @@ ol_txrx_remove_peers_for_vdev_no_lock(ol_txrx_vdev_handle vdev,
ol_txrx_peer_handle peer = NULL;
TAILQ_FOREACH(peer, &vdev->peer_list, peer_list_elem) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_info(
"%s: peer found for vdev id %d. deleting the peer",
__func__, vdev->vdev_id);
callback(callback_context, (uint8_t *)&vdev->mac_addr,
@@ -2836,14 +2836,14 @@ QDF_STATUS ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev,
int peer_ref_cnt;
if (qdf_unlikely(!pdev)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Pdev is NULL");
+ ol_txrx_err("Pdev is NULL");
qdf_assert(0);
return QDF_STATUS_E_INVAL;
}
peer = ol_txrx_peer_find_hash_find_inc_ref(pdev, peer_mac, 0, 1);
if (NULL == peer) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2,
+ ol_txrx_err(
"%s: peer is null for peer_mac 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",
__func__,
peer_mac[0], peer_mac[1], peer_mac[2], peer_mac[3],
@@ -2855,7 +2855,7 @@ QDF_STATUS ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev,
/* avoid multiple auth state change. */
if (peer->state == state) {
#ifdef TXRX_PRINT_VERBOSE_ENABLE
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO3,
+ ol_txrx_dbg(
"%s: no state change, returns directly\n",
__func__);
#endif
@@ -2863,7 +2863,7 @@ QDF_STATUS ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev,
return QDF_STATUS_SUCCESS;
}
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2, "%s: change from %d to %d\n",
+ ol_txrx_dbg("%s: change from %d to %d\n",
__func__, peer->state, state);
peer->tx_filter = (state == OL_TXRX_PEER_STATE_AUTH)
@@ -2879,7 +2879,7 @@ QDF_STATUS ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev,
* Pause all regular (non-extended) TID tx queues until
* data arrives and ADDBA negotiation has completed.
*/
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2,
+ ol_txrx_dbg(
"%s: pause peer and unpause mgmt/non-qos\n",
__func__);
ol_txrx_peer_pause(peer); /* pause all tx queues */
@@ -2920,7 +2920,7 @@ ol_txrx_peer_update(ol_txrx_vdev_handle vdev,
peer = ol_txrx_peer_find_hash_find_inc_ref(vdev->pdev, peer_mac, 0, 1);
if (!peer) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2, "%s: peer is null",
+ ol_txrx_dbg("%s: peer is null",
__func__);
return;
}
@@ -3038,14 +3038,14 @@ int ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer,
vdev = peer->vdev;
if (NULL == vdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_dbg(
"The vdev is not present anymore\n");
return -EINVAL;
}
pdev = vdev->pdev;
if (NULL == pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_dbg(
"The pdev is not present anymore\n");
return -EINVAL;
}
@@ -3076,7 +3076,7 @@ int ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer,
rc = qdf_atomic_read(&(peer->ref_cnt));
if (rc == 0) {
qdf_spin_unlock_bh(&pdev->peer_ref_mutex);
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"The Peer is not present anymore\n");
qdf_assert(0);
return -EACCES;
@@ -3154,7 +3154,7 @@ int ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer,
*
*/
ol_txrx_tx_desc_reset_vdev(vdev);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_dbg(
"%s: deleting vdev object %p "
"(%02x:%02x:%02x:%02x:%02x:%02x)"
" - its last peer is done",
@@ -3189,7 +3189,7 @@ int ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer,
for (i = 0; i < OL_TXRX_NUM_EXT_TIDS; i++) {
if (peer->tids_rx_reorder[i].array !=
&peer->tids_rx_reorder[i].base) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_dbg(
"%s, delete reorder arr, tid:%d\n",
__func__, i);
qdf_mem_free(peer->tids_rx_reorder[i].array);
@@ -3245,13 +3245,13 @@ QDF_STATUS ol_txrx_clear_peer(uint8_t sta_id)
struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Unable to find pdev!",
+ ol_txrx_err("%s: Unable to find pdev!",
__func__);
return QDF_STATUS_E_FAILURE;
}
if (sta_id >= WLAN_MAX_STA_COUNT) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Invalid sta id %d", sta_id);
+ ol_txrx_err("Invalid sta id %d", sta_id);
return QDF_STATUS_E_INVAL;
}
@@ -3343,7 +3343,7 @@ void ol_txrx_peer_detach(ol_txrx_peer_handle peer)
if (vdev->opmode == wlan_op_mode_sta) {
qdf_mc_timer_start(&peer->peer_unmap_timer,
OL_TXRX_PEER_UNMAP_TIMEOUT);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_info(
"%s: started peer_unmap_timer for peer %p",
__func__, peer);
}
@@ -3372,7 +3372,7 @@ void ol_txrx_peer_detach_force_delete(ol_txrx_peer_handle peer)
{
ol_txrx_pdev_handle pdev = peer->vdev->pdev;
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1, "%s peer %p, peer->ref_cnt %d",
+ ol_txrx_info("%s peer %p, peer->ref_cnt %d",
__func__, peer, qdf_atomic_read(&peer->ref_cnt));
/* Clear the peer_id_to_obj map entries */
@@ -3421,7 +3421,7 @@ static void ol_txrx_dump_tx_desc(ol_txrx_pdev_handle pdev_handle)
num_free = ol_tx_get_total_free_desc(pdev);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_info(
"total tx credit %d num_free %d",
total, num_free);
@@ -3445,7 +3445,7 @@ QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout)
ol_txrx_pdev_handle txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if (txrx_pdev == NULL) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: txrx context is null", __func__);
return QDF_STATUS_E_FAULT;
}
@@ -3453,7 +3453,7 @@ QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout)
while (ol_txrx_get_tx_pending(txrx_pdev)) {
qdf_sleep(OL_ATH_TX_DRAIN_WAIT_DELAY);
if (timeout <= 0) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: tx frames are pending", __func__);
ol_txrx_dump_tx_desc(txrx_pdev);
return QDF_STATUS_E_TIMEOUT;
@@ -3564,23 +3564,6 @@ void ol_txrx_discard_tx_pending(ol_txrx_pdev_handle pdev_handle)
}
/*--- debug features --------------------------------------------------------*/
-
-unsigned g_txrx_print_level = TXRX_PRINT_LEVEL_ERR; /* default */
-
-void ol_txrx_print_level_set(unsigned level)
-{
-#ifndef TXRX_PRINT_ENABLE
- QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_FATAL,
- "The driver is compiled without TXRX prints enabled.\n"
- "To enable them, recompile with TXRX_PRINT_ENABLE defined");
-#else
- QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
- "TXRX printout level changed from %d to %d",
- g_txrx_print_level, level);
- g_txrx_print_level = level;
-#endif
-}
-
struct ol_txrx_stats_req_internal {
struct ol_txrx_stats_req base;
int serviced; /* state of this request */
@@ -4616,7 +4599,7 @@ static void ol_rx_data_cb(struct ol_txrx_pdev_t *pdev,
qdf_nbuf_set_next(buf, NULL); /* Add NULL terminator */
ret = data_rx(osif_dev, buf);
if (ret != QDF_STATUS_SUCCESS) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Frame Rx to HDD failed");
+ ol_txrx_err("Frame Rx to HDD failed");
if (pdev)
TXRX_STATS_MSDU_INCR(pdev, rx.dropped_err, buf);
qdf_nbuf_free(buf);
@@ -4626,7 +4609,7 @@ static void ol_rx_data_cb(struct ol_txrx_pdev_t *pdev,
return;
free_buf:
- TXRX_PRINT(TXRX_PRINT_LEVEL_WARN, "%s:Dropping frames", __func__);
+ ol_txrx_warn("%s:Dropping frames", __func__);
buf = buf_list;
while (buf) {
next_buf = qdf_nbuf_queue_next(buf);
@@ -4656,7 +4639,7 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer,
ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if ((!peer) || (!pdev)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "peer/pdev is NULL");
+ ol_txrx_err("peer/pdev is NULL");
goto drop_rx_buf;
}
@@ -4675,14 +4658,14 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer,
if (!data_rx) {
struct ol_rx_cached_buf *cache_buf;
- TXRX_PRINT(TXRX_PRINT_LEVEL_WARN,
+ ol_txrx_info(
"Data on the peer before it is registered!!!");
buf = rx_buf_list;
while (buf) {
next_buf = qdf_nbuf_queue_next(buf);
cache_buf = qdf_mem_malloc(sizeof(*cache_buf));
if (!cache_buf) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"Failed to allocate buf to cache the rx frames");
qdf_nbuf_free(buf);
} else {
@@ -4714,7 +4697,7 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer,
pkt = cds_alloc_ol_rx_pkt(sched_ctx);
if (!pkt) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_info(
"No available Rx message buffer");
goto drop_rx_buf;
}
@@ -4733,7 +4716,7 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer,
return;
drop_rx_buf:
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1, "Dropping rx packets");
+ ol_txrx_info("Dropping rx packets");
buf = rx_buf_list;
while (buf) {
next_buf = qdf_nbuf_queue_next(buf);
@@ -4759,12 +4742,12 @@ QDF_STATUS ol_txrx_register_peer(struct ol_txrx_desc_type *sta_desc)
struct privacy_exemption privacy_filter;
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Pdev is NULL");
+ ol_txrx_err("Pdev is NULL");
return QDF_STATUS_E_INVAL;
}
if (sta_desc->sta_id >= WLAN_MAX_STA_COUNT) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Invalid sta id :%d",
+ ol_txrx_err("Invalid sta id :%d",
sta_desc->sta_id);
return QDF_STATUS_E_INVAL;
}
@@ -4808,21 +4791,21 @@ QDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr,
ol_txrx_peer_handle peer;
if (!cds_ctx) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Invalid context",
+ ol_txrx_err("%s: Invalid context",
__func__);
return QDF_STATUS_E_FAILURE;
}
pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Unable to find pdev!",
+ ol_txrx_err("%s: Unable to find pdev!",
__func__);
return QDF_STATUS_E_FAILURE;
}
peer = ol_txrx_find_peer_by_addr(pdev, mac_addr, peer_id);
if (!peer) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Unable to find OCB peer!",
+ ol_txrx_err("%s: Unable to find OCB peer!",
__func__);
return QDF_STATUS_E_FAILURE;
}
@@ -4976,7 +4959,7 @@ QDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb)
{
struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if (!pdev || !pause_cb) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "pdev or pause_cb is NULL");
+ ol_txrx_err("pdev or pause_cb is NULL");
return QDF_STATUS_E_INVAL;
}
pdev->pause_cb = pause_cb;
@@ -5077,15 +5060,15 @@ void ol_register_lro_flush_cb(void (lro_flush_cb)(void *),
struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if (pdev == NULL) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: pdev NULL!", __func__);
+ ol_txrx_err("%s: pdev NULL!", __func__);
TXRX_ASSERT2(0);
goto out;
}
if (pdev->lro_info.lro_flush_cb != NULL) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_info(
"%s: LRO already initialised\n", __func__);
if (pdev->lro_info.lro_flush_cb != lro_flush_cb) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"lro_flush_cb is differ to previously registered callback\n")
TXRX_ASSERT2(0);
goto out;
@@ -5098,7 +5081,7 @@ void ol_register_lro_flush_cb(void (lro_flush_cb)(void *),
cds_get_context(QDF_MODULE_ID_HIF);
if (qdf_unlikely(hif_device == NULL)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: hif_device NULL!", __func__);
qdf_assert(0);
goto out;
@@ -5126,11 +5109,11 @@ void ol_deregister_lro_flush_cb(void (lro_deinit_cb)(void *))
struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if (pdev == NULL) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: pdev NULL!", __func__);
+ ol_txrx_err("%s: pdev NULL!", __func__);
return;
}
if (qdf_atomic_dec_and_test(&pdev->lro_info.lro_dev_cnt) == 0) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_info(
"%s: Other LRO enabled modules still exist, do not unregister the lro_flush_cb\n", __func__);
return;
}
@@ -5138,7 +5121,7 @@ void ol_deregister_lro_flush_cb(void (lro_deinit_cb)(void *))
(struct hif_opaque_softc *)cds_get_context(QDF_MODULE_ID_HIF);
if (qdf_unlikely(hif_device == NULL)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: hif_device NULL!", __func__);
qdf_assert(0);
return;
diff --git a/core/dp/txrx/ol_txrx_flow_control.c b/core/dp/txrx/ol_txrx_flow_control.c
index fd3650f145ba..57ce2d369c4e 100644
--- a/core/dp/txrx/ol_txrx_flow_control.c
+++ b/core/dp/txrx/ol_txrx_flow_control.c
@@ -67,8 +67,7 @@ ol_tx_register_global_mgmt_pool(struct ol_txrx_pdev_t *pdev)
pdev->mgmt_pool = ol_tx_create_flow_pool(TX_FLOW_MGMT_POOL_ID,
TX_FLOW_MGMT_POOL_SIZE);
if (!pdev->mgmt_pool) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "Management pool creation failed\n");
+ ol_txrx_err("Management pool creation failed\n");
}
return;
}
@@ -133,8 +132,7 @@ void ol_tx_deregister_flow_control(struct ol_txrx_pdev_t *pdev)
if (!pool)
break;
qdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock);
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "flow pool list is not empty %d!!!\n", i++);
+ ol_txrx_info("flow pool list is not empty %d!!!\n", i++);
if (i == 1)
ol_tx_dump_flow_pool_info();
ol_tx_delete_flow_pool(pool, true);
@@ -156,21 +154,21 @@ void ol_tx_dump_flow_pool_info(void)
struct ol_tx_flow_pool_t tmp_pool;
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2, "Global Pool");
+ ol_txrx_info("Global Pool");
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2, "ERROR: pdev NULL");
+ ol_txrx_err("ERROR: pdev NULL");
QDF_ASSERT(0); /* traceback */
return;
}
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2, "Total %d :: Available %d",
+ ol_txrx_info("Total %d :: Available %d",
pdev->tx_desc.pool_size, pdev->tx_desc.num_free);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2, "Invalid flow_pool %d",
+ ol_txrx_info("Invalid flow_pool %d",
pdev->tx_desc.num_invalid_bin);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2, "No of pool map received %d",
+ ol_txrx_info("No of pool map received %d",
pdev->pool_stats.pool_map_count);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2, "No of pool unmap received %d",
+ ol_txrx_info("No of pool unmap received %d",
pdev->pool_stats.pool_unmap_count);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2,
+ ol_txrx_info(
"Pkt dropped due to unavailablity of pool %d",
pdev->pool_stats.pkt_drop_no_pool);
@@ -186,21 +184,21 @@ void ol_tx_dump_flow_pool_info(void)
qdf_mem_copy(&tmp_pool, pool, sizeof(tmp_pool));
qdf_spin_unlock_bh(&pool->flow_pool_lock);
qdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2, "\n");
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2,
+ ol_txrx_info("\n");
+ ol_txrx_info(
"Flow_pool_id %d :: status %d",
tmp_pool.flow_pool_id, tmp_pool.status);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2,
+ ol_txrx_info(
"Total %d :: Available %d :: Deficient %d",
tmp_pool.flow_pool_size, tmp_pool.avail_desc,
tmp_pool.deficient_desc);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2,
+ ol_txrx_info(
"Start threshold %d :: Stop threshold %d",
tmp_pool.start_th, tmp_pool.stop_th);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2,
+ ol_txrx_info(
"Member flow_id %d :: flow_type %d",
tmp_pool.member_flow_id, tmp_pool.flow_type);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2,
+ ol_txrx_info(
"Pkt dropped due to unavailablity of descriptors %d",
tmp_pool.pkt_drop_no_desc);
qdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock);
@@ -220,7 +218,7 @@ void ol_tx_clear_flow_pool_stats(void)
struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: pdev is null\n",
+ ol_txrx_err("%s: pdev is null\n",
__func__);
return;
}
@@ -298,7 +296,7 @@ ol_tx_distribute_descs_to_deficient_pools(struct ol_tx_flow_pool_t *src_pool)
uint16_t desc_move_count = 0;
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: pdev is NULL\n", __func__);
return -EINVAL;
}
@@ -345,7 +343,7 @@ struct ol_tx_flow_pool_t *ol_tx_create_flow_pool(uint8_t flow_pool_id,
uint32_t start_threshold;
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: pdev is NULL\n", __func__);
return NULL;
}
@@ -354,7 +352,7 @@ struct ol_tx_flow_pool_t *ol_tx_create_flow_pool(uint8_t flow_pool_id,
ol_cfg_get_tx_flow_start_queue_offset(pdev->ctrl_pdev);
pool = qdf_mem_malloc(sizeof(*pool));
if (!pool) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: malloc failed\n", __func__);
return NULL;
}
@@ -416,13 +414,13 @@ int ol_tx_delete_flow_pool(struct ol_tx_flow_pool_t *pool, bool force)
struct ol_tx_desc_t *tx_desc = NULL;
if (!pool) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: pool is NULL\n", __func__);
QDF_ASSERT(0);
return -ENOMEM;
}
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: pdev is NULL\n", __func__);
QDF_ASSERT(0);
return -ENOMEM;
@@ -455,7 +453,7 @@ int ol_tx_delete_flow_pool(struct ol_tx_flow_pool_t *pool, bool force)
qdf_spin_unlock_bh(&pool->flow_pool_lock);
pdev->tx_desc.num_invalid_bin++;
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_info(
"%s: invalid pool created %d\n",
__func__, pdev->tx_desc.num_invalid_bin);
if (pdev->tx_desc.num_invalid_bin > MAX_INVALID_BIN)
@@ -492,7 +490,7 @@ int ol_tx_free_invalid_flow_pool(struct ol_tx_flow_pool_t *pool)
struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if ((!pdev) || (!pool) || (pool->status != FLOW_POOL_INVALID)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: Invalid pool/pdev\n", __func__);
return -EINVAL;
}
@@ -505,7 +503,7 @@ int ol_tx_free_invalid_flow_pool(struct ol_tx_flow_pool_t *pool)
qdf_spin_unlock_bh(&pool->flow_pool_lock);
pdev->tx_desc.num_invalid_bin--;
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_info(
"%s: invalid pool deleted %d\n",
__func__, pdev->tx_desc.num_invalid_bin);
@@ -525,7 +523,7 @@ static struct ol_tx_flow_pool_t *ol_tx_get_flow_pool(uint8_t flow_pool_id)
bool is_found = false;
if (!pdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "ERROR: pdev NULL");
+ ol_txrx_err("ERROR: pdev NULL");
QDF_ASSERT(0); /* traceback */
return NULL;
}
@@ -564,7 +562,7 @@ static void ol_tx_flow_pool_vdev_map(struct ol_tx_flow_pool_t *pool,
vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id);
if (!vdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: invalid vdev_id %d\n",
__func__, vdev_id);
return;
@@ -592,7 +590,7 @@ static void ol_tx_flow_pool_vdev_unmap(struct ol_tx_flow_pool_t *pool,
vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id);
if (!vdev) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: invalid vdev_id %d\n",
__func__, vdev_id);
return;
@@ -627,12 +625,12 @@ void ol_tx_flow_pool_map_handler(uint8_t flow_id, uint8_t flow_type,
enum htt_flow_type type = flow_type;
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_dbg(
"%s: flow_id %d flow_type %d flow_pool_id %d flow_pool_size %d\n",
__func__, flow_id, flow_type, flow_pool_id, flow_pool_size);
if (qdf_unlikely(!pdev)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: pdev is NULL", __func__);
return;
}
@@ -642,7 +640,7 @@ void ol_tx_flow_pool_map_handler(uint8_t flow_id, uint8_t flow_type,
if (!pool) {
pool = ol_tx_create_flow_pool(flow_pool_id, flow_pool_size);
if (pool == NULL) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: creation of flow_pool %d size %d failed\n",
__func__, flow_pool_id, flow_pool_size);
return;
@@ -658,7 +656,7 @@ void ol_tx_flow_pool_map_handler(uint8_t flow_id, uint8_t flow_type,
default:
if (pool_create)
ol_tx_delete_flow_pool(pool, false);
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: flow type %d not supported !!!\n",
__func__, type);
break;
@@ -685,12 +683,12 @@ void ol_tx_flow_pool_unmap_handler(uint8_t flow_id, uint8_t flow_type,
struct ol_tx_flow_pool_t *pool;
enum htt_flow_type type = flow_type;
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_dbg(
"%s: flow_id %d flow_type %d flow_pool_id %d\n",
__func__, flow_id, flow_type, flow_pool_id);
if (qdf_unlikely(!pdev)) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: pdev is NULL", __func__);
return;
}
@@ -698,7 +696,7 @@ void ol_tx_flow_pool_unmap_handler(uint8_t flow_id, uint8_t flow_type,
pool = ol_tx_get_flow_pool(flow_pool_id);
if (!pool) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_info(
"%s: flow_pool not available flow_pool_id %d\n",
__func__, type);
return;
@@ -710,7 +708,7 @@ void ol_tx_flow_pool_unmap_handler(uint8_t flow_id, uint8_t flow_type,
ol_tx_flow_pool_vdev_unmap(pool, flow_id);
break;
default:
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_info(
"%s: flow type %d not supported !!!\n",
__func__, type);
return;
diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h
index 459d780a795b..4e3b13220f67 100644
--- a/core/dp/txrx/ol_txrx_internal.h
+++ b/core/dp/txrx/ol_txrx_internal.h
@@ -74,64 +74,41 @@
#define TXRX_ASSERT2(condition)
#endif
#endif /* #ifdef __KLOCWORK__ */
-enum {
- /* FATAL_ERR - print only irrecoverable error messages */
- TXRX_PRINT_LEVEL_FATAL_ERR,
-
- /* ERR - include non-fatal err messages */
- TXRX_PRINT_LEVEL_ERR,
-
- /* WARN - include warnings */
- TXRX_PRINT_LEVEL_WARN,
-
- /* INFO1 - include fundamental, infrequent events */
- TXRX_PRINT_LEVEL_INFO1,
-
- /* INFO2 - include non-fundamental but infrequent events */
- TXRX_PRINT_LEVEL_INFO2,
-
- /* INFO3 - include frequent events */
- /* to avoid performance impact, don't use INFO3
- unless explicitly enabled */
-#ifdef TXRX_PRINT_VERBOSE_ENABLE
- TXRX_PRINT_LEVEL_INFO3,
-#endif /* TXRX_PRINT_VERBOSE_ENABLE */
-};
-
-extern unsigned g_txrx_print_level;
#ifdef TXRX_PRINT_ENABLE
#include <stdarg.h> /* va_list */
#include <qdf_types.h> /* qdf_vprint */
-/* Supress 4296 - expression is always true
-* It will fire if level is TXRX_PRINT_LEVEL_FATAL_ERR (0)
-* because g_txrx_print_level is unsigned */
-#define ol_txrx_print(level, fmt, ...) { \
- if (level <= g_txrx_print_level) \
- qdf_print(fmt, ## __VA_ARGS__); }
-#define TXRX_PRINT(level, fmt, ...) \
- ol_txrx_print(level, "TXRX: " fmt, ## __VA_ARGS__)
-
-#ifdef TXRX_PRINT_VERBOSE_ENABLE
-
-#define ol_txrx_print_verbose(fmt, ...) { \
- if (TXRX_PRINT_LEVEL_INFO3 <= g_txrx_print_level) \
- qdf_print(fmt, ## __VA_ARGS__); }
-#define TXRX_PRINT_VERBOSE(fmt, ...) \
- ol_txrx_print_verbose("TXRX: " fmt, ## __VA_ARGS__)
-#else
-#define TXRX_PRINT_VERBOSE(fmt, ...)
-#endif /* TXRX_PRINT_VERBOSE_ENABLE */
+#define ol_txrx_log(level, args...) QDF_TRACE(QDF_MODULE_ID_TXRX, level, ## args)
+#define ol_txrx_logfl(level, format, args...) ol_txrx_log(level, FL(format), ## args)
+
+#define ol_txrx_alert(format, args...) \
+ ol_txrx_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
+#define ol_txrx_err(format, args...) \
+ ol_txrx_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
+#define ol_txrx_warn(format, args...) \
+ ol_txrx_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
+#define ol_txrx_info(format, args...) \
+ ol_txrx_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
+#define ol_txrx_info_high(format, args...) \
+ ol_txrx_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args)
+#define ol_txrx_dbg(format, args...) \
+ ol_txrx_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
/* define PN check failure message print rate
as 1 second */
#define TXRX_PN_CHECK_FAILURE_PRINT_PERIOD_MS 1000
#else
-#define TXRX_PRINT(level, fmt, ...)
-#define TXRX_PRINT_VERBOSE(fmt, ...)
+#define ol_txrx_log(level, args...)
+#define ol_txrx_logfl(level, format, args...)
+#define ol_txrx_alert(format, args...)
+#define ol_txrx_err(format, args...)
+#define ol_txrx_warn(format, args...)
+#define ol_txrx_info(format, args...)
+#define ol_txrx_info_high(format, args...)
+#define ol_txrx_dbg(format, args...)
#endif /* TXRX_PRINT_ENABLE */
/*--- tx credit debug printouts ---*/
diff --git a/core/dp/txrx/ol_txrx_peer_find.c b/core/dp/txrx/ol_txrx_peer_find.c
index ccfb71422b34..09957188e966 100644
--- a/core/dp/txrx/ol_txrx_peer_find.c
+++ b/core/dp/txrx/ol_txrx_peer_find.c
@@ -363,7 +363,7 @@ static inline void ol_txrx_peer_find_add_id(struct ol_txrx_pdev_t *pdev,
* If the peer ID is for a vdev, then we will fail to find a
* peer with a matching MAC address.
*/
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: peer not found or peer ID is %d invalid",
__func__, peer_id);
wma_peer_debug_log(DEBUG_INVALID_VDEV_ID, DEBUG_PEER_MAP_EVENT,
@@ -552,7 +552,7 @@ void ol_rx_peer_unmap_handler(ol_txrx_pdev_handle pdev, uint16_t peer_id)
if (peer_id == HTT_INVALID_PEER) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_err(
"%s: invalid peer ID %d\n", __func__, peer_id);
wma_peer_debug_log(DEBUG_INVALID_VDEV_ID,
DEBUG_PEER_UNMAP_EVENT,
@@ -573,7 +573,7 @@ void ol_rx_peer_unmap_handler(ol_txrx_pdev_handle pdev, uint16_t peer_id)
wma_peer_debug_log(DEBUG_INVALID_VDEV_ID,
DEBUG_PEER_UNMAP_EVENT,
peer_id, NULL, NULL, ref_cnt, 0x101);
- TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
+ ol_txrx_dbg(
"%s: peer already deleted, peer_id %d del_peer_id_ref_cnt %d",
__func__, peer_id, ref_cnt);
return;
@@ -586,7 +586,7 @@ void ol_rx_peer_unmap_handler(ol_txrx_pdev_handle pdev, uint16_t peer_id)
* in peer_id_to_obj_map will be NULL.
*/
qdf_spin_unlock_bh(&pdev->peer_map_unmap_lock);
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
+ ol_txrx_info(
"%s: peer not found for peer_id %d",
__func__, peer_id);
wma_peer_debug_log(DEBUG_INVALID_VDEV_ID,
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-23 22:58:48 +0000