From nobody Sun Sep 21 21:58:08 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=1757672236; cv=pass; d=zohomail.com; s=zohoarc; b=f+fbS1bbLG8UIB9aecWnSc0Toqw1JdzViLe/C55D/pNbevB0OU78w5F/LALpUj/UTC6l/cyrEpwFlcehp8asJNgoaUoCa/bFuknVQQ+KQ1732sq/AA+tXaM47YS0W5fSSLyBM8llIJgDM47+lWiAAgM7yUjbcljQoiHQWltgFdM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757672236; 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=4OwnP3ttvheDT5nRkgcsnBZxU9o9bGOr7xUV8lP2A0o=; b=mgqvWFKOsQe9k5Hcfe/pSSsZV5744/htMhR7q9hKgMLvihWu9kizkfzKpPNGlYTVS+NHlNFEupa+qUSTMOXl5cwrdRBCYuUuekdanUTBTi+0nv3BQTMsEdkWWGw63hUK4yH7K4WheW+K51Pyl8lCYcmYokW0Ax6efQt2faLCd/I= 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 1757672236793840.2719823944989; Fri, 12 Sep 2025 03:17:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ux0el-0002T9-8B; Fri, 12 Sep 2025 06:05:27 -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 1ux0cz-0007Qe-N8; Fri, 12 Sep 2025 06:03:37 -0400 Received: from mail-dm6nam04on20629.outbound.protection.outlook.com ([2a01:111:f403:2409::629] helo=NAM04-DM6-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 1ux0cc-0001Mo-11; Fri, 12 Sep 2025 06:03:30 -0400 Received: from DS7P220CA0005.NAMP220.PROD.OUTLOOK.COM (2603:10b6:8:1ca::7) by SA3PR12MB8811.namprd12.prod.outlook.com (2603:10b6:806:312::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9094.22; Fri, 12 Sep 2025 10:03:03 +0000 Received: from DS3PEPF000099DB.namprd04.prod.outlook.com (2603:10b6:8:1ca:cafe::bf) by DS7P220CA0005.outlook.office365.com (2603:10b6:8:1ca::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9115.18 via Frontend Transport; Fri, 12 Sep 2025 10:03:10 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by DS3PEPF000099DB.mail.protection.outlook.com (10.167.17.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9115.13 via Frontend Transport; Fri, 12 Sep 2025 10:03:03 +0000 Received: from Satlexmb09.amd.com (10.181.42.218) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Fri, 12 Sep 2025 03:02:08 -0700 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb09.amd.com (10.181.42.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Fri, 12 Sep 2025 03:02:07 -0700 Received: from XFR-LUMICHEL-L2.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Fri, 12 Sep 2025 03:02:06 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YKasEA3Fkm1hSDtzBN7QHXFMDAWlkW6UfDPLU12tJf9ymIzec3qUY2EYSBB/tJ5iH2Rw4OQqVxLMDftEYEvfEwDwbeZUapehAkLzHPWrfLhLV8G6tdqsb7uzhaN3rPG9RrkrZEhDowk6xc+ZtjqbkgvSyydCOkVcweNTUS95wN/IFhCki3P3UoSqVZMeZ4kvsqDIJLX6dhlo8LT9/3+eQwEREBrvJJs4IKTitZ8VnrifR8RXaah7qM5L1ziRi318ye0PnNj5vrAlcnIhBKBGrsqa2fd0NaSSgdLOnbFOuqBrgw0qmHAOYiF+zb8KGiN9KEBNvbco+y15H0ujm1W7MQ== 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=4OwnP3ttvheDT5nRkgcsnBZxU9o9bGOr7xUV8lP2A0o=; b=nMfvmjjEdFGIGHBP7KKcdiRd463eCvC3XVyDA4Emb5tMcQSfzvkH9p1gVJQgkRXAPerB6r8KS9cnTK4Jkn+kN8DYNsq9Jz0JjE02+PiQQYOhboPpU7qi8UC9nlS4nb8tYlgERDyG5V+pOf+TkH7AF3teO4iTaUNMEasEwigihog8wVk+BJYtEEpJAR5i2AJJ0EMsVb66BdYchcHXYjgMGRybnKcQ41JrOHMb3iVeRtXoVJ0Zl5MpGD0eX2i4o4CUT4tt9vWlDnEzBeJHKufZC5+7YpNPje6Yub1Lkcu3gWfttcuQ9TCBSW8I8qXTfdWjwNcH700SLvpKQ2FqEAkNzw== 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=4OwnP3ttvheDT5nRkgcsnBZxU9o9bGOr7xUV8lP2A0o=; b=QQF/d9vBSNZeena19ZcI1IB/Z9NdxZBzeD98gTCEtyc/6ruX3gDXNI+wucQzTH43IMwoBs12hJAKO9R2AB5Fa5b8O4IeSZ57NlhGdYThoK4WbnebIQxVOTnfpWKFNMXfZGlIlao4zYxRKXcFaswuehJfUbtLufwQkmuHD8SeinA= 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=satlexmb07.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 v5 26/47] hw/arm/xlnx-versal: rpu: refactor creation Date: Fri, 12 Sep 2025 12:00:35 +0200 Message-ID: <20250912100059.103997-27-luc.michel@amd.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250912100059.103997-1-luc.michel@amd.com> References: <20250912100059.103997-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099DB:EE_|SA3PR12MB8811:EE_ X-MS-Office365-Filtering-Correlation-Id: cc86f600-0c4d-47cd-670a-08ddf1e39055 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|82310400026|30052699003|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Eesz94w2QAi3LOjclvC2MXimBro+hdTPjj31r1pzkQeY+CvS5zz9dWzLruRP?= =?us-ascii?Q?Z/uIreV/FKzMdHOf7+RjMV7k8kHK4Emy+TVTba8sjqaLKFVufNoKFkJpURp0?= =?us-ascii?Q?vGSgCTIoNlEv6iJMEBhpZmjazFJuvmsRIhpcuxOH0LMGZBs7CBdh5r3xWOyM?= =?us-ascii?Q?R/H0eZUwY8ocXm5zb0YCjW/ZbeY/vV3rnlQKwokHw6IoORNORn+B+7VVLqo/?= =?us-ascii?Q?xdwS+GThVr+GVz4P1FHlx0a2mhxLx+ml6EmFCFPKvXPuNiNX4fKaFDhkvkgQ?= =?us-ascii?Q?tg0SfBszxGcR/1CDV1Y9O3WdejARqg/uQr+bjrbq5pj0JA/ddYQDe1/sb6sm?= =?us-ascii?Q?E9tdpAjc2Whf4Gl+FilbJS6asrak0dbk7+ye9xakrU+reaE3pSpI1xxhR6EG?= =?us-ascii?Q?S8uJRPesmTG6gBUYCyQJdMlgEYQx4B6SUsh+/iw3EqGaZ+NT6RFIgbqGoTDu?= =?us-ascii?Q?wt8HCAlLrFnkI7xUkGgWEEIO7EbnkkpOzj2O5wyIUlffKZhpIXnz+AEth/dR?= =?us-ascii?Q?imjQ6VRvJRVhazJWpc+UpqHJ5GaUaNsspNd54Xpwx13of1NtdqtpT5rELaNC?= =?us-ascii?Q?DO5dm24wEz8dfW+u7xxKrWvMfb4iHIEiP+KYq+vdPDmC69xA3euRWa5rqU+i?= =?us-ascii?Q?unyVg0SMto3HSfsbUAwJFx3B737pGBQ0rn520g/2E4HYcJvtbimdCCYvkUhP?= =?us-ascii?Q?ZxFH7XjhwjzqWh8oH2i7xi8nezjLE5NcL81hrEg4TRQKEjpL0VggypoZl66f?= =?us-ascii?Q?28BSn2duJ/6mI2w4muT9cTabjPFa4S3RzeioKiRLjDix76RjhIn50uVaACAr?= =?us-ascii?Q?AoARHkIiCJcG0eG4t1ML57hqJ2tGpEaz7tf0ZK2oJSwu4lJVHoV8dQZXqqZu?= =?us-ascii?Q?7dczjoiXRQHJ8lCa5yzaN95iR6nOzSzIjikxgi6gONCZp2Nh9Tz+MuRQtExv?= =?us-ascii?Q?mwtJUo8i64QUiL2OpALd01IOHVliLmIs76WWLnshspPeLQXcOF41X/GhkXAG?= =?us-ascii?Q?pPudxjpnSw8uDGJ+feBGEPz/7zxsoxgk9sYeIetcHkPLfxrXaAJnQgO/pDMM?= =?us-ascii?Q?OaaqVVDlKl8hOV4iyKunUaohN4K9QtRfvzXfCr00l0MNxRerYBeqFHNTWVam?= =?us-ascii?Q?hzgKVX3hrwwRQ5kyindt88BpDBD+JyqEl8x7M91GaUUHiDLUOZ0NfC02TLuY?= =?us-ascii?Q?h9+e3w87SiBbS/i1sxuUUYvn4UEthoDHX6kDT0MctQLVOCWAAJwPg/tsYgDm?= =?us-ascii?Q?ENsaXB5NM3ePbucMseXClTUdsSM0G5MQIOJ5nNcx6i5UQ42/426+3V6AUJMm?= =?us-ascii?Q?pF212why0BjXSTADHSfPQmMV/onwITmuhSP4Ivz412K/KZBkCAxoNwOhVtkw?= =?us-ascii?Q?lWuLrCxnX0AZ6hhlFvOojuosgYwgDl2TgCMZ7JKP0tInHy0ml7C+OoqBOghj?= =?us-ascii?Q?9RLC3NreZcb/4BhsETbh1YrGq130kND9MiXgFj4c/kKPsXxrW3/vdoBkIsr6?= =?us-ascii?Q?gp7LfWA/LXbeexRZZZtjAhNW3QjPJPhT4Yfo?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:satlexmb07.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(376014)(1800799024)(82310400026)(30052699003)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2025 10:03:03.7066 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cc86f600-0c4d-47cd-670a-08ddf1e39055 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099DB.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB8811 Received-SPF: permerror client-ip=2a01:111:f403:2409::629; envelope-from=Luc.Michel@amd.com; helo=NAM04-DM6-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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 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: 1757672237884116600 Content-Type: text/plain; charset="utf-8" Refactor the RPU cluster creation using the VersalMap structure. This effectively instantiate the RPU GICv2 which was not instantiated before. Signed-off-by: Luc Michel Reviewed-by: Francisco Iglesias --- include/hw/arm/xlnx-versal.h | 11 ------- hw/arm/xlnx-versal-virt.c | 1 + hw/arm/xlnx-versal.c | 60 +++++++++++++++--------------------- 3 files changed, 26 insertions(+), 46 deletions(-) diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index 984f9f2ccdd..0a91ec7ae36 100644 --- a/include/hw/arm/xlnx-versal.h +++ b/include/hw/arm/xlnx-versal.h @@ -12,14 +12,12 @@ =20 #ifndef XLNX_VERSAL_H #define XLNX_VERSAL_H =20 #include "hw/sysbus.h" -#include "hw/cpu/cluster.h" #include "qom/object.h" #include "net/can_emu.h" -#include "target/arm/cpu.h" #include "hw/arm/xlnx-versal-version.h" =20 #define TYPE_XLNX_VERSAL_BASE "xlnx-versal-base" OBJECT_DECLARE_TYPE(Versal, VersalClass, XLNX_VERSAL_BASE) =20 @@ -50,19 +48,10 @@ struct Versal { MemoryRegion mr_ddr_ranges[4]; } noc; =20 struct { MemoryRegion mr_ocm; - - /* Real-time Processing Unit. */ - struct { - MemoryRegion mr; - MemoryRegion mr_ps_alias; - - CPUClusterState cluster; - ARMCPU cpu[XLNX_VERSAL_NR_RCPUS]; - } rpu; } lpd; =20 struct { uint32_t clk_25mhz; uint32_t clk_125mhz; diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index 27594f78c8f..5958e712519 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -22,10 +22,11 @@ #include "hw/qdev-properties.h" #include "hw/arm/xlnx-versal.h" #include "hw/arm/boot.h" #include "target/arm/multiprocessing.h" #include "qom/object.h" +#include "target/arm/cpu.h" =20 #define TYPE_XLNX_VERSAL_VIRT_MACHINE MACHINE_TYPE_NAME("xlnx-versal-virt") OBJECT_DECLARE_SIMPLE_TYPE(VersalVirt, XLNX_VERSAL_VIRT_MACHINE) =20 #define XLNX_VERSAL_NUM_OSPI_FLASH 4 diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index d5dbbe10a6d..54d4b28c7b7 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -45,10 +45,12 @@ #include "hw/misc/xlnx-versal-crl.h" #include "hw/intc/arm_gicv3_common.h" #include "hw/intc/arm_gicv3_its_common.h" #include "hw/intc/arm_gic.h" #include "hw/core/split-irq.h" +#include "target/arm/cpu.h" +#include "hw/cpu/cluster.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 @@ -105,10 +107,11 @@ typedef struct VersalCpuClusterMap { enum StartPoweredOffMode start_powered_off; } VersalCpuClusterMap; =20 typedef struct VersalMap { VersalCpuClusterMap apu; + VersalCpuClusterMap rpu; =20 VersalSimplePeriphMap uart[2]; size_t num_uart; =20 VersalSimplePeriphMap canfd[4]; @@ -224,10 +227,31 @@ static const VersalMap VERSAL_MAP =3D { .has_its =3D true, .its =3D 0xf9020000, }, }, =20 + .rpu =3D { + .name =3D "rpu", + .cpu_model =3D ARM_CPU_TYPE_NAME("cortex-r5f"), + .num_cluster =3D 1, + .num_core =3D 2, + .qemu_cluster_id =3D 1, + .mp_affinity =3D { + .base =3D 0x100, + .core_shift =3D ARM_AFF0_SHIFT, + .cluster_shift =3D ARM_AFF1_SHIFT, + }, + .start_powered_off =3D SPO_ALL, + .dtb_expose =3D false, + .gic =3D { + .version =3D 2, + .dist =3D 0xf9000000, + .cpu_iface =3D 0xf9001000, + .num_irq =3D 192, + }, + }, + .uart[0] =3D { 0xff000000, 18 }, .uart[1] =3D { 0xff010000, 19 }, .num_uart =3D 2, =20 .canfd[0] =3D { 0xff060000, 20 }, @@ -804,39 +828,10 @@ static void versal_create_cpu_cluster(Versal *s, cons= t VersalCpuClusterMap *map) qemu_fdt_setprop(s->cfg.fdt, "/timer", "compatible", compatible, sizeof(compatible)); } } =20 -static void versal_create_rpu_cpus(Versal *s) -{ - int i; - - object_initialize_child(OBJECT(s), "rpu-cluster", &s->lpd.rpu.cluster, - TYPE_CPU_CLUSTER); - qdev_prop_set_uint32(DEVICE(&s->lpd.rpu.cluster), "cluster-id", 1); - - for (i =3D 0; i < ARRAY_SIZE(s->lpd.rpu.cpu); i++) { - Object *obj; - - object_initialize_child(OBJECT(&s->lpd.rpu.cluster), - "rpu-cpu[*]", &s->lpd.rpu.cpu[i], - XLNX_VERSAL_RCPU_TYPE); - obj =3D OBJECT(&s->lpd.rpu.cpu[i]); - object_property_set_bool(obj, "start-powered-off", true, - &error_abort); - - object_property_set_int(obj, "mp-affinity", 0x100 | i, &error_abor= t); - object_property_set_int(obj, "core-count", ARRAY_SIZE(s->lpd.rpu.c= pu), - &error_abort); - object_property_set_link(obj, "memory", OBJECT(&s->lpd.rpu.mr), - &error_abort); - qdev_realize(DEVICE(obj), NULL, &error_fatal); - } - - qdev_realize(DEVICE(&s->lpd.rpu.cluster), NULL, &error_fatal); -} - static void versal_create_uart(Versal *s, const VersalSimplePeriphMap *map, int chardev_idx) { DeviceState *dev; @@ -1638,11 +1633,11 @@ static void versal_realize(DeviceState *dev, Error = **errp) qemu_fdt_setprop_cell(s->cfg.fdt, "/", "interrupt-parent", s->phandle.= gic); qemu_fdt_setprop_cell(s->cfg.fdt, "/", "#size-cells", 0x2); qemu_fdt_setprop_cell(s->cfg.fdt, "/", "#address-cells", 0x2); =20 versal_create_cpu_cluster(s, &map->apu); - versal_create_rpu_cpus(s); + versal_create_cpu_cluster(s, &map->rpu); =20 for (i =3D 0; i < map->num_uart; i++) { versal_create_uart(s, &map->uart[i], i); } =20 @@ -1694,12 +1689,10 @@ static void versal_realize(DeviceState *dev, Error = **errp) /* Create the On Chip Memory (OCM). */ memory_region_init_ram(&s->lpd.mr_ocm, OBJECT(s), "ocm", MM_OCM_SIZE, &error_fatal); =20 memory_region_add_subregion_overlap(&s->mr_ps, MM_OCM, &s->lpd.mr_ocm,= 0); - memory_region_add_subregion_overlap(&s->lpd.rpu.mr, 0, - &s->lpd.rpu.mr_ps_alias, 0); } =20 DeviceState *versal_get_boot_cpu(Versal *s) { return DEVICE(versal_get_child_idx(s, "apu-cluster/apu", 0)); @@ -1806,14 +1799,11 @@ int versal_get_num_sdhci(VersalVersion version) static void versal_base_init(Object *obj) { Versal *s =3D XLNX_VERSAL_BASE(obj); size_t i, num_can; =20 - memory_region_init(&s->lpd.rpu.mr, obj, "mr-rpu", UINT64_MAX); memory_region_init(&s->mr_ps, obj, "mr-ps-switch", UINT64_MAX); - memory_region_init_alias(&s->lpd.rpu.mr_ps_alias, OBJECT(s), - "mr-rpu-ps-alias", &s->mr_ps, 0, UINT64_MAX); s->intc =3D g_array_new(false, false, sizeof(DeviceState *)); =20 num_can =3D versal_get_map(s)->num_canfd; s->cfg.canbus =3D g_new0(CanBusState *, num_can); =20 --=20 2.50.1