From nobody Fri Nov 14 23:28:56 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759846393; cv=none; d=zohomail.com; s=zohoarc; b=HqfjPjN1JQNwek8UPF089d2FmJM+w0N1yywr12gllZjQyw9Mumw5nIudblYaLrvh1ZtKLHMG4T3ASG25rI+48pAV4BrSP+WmqyOkaxlDbis4ArI+Et+cY1J1TmnK1LqNCJbxF/NdzaaFUTZbUeLwGDMDsgV5iVH7pzJ8/JZCipQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759846393; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=8Ig/xe9lRWR8AVvmmEJBBarD/2ccaXU1t5zwOCw2epw=; b=VSC4FSfabBQ1xSAHsmOA3y61Hi5uaQnbJmBp7MyQT25goOVmRETUjH+0BWgLzJrMG8WzBocDUiX9GhGlOFwPkmgzh9kKPGUmwcRJ35fuPADGmFtLslPhNE0PZIexRRJjuNIzNCgVYD0cME58IqsthkX/GgpdIGgmh2g/yewevys= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175984639366053.12952354438414; Tue, 7 Oct 2025 07:13:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v68QG-0005km-F5; Tue, 07 Oct 2025 10:12:13 -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 1v68QB-0005i5-KZ for qemu-devel@nongnu.org; Tue, 07 Oct 2025 10:12:07 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v68Pv-0002A0-FA for qemu-devel@nongnu.org; Tue, 07 Oct 2025 10:12:06 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-421b93ee372so2970870f8f.2 for ; Tue, 07 Oct 2025 07:11:47 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e78c5d290sm167037135e9.0.2025.10.07.07.11.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 07:11:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759846304; x=1760451104; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8Ig/xe9lRWR8AVvmmEJBBarD/2ccaXU1t5zwOCw2epw=; b=emdeTDwmHy/mYTr0uzJJUzN4QZuQNlFWRVgqX+3sen9uF53BxMH/ceb8KU1q94L/P/ QS+PKXTuFdk5o7E9fTN8wRRlhfk0kWqEjUaPKbjIHn0YrUjfb1JLvnboiSFOvPBsz7mu SZiXObYoz++idJ6VcEcshaZ1qtXC7gsYfZXYwloptM9IrDhJD1g/R2ZY0WVpV+x18bxl AoIs6ELze5QSj+hpshfJ5mAvNDgnPbyzlnQizuHNtiCvFJ0F8z0STpI2FvvZ+T+ooL6W d9m+5i0ZfS55f8awkH2QyXhXaD7kqSCB+92XUQtJSo3coDILp5LpAt8irJrwci3GONcF SEKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759846304; x=1760451104; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8Ig/xe9lRWR8AVvmmEJBBarD/2ccaXU1t5zwOCw2epw=; b=WSTmq7e4qjOJeHbX4b6E1tOgmNfBUkoM+SQ2wSIX68+x1rTR1wGmNSIc5XScHLl8bP dz1AyTuolHrno9Wt8LrSySFfScIXMHe87zqVILNXOpG5v1ZznkhHBMkxPtz6GJ4XcLb+ W9hYmCpBiNErpoFDRS3DoJGgWDyIPcZDLWAZUOxb+IQAY3xEmtusFvh3VYkCFWHxVekp IBYJBuyUwpsqxG4mqAMYbnXYXIIs1MVE6obw6VbvfPBVTutqfarBgt0FCWLprljb5CSC wu/xlowKTBj7JbGA4PZx7SxrcVy0eaogdXbuoZe5uMjcAl89/wE5oYknEokF7quqylMk cAhA== X-Gm-Message-State: AOJu0YwhlTiJBCjlvTsQQr1A4tInUVzDdKMkezB6nWLFZok9q9loDixs dBxY91ydQKqm6zToRah/wU27YEzIqjbR+IE/Cw0zlaJEXYTEIdWLAnB4zCDr8+Fh2a/QLzTTesk do1Y1 X-Gm-Gg: ASbGncsErgKj/AlYaCT6N4dI7EjExHE/owg72nfI2bmpMGdSUMMWJe728uFXdy5g5pl UeLul2M/TYiK2Iqd6RvNcCnNs7+L7eYIXQji31lgTL8AAhSExs8XjzOsuHMvJDD7I7y2+LwMsv3 zQfRzl8OLC7FfQA0TRzlS/9vFcZfSn6yvMa9+59hIcUKxvaHW9lugfmQkZ0IShOLM0l1NsQFdOZ 4us2ijcV/OEL67r8GGUc73C/6ecr7qHHYHb2zZwlPWPHwmxrIrjO8pmCjvw4Gcuo24mkB5T0Ofw /DnPtVz4rAt52rAAOPqgnV/RoTLahyRJa66oseCGFyHyhDN0WayziV+byBsik+Z8Q8rYdDweOXa lyeBkirjSErnHKwQPucFR488j/vHYCeIgduR33GNsmy9wq/6EkCocaeGi X-Google-Smtp-Source: AGHT+IHZyurwGn6fPJJIDcdOIrrHZA+Jx5aDYcrrUrmoI3qfYixqWoNuuakBgI0tXpCk7oiJcXEcOw== X-Received: by 2002:a05:6000:60f:b0:424:2275:63c2 with SMTP id ffacd0b85a97d-4256719e997mr11608621f8f.33.1759846303845; Tue, 07 Oct 2025 07:11:43 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 17/62] hw/arm/xlnx-versal: rtc: refactor creation Date: Tue, 7 Oct 2025 15:10:37 +0100 Message-ID: <20251007141123.3239867-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251007141123.3239867-1-peter.maydell@linaro.org> References: <20251007141123.3239867-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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 @linaro.org) X-ZM-MESSAGEID: 1759846396714154100 From: Luc Michel 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 Reviewed-by: Edgar E. Iglesias Tested-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20250926070806.292065-17-luc.michel@amd.com Signed-off-by: Peter Maydell --- 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 @@ -17,7 +17,6 @@ #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" @@ -81,7 +80,6 @@ struct Versal { =20 /* The Platform Management Controller subsystem. */ struct { - XlnxZynqMPRTC rtc; XlnxVersalCFUAPB cfu_apb; XlnxVersalCFUFDRO cfu_fdro; XlnxVersalCFUSFR cfu_sfr; 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 @@ -151,27 +151,6 @@ static void fdt_add_timer_nodes(VersalVirt *s) 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; @@ -426,7 +405,6 @@ static void versal_virt_init(MachineState *machine) =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); diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 7a97d5df6b8..9b1e0d46f1b 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -38,6 +38,7 @@ #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") @@ -123,6 +124,12 @@ typedef struct VersalMap { 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 { @@ -167,6 +174,10 @@ static const VersalMap VERSAL_MAP =3D { .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 { @@ -762,25 +773,36 @@ static void versal_create_pmc_apb_irq_orgate(Versal *= s, qemu_irq *pic) 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) @@ -1341,9 +1363,9 @@ static void versal_realize(DeviceState *dev, Error **= errp) =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); --=20 2.43.0