From patchwork Wed Feb 10 10:20:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pradeep Nalla X-Patchwork-Id: 87842 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7F2DEA054F; Wed, 10 Feb 2021 11:22:08 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F37D240693; Wed, 10 Feb 2021 11:22:07 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 2A88340142 for ; Wed, 10 Feb 2021 11:22:04 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 11AAKa4Z014658 for ; Wed, 10 Feb 2021 02:22:04 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=pfpt0220; bh=bUDaCWxFvIs4TLa7PaqP5H3/4zY9kR9A0MM6HjMpdDI=; b=lFC9+w65u6Dqbv2vVGcn2voYg0/0uxuUp7vQTf8tkauDcyW//imIKNlcEKq+DsnSqWzc dxv4a9rPmV/EMMjIlqa+qnInjQKWneOKF7+S5YwTuiVCo3ymR0gtdUZBvP4MJUTDCo+d M1TDXAHmKJWRQ86LP9kFNFKuJUQ5b/jN61lFNKAfab9Bk7J17VityOmguPusrJ+xHcKf q2kAoB3jEAcLf3H5J5SSX9wtOBhkRNzoP7T68esOmKzvRujL/MaLr3U0FDegTgCzOAyE XJGG8xzyyYb1oBCSVW6PyEuXcDOyL+pdjO/Wf/yx15n45IuhchBh6/T2uH/04M+8npFC kw== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com with ESMTP id 36hugqbana-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 10 Feb 2021 02:22:04 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 10 Feb 2021 02:22:02 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 10 Feb 2021 02:22:02 -0800 Received: from sburla-Super-Server.caveonetworks.com (unknown [10.106.27.196]) by maili.marvell.com (Postfix) with ESMTP id EA1013F7048; Wed, 10 Feb 2021 02:22:01 -0800 (PST) From: Nalla Pradeep To: Nalla Pradeep , Radha Mohan Chintakuntla , Veerasenareddy Burru CC: , Date: Wed, 10 Feb 2021 02:20:45 -0800 Message-ID: <20210210102045.96498-1-pnalla@marvell.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369, 18.0.737 definitions=2021-02-10_03:2021-02-10, 2021-02-10 signatures=0 Subject: [dpdk-dev] [PATCH] net/octeontx_ep: fixed format specifier X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Used PRIx64 format specifier where ever the variable getting printed is of type uint64 Signed-off-by: Nalla Pradeep --- drivers/net/octeontx_ep/otx_ep_rxtx.c | 51 +++++++++++---------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/drivers/net/octeontx_ep/otx_ep_rxtx.c b/drivers/net/octeontx_ep/otx_ep_rxtx.c index 28ff74d2d..4a7ddc264 100644 --- a/drivers/net/octeontx_ep/otx_ep_rxtx.c +++ b/drivers/net/octeontx_ep/otx_ep_rxtx.c @@ -118,9 +118,8 @@ otx_ep_init_instr_queue(struct otx_ep_device *otx_ep, int iq_no, int num_descs, goto iq_init_fail; } - otx_ep_info("IQ[%d]: base: %p basedma: %lx count: %d\n", - iq_no, iq->base_addr, (unsigned long)iq->base_addr_dma, - iq->nb_desc); + otx_ep_info("IQ[%d]: base: %p basedma: %" PRIx64 "count: %d\n", + iq_no, iq->base_addr, iq->base_addr_dma, iq->nb_desc); iq->otx_ep_dev = otx_ep; iq->q_no = iq_no; @@ -298,8 +297,8 @@ otx_ep_init_droq(struct otx_ep_device *otx_ep, uint32_t q_no, droq->desc_ring_dma = droq->desc_ring_mz->iova; droq->desc_ring = (struct otx_ep_droq_desc *)droq->desc_ring_mz->addr; - otx_ep_dbg("OQ[%d]: desc_ring: virt: 0x%p, dma: %lx\n", - q_no, droq->desc_ring, (unsigned long)droq->desc_ring_dma); + otx_ep_dbg("OQ[%d]: desc_ring: virt: 0x%p, dma: %" PRIx64 "\n", + q_no, droq->desc_ring, droq->desc_ring_dma); otx_ep_dbg("OQ[%d]: num_desc: %d\n", q_no, droq->nb_desc); /* OQ buf_list set up */ @@ -621,16 +620,14 @@ otx_ep_xmit_pkts(void *tx_queue, struct rte_mbuf **pkts, uint16_t nb_pkts) #ifdef OTX_EP_IO_DEBUG otx_ep_dbg("After swapping\n"); - otx_ep_dbg("Word0 [dptr]: 0x%016lx\n", - (unsigned long)iqcmd.dptr); - otx_ep_dbg("Word1 [ihtx]: 0x%016lx\n", (unsigned long)iqcmd.ih); - otx_ep_dbg("Word2 [pki_ih3]: 0x%016lx\n", - (unsigned long)iqcmd.pki_ih3); - otx_ep_dbg("Word3 [rptr]: 0x%016lx\n", - (unsigned long)iqcmd.rptr); - otx_ep_dbg("Word4 [irh]: 0x%016lx\n", (unsigned long)iqcmd.irh); - otx_ep_dbg("Word5 [exhdr[0]]: 0x%016lx\n", - (unsigned long)iqcmd.exhdr[0]); + otx_ep_dbg("Word0 [dptr]: 0x%016" PRIx64 "\n", iqcmd.dptr); + otx_ep_dbg("Word1 [ihtx]: 0x%016" PRIx64 "\n", iqcmd.ih.u64); + otx_ep_dbg("Word2 [pki_ih3]: 0x%016" PRIx64 "\n", + iqcmd.pki_ih3.u64); + otx_ep_dbg("Word3 [rptr]: 0x%016" PRIx64 "\n", iqcmd.rptr); + otx_ep_dbg("Word4 [irh]: 0x%016" PRIx64 "\n", iqcmd.irh.u64); + otx_ep_dbg("Word5 [exhdr[0]]: 0x%016" PRIx64 "\n", + iqcmd.exhdr[0]); rte_pktmbuf_dump(stdout, m, rte_pktmbuf_pkt_len(m)); #endif dbell = (i == (unsigned int)(nb_pkts - 1)) ? 1 : 0; @@ -754,16 +751,12 @@ otx2_ep_xmit_pkts(void *tx_queue, struct rte_mbuf **pkts, uint16_t nb_pkts) #ifdef OTX_EP_IO_DEBUG otx_ep_dbg("After swapping\n"); - otx_ep_dbg("Word0 [dptr]: 0x%016lx\n", - (unsigned long)iqcmd.dptr); - otx_ep_dbg("Word1 [ihtx]: 0x%016lx\n", (unsigned long)iqcmd.ih); - otx_ep_dbg("Word2 [pki_ih3]: 0x%016lx\n", - (unsigned long)iqcmd.pki_ih3); - otx_ep_dbg("Word3 [rptr]: 0x%016lx\n", - (unsigned long)iqcmd.rptr); - otx_ep_dbg("Word4 [irh]: 0x%016lx\n", (unsigned long)iqcmd.irh); - otx_ep_dbg("Word5 [exhdr[0]]: 0x%016lx\n", - (unsigned long)iqcmd.exhdr[0]); + otx_ep_dbg("Word0 [dptr]: 0x%016" PRIx64 "\n", iqcmd2.dptr); + otx_ep_dbg("Word1 [ihtx]: 0x%016" PRIx64 "\n", iqcmd2.ih.u64); + otx_ep_dbg("Word2 [rptr]: 0x%016" PRIx64 "\n", iqcmd2.rptr); + otx_ep_dbg("Word3 [irh]: 0x%016" PRIx64 "\n", iqcmd2.irh.u64); + otx_ep_dbg("Word4 [exhdr[0]]: 0x%016" PRIx64 "\n", + iqcmd2.exhdr[0]); #endif index = iq->host_write_index; dbell = (i == (unsigned int)(nb_pkts - 1)) ? 1 : 0; @@ -837,7 +830,7 @@ otx_ep_droq_read_packet(struct otx_ep_device *otx_ep, struct otx_ep_droq_info *info2; uint64_t total_pkt_len; uint32_t pkt_len = 0; - int next_idx; + int next_idx, retry; droq_pkt = droq->recv_buf_list[droq->read_idx]; droq_pkt2 = droq->recv_buf_list[droq->read_idx]; @@ -845,11 +838,7 @@ otx_ep_droq_read_packet(struct otx_ep_device *otx_ep, /* make sure info is available */ rte_rmb(); if (unlikely(!info->length)) { - int retry = OTX_EP_MAX_DELAYED_PKT_RETRIES; - /* otx_ep_dbg("OCTEON DROQ[%d]: read_idx: %d; Data not ready " - * "yet, Retry; pending=%lu\n", droq->q_no, droq->read_idx, - * droq->pkts_pending); - */ + retry = OTX_EP_MAX_DELAYED_PKT_RETRIES; droq->stats.pkts_delayed_data++; while (retry && !info->length) retry--;