From patchwork Mon Jul 22 16:39:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 142631 X-Patchwork-Delegate: thomas@monjalon.net 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 8860245683; Mon, 22 Jul 2024 18:41:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C3DF640E36; Mon, 22 Jul 2024 18:40:12 +0200 (CEST) Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11011052.outbound.protection.outlook.com [52.101.65.52]) by mails.dpdk.org (Postfix) with ESMTP id 16D6940E17 for ; Mon, 22 Jul 2024 18:40:09 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gEirk0gwc2+uHIp/OtxqaNLaOuBAFboawJd2AzYw6xH+GYdcVqEK9EsSPtXICoirPlIghgP9UMcoGW0D7OJhWfOEJEb3bMejRM1zVex+CxNnY6fqYTjZ9+85FgTFSLJ4PaCMZYwbfuOzp6uMaf2oTH9tQgkLxbBH4atKJNSaDHqYhLyHwfOaU+WGal19lXNUZ/cxA+qsXVdX5wUtSfRwGwUUMBsFtKgmrcButyNcn+lm4Bu9EQ4fTVP9/4aNbdqN7qYyljyjyB6FzKY+9HZCulQAsfndv6lTyHaH6eZVBinb8k8vOtLt8kmSokl95cCYCrx4WX9osnQtHKgs6jVRMA== 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=+OQIMAYpdjI5L5WWLJgT4ukoxprozPZgO4Ga1Dv1rjo=; b=GmLKVNa18DZGDuJJsqXUESBex8s9XoruNwWyu1FuJ2fPi8ceAYfJKmG0o34VnStojaVVeQ+oFzakbUGfKN+nFpH/f4m7AfmXlC15QW41FBICmxdrm5wuiF5uiBu2SY8jysW/NrFBjlNZQg1tbsIzkZg0UcGyI6Ag0omoYKXFcxEpxRzvSTnKrkTWKEf6a2hjPWMYnV6Agayt82477fExwKTKrD8KIyTkA5l6KWCYqm1qVzV7NBVfGhsU7lA0RlAx845mfkSp5Jdd9WnaqPfnTu15LfzDFt3pPbC7V1k0RVVPrkTlevarom4Hbj3uo6ySUpb6XYDrc0lZTCJLGC3GbA== 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=+OQIMAYpdjI5L5WWLJgT4ukoxprozPZgO4Ga1Dv1rjo=; b=Vf5yHnImww33fASeJxQh2P5M1MQWiVSr/Dl4DbXhSP5J92+JhQAH9Xvnnk2L0GYEmD+MRi3wCfE6FXkMwT5ThQXNKPCDsIvqCXGfXwZuUdndSxe9gj8rriqvGGfZrSK/YdFUgwvjklsZkHM2lgOiIoZPt858wWFoGeoTMjMpAis= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8SPR01MB0024.eurprd04.prod.outlook.com (2603:10a6:20b:3d0::24) by PA1PR04MB10652.eurprd04.prod.outlook.com (2603:10a6:102:491::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.16; Mon, 22 Jul 2024 16:40:07 +0000 Received: from AS8SPR01MB0024.eurprd04.prod.outlook.com ([fe80::c634:479e:8f8a:a325]) by AS8SPR01MB0024.eurprd04.prod.outlook.com ([fe80::c634:479e:8f8a:a325%7]) with mapi id 15.20.7784.017; Mon, 22 Jul 2024 16:40:07 +0000 From: Gagandeep Singh To: dev@dpdk.org, Hemant Agrawal , Sachin Saxena Cc: Jun Yang Subject: [v3 12/30] dma/dpaa2: move the qdma header to common place Date: Mon, 22 Jul 2024 22:09:12 +0530 Message-Id: <20240722163930.2171568-13-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240722163930.2171568-1-g.singh@nxp.com> References: <20240722115843.1830105-1-g.singh@nxp.com> <20240722163930.2171568-1-g.singh@nxp.com> X-ClientProxiedBy: SG3P274CA0014.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::26) To AS8SPR01MB0024.eurprd04.prod.outlook.com (2603:10a6:20b:3d0::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8SPR01MB0024:EE_|PA1PR04MB10652:EE_ X-MS-Office365-Filtering-Correlation-Id: eeeb0324-21a9-48d8-825d-08dcaa6cf20b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: dRvI43Y1PauAhpNLIG0mlEL7Lbnx8jcCQquaR4+wlHxANxl1UqmdIDTJeTgij87tDSotuuKu20X859E09+jKgUsTMJaHfLSphNRIHQ+aw9gsnbdSHIZV5CFmH0esWCsEhTAeEU5IOndEvDKYmGCaH2mpoRlE0oybx4JNcjd7YtRVD+A5J4B8phsOsXtsvurBppuh1ypTlK3/7jwsykp/DKNLQjmHBCKRpGBsVdCuDk1RvlXDG0fNKtS04jPZyMySGu9QmD+s6JOxZDVZwXwY7oUn5pL77jmn8YQ4pAZ0sp5AhGTFNVZSftf0COxhFIX1DR+0x+0glTXDjbLZWMix7Xjs05ZeSi/0UU2vffZsHzSlP7oRuORP44Sh8iPBwCBh7kFak+MkEYQro8tdRn52W6r2/Ej2+xKrvAxeErS3fl/Cd2uvk+DkXOBZeplx9rzCdlBwDc8qebN/SVIObNaaYTc4LBhWd9uSI1awL2XFDH+bPAmmCLpuonuclhLKu8n7wvjBWADvSYivjdwsxBFVEQDLRYfsGEyCMwJgLfSNLp/aMoiclLeR/u9s2H3ZW20karwvMLEyOQYESUWp97o7LQNrGqcqgOteT/nLQW6VnhhCurmbMU9LlHus1vF9fYb2+6b0gSyhMCB7uFZtre1/I5eZjidiDfT0x3okSJ609o6JkE7jBPJKqKjxNRZx3CwKal2CNyD1QT3peWvTW/irgvqvVmuDhjv1SzzbU9COv4g0XGjCR4fgHxTpU+X2LOBcmLi3h1od9Y4m7WpU68zFECZgFaCF5BzxyhCjlCHSXWZc+MZidTMur1zXMqmqAhDT4ptm/+VLEQNFp+trtTsX97bJumk3IKDAJweifj7WhPiMmDPJaa+xlILrwsMWAmX7oyCameUbyOIo+S7CgUyz1Fkuk3aL6lU/q3oAjr3tX79s3Bdf3wozuHO45f70E+U6IdW8u+KhLoPoI1yRrwX32f8+UjKc9L6b9HBqvSL0A/FcTrvUW31/aXTulErlz1Gs0iGFz8ibKhBKRX+SFsnrWSX2nmKcDuUMjLAi8N31wkB6BH2zCTDpYsIC3IqbyQkPqQPq0OoMqYKsXlrn6TSo3WjM4lau70BPXDydvUAvo4pCe5ZKn0txOGVIJSQAFejpeRootIiU1X39deLGDEiZckXPRvEWkLjG6GfYvHU+c0mx6LhbyrYN5FDrpPMt+DGj2BKgMh7p/4xrB69f9PFUQfez972uYORAM4PdyLSyjcWBO8bFnml2aSNlFU+GCNHcRZsm1AMC9FHVZUTP+ZhNyT1V0MmmIVarnuo0cAdTTkvCqO68JMRMAQ3QsiITEAlrpLhWOfFWr8el7jVdxFFB4KO9NwMyhpzXBPHKk92DpYv22zYExBCZ4YZA+jbYl+RbUhlO7gxxUUknm9nBzVWGuA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8SPR01MB0024.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: y9VIE58bmZajpoYgbEBEttiM/asKy5Vz03ba8tJAAy5xGXin6qIGkQ1ft4PG/CC7zkIJVtXN4N9AOOOeD8aYIzLX1Tkjrber6pO0hlmgXlJ2hMX6BU2mgw9+XnlbL5oin7CiIHUr30xduVXk9zNdaDOo4JyV6XES8bQBMflp8PYpatSgWW9g5F92ISSjYeIJYd7NXyasU+M1mqsqhe8Bn9JyHi0G3PTipGc23NpxPW9Sgki7Pq5F9Xtr1hKrn5K4hzBN7YY4JchkYrtsY4L/KRvJeyGw9VtkTOvLxEq4M/uAcNfi3vSZHFhD8r1sijhCCgS7We774LZ8vDD7dj67W4V7romOtqUFwVGUBUWNDdcrCOChH3FOf0Z/cR+ge+Mnc1AKS1jgHHnLX01nyYzWLRPuRZr7KJfvlgAyZRoCV2IcP1T9RyujUXvf2/y58syzFlz542nhXwIx83NAzBFG424LM0PnVgQu/xIf+YFLCfAg9KSbIPEJ4uc5/LhiuwOcAmI9mnGqqK+lUdab2F7u8CjfF/New0VTABJ5x/3NZaP1GSdh306lKSzG2t2TtzAnEBLGcx9Dgnr9Q2I+BNfuCAIcnEKtvRX+hjXD8eqJWRcRoJyycWq6WW/c9p6Ie3GFt92n6k0kTGAptT6FcOQ/4r8CT0EnKsw6GLrProUkMY5/UdcBKmPaHlgUCWASZmXWVD0QfK0YIAMgK3XwUFb30rhsvZovvA4ugA0xcqAsejpHgjguRbw15WrDWiuyNwJqhZ/JPmu+nV8oZVcbItAW5duiiqugd95OaHYUyNj5xdafmzxSCahQfKqNEYYGkcXAfUT/OKtt1TOeaaWEFQoNHezEPXLu1Vu1uM0vygHtOTiA52Qv/KgiP0ybLGpFsAWcsnOcHcJA5RQiA36Vvztw5TT2eiF7ZUhqw7en3rprUjh3Ou/U5Q0R5pqqxln5X05ovHk3fJsAdbyGEBMPClRt2jc8hy9XxcWzuVz+1+p/oXD4GNo/vr/hyE7O+NFfiJwrdT+wHIB6wA20mCa5et7h5POnCjZoD04NddjT2ehQ2QsNnYVZ07NYrk+rVjqzVh6dkXjRMg9xd9v2twgUHExHrQxR67MBoJDcNVJTs1GI2I+u6XW4tzkDVmXsDO2TcIuy4jwwLP21IrPN1/7IEzL1zjb1HrbP23bjuo7xAV0H4BPpKc+sYwOTliHr/iJMRh+ZiwOJn8Xp1EZNebGdWZlvhWNeUWvB/hrEW8duLQZ6gEOk90NivUYXcKjrGZTi6KXpOFeVD8IvycplKdR2K3yXpV3z820mxB2ncJoID3da78ai+X6zZFEe7AP51DGIGbfzkr2P96J1C8al14LQiWfmux4M6gU7PlxbTilcQZvL1/V9jk+Ki9HXLJR1WmCsp4XSXjZvNrwAL5Y/JFUU95jl078lzDBowSgg4yewzV6Y2fj+6zfMb/TZSdP+1P/Pm33XkhLLayoDAvFXzYVsGRfKKYVHU/ZJyyJ3Z9WMs08TI1QFXvfnZwIUQvo08qSre9nZOgT9f5Q0Ml6X17qyx46tkj/5lALrDwxmIyHhChv6nua8UIGSsZNxUd3AT8alzao3 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: eeeb0324-21a9-48d8-825d-08dcaa6cf20b X-MS-Exchange-CrossTenant-AuthSource: AS8SPR01MB0024.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2024 16:40:07.6946 (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: iFuOvzvZC0LwYWkQ6fmlCoyOiYex0LpgH9wQ0NVxl7STQuQrzzROETr/CtYZvge+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA1PR04MB10652 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 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 + +#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 b70750fede..19d8af9416 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" @@ -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 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_ */