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 E406445ADF; Tue, 8 Oct 2024 09:24:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1372940A7F; Tue, 8 Oct 2024 09:23:44 +0200 (CEST) Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010059.outbound.protection.outlook.com [52.101.69.59]) by mails.dpdk.org (Postfix) with ESMTP id 1BD1440669 for ; Tue, 8 Oct 2024 09:23:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qYqiPKYxG1KLOzcVrm75Icg20Mrs8KlDij7HgnPBvDtBP5quHZRvEgzNIl44YMm+qHYLqJXRfI9bwYKzSiD7D3Ut97C9TLw7xFyr3GXy00NI9dXrPNVYLTJ4N7EkrVBPrjBL/OSzJifCRUoWPmt9cKQA6qV2Qvyf+GROnI/1wpXeE7W0ptIYn1sCCSMy5n8YZs8AUUYzXhg1DQXbuJYGIYMCg38tU8Br7TycJS3R+o6UPjx+Pdx6ylWucPx6ty6nQyNJx/tekBzL4ISv1JjtYC2N/x+OTGbUT0Q8RiSE2xPFdYejF8xDrieOZGuYufBg8IhNRWJBpCDV+aclC0pICw== 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=Wnm/1TZGe7wb61D6afEfPT1RQFIPEXP04str38be1IU5Z0pAr8hCq2Lu7v3I1tNvpkaMYDrctOI0614oyBNxPQyOBe/fBm7026xRlfxH0H+vFeZYEWizL0GyT4souEiH6kTTJm2oa+C0AvODS9xxi99WGkXEcm+/Y86w70QIjZ54UjaNpx3svTi8dlAPC1pixJsuFug4oYJ3A9FNsB3gn5O1yFLHTfHmWIt3FeNoxZi72dfZgG9UO8bPJKAz2qWUHTCAOajE4o8Q4XtwEYrpO8uZwyNu0FaVprqkY1sKK6/SfhkeX5nDzfA8oJtZLn9FmxEmy/rDr8RsFUaJGDOvpw== 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=ViD3yabjuznDgukixcZJ02IZepYJksQSR59UlDoJpjYs5Rn9Q0Exe3MciHuFanG54Gm/uQaB25YcSLSZmWgOdawDqaesArBVGmfeFzt7tJfyQor6DH2HfaHRhJrTJ6BCLyNyJHAFLGuot2ntNC6AU+4z2IdrxsjU0Sd74pecBIRjPlLoyDh5cYb38Zn7Wf41FJxpdpRDdboUU8MdXhX4thS1NWckBRCx1FR8jp/69C2wOOxbf6Wfkojy2y5ZrWf+kzwLZuDYrruYVFw5PQPL4sdKEerAf/WxLy40FECX/IAtUaPri6pIEMH0PoqjOgYGguRgH228cgo/iOpCFOPp2Q== 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 DBBPR04MB7593.eurprd04.prod.outlook.com (2603:10a6:10:20c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.22; Tue, 8 Oct 2024 07:23: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 07:23:37 +0000 From: Gagandeep Singh To: dev@dpdk.org, Hemant Agrawal , Sachin Saxena Cc: Jun Yang Subject: [v4 07/15] dma/dpaa2: move the qdma header to common place Date: Tue, 8 Oct 2024 12:52:58 +0530 Message-Id: <20241008072306.1256445-8-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241008072306.1256445-1-g.singh@nxp.com> References: <20240722163930.2171568-2-g.singh@nxp.com> <20241008072306.1256445-1-g.singh@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR06CA0221.apcprd06.prod.outlook.com (2603:1096:4:68::29) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|DBBPR04MB7593:EE_ X-MS-Office365-Filtering-Correlation-Id: 2dbf11a7-09f1-4673-5840-08dce76a2036 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|366016|52116014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?HNpeHdHvNYUwSmGp0GCDX037x038VbC9roLX6OAjYyA/JMl2FYaJH7hhbt1T?= =?us-ascii?Q?+Pwuq2C7rY/YBwXAXiKo7N6WP6VaCs7IboosZPUCoL09jjY4dZkbn/Z8hGzs?= =?us-ascii?Q?g7XGafPXh+teVAZ18sH+b0dxhqMAYjSSITauVhXVQH5v6HuXwNg4PuaEXjsA?= =?us-ascii?Q?iAYx8jIeNdFReugwzfbRElvOqtiuNDUlF5d1z1DuQS/2v7J+e++MCsc3Lrno?= =?us-ascii?Q?juqa5AEaI4G03Xcu2sp6eanVJlyfMnwcWXr7ME3HPKtH0YFOd/OJjadtYuHY?= =?us-ascii?Q?nT0G4zRyfb6XK13DnYg7ylEanDRjiL9B4tomZBjBzo1KbctvhLCutKlTO9AM?= =?us-ascii?Q?elYBKT14U69NqV47rCj35yWm9BhXUnqoFdRZlz0EQyS2l0cumTZjKq5v0W8y?= =?us-ascii?Q?MAO0plm9xsGJhj5BvzJ+c/QILi6WfRNWObh3uNL+mQb5Ey7ocsmcVbHw2lxA?= =?us-ascii?Q?8RCqvjlUp2JrhgatPf2Y5ByAYL3iJFNgh8lZMtloEc+BEJFXzR5hQRrxTxDY?= =?us-ascii?Q?uuVLIset179a6HToKc1SV5OSO1gOoLZQGT43SFM3Lvp5Gs0d1WKyghQ+Pf8p?= =?us-ascii?Q?d2YO0s+zqtXkDzqXc9SKOysEnNSAoCZ+ibM4Zre1wVpIVK+qO6ySUY+eqUbK?= =?us-ascii?Q?hH29Pc11FWQIbMeBM4CckmHVeoynbq9wnolZ2YjozXLwDMI+6eYOPbFj0yMB?= =?us-ascii?Q?Jcw/6bUE8+ilFTFQQOAfLlOJySi626J5R9lNExm7rbC83hHD0vx7149uo2kN?= =?us-ascii?Q?ECHMnkepKsYYeDn9G2LDMatbqn0XFW7RZX8nidA4tZ2ro0pM2LFHW0HmMnnu?= =?us-ascii?Q?jbwGJkHrCowgWTS7nFD9GCtns6kwzYd60SEV7EBo97VYwCK6dhZDoR8cxtIS?= =?us-ascii?Q?wuvcG0kvpskkn3SoxsfbEaQmZ1pLYAM1cvajyOX50oldDZlau+D5BbHRiffi?= =?us-ascii?Q?sZkR6XTw4vazSws8uZcCcnnpSNY9OB6BRqEWXcWwhl3JDHafoTKn2lhc0Ox9?= =?us-ascii?Q?kgUNd+9ElLmXCMOaMumJdIt8AqCyxkrx9ZgtGhlShu4bWt/OL8ifiOy7w9Ja?= =?us-ascii?Q?9b+RE9UPeG0f8JipPwF4Mb43iwOlJGsed44KLG1L+TdMEvGsdb4Da3ooKBc+?= =?us-ascii?Q?Fqy39CPN/7NyOelkjsHnX/aQBmf8BS7Jm7kBa4U1bSgiWFNbIxLNUbDP8nzm?= =?us-ascii?Q?M4h1cV2f74x9o4Pbr6NDb+BqobolBDOwgSNq3ipyYw7AxCwu0JiJVwEf6Sqc?= =?us-ascii?Q?Tdq3LbyF4J6F0WfoI7QwbT8MC076cyDBey0Oub3eCvGVLPmirKzzM+SHkgZ0?= =?us-ascii?Q?+D17kJyyA7GoahskM2aJYRc0IqcZQgD25qhVrGx7CVt2AQ=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)(376014)(366016)(52116014)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xipnAzGOyKFazmMRXODkXmomHBw8Lmc3vcXKvRxyebiL4L+FFvHXYa1Zsmgo?= =?us-ascii?Q?+251iL2yIBqPrKBUYhKqP7nimQNw67iZwkpqyPZvzPxBbmrX/tiGzcVhpvpG?= =?us-ascii?Q?c6jmInm/aFPXPUsC5ayvsPSwDS7PKKqbKy5JENMYKghwtAXiqx0MbYmT8Jl2?= =?us-ascii?Q?ZmkxkTiqbKP/inppqjxp8WQhi03soGENF9eq4j1AOKuJ1S6X1xFUxG5Q5rWo?= =?us-ascii?Q?EmWDhocvbt6d+Uu2KMTtcyuTzJJlBGPyLHDQM703VyB+h+Qocvjdo+Evce/2?= =?us-ascii?Q?nvb/Xu6loXyUeTbTLrcSHWo+TaCYzwKkIHqcr3iwZgD6DdZ/jPVOrM/T/WON?= =?us-ascii?Q?HKlPe847Ba6+1lUYo1gB3Bqrc7rvzPPibGTZftn0pvxTbYrq0+yOXZiPV7qQ?= =?us-ascii?Q?2UcQbkN8yrRQH8vWxM3T5+yVow3U4Q0AhklrXrydt3XTQQF8ea/wir/mfz0K?= =?us-ascii?Q?mvsqsbFfk12I3ZKHZbeGINae77SZtXrtGCM2Do0OQ9spDoqot0vgCPw54hjh?= =?us-ascii?Q?z1XzPLvBtkU38k/mk8kzfWQBOTBXAjnDpX3UyLH1n/zmaWlPPy4p3J4TomdW?= =?us-ascii?Q?WXNId64rCOTatHjMNLh91JybfyRdpbKZY9oWzIJ5tcAAzzc/pouzM1kNmUMn?= =?us-ascii?Q?S+QLxZcwQ9TX0GW7aFMRGAFvIqN8r9vmbptnYlxNOk8ZOHkRZT4UueDchKj0?= =?us-ascii?Q?QkNdNtiH2u4FR3aF2CzqIvHDVnYu7hKaAMkfYGxrwYW47bE22ChvYWmr2hdg?= =?us-ascii?Q?oeAJCiEoQgcxGKMFDbKaZpNI0Cs6VWIc7d5iIly03VeTXPOmvK26viC6ccsL?= =?us-ascii?Q?AVyTNq4xuv8GcrZXhdKprij69uPQcewdbZ9cIKGUmh7g6WAJYygrvclLQA+a?= =?us-ascii?Q?VXrp5uNHrBKAc6JGH4tt6s1Caj6kkFmnk8FvQ3XjauGVsu7mfKbotkaH5NQ6?= =?us-ascii?Q?HDwzLdtDK3FeF9SuzxAMRKpeCc2OEkT24VeY5EKDSQFdqnvqtykDHiwExJKf?= =?us-ascii?Q?kojmrsoPq2VzY9IxCu+n+KaAro4mhmvsIP3WO59maUwMsSu0QRUdVdjjdJEC?= =?us-ascii?Q?ZM6locY53/nZfm/UNPuUiJ0gDiGkbcUBZI5u7O2/eKj/2oydOZyzrwBbr3wb?= =?us-ascii?Q?2MuzipCqy5acBFUQQG2zo9KRMVH2wf/cFhQm62Od4nFExpRL5ovUFUrKe+RK?= =?us-ascii?Q?dUSfXgrvgIhQIDAQBiBa/io0LnWF+O/x6X8qG9SwWesxrTyMPgTIfey/jMJX?= =?us-ascii?Q?4SDLIKLvd50IzdU1bBdqjotiHQgX9O6gFWX6+4nrhYpE6fnh0paye+hN5KdN?= =?us-ascii?Q?nKMWpRcQxv1VBWr+r28cyKtqO1Oajqqr7uf2p13LFftRT28k520qczKqZ3Qn?= =?us-ascii?Q?PKGxq37KMMQTJvEkKtkKAIMxChj7EUPQw8xyWgbOHGNRVhswbYpBO+9DZJeq?= =?us-ascii?Q?4l6NvgrbYWkT+vZ6SSDBMpb1MwW+/WHrWwYK7wzSIpKW8xPtxsscart+NGLF?= =?us-ascii?Q?jjlZiVdyoHoUjGiX20v3bC8cnXb20afE3dISotzuZXZFJECRSWLPy5nMpbCW?= =?us-ascii?Q?4pdSAmmgxIv6J9YmEPs=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2dbf11a7-09f1-4673-5840-08dce76a2036 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2024 07:23:37.6498 (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: n4oW6kdZM0u9uRlFVK280/7eYLiYpXZcHMjzQCu0jkdFnT5gK2uZYZzTRpCx5/2n X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7593 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