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 2398045ADE; Tue, 8 Oct 2024 12:59:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E5FDC40E42; Tue, 8 Oct 2024 12:58:42 +0200 (CEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2047.outbound.protection.outlook.com [40.107.104.47]) by mails.dpdk.org (Postfix) with ESMTP id 1512740B97 for ; Tue, 8 Oct 2024 12:58:41 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pcdf4u1+qoTPJlQTuNj2mME/8LUfbCl1HOTa6iceUSMk4jEtW+CBnFz/An5hhz+LVOntzsaAXM8w7qNwMJ8iCeJMnPM40lE6adkDlsnZUhn8kEC6GQtADPBpBsA5/s9ZmR6d0L5Sv3gO0optKrP+wmwqt9YIgbxwIGep58DNFNFzsviA7zT4MdztpsUKxBmbwnupXm7Lg0ED1E9PPRsz8HpgW4jy45/t1h7u8XcTvouTGKgoIezcBy9dX5rnJF6h+fsWYL6BkTxhppaXbVCC5KgrkQ0jefqVpUMgX7eGLPfTqOXAh8R382MmRb8ECSfv+wNroe9aLdZJoGx+bYoYTg== 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=McAXAKSDR4z9KTfPXQrLFgWT0QSF6RLVZW1ZdttEPOc=; b=MjCe87lT2nxPPrSNwCvGEkSqs5uX5yfgoMFFYsjJNPhEx8WOv8YHvUPs59vxAVvg/JGiJ6ng5nop+CGm52c7VysKjWahz6LphIAHS/v9RTKr3YpTwkonNg9HU/swHk7rv9YdXnzMTzC88HY0K0rVpfSSB0jf9C60Mu682Dw+djvAT6LzzZDA4fUx9VeCeVyUbPvGcLO0WyorRQk5xOAlBnBA7GmB3k0OuJeTPIC25e9+hTVGmGMzpIpqwzaVfRMG7YbStlk+RobryzKJOsVRxXaIhZK8+leic1PGxJRZ6Z8rgEQzsXPiMhiuGRg98RGDjGWC4AqUPeavFCvQpytzeQ== 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=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=McAXAKSDR4z9KTfPXQrLFgWT0QSF6RLVZW1ZdttEPOc=; b=H+rMj/+8UvVVayoUKDqzqH5FBBmB/ZC8Mo2DFOp7aEVqJyJDUPj1XjRh2+xgBdeobMcJciwl43Hqwbm4jrCQnhp2mbwJpJ0THVeLVZAn9ESWjRka7ttyBd+FQfzHm5L0qqvFQIq9FxLbeYvMH4/oFR1Enw6jf8lIMBYCwAAEhUq9Yb/9FJ06OxQMsv6Leow1q2I+ePfrTqE8cG1T2/i9P2Oq6urqfLVzo7Wy1IjAoFu69qlI+RUcs2hstwwKq8lOruQAbFCT/5HbYml/zuKSy0kPcygyg5YMtxfrsJAd4anvSKwrHlizPm/GUjnhUcwdgt8TDIYCJgb5X9vm7dbxWA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by AM0PR04MB6932.eurprd04.prod.outlook.com (2603:10a6:208:182::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.23; Tue, 8 Oct 2024 10:58:37 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::2e32:1a4a:7d29:195]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::2e32:1a4a:7d29:195%4]) with mapi id 15.20.8026.020; Tue, 8 Oct 2024 10:58:37 +0000 From: Gagandeep Singh To: dev@dpdk.org, Hemant Agrawal , Sachin Saxena Cc: Jun Yang Subject: [v5 07/15] dma/dpaa2: move the qdma header to common place Date: Tue, 8 Oct 2024 16:28:02 +0530 Message-Id: <20241008105810.1454133-8-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241008105810.1454133-1-g.singh@nxp.com> References: <20241008072306.1256445-2-g.singh@nxp.com> <20241008105810.1454133-1-g.singh@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR03CA0123.apcprd03.prod.outlook.com (2603:1096:4:91::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|AM0PR04MB6932:EE_ X-MS-Office365-Filtering-Correlation-Id: fdcb1915-fd0a-494e-3ee8-08dce7882921 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?6VsnCk7ufqoenDVgJzC1idsXvqXECOd4VdHGCcZcyJiGRG3EGxG3WWhj7fb7?= =?us-ascii?Q?fY5XmCKxmq2ZP1voYJXVJb+/ZXSmadBqUf0ormtLE3CRDNLbUcdZjM3VymAt?= =?us-ascii?Q?q7FQvviR0RgzXc+VYkAH0O9lXJldYFwAnkPMdd5uZ569it1cEOAbCeaCHPyW?= =?us-ascii?Q?HehGXZR+FEjom4QNjoFvpCuxIwsBuW1HvHVSRhkh2b9+QTqy1bPhM9dKsFHG?= =?us-ascii?Q?BEQXv3SFjqgslK3QUbsWPZiSbwPojlxXKvKaQnasAmdDNjI7jK2f1uW28pin?= =?us-ascii?Q?SNLgq1tiZxUt5EJO0SZlPBBpnxlWzEBirGXyxSi35JHWF27NlxkkPNFNrHY9?= =?us-ascii?Q?7CkhsOoT4gWjUO01YcQM/WD6a4qi7qgpgouTgtiIDRb1025qsgx4DtxIEYTj?= =?us-ascii?Q?IisaqOU8fDNvE7LN6XTL5GnqUzwKTj2dP9szdiShXUD0/5hp+w3vEuorz/XI?= =?us-ascii?Q?LagExDSZH/qrxcGHgm0ZvEtTo0yjlHzbpdB/f7THTx/DsFMgDhpC6rrET7pH?= =?us-ascii?Q?zk91mf3o7LTVMQxnF/pf2Vx1OwHpGtBHykUTu7AlEHcGHXqjC5K2bKFUidxG?= =?us-ascii?Q?aNqGD3TP5DX7Zc62Rx1EG5vOGqO4rQuaoJ+5QmDGg0vcgeX/IUvajY7OcIQH?= =?us-ascii?Q?fOnYKTYYpPHRRhRepDc+BFBM3llv1C6VPEYcXM0HM6o1HaM7buQjToApPzY7?= =?us-ascii?Q?oI6rC0GX96gp5PWd8Ut6IS2H8Ikp4J38gnqmSoNZEWoV4mkY34TQC/9wKZCD?= =?us-ascii?Q?jwxOTWyDn1OqW6lLb8nv87fEognSoM8bzVSzvPo+QdMbtrEm9qtlBJ+Z7DNv?= =?us-ascii?Q?9kFedRrHdiBS8QbHURrYMNQZLMfd2XNJ1gaIW/CpjROxY8TsHhgJrRO+4UKH?= =?us-ascii?Q?1NdajAAQmpUhytK3zKPrJIGKQdozngGWzCUxdvzA3GFCtp84y6sgCI3aBoml?= =?us-ascii?Q?/q2OgUVJ/PCEic1N2xVcs93eVzssOz93xaDn/NLOqoaUAbcSIcRyTrDmHpnj?= =?us-ascii?Q?QN3bjOaNGeX6K3f1PEWp1+A8w2WDPrPlhpSGvzt7fBMv0oixtZBxyP4nkVJb?= =?us-ascii?Q?+kQKxmfxdG06RPzjPpITTdcivUZOmsG+VhdUHNlHu1JSTEuPPB/n9sKrQo3N?= =?us-ascii?Q?wN4+odDMv2GVveKAjPbxyc8DQj1LhShXY++c2A04OwtKp0wuk1Wu2kmoDtnG?= =?us-ascii?Q?Ovbptmee1Oua4NoRVZvgmcy7rKC2WqNC89xh+7q6HsVYECUhCioeOIgizrIF?= =?us-ascii?Q?XYDup1DjseipD0GOJ/ceszOYek4vEYrEs8yGwBrk+T03LfZvEXN9LKUkDm6g?= =?us-ascii?Q?GSmhdqGxF1B2i9463HhhuELxVY390EAg7Phi8HF6udwosA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0VjsoFAzqmc8ciUnNVQig+S/jziaI8ARbSejElb8Pa9ESS8FmbA4aHuInLYO?= =?us-ascii?Q?n/w/UGq4CF9MzCaK1hZfsGWiIkIHDkg2eZhEi0IEy+mWm+6Yak8e8EdFX6Lk?= =?us-ascii?Q?A0ozsQ8s7cTCsNBpTf3r/X+3A4SrihM+dQPs3ffcSlwhXlPayn/P6yTtQtbr?= =?us-ascii?Q?dZRrCf2T+hCPk/idw+ygHUkFUMb/KQ4+9zogUnD9XwLtdvj7RBJu3zhB4EP1?= =?us-ascii?Q?K1zjG9TkRdyCneP/M4G/mmYotsFb/3XYnYbYiySxE7ZCMN5h4kKCYmuDi5r4?= =?us-ascii?Q?QHExmm+aj2oStEMW02Hz21UOM5SBZX+lcRPcKRZvDkIXor5UcRq4up1jSNvu?= =?us-ascii?Q?//LW3M0GNftiaVBuGld15LNPUz7AOFZoO8jrST30QT0yfaZ25qw58seTFThp?= =?us-ascii?Q?4v7dji4Tn+2w1Yf7mD8JBKPHAgSFh0fA0ewrqXm2hqtZN6M1YdwLrljME6dz?= =?us-ascii?Q?wT5HaUJ2ZmyfcnSFWA2eDQ/9ztYyeNYFUfIzPvplysIeLS84Qe2+5h33I+Xo?= =?us-ascii?Q?IHtf4GfIZs+l3B5EdzlXSwpwI3Jyw1CX6qHlKKCEFI4HBy8BIu7m/9bwqO53?= =?us-ascii?Q?Jbn8gL+XM8nkyxPrhhe1GuP6N/8X712+ogA/Gan5n9dVTJt63WK11+bjURt+?= =?us-ascii?Q?eLo59XkWTTDPZFokFaGhK1sNFeF94/E6/3GIvG61hAYhjYgQevRxkS997O67?= =?us-ascii?Q?xf/bMJ/SB6etwRKq+7ssPI/NceOUQniyfp/PndTxDu2mKKyQ6s5YuveoDS9n?= =?us-ascii?Q?EJ6DTR4ZtkenzdVVO08VBfaySmwkiDJI0lDbCpu7XuNW9sehjKbyiwt84iqA?= =?us-ascii?Q?GMp8fOSORv1tlpmYQsxoszYDLKEWkhKo4fosf+0jNxs5hZACtdTIt0qRovCO?= =?us-ascii?Q?qQvtN8BXXVbrE+pih8vfHcgZueoS0RgV1BTfMf2MHHGt1Zgnby6U9pKFyMcY?= =?us-ascii?Q?l2z+MHvl6Ci1fHjqQJuTmtQKYsNxdQ5JF993ElMGOhdzbA9XuYEqPDDRU1dp?= =?us-ascii?Q?GSk4+d/4VpouARAEa0qiuwDXDBdheLUM3R18nS3aGMBh7oAW1OBP2SvAYv6R?= =?us-ascii?Q?lRL0bgqdjKM+qSWYC88+T/ws52ZMgZP/JyvbUh8Rm7pnNhseo5Zbw6kpnQbB?= =?us-ascii?Q?YcgmrGcy5ZmMiaqfnOuWA4YpxIh+5n1XIg7JO+LaO2fQbStNK0/5/StG5oKR?= =?us-ascii?Q?9nt9hQ/tE5oTaja3JWrTiOjh5ebnR3ppzinFVjuBq5grHu3sa3J5piBZy6Ke?= =?us-ascii?Q?lqctD9lZ0+Hrv/83Dz+1HmuA7ULL2MNIqOoS7OHHKscQCYscdtrkkKqIqPJm?= =?us-ascii?Q?jlRXcTu7tVBGazZygNBTCRxbHo5NdxUUDTdXWizRWVs/3MtW2k42DoXUnxo/?= =?us-ascii?Q?dtCmXBVUkCqDJO/vua3frQyswGMReJz0MPyj1k6elP/KNMGV3bO+MOUDwWgr?= =?us-ascii?Q?eaYGc7LEqxEosUd22zHMFiBGfzUW/UFIJXt05uPEHSEUCD+DTDbQVMVBKSTX?= =?us-ascii?Q?wu7y3m0nsl5juhzV0FliyNw1CaPX1GEmpdqOaKq2/yk3ZuUZ9Gn10VHX8v4T?= =?us-ascii?Q?oQLYM+ykQD1+eVxG4Rc=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: fdcb1915-fd0a-494e-3ee8-08dce7882921 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2024 10:58:37.4730 (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: NF5OdPlkuuvMKoKV+6w3g+/q3gjqnsucPSJ4M/26/fbUusZ+t7CiBVYdFeyflwg8 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6932 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 From: Jun Yang Include rte_pmd_dpaax_qdma.h instead of rte_pmd_dpaa2_qdma.h and change code accordingly. Signed-off-by: Jun Yang --- 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 f9f0300126..5a4411eb4a 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 + +#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 180ffb3468..c36cf6cbe6 100644 --- a/drivers/dma/dpaa2/dpaa2_qdma.c +++ b/drivers/dma/dpaa2/dpaa2_qdma.c @@ -10,7 +10,7 @@ #include -#include "rte_pmd_dpaa2_qdma.h" +#include #include "dpaa2_qdma.h" #include "dpaa2_qdma_logs.h" @@ -251,16 +251,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 */ @@ -274,23 +274,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 } } @@ -389,21 +387,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)) { @@ -483,17 +479,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); @@ -599,7 +594,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; @@ -649,9 +644,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; } @@ -670,11 +665,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 + @@ -706,8 +697,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, @@ -1050,7 +1040,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( @@ -1085,7 +1075,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 @@ -1117,7 +1107,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++; @@ -1170,11 +1160,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; @@ -1355,6 +1345,7 @@ dpaa2_qdma_vchan_setup(struct rte_dma_dev *dev, uint16_t vchan, uint32_t pool_size; char pool_name[64]; int ret; + uint64_t iova, va; DPAA2_QDMA_FUNC_TRACE(); @@ -1390,6 +1381,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 250c83c83c..0fd1debaf8 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 *)(uintptr_t)((flag) - ((flag) & RTE_DPAA2_QDMA_SG_IDX_ADDR_MASK))) + ((void *)(uintptr_t)((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 - -#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