From nobody Sat Nov 15 05:21:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1755876025; cv=pass; d=zohomail.com; s=zohoarc; b=Gj2KtgrBgRSi90AL2lWbh8hDiWttTNeRo5TS4qguT+lYzSqA13OnpLvlaCX5/ev2wxQ72DSJOH1aKjeB1K9HKgq0brHyiaZ4MG2qFXuXh5uetRjoRAf5JZXWKm0aFJhOonCZPzmrQgB/6d3FEL24sPuGtEncjHuQlL1rW8VETuc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755876025; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4yTn+aKb/vVefKqED7Edq3BaNdJiibEsvCoq4eg0nXM=; b=a4funYqS7NIdP2pOkC8M4bF3kcr57dlXHHhALaR9unXbT8sssC1F8hzOZ95UrVwnrpQYGGpxljN4E22gQlGlN2NWtdQtuypZkIJBkm1gCF2bkhXBXHFxoGnVQFXtaPMrikC/qbyBQNqAN3tpQ7lxLotv+27UnWzyEFLjJ0mbr70= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1755876025703364.2396216264558; Fri, 22 Aug 2025 08:20:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1upTVe-0007a7-NM; Fri, 22 Aug 2025 11:16:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1upTVc-0007Ze-QN; Fri, 22 Aug 2025 11:16:52 -0400 Received: from mail-co1nam11on20608.outbound.protection.outlook.com ([2a01:111:f403:2416::608] helo=NAM11-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1upTVX-00077b-Iz; Fri, 22 Aug 2025 11:16:52 -0400 Received: from BY1P220CA0002.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:59d::6) by SN7PR12MB6816.namprd12.prod.outlook.com (2603:10b6:806:264::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.24; Fri, 22 Aug 2025 15:16:40 +0000 Received: from SJ1PEPF0000231E.namprd03.prod.outlook.com (2603:10b6:a03:59d:cafe::c7) by BY1P220CA0002.outlook.office365.com (2603:10b6:a03:59d::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.19 via Frontend Transport; Fri, 22 Aug 2025 15:16:39 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by SJ1PEPF0000231E.mail.protection.outlook.com (10.167.242.230) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Fri, 22 Aug 2025 15:16:39 +0000 Received: from satlexmb10.amd.com (10.181.42.219) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 22 Aug 2025 10:16:38 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by satlexmb10.amd.com (10.181.42.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1748.10; Fri, 22 Aug 2025 08:16:38 -0700 Received: from XFR-LUMICHEL-L2.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Fri, 22 Aug 2025 10:16:36 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=giF46/g4IvZ3d7XgIFM8XqpWj6gK9Ab1FEUC0TRfRjwIh7C/ywUCq1PyWiCzYmjAFoK1prt2xTgVSMdQ58PBN8vbqXcvt4o6Aa1umTsBZlXw78CZxYHnsVgXxviYVWsMbYXxLDAYcRfM2K3NJNeEii8qZutNFgNGwRKprQHsd7bWEdfz8vav2jjRxYhkI6eYc39hCFKxIrK0Np44bsl57qYdONPKxlEhBWoc6RSIGckYWHwb84mWpPktosCm4xqFqZLBjm3bANx9442mVODlYsgMlCdm6AmpD/uwyRcBjHV9z+ZAxqyfYR7c5FwAEYztd6e/EABomYQkUWGZczM29A== 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=4yTn+aKb/vVefKqED7Edq3BaNdJiibEsvCoq4eg0nXM=; b=HVhAAOBxxGFf1p1QXXX21XW92DdxbNkimlTR077I34G92M9o1fw12yiyfjIGs25jXoQlroRK/GNMnNymjodlGPodgP01pfQsCNBLItFE81HrG+/rYHk3yT/ydmjFCl+K1N6gjYKpHA+vnZV547ABKGxIqquDoYxCFNbdxt/V4K8R2eetLAFua4yggnJQssq06BkKLr2uE9F3qScbK5P3F0MC6KT5UxpTwrwo4zv/KJzMW90oEeqeT+n811XnZEJXvrqf5Gs/pqNnmxv9AtuHuv5i4Mb87h6E+84tw4TFP+vDsdo8A/pqA57IoZeqOOIm2i2l9Hd6APVWv3cTfNxjYg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4yTn+aKb/vVefKqED7Edq3BaNdJiibEsvCoq4eg0nXM=; b=0VcS+fvNxYhGRHdkkVXzGZpkXUat1K99WBy3h5t/dzDmcB/yDzchDnOJ9qzWwbqNIoA3hVV24bDJHCSsNY4blqzE+L10pe9y3F4qIzqVO3tgR4eQkN3GP6lBkVeQIbhWtGhMwaz0AolWh/5KziYDilyuH99+fVNPCdgM73lL2I0= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Luc Michel To: , CC: Luc Michel , Peter Maydell , Francisco Iglesias , "Edgar E . Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , "Frederic Konrad" , Sai Pavan Boddu Subject: [PATCH v4 07/47] hw/arm/xlnx-versal: adma: refactor creation Date: Fri, 22 Aug 2025 17:15:32 +0200 Message-ID: <20250822151614.187856-8-luc.michel@amd.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250822151614.187856-1-luc.michel@amd.com> References: <20250822151614.187856-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF0000231E:EE_|SN7PR12MB6816:EE_ X-MS-Office365-Filtering-Correlation-Id: b07b5615-809b-4bf0-d68c-08dde18ee4cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?oEu5mli5S9yi9H/7FLgc+OV0l6f6i1bsWoZPM/1Gl5synkVGSJY6LPUMzmxK?= =?us-ascii?Q?yVtydBoPPBUoOZpk4sm9DhrkoUfso2GBWA1wzjAnYYrGVw1JEkZ2A/SpQLaN?= =?us-ascii?Q?70gTo+q7EJOrKSY+JHFSdxK0FJ69tChVrFJLEi9kFZbPfXy5iv5FQet0jlnl?= =?us-ascii?Q?C3mHLRRFZtBVtzfimMk0nxFzej7KJSNfd+wh4PwRIXtZe55C0u5irFnXmPXD?= =?us-ascii?Q?s3PEwSXuTT08LMjHT8pIeP0uXdDwnQ0Tqwznqunst5U/PGMVRVLiayTS0UoE?= =?us-ascii?Q?o5y4kKFYT62lTDCz+acZkulPDpO82XbNTtqhXUnnF9cEdSea1SLAjTdhn0O6?= =?us-ascii?Q?Yx0xowEpRZ7l4cGZISPFWjPbUZ43wcr6LSZIFlwvpJBZCQSvcjrhsJmitIz1?= =?us-ascii?Q?vUpasOR9P9wwC9CE81A//Se7CV2ge8RHPcps422JMXUHttpxyYEvB5vZz63W?= =?us-ascii?Q?R/EVBiJ/SC4QrXGfJNMQMk1pAsXih98cLoZtEVHK1sCl3yj/PNP5cwH+ZAph?= =?us-ascii?Q?ahOKFI+dN9tCU2ZCmzKJixIn5NlwTri5aW6EIydJUzeFghm+Nx+zh1g7dpsV?= =?us-ascii?Q?KSsdjuHzE12O7cQ5oyqBz9B9F8gK7pzSEDncMIWs3T51plRQXlmCDSD4z7ce?= =?us-ascii?Q?O8BhdWI8m091vgWz7iUPT4HIKgwnoHjHsjwaECtHOPkAb9BnGup7pZBz3Uz2?= =?us-ascii?Q?Kr5IxSa4jMDAupgKfMdpd3bXYBPmmZJnCPkqpUj+RlJ/eSPELUUYTJhejt9f?= =?us-ascii?Q?6Zng1msUnyY9j7VREbJ238Ovjhc3D0sf7kWDoYKvmMiy4FgFlErTN/qJvfxY?= =?us-ascii?Q?sBRl3D29xsAvnYMrx+KbW54SX9uGMXucObyp8jyzmOVfDYIizQyf771qX6Ki?= =?us-ascii?Q?E2l0I1dmarY8inB+n+9yYl1cOfIks9P/7nJNcbkpajFFSuTp46USTOzjg/WI?= =?us-ascii?Q?i8n97R6ak+Ro71aJOKCXRw8hEpP1BMigIg5N6NvOjcdtKdSKLwvlfuuo/dOS?= =?us-ascii?Q?dRdpEd5Npg9FJJXpwscuHa7urjf9AYMOsbvnkLo5XMj9nCQD3sisD7DKD33k?= =?us-ascii?Q?enmNbG3AxDm3V/j25nEeDM5XnzS11ekhXiVtAAi6sW+sNA6labOO/63iAs02?= =?us-ascii?Q?wLn9canCMLvspWIeS/LtGYZoAOyqiyxrztLsVOPEaazcXjbNbCWz8Y8YTokU?= =?us-ascii?Q?gXIgsyOCWx3+hMW5MBpYpqHQzw/7WXL9JmuqpoT+bWq8qXcNuKno+e80tuwK?= =?us-ascii?Q?RHiM13+Ft1MjkPiOq2iUDfK3wOXix8+P2yMZc41yKSbFlzeiOKhDpIscOoKa?= =?us-ascii?Q?5XPxZtKJ1O0uuAjYrnRRsMI26vyU4N+SNOn7d16YwIK6AB12YbSD7tAEVRi0?= =?us-ascii?Q?77yYljn61BTubL5N/4TF8vNxHNf58i6niqOR1imeRvAPiUemCk5MAe9MEjPf?= =?us-ascii?Q?/lj+jK3Jh/nwEk0oosWgnBbvZfCThgzwmPJDbpBjzI/XBQhAtjGMk9Fep/q3?= =?us-ascii?Q?f4jpRfetKdlMNsc9VIyAPoU07vrKDNvOG8Q3?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2025 15:16:39.5373 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b07b5615-809b-4bf0-d68c-08dde18ee4cc X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF0000231E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6816 Received-SPF: permerror client-ip=2a01:111:f403:2416::608; envelope-from=Luc.Michel@amd.com; helo=NAM11-CO1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1755876027940124100 Content-Type: text/plain; charset="utf-8" Refactor the ADMA creation using the VersalMap structure. Note that the connection to the CRL is removed for now and will be re-added by next commits. Signed-off-by: Luc Michel Reviewed-by: Francisco Iglesias --- include/hw/arm/xlnx-versal.h | 2 - hw/arm/xlnx-versal-virt.c | 28 -------------- hw/arm/xlnx-versal.c | 72 ++++++++++++++++++++++++------------ 3 files changed, 48 insertions(+), 54 deletions(-) diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index 1fcc2b623da..4eeea98ff34 100644 --- a/include/hw/arm/xlnx-versal.h +++ b/include/hw/arm/xlnx-versal.h @@ -15,11 +15,10 @@ =20 #include "hw/sysbus.h" #include "hw/cpu/cluster.h" #include "hw/or-irq.h" #include "hw/intc/arm_gicv3.h" -#include "hw/dma/xlnx-zdma.h" #include "hw/rtc/xlnx-zynqmp-rtc.h" #include "qom/object.h" #include "hw/usb/xlnx-usb-subsystem.h" #include "hw/misc/xlnx-versal-xramc.h" #include "hw/nvram/xlnx-bbram.h" @@ -75,11 +74,10 @@ struct Versal { =20 struct { MemoryRegion mr_ocm; =20 struct { - XlnxZDMA adma[XLNX_VERSAL_NR_ADMAS]; VersalUsb2 usb; } iou; =20 /* Real-time Processing Unit. */ struct { diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index 0634cc90eac..418e4c6e983 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -202,37 +202,10 @@ static void fdt_add_usb_xhci_nodes(VersalVirt *s) qemu_fdt_setprop_cell(s->fdt, name, "phandle", s->phandle.dwc); qemu_fdt_setprop_string(s->fdt, name, "maximum-speed", "high-speed"); g_free(name); } =20 -static void fdt_add_zdma_nodes(VersalVirt *s) -{ - const char clocknames[] =3D "clk_main\0clk_apb"; - const char compat[] =3D "xlnx,zynqmp-dma-1.0"; - int i; - - for (i =3D XLNX_VERSAL_NR_ADMAS - 1; i >=3D 0; i--) { - uint64_t addr =3D MM_ADMA_CH0 + MM_ADMA_CH0_SIZE * i; - char *name =3D g_strdup_printf("/dma@%" PRIx64, addr); - - qemu_fdt_add_subnode(s->fdt, name); - - qemu_fdt_setprop_cell(s->fdt, name, "xlnx,bus-width", 64); - qemu_fdt_setprop_cells(s->fdt, name, "clocks", - s->phandle.clk_25Mhz, s->phandle.clk_25Mhz); - qemu_fdt_setprop(s->fdt, name, "clock-names", - clocknames, sizeof(clocknames)); - qemu_fdt_setprop_cells(s->fdt, name, "interrupts", - GIC_FDT_IRQ_TYPE_SPI, VERSAL_ADMA_IRQ_0 + i, - GIC_FDT_IRQ_FLAGS_LEVEL_HI); - qemu_fdt_setprop_sized_cells(s->fdt, name, "reg", - 2, addr, 2, 0x1000); - qemu_fdt_setprop(s->fdt, name, "compatible", compat, sizeof(compat= )); - g_free(name); - } -} - static void fdt_add_rtc_node(VersalVirt *s) { const char compat[] =3D "xlnx,zynqmp-rtc"; const char interrupt_names[] =3D "alarm\0sec"; char *name =3D g_strdup_printf("/rtc@%x", MM_PMC_RTC); @@ -559,11 +532,10 @@ static void versal_virt_init(MachineState *machine) sysbus_realize(SYS_BUS_DEVICE(&s->soc), &error_fatal); create_virtio_regions(s); =20 fdt_add_gic_nodes(s); fdt_add_timer_nodes(s); - fdt_add_zdma_nodes(s); fdt_add_usb_xhci_nodes(s); fdt_add_rtc_node(s); fdt_add_bbram_node(s); fdt_add_efuse_ctrl_node(s); fdt_add_efuse_cache_node(s); diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index ad4bd766448..0ce9703cbaa 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -28,10 +28,11 @@ #include "hw/arm/fdt.h" #include "hw/char/pl011.h" #include "hw/net/xlnx-versal-canfd.h" #include "hw/sd/sdhci.h" #include "hw/net/cadence_gem.h" +#include "hw/dma/xlnx-zdma.h" =20 #define XLNX_VERSAL_ACPU_TYPE ARM_CPU_TYPE_NAME("cortex-a72") #define XLNX_VERSAL_RCPU_TYPE ARM_CPU_TYPE_NAME("cortex-r5f") #define GEM_REVISION 0x40070106 =20 @@ -58,10 +59,20 @@ typedef struct VersalMap { size_t num_prio_queue; const char *phy_mode; const uint32_t speed; } gem[3]; size_t num_gem; + + struct VersalZDMAMap { + const char *name; + VersalSimplePeriphMap map; + size_t num_chan; + uint64_t chan_stride; + int irq_stride; + } zdma[2]; + size_t num_zdma; + } VersalMap; =20 static const VersalMap VERSAL_MAP =3D { .uart[0] =3D { 0xff000000, 18 }, .uart[1] =3D { 0xff010000, 19 }, @@ -76,10 +87,13 @@ static const VersalMap VERSAL_MAP =3D { .num_sdhci =3D 2, =20 .gem[0] =3D { { 0xff0c0000, 56 }, 2, "rgmii-id", 1000 }, .gem[1] =3D { { 0xff0d0000, 58 }, 2, "rgmii-id", 1000 }, .num_gem =3D 2, + + .zdma[0] =3D { "adma", { 0xffa80000, 60 }, 8, 0x10000, 1 }, + .num_zdma =3D 1, }; =20 static const VersalMap *VERSION_TO_MAP[] =3D { [VERSAL_VER_VERSAL] =3D &VERSAL_MAP, }; @@ -490,34 +504,49 @@ static void versal_create_gem_fdt(Versal *s, } qemu_fdt_setprop(s->cfg.fdt, node, "interrupts", irq_prop, sizeof(uint32_t) * map->num_prio_queue * 3); } =20 - -static void versal_create_admas(Versal *s, qemu_irq *pic) +static void versal_create_zdma(Versal *s, + const struct VersalZDMAMap *map) { - int i; + DeviceState *dev; + MemoryRegion *mr; + g_autofree char *name; + const char compatible[] =3D "xlnx,zynqmp-dma-1.0"; + const char clocknames[] =3D "clk_main\0clk_apb"; + size_t i; =20 - for (i =3D 0; i < ARRAY_SIZE(s->lpd.iou.adma); i++) { - char *name =3D g_strdup_printf("adma%d", i); - DeviceState *dev; - MemoryRegion *mr; + name =3D g_strdup_printf("%s[*]", map->name); =20 - object_initialize_child(OBJECT(s), name, &s->lpd.iou.adma[i], - TYPE_XLNX_ZDMA); - dev =3D DEVICE(&s->lpd.iou.adma[i]); + for (i =3D 0; i < map->num_chan; i++) { + uint64_t addr =3D map->map.addr + map->chan_stride * i; + int irq =3D map->map.irq + map->irq_stride * i; + g_autofree char *node; + + dev =3D qdev_new(TYPE_XLNX_ZDMA); + object_property_add_child(OBJECT(s), name, OBJECT(dev)); object_property_set_int(OBJECT(dev), "bus-width", 128, &error_abor= t); object_property_set_link(OBJECT(dev), "dma", OBJECT(get_system_memory()), &error_fatal= ); - sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); =20 mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); - memory_region_add_subregion(&s->mr_ps, - MM_ADMA_CH0 + i * MM_ADMA_CH0_SIZE, mr= ); + memory_region_add_subregion(&s->mr_ps, addr, mr); =20 - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[VERSAL_ADMA_IRQ_0 += i]); - g_free(name); + versal_sysbus_connect_irq(s, SYS_BUS_DEVICE(dev), 0, irq); + + node =3D versal_fdt_add_simple_subnode(s, "/dma", addr, 0x1000, + compatible, sizeof(compatible= )); + qemu_fdt_setprop_cell(s->cfg.fdt, node, "xlnx,bus-width", 64); + qemu_fdt_setprop_cells(s->cfg.fdt, node, "clocks", + s->phandle.clk_25mhz, s->phandle.clk_25mhz); + qemu_fdt_setprop(s->cfg.fdt, node, "clock-names", + clocknames, sizeof(clocknames)); + qemu_fdt_setprop_cells(s->cfg.fdt, node, "interrupts", + GIC_FDT_IRQ_TYPE_SPI, irq, + GIC_FDT_IRQ_FLAGS_LEVEL_HI); } } =20 #define SDHCI_CAPABILITIES 0x280737ec6481 /* Same as on ZynqMP. */ static void versal_create_sdhci(Versal *s, @@ -976,18 +1005,10 @@ static void versal_create_crl(Versal *s, qemu_irq *p= ic) object_property_set_link(OBJECT(&s->lpd.crl), name, OBJECT(&s->lpd.rpu.cpu[i]), &error_abort); } =20 - for (i =3D 0; i < ARRAY_SIZE(s->lpd.iou.adma); i++) { - g_autofree gchar *name =3D g_strdup_printf("adma[%d]", i); - - object_property_set_link(OBJECT(&s->lpd.crl), - name, OBJECT(&s->lpd.iou.adma[i]), - &error_abort); - } - object_property_set_link(OBJECT(&s->lpd.crl), "usb", OBJECT(&s->lpd.iou.usb), &error_abort); =20 sysbus_realize(sbd, &error_fatal); @@ -1173,12 +1194,15 @@ static void versal_realize(DeviceState *dev, Error = **errp) * interface naming order when persistent naming scheme is not in = use. */ versal_create_gem_fdt(s, &map->gem[map->num_gem - 1 - i]); } =20 + for (i =3D 0; i < map->num_zdma; i++) { + versal_create_zdma(s, &map->zdma[i]); + } + versal_create_usbs(s, pic); - versal_create_admas(s, pic); versal_create_pmc_apb_irq_orgate(s, pic); versal_create_rtc(s, pic); versal_create_trng(s, pic); versal_create_xrams(s, pic); versal_create_bbram(s, pic); --=20 2.50.1