From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 77A0B4564F;
Fri, 19 Jul 2024 12:03:11 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 2631A42EF5;
Fri, 19 Jul 2024 12:02:08 +0200 (CEST)
Received: from AM0PR83CU005.outbound.protection.outlook.com
(mail-westeuropeazon11010063.outbound.protection.outlook.com [52.101.69.63])
by mails.dpdk.org (Postfix) with ESMTP id 890B342EC8
for <dev@dpdk.org>; Fri, 19 Jul 2024 12:02:03 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=CkSorgGvKzRM4256urqEfNX3mi3KVnL0qNLiyT6UwjI7aOK5d3QkCgAMuHdKSNnN77Y30w3KIu66RzPROzDZg73eUmc3oUcC3KFpeL9FDm+TRKrPvsG1EI6dcw7EaS7rHQQFJpchA4dQu91VdfGYmG06LY6Jbfxvkas1U0wT8nOVnuUtswZjT7YEC9rezxDDT+B+n7jK+mWz4gvHH/y2q+p/P1Z5E/XT7HRiqUfu/ech0TMrKnerBDR4ZUOVQ/t+gdiUIJZoinsgppLynHJLmymLJ60a1OVMSmgv4g2pYmQMNkVy20i0Pqfr3pp9CRcWTgEZwLmQju3Va1h8MQkDEQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector10001;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
bh=8rUyemnPGK1EbpWoN9RzWHDTEk/XljncqCSwjMaKXtQ=;
b=HgRPv8M9ghK9kyTm1/dnMuy0tNyWkGsGx2fZJQ9bG0IIIqfQlHPSVRUvZ3HhW/bS5ZqjawqtBBjcFlaHt9yOVZANZdeVJ2Z1BqqtyrkKRaknYUdP443WY8LzpvX/f8ztyHmcybc3Hds5AneqZ6VodBp4kay49cDZNRWUUC3jlpVfNvXrOTspLAgpkzHHaLwgMyX7NXmzOe1C5fWdFJqsIQSFE0ygEndVoBQaiT/zxD+bXZ0rgbguL6kcIJ5cRDA8HAbjuKmKOnmRbK2+p5ymQjlH3w3k0PHbYSCNunj4WRqSDcPzykS9/fgXZVby6m68wk4RYhbAcNPodaqSR+Ifvw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass
header.d=nxp.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=8rUyemnPGK1EbpWoN9RzWHDTEk/XljncqCSwjMaKXtQ=;
b=r0j9wLOzyFzbQtgJSZY4NbQc+vEO/gGX6hzABcjIJwJhidSs3LqQ7Iq4Kb1estSLXEnStBpGuppcTM15r3Zisoc/yfE0XAUBSQbe4XOpr8l5T5ytcShp40dtcN9vcztC+EW9AOy6W+ZI+urRvvkQmdEACqjg/qFH37cvLibZpo8=
Authentication-Results: dkim=none (message not signed)
header.d=none;dmarc=none action=none header.from=nxp.com;
Received: from PAXPR04MB8205.eurprd04.prod.outlook.com (2603:10a6:102:1c2::20)
by DB9PR04MB8345.eurprd04.prod.outlook.com (2603:10a6:10:246::14)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.19; Fri, 19 Jul
2024 10:02:01 +0000
Received: from PAXPR04MB8205.eurprd04.prod.outlook.com
([fe80::7633:884d:5973:174f]) by PAXPR04MB8205.eurprd04.prod.outlook.com
([fe80::7633:884d:5973:174f%6]) with mapi id 15.20.7784.016; Fri, 19 Jul 2024
10:02:01 +0000
From: Gagandeep Singh <g.singh@nxp.com>
To: dev@dpdk.org, Hemant Agrawal <hemant.agrawal@nxp.com>,
Sachin Saxena <sachin.saxena@nxp.com>
Cc: Jun Yang <jun.yang@nxp.com>
Subject: [PATCH 12/30] dma/dpaa2: move the qdma header to common place
Date: Fri, 19 Jul 2024 15:31:08 +0530
Message-Id: <20240719100126.1150373-12-g.singh@nxp.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20240719100126.1150373-1-g.singh@nxp.com>
References: <20240719100126.1150373-1-g.singh@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-ClientProxiedBy: SG2PR01CA0184.apcprd01.prod.exchangelabs.com
(2603:1096:4:189::9) To PAXPR04MB8205.eurprd04.prod.outlook.com
(2603:10a6:102:1c2::20)
MIME-Version: 1.0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: PAXPR04MB8205:EE_|DB9PR04MB8345:EE_
X-MS-Office365-Filtering-Correlation-Id: c3a3f47e-41f6-4d85-fb3a-08dca7d9d59b
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
ARA:13230040|52116014|366016|1800799024|376014|38350700014;
X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?0X1kHXqe2aHmPjKVCSoMi2pNmEVIHgUl8jpwc/9buhUvPrdhKl1N3ob/AqcM?=
=?us-ascii?Q?6enMOtQeGApfst3uWqDD56E1ShNHvfR0PJPZpzQ9III04mlImuCuSXT7jVtu?=
=?us-ascii?Q?iQbysfK1GkfGGZwg8haA2s9Mup6i7BuVeHMhwToCss7QdoqMAJDVKdmyIE9I?=
=?us-ascii?Q?JdXBdFxKObD6ZGsTYjC+I+B7JQ8BWfbzcS6BdeE+M0wQ9R7DWS+O42xOHGvG?=
=?us-ascii?Q?Y+tURYesHhRph+P1OjT46bUUyEWoOCEzVUXkqcAGtXUWqoR6Hd4kfyL+yTGd?=
=?us-ascii?Q?kcpctTIRQAWLZ0tR4MwcD3/R6/Dhy2gXt6xkDJMX/IzKL0+ghOtm3eH/RJDN?=
=?us-ascii?Q?06ucc2sPZHvbx4ZTjw5MUjXWdOfJuKIadjibSWnBqPkc6UvX73Dlpf+hy5zH?=
=?us-ascii?Q?3qGJaG5LeRNlgy/iVukWK/uCytT/ORSC8YD2DyzS0h55AtEwfn2w3c8kOv9c?=
=?us-ascii?Q?vmN/pKxnMTiB8Cm5afcpGL13uCPk/M5s/fGTw3q3qR+H/92PqKcmZJG5WrE0?=
=?us-ascii?Q?gjrsJJPCjSvJQuPzZ6Ix1g3+7HYCUqvYSnKwQrPdeGwlhyOisYMIWKP12wMd?=
=?us-ascii?Q?p6rLe67I5dLD8+KtO+CqGsTEl2C7l/GAZJywk98IfFqvBqM1ptGsNxd4LI6/?=
=?us-ascii?Q?aRojmGvCBCvoPF1XRxYK5Cj8C3lwjRqZl2xKi6cl4A/VVF6Zr/jw5tqXTK3J?=
=?us-ascii?Q?0HXzioJZ6WIg3yw8xoikMX2UZuD6qSaI40vv112CWCeXY8fII+kGA+oiXANA?=
=?us-ascii?Q?9FEwBN8fCzhgiKxn/Zrn9isVhqAu21l4tAVs/D0tbOXxqwOjQSx9ROusQp3T?=
=?us-ascii?Q?XA54/kPkMV7ZouvBQ6CDB3otFhViYz5bcENQrOPe5Y842e1gWOMsMhnj78er?=
=?us-ascii?Q?AoHXvf3lUfkOLx+3QQ4YJH9IQlHhJMtPME5dsV2FOGQJ2+K1iw+pxmrG/9AF?=
=?us-ascii?Q?UxtfxdgAvpGNKC9St7W+mMFCvsT6W7skp9YEVX5MBeB0sj9Pr1XsSNElQ78F?=
=?us-ascii?Q?LDjgRdDDB3CmIQnwEofwklubfejNjKE1KU8MVdhqP2NhTBgQHoJdcvZ0Ri54?=
=?us-ascii?Q?QKNUR1bGbq9pG8+ejIolKBOcupOUM2M0z8f/EAGvQGLo8IrDNfs6oS5qVisq?=
=?us-ascii?Q?A2zoYzZywH8Z1pof8RJRtUDUkpnI7jG+9IrX1AXDq5Jee8u2/dI0pZT5+14l?=
=?us-ascii?Q?lNKzjG1C4Sy3o5SGlNs8QSJbTDrZ/oRfU22vDUE4mzBcH2Q5UoyrrXeNLc9s?=
=?us-ascii?Q?WM2RedX8DdiUPT6u3mmP969YnpUPOJVKZSwYYWIUgD7xzbs9tdiyBGzFGB+7?=
=?us-ascii?Q?JSJabZIl2U1563GpAly9zFE7LfxqE7jJ5PHx8YXW/Vooq2xftxLR+Vh6spVa?=
=?us-ascii?Q?W0Kbzwl9RXvF+KPYRClQTpZ9xNjpkVuelqlcs3qRFA7J0+JxEQ=3D=3D?=
X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:PAXPR04MB8205.eurprd04.prod.outlook.com; PTR:; CAT:NONE;
SFS:(13230040)(52116014)(366016)(1800799024)(376014)(38350700014); DIR:OUT;
SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jSBJUVf1Q0vGptvEmTiLsyZzmIW080oqw+nrJdildl4gu0DMzyE2uvdTl8k+?=
=?us-ascii?Q?j++wS7mqT7Qt71UxIYKiUi3Tl37GOyI0llyh6ShkcKDQBUUISN8W4plCXOii?=
=?us-ascii?Q?qEwf3KGEsV+v6oprzxXxllgl2I93Fan244cPMVTIG38Sh/dfxSKoKGQnroxE?=
=?us-ascii?Q?U12JuiVK+Ms/K8E7gDjnkZ/REtlECuJAkxIzDK2VqYF546/971LQHUNxCkUa?=
=?us-ascii?Q?2FgCeHNSFRAB3/lGeinGeNnjJ2R4Et5feT9L9clN9o3Vgij/al+lPis7SPl9?=
=?us-ascii?Q?xO6o5ubVFDN8112vuA/jgD9ZMv8G/8WpXXyBVP5rEEDhm8n1Qj72ZMcaJ9VM?=
=?us-ascii?Q?v7GRVRWm0ckU3IE1Y4pj+Wlj41dmoWCvGN+xAMJgAdtlQ2vJYER1EBR+eSl5?=
=?us-ascii?Q?AMnGDwnN4Dov+2C5nwLue6LjJfkqM+lprAs+UBoI3PvhVhZJ2SkIYIPBRY6V?=
=?us-ascii?Q?89plmGdbwxey9WvX6Dt+cI3tGXVy6ydIWIrGCGKMdc4IuBWCeDxdgA5qYKBT?=
=?us-ascii?Q?WObY94SouQoLyu/lNhaeeGuBLwBNQ3Y4xg3rWIFwIeU7QcKabRWS0LitZwJm?=
=?us-ascii?Q?gnzzfrWuFUdEORsyOG7N/8/SWZqcHZ/lD0hy/zl19NFbiXVLNT+GsGJu3LfH?=
=?us-ascii?Q?FBX9uKDqiDmEB+Cbi2w7zOJhPCPgpuRqyg/HkHlKfi6+12thE2yqBxXf27JJ?=
=?us-ascii?Q?M3Qtn+u39Id57/Y+Y+lSXuvDDtHL3t9LO+TkrxuGNiibW+VzihvqUkissQJ1?=
=?us-ascii?Q?t38d3kECcgP2BUhX/hx54+S9RTlW2cTcbdMQY5mIDGehEHHmNdoJv47Wr0Oc?=
=?us-ascii?Q?JeQzVHTUjO/F/nRv9bNCEXC0lEGLU0MJDenRduRG8cEA9QzjB179KUmDURUW?=
=?us-ascii?Q?DJTEmCLt3tjgPuQ/LOcgtGh/413k3CwV65yGIacCfGIXxg5IwXPfrJPcFo1s?=
=?us-ascii?Q?1i3FSOS4oecaN3wEhaH7DbMAoMeNVEyLy5MeOOC8XE79FZdTPi6BGcXSFtHq?=
=?us-ascii?Q?74Ar8gC4GI+kjN63/H8CpeFs2lXygVXi83ppyBkC5y+2IJtJMXXCzyeJ1Wnz?=
=?us-ascii?Q?KJyXfjp2ibKRW71Ir/pY8ltQnyas7RtyeYjfmJfDAwfydlb8C06+Kh12I7oe?=
=?us-ascii?Q?GoVzCzgVskw4IOSqrdmChNVKHETOEkH7/OoEqr5AE61Mmjl6BHJh2FkEE4H9?=
=?us-ascii?Q?ouyxzMhjXUc+HTIp8VPUb6SbT+qYjtwVwIAgloezdkEGEz+kPFiWTI4DYDjo?=
=?us-ascii?Q?FHUe4dEmbcVQFyhnKwatYxbtmAAJl5v3Jh7gJ2yrkaX3CBdz+SNBRLDwnmiT?=
=?us-ascii?Q?T1IcSozvhuoIcD1RXD8beXHCC8+7PKP3WV5BbuV5Ko4irMzMM+mZ+DIzueSM?=
=?us-ascii?Q?yUU31XukHiEab5khL292X+d5zDRdUAWHHRY0tccRCgH/gLn/6JsAQ2d2gApj?=
=?us-ascii?Q?RCcaN9qG1JQ1wANbF9ux5jjKWGDIVzb45ALfM8N+DYsyH3SPG1CUTo22x7Gn?=
=?us-ascii?Q?krkGROkhjxejHNBBPULdod0u4QmA8wBSC0+EJbVDbu7+Yh313HCpF9upQlSL?=
=?us-ascii?Q?lTTq4ZwI25j7Ru8W7xQkYRVMkwEGyJAGuurua9gV?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c3a3f47e-41f6-4d85-fb3a-08dca7d9d59b
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8205.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 10:02:01.6328 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: sMIfM/Xc/nmxp891vno8ChltOjF78wPCJJmEAXM1RvKlxSrcmXJttFkA4C7dC9M1
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8345
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
From: Jun Yang <jun.yang@nxp.com>
Include rte_pmd_dpaax_qdma.h instead of rte_pmd_dpaa2_qdma.h
and change code accordingly.
Signed-off-by: Jun Yang <jun.yang@nxp.com>
---
doc/api/doxy-api-index.md | 2 +-
doc/api/doxy-api.conf.in | 2 +-
drivers/common/dpaax/meson.build | 3 +-
drivers/common/dpaax/rte_pmd_dpaax_qdma.h | 23 +++++++
drivers/dma/dpaa2/dpaa2_qdma.c | 84 +++++++++++------------
drivers/dma/dpaa2/dpaa2_qdma.h | 10 +--
drivers/dma/dpaa2/meson.build | 4 +-
drivers/dma/dpaa2/rte_pmd_dpaa2_qdma.h | 23 -------
8 files changed, 72 insertions(+), 79 deletions(-)
create mode 100644 drivers/common/dpaax/rte_pmd_dpaax_qdma.h
delete mode 100644 drivers/dma/dpaa2/rte_pmd_dpaa2_qdma.h
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index f9283154f8..ab42440733 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -57,7 +57,7 @@ The public API headers are grouped by topics:
[mlx5](@ref rte_pmd_mlx5.h),
[dpaa2_mempool](@ref rte_dpaa2_mempool.h),
[dpaa2_cmdif](@ref rte_pmd_dpaa2_cmdif.h),
- [dpaa2_qdma](@ref rte_pmd_dpaa2_qdma.h),
+ [dpaax](@ref rte_pmd_dpaax_qdma.h),
[crypto_scheduler](@ref rte_cryptodev_scheduler.h),
[dlb2](@ref rte_pmd_dlb2.h),
[ifpga](@ref rte_pmd_ifpga.h)
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index a8823c046f..33250d867c 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -8,7 +8,7 @@ INPUT = @TOPDIR@/doc/api/doxy-api-index.md \
@TOPDIR@/drivers/bus/vdev \
@TOPDIR@/drivers/crypto/cnxk \
@TOPDIR@/drivers/crypto/scheduler \
- @TOPDIR@/drivers/dma/dpaa2 \
+ @TOPDIR@/drivers/common/dpaax \
@TOPDIR@/drivers/event/dlb2 \
@TOPDIR@/drivers/event/cnxk \
@TOPDIR@/drivers/mempool/cnxk \
diff --git a/drivers/common/dpaax/meson.build b/drivers/common/dpaax/meson.build
index a162779116..db61b76ce3 100644
--- a/drivers/common/dpaax/meson.build
+++ b/drivers/common/dpaax/meson.build
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 NXP
+# Copyright 2018, 2024 NXP
if not is_linux
build = false
@@ -16,3 +16,4 @@ endif
if cc.has_argument('-Wno-pointer-arith')
cflags += '-Wno-pointer-arith'
endif
+headers = files('rte_pmd_dpaax_qdma.h')
diff --git a/drivers/common/dpaax/rte_pmd_dpaax_qdma.h b/drivers/common/dpaax/rte_pmd_dpaax_qdma.h
new file mode 100644
index 0000000000..2552a4adfb
--- /dev/null
+++ b/drivers/common/dpaax/rte_pmd_dpaax_qdma.h
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2021-2024 NXP
+ */
+
+#ifndef _RTE_PMD_DPAAX_QDMA_H_
+#define _RTE_PMD_DPAAX_QDMA_H_
+
+#include <rte_compat.h>
+
+#define RTE_DPAAX_QDMA_COPY_IDX_OFFSET 8
+#define RTE_DPAAX_QDMA_SG_IDX_ADDR_ALIGN \
+ RTE_BIT64(RTE_DPAAX_QDMA_COPY_IDX_OFFSET)
+#define RTE_DPAAX_QDMA_SG_IDX_ADDR_MASK \
+ (RTE_DPAAX_QDMA_SG_IDX_ADDR_ALIGN - 1)
+#define RTE_DPAAX_QDMA_SG_SUBMIT(idx_addr, flag) \
+ (((uint64_t)idx_addr) | (flag))
+
+#define RTE_DPAAX_QDMA_COPY_SUBMIT(idx, flag) \
+ ((idx << RTE_DPAAX_QDMA_COPY_IDX_OFFSET) | (flag))
+
+#define RTE_DPAAX_QDMA_JOB_SUBMIT_MAX 64
+#define RTE_DMA_CAPA_DPAAX_QDMA_FLAGS_INDEX RTE_BIT64(63)
+#endif /* _RTE_PMD_DPAAX_QDMA_H_ */
diff --git a/drivers/dma/dpaa2/dpaa2_qdma.c b/drivers/dma/dpaa2/dpaa2_qdma.c
index c3e6f84a48..32736726f6 100644
--- a/drivers/dma/dpaa2/dpaa2_qdma.c
+++ b/drivers/dma/dpaa2/dpaa2_qdma.c
@@ -10,7 +10,7 @@
#include <mc/fsl_dpdmai.h>
-#include "rte_pmd_dpaa2_qdma.h"
+#include <rte_pmd_dpaax_qdma.h>
#include "dpaa2_qdma.h"
#include "dpaa2_qdma_logs.h"
@@ -212,16 +212,16 @@ fle_sdd_pre_populate(struct qdma_cntx_fle_sdd *fle_sdd,
}
/* source frame list to source buffer */
DPAA2_SET_FLE_ADDR(&fle[DPAA2_QDMA_SRC_FLE], src);
-#ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA
- DPAA2_SET_FLE_BMT(&fle[DPAA2_QDMA_SRC_FLE]);
-#endif
+ /** IOMMU is always on for either VA or PA mode,
+ * so Bypass Memory Translation should be disabled.
+ *
+ * DPAA2_SET_FLE_BMT(&fle[DPAA2_QDMA_SRC_FLE]);
+ * DPAA2_SET_FLE_BMT(&fle[DPAA2_QDMA_DST_FLE]);
+ */
fle[DPAA2_QDMA_SRC_FLE].word4.fmt = fmt;
/* destination frame list to destination buffer */
DPAA2_SET_FLE_ADDR(&fle[DPAA2_QDMA_DST_FLE], dest);
-#ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA
- DPAA2_SET_FLE_BMT(&fle[DPAA2_QDMA_DST_FLE]);
-#endif
fle[DPAA2_QDMA_DST_FLE].word4.fmt = fmt;
/* Final bit: 1, for last frame list */
@@ -235,23 +235,21 @@ sg_entry_pre_populate(struct qdma_cntx_sg *sg_cntx)
struct qdma_sg_entry *src_sge = sg_cntx->sg_src_entry;
struct qdma_sg_entry *dst_sge = sg_cntx->sg_dst_entry;
- for (i = 0; i < RTE_DPAA2_QDMA_JOB_SUBMIT_MAX; i++) {
+ for (i = 0; i < RTE_DPAAX_QDMA_JOB_SUBMIT_MAX; i++) {
/* source SG */
src_sge[i].ctrl.sl = QDMA_SG_SL_LONG;
src_sge[i].ctrl.fmt = QDMA_SG_FMT_SDB;
-#ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA
- src_sge[i].ctrl.bmt = QDMA_SG_BMT_ENABLE;
-#else
+ /** IOMMU is always on for either VA or PA mode,
+ * so Bypass Memory Translation should be disabled.
+ */
src_sge[i].ctrl.bmt = QDMA_SG_BMT_DISABLE;
-#endif
/* destination SG */
dst_sge[i].ctrl.sl = QDMA_SG_SL_LONG;
dst_sge[i].ctrl.fmt = QDMA_SG_FMT_SDB;
-#ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA
- dst_sge[i].ctrl.bmt = QDMA_SG_BMT_ENABLE;
-#else
+ /** IOMMU is always on for either VA or PA mode,
+ * so Bypass Memory Translation should be disabled.
+ */
dst_sge[i].ctrl.bmt = QDMA_SG_BMT_DISABLE;
-#endif
}
}
@@ -350,21 +348,19 @@ sg_entry_populate(const struct rte_dma_sge *src,
src_sge->data_len.data_len_sl0 = src[i].length;
src_sge->ctrl.sl = QDMA_SG_SL_LONG;
src_sge->ctrl.fmt = QDMA_SG_FMT_SDB;
-#ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA
- src_sge->ctrl.bmt = QDMA_SG_BMT_ENABLE;
-#else
+ /** IOMMU is always on for either VA or PA mode,
+ * so Bypass Memory Translation should be disabled.
+ */
src_sge->ctrl.bmt = QDMA_SG_BMT_DISABLE;
-#endif
dst_sge->addr_lo = (uint32_t)dst[i].addr;
dst_sge->addr_hi = (dst[i].addr >> 32);
dst_sge->data_len.data_len_sl0 = dst[i].length;
dst_sge->ctrl.sl = QDMA_SG_SL_LONG;
dst_sge->ctrl.fmt = QDMA_SG_FMT_SDB;
-#ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA
- dst_sge->ctrl.bmt = QDMA_SG_BMT_ENABLE;
-#else
+ /** IOMMU is always on for either VA or PA mode,
+ * so Bypass Memory Translation should be disabled.
+ */
dst_sge->ctrl.bmt = QDMA_SG_BMT_DISABLE;
-#endif
total_len += src[i].length;
if (i == (nb_sge - 1)) {
@@ -444,17 +440,16 @@ fle_populate(struct qbman_fle fle[],
}
/* source frame list to source buffer */
DPAA2_SET_FLE_ADDR(&fle[DPAA2_QDMA_SRC_FLE], src_iova);
-#ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA
- DPAA2_SET_FLE_BMT(&fle[DPAA2_QDMA_SRC_FLE]);
-#endif
+ /** IOMMU is always on for either VA or PA mode,
+ * so Bypass Memory Translation should be disabled.
+ * DPAA2_SET_FLE_BMT(&fle[DPAA2_QDMA_SRC_FLE]);
+ * DPAA2_SET_FLE_BMT(&fle[DPAA2_QDMA_DST_FLE]);
+ */
fle[DPAA2_QDMA_SRC_FLE].word4.fmt = fmt;
DPAA2_SET_FLE_LEN(&fle[DPAA2_QDMA_SRC_FLE], len);
/* destination frame list to destination buffer */
DPAA2_SET_FLE_ADDR(&fle[DPAA2_QDMA_DST_FLE], dst_iova);
-#ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA
- DPAA2_SET_FLE_BMT(&fle[DPAA2_QDMA_DST_FLE]);
-#endif
fle[DPAA2_QDMA_DST_FLE].word4.fmt = fmt;
DPAA2_SET_FLE_LEN(&fle[DPAA2_QDMA_DST_FLE], len);
@@ -560,7 +555,7 @@ dpaa2_qdma_long_fmt_dump(const struct qbman_fle *fle)
DPAA2_QDMA_INFO("long format/SG format, job number:%d",
cntx_sg->job_nb);
if (!cntx_sg->job_nb ||
- cntx_sg->job_nb > RTE_DPAA2_QDMA_JOB_SUBMIT_MAX) {
+ cntx_sg->job_nb > RTE_DPAAX_QDMA_JOB_SUBMIT_MAX) {
DPAA2_QDMA_ERR("Invalid SG job number:%d",
cntx_sg->job_nb);
return;
@@ -610,9 +605,9 @@ dpaa2_qdma_copy_sg(void *dev_private,
return -EINVAL;
}
- if (unlikely(nb_src > RTE_DPAA2_QDMA_JOB_SUBMIT_MAX)) {
+ if (unlikely(nb_src > RTE_DPAAX_QDMA_JOB_SUBMIT_MAX)) {
DPAA2_QDMA_ERR("SG entry number(%d) > MAX(%d)",
- nb_src, RTE_DPAA2_QDMA_JOB_SUBMIT_MAX);
+ nb_src, RTE_DPAAX_QDMA_JOB_SUBMIT_MAX);
return -EINVAL;
}
@@ -631,11 +626,7 @@ dpaa2_qdma_copy_sg(void *dev_private,
cntx_sg->cntx_idx[i] = idx_addr[i];
}
-#ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA
- cntx_iova = rte_mempool_virt2iova(cntx_sg);
-#else
- cntx_iova = DPAA2_VADDR_TO_IOVA(cntx_sg);
-#endif
+ cntx_iova = (uint64_t)cntx_sg - qdma_vq->fle_iova2va_offset;
fle = cntx_sg->fle_sdd.fle;
fle_iova = cntx_iova +
@@ -667,8 +658,7 @@ dpaa2_qdma_copy_sg(void *dev_private,
offsetof(struct qdma_cntx_sg, sg_src_entry);
dst_sge_iova = cntx_iova +
offsetof(struct qdma_cntx_sg, sg_dst_entry);
- len = sg_entry_populate(src, dst,
- cntx_sg, nb_src);
+ len = sg_entry_populate(src, dst, cntx_sg, nb_src);
fle_populate(fle, sdd, sdd_iova,
&qdma_vq->rbp, src_sge_iova, dst_sge_iova, len,
@@ -1011,7 +1001,7 @@ dpaa2_qdma_dequeue(void *dev_private,
q_storage->last_num_pkts);
qbman_pull_desc_set_fq(&pulldesc, fqid);
qbman_pull_desc_set_storage(&pulldesc, dq_storage,
- (size_t)(DPAA2_VADDR_TO_IOVA(dq_storage)), 1);
+ DPAA2_VADDR_TO_IOVA(dq_storage), 1);
if (check_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index)) {
while (!qbman_check_command_complete(
get_swp_active_dqs(
@@ -1046,7 +1036,7 @@ dpaa2_qdma_dequeue(void *dev_private,
qbman_pull_desc_set_numframes(&pulldesc, pull_size);
qbman_pull_desc_set_fq(&pulldesc, fqid);
qbman_pull_desc_set_storage(&pulldesc, dq_storage1,
- (size_t)(DPAA2_VADDR_TO_IOVA(dq_storage1)), 1);
+ DPAA2_VADDR_TO_IOVA(dq_storage1), 1);
/* Check if the previous issued command is completed.
* Also seems like the SWP is shared between the Ethernet Driver
@@ -1078,7 +1068,7 @@ dpaa2_qdma_dequeue(void *dev_private,
}
fd = qbman_result_DQ_fd(dq_storage);
ret = dpaa2_qdma_dq_fd(fd, qdma_vq, &free_space, &fle_elem_nb);
- if (ret || free_space < RTE_DPAA2_QDMA_JOB_SUBMIT_MAX)
+ if (ret || free_space < RTE_DPAAX_QDMA_JOB_SUBMIT_MAX)
pending = 0;
dq_storage++;
@@ -1131,11 +1121,11 @@ dpaa2_qdma_info_get(const struct rte_dma_dev *dev,
RTE_DMA_CAPA_SILENT |
RTE_DMA_CAPA_OPS_COPY |
RTE_DMA_CAPA_OPS_COPY_SG;
- dev_info->dev_capa |= RTE_DMA_CAPA_DPAA2_QDMA_FLAGS_INDEX;
+ dev_info->dev_capa |= RTE_DMA_CAPA_DPAAX_QDMA_FLAGS_INDEX;
dev_info->max_vchans = dpdmai_dev->num_queues;
dev_info->max_desc = DPAA2_QDMA_MAX_DESC;
dev_info->min_desc = DPAA2_QDMA_MIN_DESC;
- dev_info->max_sges = RTE_DPAA2_QDMA_JOB_SUBMIT_MAX;
+ dev_info->max_sges = RTE_DPAAX_QDMA_JOB_SUBMIT_MAX;
dev_info->dev_name = dev->device->name;
if (dpdmai_dev->qdma_dev)
dev_info->nb_vchans = dpdmai_dev->qdma_dev->num_vqs;
@@ -1317,6 +1307,7 @@ dpaa2_qdma_vchan_setup(struct rte_dma_dev *dev, uint16_t vchan,
char pool_name[64];
int ret;
char *env = NULL;
+ uint64_t iova, va;
DPAA2_QDMA_FUNC_TRACE();
@@ -1359,6 +1350,9 @@ dpaa2_qdma_vchan_setup(struct rte_dma_dev *dev, uint16_t vchan,
DPAA2_QDMA_ERR("%s create failed", pool_name);
return -ENOMEM;
}
+ iova = qdma_dev->vqs[vchan].fle_pool->mz->iova;
+ va = qdma_dev->vqs[vchan].fle_pool->mz->addr_64;
+ qdma_dev->vqs[vchan].fle_iova2va_offset = va - iova;
if (qdma_dev->is_silent) {
ret = rte_mempool_get_bulk(qdma_dev->vqs[vchan].fle_pool,
diff --git a/drivers/dma/dpaa2/dpaa2_qdma.h b/drivers/dma/dpaa2/dpaa2_qdma.h
index 1a4b611c08..17abdf9260 100644
--- a/drivers/dma/dpaa2/dpaa2_qdma.h
+++ b/drivers/dma/dpaa2/dpaa2_qdma.h
@@ -220,18 +220,18 @@ struct qdma_cntx_fle_sdd {
struct qdma_cntx_sg {
struct qdma_cntx_fle_sdd fle_sdd;
- struct qdma_sg_entry sg_src_entry[RTE_DPAA2_QDMA_JOB_SUBMIT_MAX];
- struct qdma_sg_entry sg_dst_entry[RTE_DPAA2_QDMA_JOB_SUBMIT_MAX];
- uint16_t cntx_idx[RTE_DPAA2_QDMA_JOB_SUBMIT_MAX];
+ struct qdma_sg_entry sg_src_entry[RTE_DPAAX_QDMA_JOB_SUBMIT_MAX];
+ struct qdma_sg_entry sg_dst_entry[RTE_DPAAX_QDMA_JOB_SUBMIT_MAX];
+ uint16_t cntx_idx[RTE_DPAAX_QDMA_JOB_SUBMIT_MAX];
uint16_t job_nb;
uint16_t rsv[3];
} __rte_packed;
#define DPAA2_QDMA_IDXADDR_FROM_SG_FLAG(flag) \
- ((void *)((flag) - ((flag) & RTE_DPAA2_QDMA_SG_IDX_ADDR_MASK)))
+ ((void *)((flag) - ((flag) & RTE_DPAAX_QDMA_SG_IDX_ADDR_MASK)))
#define DPAA2_QDMA_IDX_FROM_FLAG(flag) \
- ((flag) >> RTE_DPAA2_QDMA_COPY_IDX_OFFSET)
+ ((flag) >> RTE_DPAAX_QDMA_COPY_IDX_OFFSET)
/** Represents a DPDMAI device */
struct dpaa2_dpdmai_dev {
diff --git a/drivers/dma/dpaa2/meson.build b/drivers/dma/dpaa2/meson.build
index a99151e2a5..a523f5edb4 100644
--- a/drivers/dma/dpaa2/meson.build
+++ b/drivers/dma/dpaa2/meson.build
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2021 NXP
+# Copyright 2021, 2024 NXP
if not is_linux
build = false
@@ -14,5 +14,3 @@ sources = files('dpaa2_qdma.c')
if cc.has_argument('-Wno-pointer-arith')
cflags += '-Wno-pointer-arith'
endif
-
-headers = files('rte_pmd_dpaa2_qdma.h')
diff --git a/drivers/dma/dpaa2/rte_pmd_dpaa2_qdma.h b/drivers/dma/dpaa2/rte_pmd_dpaa2_qdma.h
deleted file mode 100644
index df21b39cae..0000000000
--- a/drivers/dma/dpaa2/rte_pmd_dpaa2_qdma.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2021-2023 NXP
- */
-
-#ifndef _RTE_PMD_DPAA2_QDMA_H_
-#define _RTE_PMD_DPAA2_QDMA_H_
-
-#include <rte_compat.h>
-
-#define RTE_DPAA2_QDMA_COPY_IDX_OFFSET 8
-#define RTE_DPAA2_QDMA_SG_IDX_ADDR_ALIGN \
- RTE_BIT64(RTE_DPAA2_QDMA_COPY_IDX_OFFSET)
-#define RTE_DPAA2_QDMA_SG_IDX_ADDR_MASK \
- (RTE_DPAA2_QDMA_SG_IDX_ADDR_ALIGN - 1)
-#define RTE_DPAA2_QDMA_SG_SUBMIT(idx_addr, flag) \
- (((uint64_t)idx_addr) | (flag))
-
-#define RTE_DPAA2_QDMA_COPY_SUBMIT(idx, flag) \
- ((idx << RTE_DPAA2_QDMA_COPY_IDX_OFFSET) | (flag))
-
-#define RTE_DPAA2_QDMA_JOB_SUBMIT_MAX (32 + 8)
-#define RTE_DMA_CAPA_DPAA2_QDMA_FLAGS_INDEX RTE_BIT64(63)
-#endif /* _RTE_PMD_DPAA2_QDMA_H_ */
--
2.25.1