Przeglądaj źródła

qcacld-3.0: dp: Replace instances of unadorned %p

Replace instances of unadorned %p in core/dp.

Change-Id: I7baa3ecc4f9964c47261dafa26116447fc7611b5
CRs-Fixed: 2100997
Jeff Johnson 7 lat temu
rodzic
commit
c13bfe08ca

+ 3 - 3
core/dp/htt/htt.c

@@ -790,12 +790,12 @@ void htt_display(htt_pdev_handle pdev, int indent)
 	qdf_print("%*srx ring: space for %d elems, filled with %d buffers\n",
 		  indent + 4, " ",
 		  pdev->rx_ring.size, pdev->rx_ring.fill_level);
-	qdf_print("%*sat %p (%llx paddr)\n", indent + 8, " ",
+	qdf_print("%*sat %pK (%llx paddr)\n", indent + 8, " ",
 		  pdev->rx_ring.buf.paddrs_ring,
 		  (unsigned long long)pdev->rx_ring.base_paddr);
-	qdf_print("%*snetbuf ring @ %p\n", indent + 8, " ",
+	qdf_print("%*snetbuf ring @ %pK\n", indent + 8, " ",
 		  pdev->rx_ring.buf.netbufs_ring);
-	qdf_print("%*sFW_IDX shadow register: vaddr = %p, paddr = %llx\n",
+	qdf_print("%*sFW_IDX shadow register: vaddr = %pK, paddr = %llx\n",
 		  indent + 8, " ",
 		  pdev->rx_ring.alloc_idx.vaddr,
 		  (unsigned long long)pdev->rx_ring.alloc_idx.paddr);

+ 1 - 1
core/dp/htt/htt_internal.h

@@ -702,7 +702,7 @@ static inline int htt_display_rx_buf_debug(struct htt_pdev_t *pdev)
 			if (buf[i].posted != 0)
 				QDF_TRACE(QDF_MODULE_ID_TXRX,
 					  QDF_TRACE_LEVEL_ERROR,
-					  "[%d][0x%x] %p %lu %p %llu %llu",
+					  "[%d][0x%x] %pK %lu %pK %llu %llu",
 					  i, buf[i].cpu,
 					  buf[i].nbuf_data,
 					  (unsigned long)buf[i].paddr,

+ 4 - 4
core/dp/htt/htt_rx.c

@@ -392,7 +392,7 @@ htt_rx_paddr_unmark_high_bits(qdf_dma_addr_t paddr)
 		 * padded (with 0b0) to 8 bits
 		 */
 		if ((markings & 0xFFFF0000) != RX_PADDR_MAGIC_PATTERN) {
-			qdf_print("%s: paddr not marked correctly: 0x%p!\n",
+			qdf_print("%s: paddr not marked correctly: 0x%pK!\n",
 				  __func__, (void *)paddr);
 			HTT_ASSERT_ALWAYS(0);
 		}
@@ -3320,7 +3320,7 @@ htt_rx_hash_list_insert(struct htt_pdev_t *pdev,
 	htt_list_add_tail(&pdev->rx_ring.hash_table[i]->listhead,
 			  &hash_element->listnode);
 
-	RX_HASH_LOG(qdf_print("rx hash: %s: paddr 0x%x netbuf %p bucket %d\n",
+	RX_HASH_LOG(qdf_print("rx hash: %s: paddr 0x%x netbuf %pK bucket %d\n",
 			      __func__, paddr, netbuf, (int)i));
 
 	HTT_RX_HASH_COUNT_INCR(pdev->rx_ring.hash_table[i]);
@@ -3385,14 +3385,14 @@ qdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev,
 		}
 	}
 
-	RX_HASH_LOG(qdf_print("rx hash: %s: paddr 0x%x, netbuf %p, bucket %d\n",
+	RX_HASH_LOG(qdf_print("rx hash: %s: paddr 0x%x, netbuf %pK, bucket %d\n",
 			      __func__, paddr, netbuf, (int)i));
 	HTT_RX_HASH_COUNT_PRINT(pdev->rx_ring.hash_table[i]);
 
 	qdf_spin_unlock_bh(&(pdev->rx_ring.rx_hash_lock));
 
 	if (netbuf == NULL) {
-		qdf_print("rx hash: %s: no entry found for %p!\n",
+		qdf_print("rx hash: %s: no entry found for %pK!\n",
 			  __func__, (void *)paddr);
 		HTT_ASSERT_ALWAYS(0);
 	}

+ 1 - 1
core/dp/htt/htt_tx.c

@@ -1023,7 +1023,7 @@ void htt_tx_desc_display(void *tx_desc)
 	htt_tx_desc = (struct htt_tx_msdu_desc_t *)tx_desc;
 
 	/* only works for little-endian */
-	qdf_print("HTT tx desc (@ %p):", htt_tx_desc);
+	qdf_print("HTT tx desc (@ %pK):", htt_tx_desc);
 	qdf_print("  msg type = %d", htt_tx_desc->msg_type);
 	qdf_print("  pkt subtype = %d", htt_tx_desc->pkt_subtype);
 	qdf_print("  pkt type = %d", htt_tx_desc->pkt_type);

+ 1 - 1
core/dp/ol/inc/ol_htt_tx_api.h

@@ -291,7 +291,7 @@ struct htt_msdu_info_t {
 static inline void htt_msdu_info_dump(struct htt_msdu_info_t *msdu_info)
 {
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "HTT MSDU info object (%p)\n", msdu_info);
+		  "HTT MSDU info object (%pK)\n", msdu_info);
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  ethertype: %#x\n", msdu_info->info.ethertype);
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,

+ 6 - 6
core/dp/txrx/ol_rx.c

@@ -194,7 +194,7 @@ void ol_rx_trigger_restore(htt_pdev_handle htt_pdev, qdf_nbuf_t head_msdu,
 	while (head_msdu) {
 		next = qdf_nbuf_next(head_msdu);
 		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
-			  "freeing %p\n", head_msdu);
+			  "freeing %pK\n", head_msdu);
 		qdf_nbuf_free(head_msdu);
 		head_msdu = next;
 	}
@@ -760,7 +760,7 @@ ol_rx_sec_ind_handler(ol_txrx_pdev_handle pdev,
 		return;
 	}
 	ol_txrx_dbg(
-		"sec spec for peer %p (%02x:%02x:%02x:%02x:%02x:%02x): %s key of type %d\n",
+		"sec spec for peer %pK (%02x:%02x:%02x:%02x:%02x:%02x): %s key of type %d\n",
 		peer,
 		peer->mac_addr.raw[0], peer->mac_addr.raw[1],
 		peer->mac_addr.raw[2], peer->mac_addr.raw[3],
@@ -1201,7 +1201,7 @@ ol_rx_deliver(struct ol_txrx_vdev_t *vdev,
 		if (OL_RX_DECAP(vdev, peer, msdu, &info) != A_OK) {
 			discard = 1;
 			ol_txrx_dbg(
-				"decap error %p from peer %p (%02x:%02x:%02x:%02x:%02x:%02x) len %d\n",
+				"decap error %pK from peer %pK (%02x:%02x:%02x:%02x:%02x:%02x) len %d\n",
 				msdu, peer,
 				peer->mac_addr.raw[0], peer->mac_addr.raw[1],
 				peer->mac_addr.raw[2], peer->mac_addr.raw[3],
@@ -1378,7 +1378,7 @@ ol_rx_discard(struct ol_txrx_vdev_t *vdev,
 
 		msdu_list = qdf_nbuf_next(msdu_list);
 		ol_txrx_dbg(
-			"discard rx %p from partly-deleted peer %p (%02x:%02x:%02x:%02x:%02x:%02x)\n",
+			"discard rx %pK from partly-deleted peer %pK (%02x:%02x:%02x:%02x:%02x:%02x)\n",
 			msdu, peer,
 			peer->mac_addr.raw[0], peer->mac_addr.raw[1],
 			peer->mac_addr.raw[2], peer->mac_addr.raw[3],
@@ -1469,7 +1469,7 @@ ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev,
 	}
 
 #if defined(HELIUMPLUS_DEBUG)
-	qdf_print("%s %d: rx_ind_msg 0x%p peer_id %d tid %d is_offload %d\n",
+	qdf_print("%s %d: rx_ind_msg 0x%pK peer_id %d tid %d is_offload %d\n",
 		  __func__, __LINE__, rx_ind_msg, peer_id, tid, is_offload);
 #endif
 
@@ -1647,7 +1647,7 @@ ol_rx_offload_paddr_deliver_ind_handler(htt_pdev_handle htt_pdev,
 			msdu_iter++;
 			msdu_count--;
 			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
-				  "skip msg_word %p, msdu #%d, continue next",
+				  "skip msg_word %pK, msdu #%d, continue next",
 				  msg_word, msdu_iter);
 			continue;
 		}

+ 3 - 3
core/dp/txrx/ol_rx_pn.c

@@ -164,7 +164,7 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev,
 			    (current_time_ms - last_pncheck_print_time)) {
 				last_pncheck_print_time = current_time_ms;
 				ol_txrx_warn(
-				   "PN check failed - TID %d, peer %p "
+				   "PN check failed - TID %d, peer %pK "
 				   "(%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"
@@ -183,7 +183,7 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev,
 							    rx_desc));
 			} else {
 				ol_txrx_dbg(
-				   "PN check failed - TID %d, peer %p "
+				   "PN check failed - TID %d, peer %pK "
 				   "(%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"
@@ -361,7 +361,7 @@ void ol_rx_pn_trace_display(ol_txrx_pdev_handle pdev, int just_once)
 		  "   count  idx    peer   tid uni  num    LSBs");
 	do {
 		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
-			  "  %6lld %4d  %p %2d   %d %4d %8d",
+			  "  %6lld %4d  %pK %2d   %d %4d %8d",
 			  cnt, i,
 			  pdev->rx_pn_trace.data[i].peer,
 			  pdev->rx_pn_trace.data[i].tid,

+ 2 - 2
core/dp/txrx/ol_rx_reorder.c

@@ -667,7 +667,7 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev,
 					last_pncheck_print_time =
 						current_time_ms;
 					ol_txrx_warn(
-					   "Tgt PN check failed - TID %d, peer %p "
+					   "Tgt PN check failed - TID %d, peer %pK "
 					   "(%02x:%02x:%02x:%02x:%02x:%02x)\n"
 					   "    PN (u64 x2)= 0x%08llx %08llx (LSBs = %lld)\n"
 					   "    new seq num = %d\n",
@@ -684,7 +684,7 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev,
 								    rx_desc));
 				} else {
 					ol_txrx_dbg(
-					   "Tgt PN check failed - TID %d, peer %p "
+					   "Tgt PN check failed - TID %d, peer %pK "
 					   "(%02x:%02x:%02x:%02x:%02x:%02x)\n"
 					   "    PN (u64 x2)= 0x%08llx %08llx (LSBs = %lld)\n"
 					   "    new seq num = %d\n",

+ 4 - 4
core/dp/txrx/ol_tx.c

@@ -624,7 +624,7 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev,
 			htt_tx_desc_frag(pdev->htt_pdev, tx_desc->htt_frag_desc,
 					 i - 1, frag_paddr, frag_len);
 #if defined(HELIUMPLUS_DEBUG)
-			qdf_print("%s:%d: htt_fdesc=%p frag=%d frag_paddr=0x%0llx len=%zu",
+			qdf_print("%s:%d: htt_fdesc=%pK frag=%d frag_paddr=0x%0llx len=%zu",
 				  __func__, __LINE__, tx_desc->htt_frag_desc,
 				  i-1, frag_paddr, frag_len);
 			ol_txrx_dump_pkt(netbuf, frag_paddr, 64);
@@ -1907,11 +1907,11 @@ void ol_txrx_dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc)
 	uint32_t                *frag_ptr_i_p;
 	int                     i;
 
-	qdf_print("OL TX Descriptor 0x%p msdu_id %d\n",
+	qdf_print("OL TX Descriptor 0x%pK msdu_id %d\n",
 		 tx_desc, tx_desc->id);
-	qdf_print("HTT TX Descriptor vaddr: 0x%p paddr: %pad",
+	qdf_print("HTT TX Descriptor vaddr: 0x%pK paddr: %pad",
 		 tx_desc->htt_tx_desc, &tx_desc->htt_tx_desc_paddr);
-	qdf_print("%s %d: Fragment Descriptor 0x%p (paddr=%pad)",
+	qdf_print("%s %d: Fragment Descriptor 0x%pK (paddr=%pad)",
 		 __func__, __LINE__, tx_desc->htt_frag_desc,
 		 &tx_desc->htt_frag_desc_paddr);
 

+ 5 - 5
core/dp/txrx/ol_tx_classify.c

@@ -420,7 +420,7 @@ ol_tx_classify(
 			if (!peer) {
 				QDF_TRACE(QDF_MODULE_ID_TXRX,
 					  QDF_TRACE_LEVEL_ERROR,
-					  "Error: STA %p (%02x:%02x:%02x:%02x:%02x:%02x) trying to send bcast DA tx data frame w/o association\n",
+					  "Error: STA %pK (%02x:%02x:%02x:%02x:%02x:%02x) trying to send bcast DA tx data frame w/o association\n",
 					  vdev,
 					  vdev->mac_addr.raw[0],
 					  vdev->mac_addr.raw[1],
@@ -470,7 +470,7 @@ ol_tx_classify(
 			if (!peer) {
 				QDF_TRACE(QDF_MODULE_ID_TXRX,
 					  QDF_TRACE_LEVEL_ERROR,
-					  "Error: vdev %p (%02x:%02x:%02x:%02x:%02x:%02x) trying to send bcast/mcast, but no self-peer found\n",
+					  "Error: vdev %pK (%02x:%02x:%02x:%02x:%02x:%02x) trying to send bcast/mcast, but no self-peer found\n",
 					  vdev,
 					  vdev->mac_addr.raw[0],
 					  vdev->mac_addr.raw[1],
@@ -536,7 +536,7 @@ ol_tx_classify(
 			 */
 			QDF_TRACE(QDF_MODULE_ID_TXRX,
 				  QDF_TRACE_LEVEL_ERROR,
-				  "Error: vdev %p (%02x:%02x:%02x:%02x:%02x:%02x) trying to send unicast tx data frame to an unknown peer\n",
+				  "Error: vdev %pK (%02x:%02x:%02x:%02x:%02x:%02x) trying to send unicast tx data frame to an unknown peer\n",
 				  vdev,
 				  vdev->mac_addr.raw[0], vdev->mac_addr.raw[1],
 				  vdev->mac_addr.raw[2], vdev->mac_addr.raw[3],
@@ -580,7 +580,7 @@ ol_tx_classify(
 		if (tx_msdu_info->htt.info.peer_id == HTT_INVALID_PEER_ID) {
 			if (peer) {
 				ol_txrx_info(
-					   "%s: remove the peer for invalid peer_id %p\n",
+					   "%s: remove the peer for invalid peer_id %pK\n",
 					   __func__, peer);
 				/* remove the peer reference added above */
 				OL_TXRX_PEER_UNREF_DELETE(peer);
@@ -603,7 +603,7 @@ ol_tx_classify(
 				wlan_op_mode_sta && tx_msdu_info->peer !=
 								NULL) {
 		ol_txrx_dbg(
-			   "%s: remove the peer reference %p\n",
+			   "%s: remove the peer reference %pK\n",
 			   __func__, peer);
 		/* remove the peer reference added above */
 		OL_TXRX_PEER_UNREF_DELETE(tx_msdu_info->peer);

+ 2 - 2
core/dp/txrx/ol_tx_desc.c

@@ -49,7 +49,7 @@ static inline void ol_tx_desc_sanity_checks(struct ol_txrx_pdev_t *pdev,
 {
 	if (tx_desc->pkt_type != ol_tx_frm_freed) {
 		ol_txrx_err(
-				   "%s Potential tx_desc corruption pkt_type:0x%x pdev:0x%p",
+				   "%s Potential tx_desc corruption pkt_type:0x%x pdev:0x%pK",
 				   __func__, tx_desc->pkt_type, pdev);
 		qdf_assert(0);
 	}
@@ -592,7 +592,7 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev,
 			htt_tx_desc_frag(pdev->htt_pdev, tx_desc->htt_frag_desc,
 					 i - 1, frag_paddr, frag_len);
 #if defined(HELIUMPLUS_DEBUG)
-			qdf_print("%s:%d: htt_fdesc=%p frag=%d frag_vaddr=0x%p frag_paddr=0x%llx len=%zu\n",
+			qdf_print("%s:%d: htt_fdesc=%pK frag=%d frag_vaddr=0x%pK frag_paddr=0x%llx len=%zu\n",
 				  __func__, __LINE__, tx_desc->htt_frag_desc,
 				  i-1, frag_vaddr, frag_paddr, frag_len);
 			ol_txrx_dump_pkt(netbuf, frag_paddr, 64);

+ 5 - 5
core/dp/txrx/ol_tx_queue.c

@@ -128,7 +128,7 @@ ol_tx_queue_vdev_flush(struct ol_txrx_pdev_t *pdev, struct ol_txrx_vdev_t *vdev)
 					ol_tx_queue_free(pdev, txq, j, true);
 			}
 			ol_txrx_info(
-				   "%s: Delete Peer %p\n", __func__, peer);
+				   "%s: Delete Peer %pK\n", __func__, peer);
 			OL_TXRX_PEER_UNREF_DELETE(peers[i]);
 		}
 	} while (peer_count >= PEER_ARRAY_COUNT);
@@ -1654,7 +1654,7 @@ ol_tx_queue_display(struct ol_tx_frms_queue_t *txq, int indent)
 
 	state = (txq->flag == ol_tx_queue_active) ? "active" : "paused";
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "%*stxq %p (%s): %d frms, %d bytes\n",
+		  "%*stxq %pK (%s): %d frms, %d bytes\n",
 		  indent, " ", txq, state, txq->frms, txq->bytes);
 }
 
@@ -1664,7 +1664,7 @@ ol_tx_queues_display(struct ol_txrx_pdev_t *pdev)
 	struct ol_txrx_vdev_t *vdev;
 
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "pdev %p tx queues:\n", pdev);
+		  "pdev %pK tx queues:\n", pdev);
 	TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) {
 		struct ol_txrx_peer_t *peer;
 		int i;
@@ -1674,7 +1674,7 @@ ol_tx_queues_display(struct ol_txrx_pdev_t *pdev)
 				continue;
 
 			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-				  "vdev %d (%p), txq %d\n", vdev->vdev_id,
+				  "vdev %d (%pK), txq %d\n", vdev->vdev_id,
 				  vdev, i);
 			ol_tx_queue_display(&vdev->txqs[i], 4);
 		}
@@ -1685,7 +1685,7 @@ ol_tx_queues_display(struct ol_txrx_pdev_t *pdev)
 
 				QDF_TRACE(QDF_MODULE_ID_TXRX,
 					  QDF_TRACE_LEVEL_INFO_LOW,
-					  "peer %d (%p), txq %d\n",
+					  "peer %d (%pK), txq %d\n",
 					  peer->peer_ids[0], vdev, i);
 				ol_tx_queue_display(&peer->txqs[i], 6);
 			}

+ 23 - 23
core/dp/txrx/ol_txrx.c

@@ -1462,7 +1462,7 @@ ol_txrx_pdev_post_attach(struct cdp_pdev *ppdev)
 	/* link SW tx descs into a freelist */
 	pdev->tx_desc.num_free = desc_pool_size;
 	ol_txrx_dbg(
-		   "%s first tx_desc:0x%p Last tx desc:0x%p\n", __func__,
+		   "%s first tx_desc:0x%pK Last tx desc:0x%pK\n", __func__,
 		   (uint32_t *) pdev->tx_desc.freelist,
 		   (uint32_t *) (pdev->tx_desc.freelist + desc_pool_size));
 
@@ -1672,7 +1672,7 @@ ol_txrx_pdev_post_attach(struct cdp_pdev *ppdev)
 
 	OL_RX_REORDER_TIMEOUT_INIT(pdev);
 
-	ol_txrx_dbg("Created pdev %p\n", pdev);
+	ol_txrx_dbg("Created pdev %pK\n", pdev);
 
 	pdev->cfg.host_addba = ol_cfg_host_addba(pdev->ctrl_pdev);
 
@@ -1856,7 +1856,7 @@ static void ol_txrx_pdev_pre_detach(struct cdp_pdev *ppdev, int force)
 		 * As a side effect, this will complete the deletion of any
 		 * vdevs that are waiting for their peers to finish deletion.
 		 */
-		ol_txrx_dbg("Force delete for pdev %p\n",
+		ol_txrx_dbg("Force delete for pdev %pK\n",
 			   pdev);
 		ol_txrx_peer_find_hash_erase(pdev);
 	}
@@ -2090,7 +2090,7 @@ ol_txrx_vdev_attach(struct cdp_pdev *ppdev,
 	TAILQ_INSERT_TAIL(&pdev->vdev_list, vdev, vdev_list_elem);
 
 	ol_txrx_dbg(
-		   "Created vdev %p (%02x:%02x:%02x:%02x:%02x:%02x)\n",
+		   "Created vdev %pK (%02x:%02x:%02x:%02x:%02x:%02x)\n",
 		   vdev,
 		   vdev->mac_addr.raw[0], vdev->mac_addr.raw[1],
 		   vdev->mac_addr.raw[2], vdev->mac_addr.raw[3],
@@ -2292,7 +2292,7 @@ ol_txrx_vdev_detach(struct cdp_vdev *pvdev,
 	if (!TAILQ_EMPTY(&vdev->peer_list)) {
 		/* debug print - will be removed later */
 		ol_txrx_dbg(
-			   "%s: not deleting vdev object %p (%02x:%02x:%02x:%02x:%02x:%02x) until deletion finishes for all its peers\n",
+			   "%s: not deleting vdev object %pK (%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],
 			   vdev->mac_addr.raw[2], vdev->mac_addr.raw[3],
@@ -2308,7 +2308,7 @@ ol_txrx_vdev_detach(struct cdp_vdev *pvdev,
 	qdf_event_destroy(&vdev->wait_delete_comp);
 
 	ol_txrx_dbg(
-		   "%s: deleting vdev obj %p (%02x:%02x:%02x:%02x:%02x:%02x)\n",
+		   "%s: deleting vdev obj %pK (%02x:%02x:%02x:%02x:%02x:%02x)\n",
 		   __func__, vdev,
 		   vdev->mac_addr.raw[0], vdev->mac_addr.raw[1],
 		   vdev->mac_addr.raw[2], vdev->mac_addr.raw[3],
@@ -2582,7 +2582,7 @@ ol_txrx_peer_attach(struct cdp_vdev *pvdev, uint8_t *peer_mac_addr)
 	ol_txrx_peer_find_hash_add(pdev, peer);
 
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH,
-		   "vdev %p created peer %p ref_cnt %d (%02x:%02x:%02x:%02x:%02x:%02x)\n",
+		   "vdev %pK created peer %pK ref_cnt %d (%02x:%02x:%02x:%02x:%02x:%02x)\n",
 		   vdev, peer, qdf_atomic_read(&peer->ref_cnt),
 		   peer->mac_addr.raw[0], peer->mac_addr.raw[1],
 		   peer->mac_addr.raw[2], peer->mac_addr.raw[3],
@@ -3231,7 +3231,7 @@ int ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer,
 		u_int16_t peer_id;
 
 		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
-			   "[%s][%d]: Deleting peer %p (%pM) ref_cnt %d\n",
+			   "[%s][%d]: Deleting peer %pK (%pM) ref_cnt %d\n",
 			   fname, line, peer, peer->mac_addr.raw,
 			   qdf_atomic_read(&peer->ref_cnt));
 
@@ -3290,7 +3290,7 @@ int ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer,
 				 */
 				ol_txrx_tx_desc_reset_vdev(vdev);
 				ol_txrx_dbg(
-					"%s: deleting vdev object %p (%02x:%02x:%02x:%02x:%02x:%02x) - its last peer is done",
+					"%s: deleting vdev object %pK (%02x:%02x:%02x:%02x:%02x:%02x) - its last peer is done",
 					__func__, vdev,
 					vdev->mac_addr.raw[0],
 					vdev->mac_addr.raw[1],
@@ -3310,7 +3310,7 @@ int ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer,
 		}
 
 		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG,
-			  "%s: Deleting peer %p (%pM) ref_cnt = %d",
+			  "%s: Deleting peer %pK (%pM) ref_cnt = %d",
 			  __func__, peer, peer->mac_addr.raw,
 			  qdf_atomic_read(&peer->ref_cnt));
 		ol_txrx_peer_tx_queue_free(pdev, peer);
@@ -3342,7 +3342,7 @@ int ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer,
 	} else {
 		qdf_spin_unlock_bh(&pdev->peer_ref_mutex);
 		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG,
-			  "[%s][%d]: ref delete peer %p peer->ref_cnt = %d",
+			  "[%s][%d]: ref delete peer %pK peer->ref_cnt = %d",
 			  fname, line, peer, rc);
 	}
 
@@ -3421,9 +3421,9 @@ void peer_unmap_timer_handler(void *data)
 	ol_txrx_peer_handle peer = (ol_txrx_peer_handle)data;
 	ol_txrx_pdev_handle txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 
-	ol_txrx_err("all unmap events not received for peer %p, ref_cnt %d",
+	ol_txrx_err("all unmap events not received for peer %pK, ref_cnt %d",
 		    peer, qdf_atomic_read(&peer->ref_cnt));
-	ol_txrx_err("peer %p (%02x:%02x:%02x:%02x:%02x:%02x)",
+	ol_txrx_err("peer %pK (%02x:%02x:%02x:%02x:%02x:%02x)",
 		    peer,
 		    peer->mac_addr.raw[0], peer->mac_addr.raw[1],
 		    peer->mac_addr.raw[2], peer->mac_addr.raw[3],
@@ -3468,7 +3468,7 @@ static void ol_txrx_peer_detach(void *ppeer)
 	/* htt_rx_reorder_log_print(vdev->pdev->htt_pdev); */
 
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
-		   "%s:peer %p (%02x:%02x:%02x:%02x:%02x:%02x)",
+		   "%s:peer %pK (%02x:%02x:%02x:%02x:%02x:%02x)",
 		   __func__, peer,
 		   peer->mac_addr.raw[0], peer->mac_addr.raw[1],
 		   peer->mac_addr.raw[2], peer->mac_addr.raw[3],
@@ -3503,7 +3503,7 @@ static void ol_txrx_peer_detach(void *ppeer)
 	if (vdev->opmode == wlan_op_mode_sta) {
 		qdf_timer_start(&peer->peer_unmap_timer,
 				OL_TXRX_PEER_UNMAP_TIMEOUT);
-		ol_txrx_info_high("%s: started peer_unmap_timer for peer %p",
+		ol_txrx_info_high("%s: started peer_unmap_timer for peer %pK",
 			     __func__, peer);
 	}
 
@@ -3532,7 +3532,7 @@ static void ol_txrx_peer_detach_force_delete(void *ppeer)
 	ol_txrx_peer_handle peer = ppeer;
 	ol_txrx_pdev_handle pdev = peer->vdev->pdev;
 
-	ol_txrx_info_high("%s peer %p, peer->ref_cnt %d",
+	ol_txrx_info_high("%s peer %pK, peer->ref_cnt %d",
 		__func__, peer, qdf_atomic_read(&peer->ref_cnt));
 
 	/* Clear the peer_id_to_obj map entries */
@@ -3547,7 +3547,7 @@ ol_txrx_peer_find_by_addr(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac_addr)
 	peer = ol_txrx_peer_find_hash_find_inc_ref(pdev, peer_mac_addr, 0, 0);
 	if (peer) {
 		ol_txrx_info_high(
-			   "%s: Delete extra reference %p", __func__, peer);
+			   "%s: Delete extra reference %pK", __func__, peer);
 		/* release the extra reference */
 		OL_TXRX_PEER_UNREF_DELETE(peer);
 	}
@@ -4051,7 +4051,7 @@ void ol_txrx_pdev_display(ol_txrx_pdev_handle pdev, int indent)
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%*s%s:\n", indent, " ", "txrx pdev");
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "%*spdev object: %p", indent + 4, " ", pdev);
+		  "%*spdev object: %pK", indent + 4, " ", pdev);
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%*svdev list:", indent + 4, " ");
 	TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) {
@@ -4059,7 +4059,7 @@ void ol_txrx_pdev_display(ol_txrx_pdev_handle pdev, int indent)
 	}
 	ol_txrx_peer_find_display(pdev, indent + 4);
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "%*stx desc pool: %d elems @ %p", indent + 4, " ",
+		  "%*stx desc pool: %d elems @ %pK", indent + 4, " ",
 		  pdev->tx_desc.pool_size, pdev->tx_desc.array);
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " ");
 	htt_display(pdev->htt_pdev, indent);
@@ -4070,7 +4070,7 @@ void ol_txrx_vdev_display(ol_txrx_vdev_handle vdev, int indent)
 	struct ol_txrx_peer_t *peer;
 
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "%*stxrx vdev: %p\n", indent, " ", vdev);
+		  "%*stxrx vdev: %pK\n", indent, " ", vdev);
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%*sID: %d\n", indent + 4, " ", vdev->vdev_id);
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
@@ -4091,7 +4091,7 @@ void ol_txrx_peer_display(ol_txrx_peer_handle peer, int indent)
 	int i;
 
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-		  "%*stxrx peer: %p", indent, " ", peer);
+		  "%*stxrx peer: %pK", indent, " ", peer);
 	for (i = 0; i < MAX_NUM_PEER_ID_PER_PEER; i++) {
 		if (peer->peer_ids[i] != HTT_INVALID_PEER) {
 			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
@@ -4179,7 +4179,7 @@ static void ol_txrx_disp_peer_stats(ol_txrx_pdev_handle pdev)
 
 		if (peer) {
 			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-				"stats: peer 0x%p local peer id %d", peer, i);
+				"stats: peer 0x%pK local peer id %d", peer, i);
 			ol_txrx_disp_peer_cached_bufq_stats(peer);
 			OL_TXRX_PEER_UNREF_DELETE(peer);
 		}
@@ -5033,7 +5033,7 @@ static QDF_STATUS ol_txrx_register_pause_cb(struct cdp_soc_t *soc,
 void
 ol_txrx_dump_pkt(qdf_nbuf_t nbuf, uint32_t nbuf_paddr, int len)
 {
-	qdf_print("%s: Pkt: VA 0x%p PA 0x%llx len %d\n", __func__,
+	qdf_print("%s: Pkt: VA 0x%pK PA 0x%llx len %d\n", __func__,
 		  qdf_nbuf_data(nbuf), (unsigned long long int)nbuf_paddr, len);
 	print_hex_dump(KERN_DEBUG, "Pkt:   ", DUMP_PREFIX_ADDRESS, 16, 4,
 		       qdf_nbuf_data(nbuf), len, true);

+ 3 - 3
core/dp/txrx/ol_txrx_flow_control.c

@@ -230,7 +230,7 @@ QDF_STATUS ol_tx_inc_pool_ref(struct ol_tx_flow_pool_t *pool)
 	qdf_spin_lock_bh(&pool->flow_pool_lock);
 	qdf_atomic_inc(&pool->ref_cnt);
 	qdf_spin_unlock_bh(&pool->flow_pool_lock);
-	ol_txrx_dbg("pool %p, ref_cnt %x",
+	ol_txrx_dbg("pool %pK, ref_cnt %x",
 		    pool, qdf_atomic_read(&pool->ref_cnt));
 
 	return  QDF_STATUS_SUCCESS;
@@ -259,12 +259,12 @@ QDF_STATUS ol_tx_dec_pool_ref(struct ol_tx_flow_pool_t *pool, bool force)
 		TAILQ_REMOVE(&pdev->tx_desc.flow_pool_list, pool,
 			     flow_pool_list_elem);
 		qdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock);
-		ol_txrx_dbg("Deleting pool %p", pool);
+		ol_txrx_dbg("Deleting pool %pK", pool);
 		ol_tx_delete_flow_pool(pool, force);
 	} else {
 		qdf_spin_unlock_bh(&pool->flow_pool_lock);
 		qdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock);
-		ol_txrx_dbg("pool %p, ref_cnt %x",
+		ol_txrx_dbg("pool %pK, ref_cnt %x",
 			    pool, qdf_atomic_read(&pool->ref_cnt));
 	}
 

+ 5 - 5
core/dp/txrx/ol_txrx_internal.h

@@ -421,7 +421,7 @@ ol_txrx_frms_dump(const char *name,
 			} else {
 				QDF_TRACE(QDF_MODULE_ID_TXRX,
 					  QDF_TRACE_LEVEL_INFO,
-					  "frame %p non-IP ethertype (%x)\n",
+					  "frame %pK non-IP ethertype (%x)\n",
 					  frm, ethtype);
 				goto NOT_IP_TCP;
 			}
@@ -438,12 +438,12 @@ ol_txrx_frms_dump(const char *name,
 					(tcp_hdr->seq_num[1] << 0);
 				QDF_TRACE(QDF_MODULE_ID_TXRX,
 					  QDF_TRACE_LEVEL_INFO,
-					  "frame %p: TCP seq num = %d\n", frm,
+					  "frame %pK: TCP seq num = %d\n", frm,
 					  tcp_seq_num);
 #else
 				QDF_TRACE(QDF_MODULE_ID_TXRX,
 					  QDF_TRACE_LEVEL_INFO,
-					  "frame %p: TCP seq num = %d\n", frm,
+					  "frame %pK: TCP seq num = %d\n", frm,
 					  ((*(p + tcp_offset + 4)) << 24) |
 					  ((*(p + tcp_offset + 5)) << 16) |
 					  ((*(p + tcp_offset + 6)) << 8) |
@@ -452,7 +452,7 @@ ol_txrx_frms_dump(const char *name,
 			} else {
 				QDF_TRACE(QDF_MODULE_ID_TXRX,
 					  QDF_TRACE_LEVEL_INFO,
-					  "frame %p non-TCP IP protocol (%x)\n",
+					  "frame %pK non-TCP IP protocol (%x)\n",
 					  frm, ip_prot);
 			}
 		}
@@ -490,7 +490,7 @@ NOT_IP_TCP:
 			}
 
 			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
-				  "frame %p data (%p), hex dump of bytes 0-%d of %d:\n",
+				  "frame %pK data (%pK), hex dump of bytes 0-%d of %d:\n",
 				  frm, p, len_lim - 1, (int)qdf_nbuf_len(frm));
 			p = local_buf;
 			while (len_lim > 16) {

+ 5 - 5
core/dp/txrx/ol_txrx_peer_find.c

@@ -85,7 +85,7 @@ void __ol_txrx_peer_change_ref_cnt(struct ol_txrx_peer_t *peer,
 {
 	qdf_atomic_add(change, &peer->ref_cnt);
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH,
-		"[%s][%d]: peer %p peer->ref_cnt changed by (%d) to %d",
+		"[%s][%d]: peer %pK peer->ref_cnt changed by (%d) to %d",
 		fname, line, peer, change, qdf_atomic_read(&peer->ref_cnt));
 }
 
@@ -438,7 +438,7 @@ static inline void ol_txrx_peer_find_add_id(struct ol_txrx_pdev_t *pdev,
 				peer_id_to_obj_map[peer_id].peer_id_ref_cnt);
 	peer_ref_cnt = qdf_atomic_read(&peer->ref_cnt);
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH,
-	   "%s: peer %p ID %d peer_id[%d] peer_id_ref_cnt %d peer->ref_cnt %d",
+	   "%s: peer %pK ID %d peer_id[%d] peer_id_ref_cnt %d peer->ref_cnt %d",
 	   __func__, peer, peer_id, i, peer_id_ref_cnt, peer_ref_cnt);
 
 	if (status) {
@@ -627,7 +627,7 @@ void ol_rx_peer_unmap_handler(ol_txrx_pdev_handle pdev, uint16_t peer_id)
 	OL_TXRX_PEER_UNREF_DELETE(peer);
 
 	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG,
-		  "%s: peer_id %d peer %p peer_id_ref_cnt %d",
+		  "%s: peer_id %d peer %pK peer_id_ref_cnt %d",
 		  __func__, peer_id, peer, ref_cnt);
 }
 
@@ -727,7 +727,7 @@ void ol_txrx_peer_find_display(ol_txrx_pdev_handle pdev, int indent)
 	for (i = 0; i < max_peers; i++) {
 		if (pdev->peer_id_to_obj_map[i].peer) {
 			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
-				  "%*sid %d -> %p\n",
+				  "%*sid %d -> %pK\n",
 				  indent + 4, " ", i,
 				  pdev->peer_id_to_obj_map[i].peer);
 		}
@@ -742,7 +742,7 @@ void ol_txrx_peer_find_display(ol_txrx_pdev_handle pdev, int indent)
 				      hash_list_elem) {
 				QDF_TRACE(QDF_MODULE_ID_TXRX,
 					  QDF_TRACE_LEVEL_INFO_LOW,
-					  "%*shash idx %d -> %p (%02x:%02x:%02x:%02x:%02x:%02x)\n",
+					  "%*shash idx %d -> %pK (%02x:%02x:%02x:%02x:%02x:%02x)\n",
 					indent + 4, " ", i, peer,
 					peer->mac_addr.raw[0],
 					peer->mac_addr.raw[1],