From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 682F846868; Fri, 6 Jun 2025 19:10:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8799C40DCD; Fri, 6 Jun 2025 19:09:39 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by mails.dpdk.org (Postfix) with ESMTP id 3351E40B9A for ; Fri, 6 Jun 2025 19:09:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1749229777; x=1780765777; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=0xtASUpwkqhIocKD8lBVjvyd5daBw1x3EhMUmG67eAQ=; b=hj7eupGMQ975p7XVzna2oNUkWMRmuYetkN8U0Zx57ht9TwaxGLTjuD/H J2aibQVqo3NjQsHUqxYc43v1l8DX5euGnlXrr3vjKl/E6uQ2KTqo9CaZL L1HrBQzx4BhbYdqbRjjoXjWLVvCjrhu+Muf5mxz/iv/fW3pkGWdFvI16+ 38CjiYmy6kdIwCBpuTOaHZQW02x4YJY5C6NmOXSHD7cMy+nzjaeZLDfjH Wp5x1iMMiqTROmuYsvuwUXJsIDGIBSjhRwxqepHnksQv4V3wNBb/mLYYD aLy+Sa8DDRnN/yLx4qo4x4WgiWg7/lyRiGVWMyU9AMTtAaItiVanAGRzh Q==; X-CSE-ConnectionGUID: Vv/hDoDCQkaD2Gdi1yVPtQ== X-CSE-MsgGUID: I2fFrB9rTcWh5lJlt2fDlg== X-IronPort-AV: E=McAfee;i="6800,10657,11456"; a="68828402" X-IronPort-AV: E=Sophos;i="6.16,215,1744095600"; d="scan'208";a="68828402" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2025 10:09:37 -0700 X-CSE-ConnectionGUID: uLMOImwOS3awn9zsKfHQAw== X-CSE-MsgGUID: XiH1FI7yRIOwgblIL5jMwA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,215,1744095600"; d="scan'208";a="145808137" Received: from silpixa00401119.ir.intel.com ([10.55.129.167]) by orviesa010.jf.intel.com with ESMTP; 06 Jun 2025 10:09:36 -0700 From: Anatoly Burakov To: dev@dpdk.org, Bruce Richardson Subject: [PATCH v5 05/34] net/ice: match variable name to other drivers Date: Fri, 6 Jun 2025 18:08:44 +0100 Message-ID: <2ccea9d1797088dd72d6da8e04f113b1c0bd0912.1749229650.git.anatoly.burakov@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Currently, the ice driver has a variable that have the same semantics as in other drivers, but has a different name. Rename `rx_ring_dma` to `rx_ring_phys_addr` for consistency with other drivers. Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- Notes: v3 -> v4: - Make this commit separate drivers/net/intel/ice/ice_dcf.c | 2 +- drivers/net/intel/ice/ice_rxtx.c | 8 ++++---- drivers/net/intel/ice/ice_rxtx.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/intel/ice/ice_dcf.c b/drivers/net/intel/ice/ice_dcf.c index 65c18921f4..fa95aaaba6 100644 --- a/drivers/net/intel/ice/ice_dcf.c +++ b/drivers/net/intel/ice/ice_dcf.c @@ -1211,7 +1211,7 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw) vc_qp->rxq.max_pkt_size = rxq[i]->max_pkt_len; vc_qp->rxq.ring_len = rxq[i]->nb_rx_desc; - vc_qp->rxq.dma_ring_addr = rxq[i]->rx_ring_dma; + vc_qp->rxq.dma_ring_addr = rxq[i]->rx_ring_phys_addr; vc_qp->rxq.databuffer_size = rxq[i]->rx_buf_len; #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC diff --git a/drivers/net/intel/ice/ice_rxtx.c b/drivers/net/intel/ice/ice_rxtx.c index ba1435b9de..81962a1f9a 100644 --- a/drivers/net/intel/ice/ice_rxtx.c +++ b/drivers/net/intel/ice/ice_rxtx.c @@ -370,7 +370,7 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq) rx_ctx.dtype = 0; /* No Protocol Based Buffer Split mode */ } - rx_ctx.base = rxq->rx_ring_dma / ICE_QUEUE_BASE_ADDR_UNIT; + rx_ctx.base = rxq->rx_ring_phys_addr / ICE_QUEUE_BASE_ADDR_UNIT; rx_ctx.qlen = rxq->nb_rx_desc; rx_ctx.dbuf = rxq->rx_buf_len >> ICE_RLAN_CTX_DBUF_S; rx_ctx.hbuf = rxq->rx_hdr_len >> ICE_RLAN_CTX_HBUF_S; @@ -847,7 +847,7 @@ ice_fdir_program_hw_rx_queue(struct ice_rx_queue *rxq) memset(&rx_ctx, 0, sizeof(rx_ctx)); - rx_ctx.base = rxq->rx_ring_dma / ICE_QUEUE_BASE_ADDR_UNIT; + rx_ctx.base = rxq->rx_ring_phys_addr / ICE_QUEUE_BASE_ADDR_UNIT; rx_ctx.qlen = rxq->nb_rx_desc; rx_ctx.dbuf = rxq->rx_buf_len >> ICE_RLAN_CTX_DBUF_S; rx_ctx.hbuf = rxq->rx_hdr_len >> ICE_RLAN_CTX_HBUF_S; @@ -1273,7 +1273,7 @@ ice_rx_queue_setup(struct rte_eth_dev *dev, /* Zero all the descriptors in the ring. */ memset(rz->addr, 0, ring_size); - rxq->rx_ring_dma = rz->iova; + rxq->rx_ring_phys_addr = rz->iova; rxq->rx_ring = rz->addr; /* always reserve more for bulk alloc */ @@ -2500,7 +2500,7 @@ ice_fdir_setup_rx_resources(struct ice_pf *pf) rxq->reg_idx = pf->fdir.fdir_vsi->base_queue; rxq->vsi = pf->fdir.fdir_vsi; - rxq->rx_ring_dma = rz->iova; + rxq->rx_ring_phys_addr = rz->iova; memset(rz->addr, 0, ICE_FDIR_NUM_RX_DESC * sizeof(union ice_32byte_rx_desc)); rxq->rx_ring = (union ice_rx_flex_desc *)rz->addr; diff --git a/drivers/net/intel/ice/ice_rxtx.h b/drivers/net/intel/ice/ice_rxtx.h index 500d630679..3c5c014b41 100644 --- a/drivers/net/intel/ice/ice_rxtx.h +++ b/drivers/net/intel/ice/ice_rxtx.h @@ -93,7 +93,7 @@ enum ice_rx_dtype { struct ice_rx_queue { struct rte_mempool *mp; /* mbuf pool to populate RX ring */ volatile union ice_rx_flex_desc *rx_ring;/* RX ring virtual address */ - rte_iova_t rx_ring_dma; /* RX ring DMA address */ + rte_iova_t rx_ring_phys_addr; /* RX ring DMA address */ struct ice_rx_entry *sw_ring; /* address of RX soft ring */ uint16_t nb_rx_desc; /* number of RX descriptors */ uint16_t rx_free_thresh; /* max free RX desc to hold */ -- 2.47.1