From nobody Sat Nov 15 05:21:32 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=1755876076; cv=pass; d=zohomail.com; s=zohoarc; b=Ysy3exF+NiX4ZnmVUUFZD6+FBRfE1WjsUUgk4m9M2kF7iE9KZ5RioviE1rZpV6eaQTTeWBEAhHDTLCEgNyx2bZQFK4CKN1yz0KgJ8JmEk+2whfVqPnjRvncrjk8Cz9kC/5M9THzejj88EggHozb+rtMkiFaEraGI7TEgFslPifI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755876076; 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=ujq79R9QvzNpHaBAxDLixSInkRhlwu2BU7UOoCiPQW8=; b=GQO4Oq9HIEp/OQLTY7xYkb32UjISguYxnAJtJT6Kioyp7WcWH728ibAKmnYncbo6BBnvS7PqmfEvLXHc8u+p365uRcaONH91uCFM4lQ3C1Z1+HewAInBmEPx8ij6A/qulEJUUqUGLc1j/BWT8QRYz99uigYecS3b1bmcmKTrYP8= 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 1755876076410247.97594941528064; Fri, 22 Aug 2025 08:21:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1upTW4-0007rf-ML; Fri, 22 Aug 2025 11:17:21 -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 1upTVv-0007jx-6T; Fri, 22 Aug 2025 11:17:11 -0400 Received: from mail-bn8nam11on2061a.outbound.protection.outlook.com ([2a01:111:f403:2414::61a] helo=NAM11-BN8-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 1upTVq-0007A8-3d; Fri, 22 Aug 2025 11:17:09 -0400 Received: from MW4PR04CA0196.namprd04.prod.outlook.com (2603:10b6:303:86::21) by DM4PR12MB6184.namprd12.prod.outlook.com (2603:10b6:8:a6::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.14; Fri, 22 Aug 2025 15:16:58 +0000 Received: from SJ1PEPF0000231B.namprd03.prod.outlook.com (2603:10b6:303:86:cafe::96) by MW4PR04CA0196.outlook.office365.com (2603:10b6:303:86::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.17 via Frontend Transport; Fri, 22 Aug 2025 15:16:57 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by SJ1PEPF0000231B.mail.protection.outlook.com (10.167.242.232) 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:57 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) 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:56 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) 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:56 -0500 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:54 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pKuT1jhB0WVDAthjI5sf9QhYKWpFeXxZ9mff5ITpxYPuGec8hY5wDD9W+0xPl0OLoomwcDC9nLv7+dbEXxP/k508U/VoBJ/p3xzi8yAPSMNT+vUTfHEkscHvZqpi1tN3wCzAUI6cv5oj9y6dCf9yeOYfopbiUMNNcKzClH9vzos694j+B9xkiyJloEGdK2XDBbW1z6nYp26opWqlMoyZNxVeWRxVYDvVDpJu2jWFB8brDwXcCF0qMueZlFY8FGadks5vcNU9VTx3GuFDss4Gqe4s4w6bTvaMiD/Ok7548FBO8q5jVy+nfZ7zj4U1bHz4oDTzbOzDfDyQDAPBirWmbA== 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=ujq79R9QvzNpHaBAxDLixSInkRhlwu2BU7UOoCiPQW8=; b=lx6yYSjbJRy9nPeT4Rd7W3OveSN4FjwMcEQKqQN8m+7b22jqLQbcEpB0mvmkPLvMVeTUowwfTIXN6fx0DZ9h4ah+lpAK5UdoF40B2YDZtUaZsCKm0/zOaZRbePxVkfu6pcaSW4iKvXn2bDNdaffgPj+EHOnr8kjJSHxOMqVjwXqZlUlhdjNNpLKDQtwcflcb+0bnjSJtPOA7J0KVAbk9/axCgResGi58+0WMA8/Fff8kPPEFwjA6zLuGJ/2LFnoSC0Pf0MSH9PGmLMbRGPAfnaHd2y9yV7uQjLbi5gTXPzmv7usqUvybG5kOzA+GXaX5efppSIfOU771A+60Catq8g== 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=ujq79R9QvzNpHaBAxDLixSInkRhlwu2BU7UOoCiPQW8=; b=uBlZKe2/tB2k+ENFsKFbsCcvYk2JOMLwrQp7fctdwBV2c8yKHNpMPj7GKlzgkBWyZ9A9RA8gAesVPF1Q6qmn1qKxDb4Ytkjqu/aHZtfLh5e4V614Zm9lefYl/XpAA5EGLKsYdxAIi/dgQaE5Z1XzEoyiVott8GEUgM/NTQhcwLY= 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 16/47] hw/arm/xlnx-versal: rtc: refactor creation Date: Fri, 22 Aug 2025 17:15:41 +0200 Message-ID: <20250822151614.187856-17-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 Received-SPF: None (SATLEXMB05.amd.com: luc.michel@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF0000231B:EE_|DM4PR12MB6184:EE_ X-MS-Office365-Filtering-Correlation-Id: 0784a17e-bf51-41e3-963d-08dde18eef42 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Qs2vlkGkxFwQFPTtyZBDVQEgApJHQziwO0577a97NMtn1nCWqaet3vHcnjEp?= =?us-ascii?Q?o8o6BIH6I/9dZkFXP0UzYhetIx+Ev4/TjpRvWSVytY96nXCAolITPSIFVC1n?= =?us-ascii?Q?dB6uLe7zu8VUJ+iI8nUhMpIg7e3770lmQqSgllLQSV66Rmrg4hADYQO8rcuo?= =?us-ascii?Q?Aiw+HTifQ+2gnSQznq0n5aU1mFMfjCrh/tVRlD01LRvVX+wM1f6mQ8e8pTgN?= =?us-ascii?Q?87a8QRQ1pqyxr6kWAafHwpWiUfsnGcHw3Q8/wG72f/bMPSnRLP1xJ8H2+TXl?= =?us-ascii?Q?F38BoWF3RyN6kEuWzU1q4TvDVvp+D+O8XXPKdPIfockkgHaXHOghY0i7vo6R?= =?us-ascii?Q?LSKOq2lumUr7AtO1LEKyyoXTc3pOZ9bgVEqIwyFkdleb6gSZhU01vBbG7fo8?= =?us-ascii?Q?1xQc3O9wMGrHVwy4lhf3cxOw1jFhA1IrShp1BWHYV07Og8WKKvtLtNTHtSrZ?= =?us-ascii?Q?zqNqu36w0ytNxcfjCEGS5UOZSRersr2STvMPBk7n0Hieb+mkgRGR25/L26vv?= =?us-ascii?Q?FEsYgLFAOcLZnXt5nMumGzpKrhhvyeyRz5v7lZmAuMDhYHBGTLWXQgkjJaTf?= =?us-ascii?Q?WiyL7lUparK1uHCu3+vQ6hqMZv1treWxA22//NSFLJW2C7L8FZj89VtR5p2Z?= =?us-ascii?Q?dPN+ygjZd2pkUlJ3RAol7neGdm3mGALvlVoYUZO9s7MogQuNpwUbL/YNqKPY?= =?us-ascii?Q?edUroOwEqhFXUvLXuTWOin5jOEbMozmBs+/tO8GWLArppnuhZltYxtsQUDVU?= =?us-ascii?Q?LlNqY/xVDmyPL9ol43vVnBS/Y9PxJZGfxDDD3EhAbV/pzjzueJWg576Vx6zz?= =?us-ascii?Q?NTI98J3GCWwJENfjrA8yY92vdUesatB2oJBi8mxwhf49731wtRXATczwv9TM?= =?us-ascii?Q?UYU0rPadufjyZaqsQLrm1xaYn4fJcxxS0eoOkqrkv5SNf+ja3jp+L5zmsuUz?= =?us-ascii?Q?j4LV/jpZVGQD1uYb+AF6r3GzxvMRjmzc6wgpnnADQqv8Yb+tKpBSrS5L60CR?= =?us-ascii?Q?6UMdm5xwgjuZPshIEuxsthrymKsg31WR7EhPbdDoFphzTW/TojWYgUGtUMKN?= =?us-ascii?Q?/cPdUe/CrAXyF2dzWEKl8JhVXta6wGomAbNrsIl4wkA686jFRUfrX9sk5amM?= =?us-ascii?Q?ope8SQGFL4GQayCmmEBmWf95zvFRp+7G5PIe8Vnv4Lx+C4Wgu365uLmSBXuE?= =?us-ascii?Q?wK2XOgVf/uXIt5+bKr4RhVjNxIzg+kq5yMgvWPLZxVcYvN5RLyQFR63F4OcW?= =?us-ascii?Q?PaSRhvikvNdTQitRlY2bvDBpzP0HYL/faSOKgysW7/e36PUJPsNm58lOvfXk?= =?us-ascii?Q?RWZRsXyLsJYCO5KTuVtOXqerrdt4YqKPozugz0+qUaRJN2NLZIHW08pTaJf+?= =?us-ascii?Q?PjtdZXR34Lmg7WcAzyRAGUaHPJcSLMMVawWAptu4rH55XwheZIqlKX+3d/km?= =?us-ascii?Q?HOmryxY2fn7Y5jeEZN67KyIPNQV//BKATxxuYbmHkAknPI+rdpIslPTm1hxm?= =?us-ascii?Q?rcK+50Hy0kAiCtptrKU4MEnGLNl9ZHTDIrtp?= 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)(82310400026)(376014)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2025 15:16:57.0842 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0784a17e-bf51-41e3-963d-08dde18eef42 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: SJ1PEPF0000231B.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6184 Received-SPF: permerror client-ip=2a01:111:f403:2414::61a; envelope-from=Luc.Michel@amd.com; helo=NAM11-BN8-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: 1755876078157116600 Content-Type: text/plain; charset="utf-8" Refactor the RTC device creation using the VersalMap structure. The sysbus IRQ output 0 (APB IRQ) is connected instead of the output 1 (addr error IRQ). This does not change the current behaviour since the RTC model does not implement those IRQs anyway. Signed-off-by: Luc Michel Reviewed-by: Francisco Iglesias --- include/hw/arm/xlnx-versal.h | 2 -- hw/arm/xlnx-versal-virt.c | 22 -------------------- hw/arm/xlnx-versal.c | 40 ++++++++++++++++++++++++++++-------- 3 files changed, 31 insertions(+), 33 deletions(-) diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index bba96201d37..abdbed15689 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/rtc/xlnx-zynqmp-rtc.h" #include "qom/object.h" #include "hw/misc/xlnx-versal-crl.h" #include "net/can_emu.h" #include "hw/misc/xlnx-versal-cfu.h" #include "hw/misc/xlnx-versal-cframe-reg.h" @@ -79,11 +78,10 @@ struct Versal { XlnxVersalCRL crl; } lpd; =20 /* The Platform Management Controller subsystem. */ struct { - XlnxZynqMPRTC rtc; XlnxVersalCFUAPB cfu_apb; XlnxVersalCFUFDRO cfu_fdro; XlnxVersalCFUSFR cfu_sfr; XlnxVersalCFrameReg cframe[XLNX_VERSAL_NR_CFRAME]; XlnxVersalCFrameBcastReg cframe_bcast; diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index f766a3e1027..d96f3433929 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -149,31 +149,10 @@ static void fdt_add_timer_nodes(VersalVirt *s) GIC_FDT_IRQ_TYPE_PPI, VERSAL_TIMER_NS_EL2_IRQ, irqflags); qemu_fdt_setprop(s->fdt, "/timer", "compatible", compat, sizeof(compat)); } =20 -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); - - qemu_fdt_add_subnode(s->fdt, name); - - qemu_fdt_setprop_cells(s->fdt, name, "interrupts", - GIC_FDT_IRQ_TYPE_SPI, VERSAL_RTC_ALARM_IRQ, - GIC_FDT_IRQ_FLAGS_LEVEL_HI, - GIC_FDT_IRQ_TYPE_SPI, VERSAL_RTC_SECONDS_IRQ, - GIC_FDT_IRQ_FLAGS_LEVEL_HI); - qemu_fdt_setprop(s->fdt, name, "interrupt-names", - interrupt_names, sizeof(interrupt_names)); - qemu_fdt_setprop_sized_cells(s->fdt, name, "reg", - 2, MM_PMC_RTC, 2, MM_PMC_RTC_SIZE); - qemu_fdt_setprop(s->fdt, name, "compatible", compat, sizeof(compat)); - g_free(name); -} - static void fdt_nop_memory_nodes(void *fdt, Error **errp) { Error *err =3D NULL; char **node_path; int n =3D 0; @@ -424,11 +403,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_rtc_node(s); fdt_add_cpu_nodes(s, psci_conduit); fdt_add_clk_node(s, "/old-clk125", 125000000, s->phandle.clk_125Mhz); fdt_add_clk_node(s, "/old-clk25", 25000000, s->phandle.clk_25Mhz); =20 /* Make the APU cpu address space visible to virtio and other diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 7b4dffc448e..3a29052a176 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -36,10 +36,11 @@ #include "hw/nvram/xlnx-versal-efuse.h" #include "hw/ssi/xlnx-versal-ospi.h" #include "hw/misc/xlnx-versal-pmc-iou-slcr.h" #include "hw/nvram/xlnx-bbram.h" #include "hw/misc/xlnx-versal-trng.h" +#include "hw/rtc/xlnx-zynqmp-rtc.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 @@ -121,10 +122,16 @@ typedef struct VersalMap { } ospi; =20 VersalSimplePeriphMap pmc_iou_slcr; VersalSimplePeriphMap bbram; VersalSimplePeriphMap trng; + + struct VersalRtcMap { + VersalSimplePeriphMap map; + int alarm_irq; + int second_irq; + } rtc; } VersalMap; =20 static const VersalMap VERSAL_MAP =3D { .uart[0] =3D { 0xff000000, 18 }, .uart[1] =3D { 0xff010000, 19 }, @@ -165,10 +172,14 @@ static const VersalMap VERSAL_MAP =3D { }, =20 .pmc_iou_slcr =3D { 0xf1060000, OR_IRQ(121, 0) }, .bbram =3D { 0xf11f0000, OR_IRQ(121, 1) }, .trng =3D { 0xf1230000, 141 }, + .rtc =3D { + { 0xf12a0000, OR_IRQ(121, 2) }, + .alarm_irq =3D 142, .second_irq =3D 143 + }, }; =20 static const VersalMap *VERSION_TO_MAP[] =3D { [VERSAL_VER_VERSAL] =3D &VERSAL_MAP, }; @@ -760,29 +771,40 @@ static void versal_create_pmc_apb_irq_orgate(Versal *= s, qemu_irq *pic) "num-lines", VERSAL_NUM_PMC_APB_IRQS, &error_f= atal); qdev_realize(orgate, NULL, &error_fatal); qdev_connect_gpio_out(orgate, 0, pic[VERSAL_PMC_APB_IRQ]); } =20 -static void versal_create_rtc(Versal *s, qemu_irq *pic) +static void versal_create_rtc(Versal *s, const struct VersalRtcMap *map) { SysBusDevice *sbd; MemoryRegion *mr; + g_autofree char *node; + const char compatible[] =3D "xlnx,zynqmp-rtc"; + const char interrupt_names[] =3D "alarm\0sec"; =20 - object_initialize_child(OBJECT(s), "rtc", &s->pmc.rtc, - TYPE_XLNX_ZYNQMP_RTC); - sbd =3D SYS_BUS_DEVICE(&s->pmc.rtc); - sysbus_realize(sbd, &error_fatal); + sbd =3D SYS_BUS_DEVICE(qdev_new(TYPE_XLNX_ZYNQMP_RTC)); + object_property_add_child(OBJECT(s), "rtc", OBJECT(sbd)); + sysbus_realize_and_unref(sbd, &error_abort); =20 mr =3D sysbus_mmio_get_region(sbd, 0); - memory_region_add_subregion(&s->mr_ps, MM_PMC_RTC, mr); + memory_region_add_subregion(&s->mr_ps, map->map.addr, mr); =20 /* * TODO: Connect the ALARM and SECONDS interrupts once our RTC model * supports them. */ - sysbus_connect_irq(sbd, 1, - qdev_get_gpio_in(DEVICE(&s->pmc.apb_irq_orgate), 0)= ); + versal_sysbus_connect_irq(s, sbd, 0, map->map.irq); + + node =3D versal_fdt_add_simple_subnode(s, "/rtc", map->map.addr, 0x100= 00, + compatible, sizeof(compatible)); + qemu_fdt_setprop_cells(s->cfg.fdt, node, "interrupts", + GIC_FDT_IRQ_TYPE_SPI, map->alarm_irq, + GIC_FDT_IRQ_FLAGS_LEVEL_HI, + GIC_FDT_IRQ_TYPE_SPI, map->second_irq, + GIC_FDT_IRQ_FLAGS_LEVEL_HI); + qemu_fdt_setprop(s->cfg.fdt, node, "interrupt-names", + interrupt_names, sizeof(interrupt_names)); } =20 static void versal_create_trng(Versal *s, const VersalSimplePeriphMap *map) { SysBusDevice *sbd; @@ -1343,13 +1365,13 @@ static void versal_realize(DeviceState *dev, Error = **errp) qdev_get_gpio_in_named(ospi, "ospi-mux-sel", 0)); =20 versal_create_bbram(s, &map->bbram); versal_create_trng(s, &map->trng); + versal_create_rtc(s, &map->rtc); =20 versal_create_pmc_apb_irq_orgate(s, pic); - versal_create_rtc(s, pic); versal_create_crl(s, pic); versal_create_cfu(s, pic); versal_map_ddr(s); versal_unimp(s); =20 --=20 2.50.1