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=1759847228; cv=none; d=zohomail.com; s=zohoarc; b=GDdpRqLdWnWl/DPcE4F29os5CXCUvLQP8c2JZVD603Q0xoVZ8HM8CwdKcXPZeWYBcC21JDN78wFWczy/aWzVgwEBBMg1NkFbSDZEMP1oeA692DvAdJv4fkb6rTfjBFS3zI2rLhGainwAiOuNeQum39KBoAF43VvNDIDmJFZtVA4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759847228; 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=REExaYDHINLR9Ktzyks9N8RWTaQZTmAlLbGW7Aj7d6c=; b=GGDwRtbvlHXtzmol5MMb2tQzp5NPOLR/Uu9UcK5XHeT6nrYBNd7ED9BReTrLasdkN3HCIxZTEyylHPihQChVsC/L0yOSu4tLbWBzQ3RqX0SI+mVFBpjL10CcxwVvNk5mAs/jTb8YeLyr0j7b+APkR0/n4UGMVDAOz+uMBuxXjnI= 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 1759847228078400.71661756209687; Tue, 7 Oct 2025 07:27:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v68Q3-0005fK-V7; Tue, 07 Oct 2025 10:12:00 -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 1v68Q0-0005f2-M8 for qemu-devel@nongnu.org; Tue, 07 Oct 2025 10:11:57 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v68Pm-00028N-No for qemu-devel@nongnu.org; Tue, 07 Oct 2025 10:11:55 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-46e2e6a708fso41809495e9.0 for ; Tue, 07 Oct 2025 07:11:40 -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.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 07:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759846298; x=1760451098; 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=REExaYDHINLR9Ktzyks9N8RWTaQZTmAlLbGW7Aj7d6c=; b=rAhbtBEXo6hH7+/wf77cIth4RxX3TNiOKUwB4x3salhvQBiImrNmFoVaPfcgfJzBbQ SrY3XzzdVttpgPO1oMRERONAsP8v4+APYtbRCqE8zJLv7JJvxC+xYB1AkMwYpzHNVG0m s09hnWMPMie0iJvgdPoyPbJULVV83sJFiNX7vf+xj1ILh5svirF8P9HIwo0w3ydfE9ak /pVeEOuD3AHWz/1aXZwZz79h4jqtGlO03YT8EhB3DJF2rw2y7BrY7HYuUB+NfRTLbesq k1GFIvKAIwAzr2PJtbg6GHvOSkNDb0YvGGbaBxL2Esdv5mdcSqpMTUBME6HWzfI6XXco CCKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759846298; x=1760451098; 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=REExaYDHINLR9Ktzyks9N8RWTaQZTmAlLbGW7Aj7d6c=; b=tyfaEI26Ww/zXQVMcRfdNxjtQZrhs61i272rav2Mr8KZt5uzGLCiqIb7PWwX0E62tC XchAMjCw0P4RD1UXJT3Lr4MdYBEsNgsNYyB6ABg3TJznzCG/w98HWa5M6ncm4mD2Tot1 iYG2i0ilhcMBbH5fwPk0pKq/5mY8uHQeVEdxVdIgjLz79MC74oWuzhoJMWYTQESAdG4V YD41wMQJSPpUMJjzbHSfhT5fvLNUvYTvJwxHQg9+LzwSV/5dREdzLPVVJkHLPXv21OJr HioeynbqE30zuSJCfMzyJAaHRfWy8HoVDfAr3qzL4hTlZ4t0w8J7O5I433+W1xtTRSDr duzA== X-Gm-Message-State: AOJu0YyflGU2EV56bkrpb6xeZruKOI3sldT8j0blLyZc7bFMIkmyIa/o AG9U7Zl5oyz945BSRyQrBr7tydWabAUhRca3+R2dxp/fMYCP39IjpackUcXOTRo3GS51m5h70xl wmzjA X-Gm-Gg: ASbGnctxokSh8QDOYrF44cqCWtzwdgWJjV3IoRNuNgLngDtKRKTQSOBnd8jPFtpJup1 7Zg37Os/mXBgqB+dgTtW9Hgt/6Lf05YK9EVNzN1ctRuHay4ZJNI4TTC8MuPxqJkmnMsoMmuDbM4 RbHK0R/VUz6wZsT/xbbZuGDbYOenu6MKjKLq7A8z8+Gdgvgz9+gpY9O129KuQSnAsWxMsYS1wEE z2dSN3pHi6X4VOHRGFTcU5LEYdQhtB9wBAMuOPaBwYZbaihH2Pf2dk6ybWjdK4fB+H184YUCkU7 1yDlnZB9iV5t3yIzy1CoOeqcELwwT4Hn9LCjfOZAm1E3aEpg74L9ZaPyrKshl5tpv7YEge5iE0i A4TYpjisyeHHEsHG5CuuPUCixB7rSx9pEetfiai6QDN4QLstA0L0euKNG X-Google-Smtp-Source: AGHT+IHByTDVX/2r1rmfjq2BXfQBPdXHytKjlL75jMDUEyjuGvasdEXxzigsTPSRrkudWKOfeSfkbw== X-Received: by 2002:a05:600c:a118:b0:46e:4784:cdf5 with SMTP id 5b1f17b1804b1-46e7227f720mr85535355e9.15.1759846297723; Tue, 07 Oct 2025 07:11:37 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/62] hw/arm/xlnx-versal: efuse: refactor creation Date: Tue, 7 Oct 2025 15:10:31 +0100 Message-ID: <20251007141123.3239867-12-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::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.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: 1759847234566116600 From: Luc Michel Refactore the eFuse devices creation using the VersalMap structure. Note that the corresponding FDT nodes are removed. They do not correspond to any real node in standard Versal DTBs. No matching drivers exist for them. 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-11-luc.michel@amd.com Signed-off-by: Peter Maydell --- include/hw/arm/xlnx-versal.h | 5 +-- hw/arm/xlnx-versal-virt.c | 43 ++------------------ hw/arm/xlnx-versal.c | 78 +++++++++++++++++++++++------------- 3 files changed, 54 insertions(+), 72 deletions(-) diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index 5d4b30f0ff9..79ca9b13321 100644 --- a/include/hw/arm/xlnx-versal.h +++ b/include/hw/arm/xlnx-versal.h @@ -20,7 +20,6 @@ #include "hw/rtc/xlnx-zynqmp-rtc.h" #include "qom/object.h" #include "hw/nvram/xlnx-bbram.h" -#include "hw/nvram/xlnx-versal-efuse.h" #include "hw/ssi/xlnx-versal-ospi.h" #include "hw/dma/xlnx_csu_dma.h" #include "hw/misc/xlnx-versal-crl.h" @@ -102,9 +101,6 @@ struct Versal { XlnxZynqMPRTC rtc; XlnxVersalTRng trng; XlnxBBRam bbram; - XlnxEFuse efuse; - XlnxVersalEFuseCtrl efuse_ctrl; - XlnxVersalEFuseCache efuse_cache; XlnxVersalCFUAPB cfu_apb; XlnxVersalCFUFDRO cfu_fdro; XlnxVersalCFUSFR cfu_sfr; @@ -139,6 +135,7 @@ static inline void versal_set_fdt(Versal *s, void *fdt) } =20 void versal_sdhci_plug_card(Versal *s, int sd_idx, BlockBackend *blk); +void versal_efuse_attach_drive(Versal *s, BlockBackend *blk); =20 int versal_get_num_can(VersalVersion version); int versal_get_num_sdhci(VersalVersion version); diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index 5801598da7c..b6c49dafe09 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -192,41 +192,6 @@ static void fdt_add_bbram_node(VersalVirt *s) g_free(name); } =20 -static void fdt_add_efuse_ctrl_node(VersalVirt *s) -{ - const char compat[] =3D TYPE_XLNX_VERSAL_EFUSE_CTRL; - const char interrupt_names[] =3D "pmc_efuse"; - char *name =3D g_strdup_printf("/pmc_efuse@%x", MM_PMC_EFUSE_CTRL); - - qemu_fdt_add_subnode(s->fdt, name); - - qemu_fdt_setprop_cells(s->fdt, name, "interrupts", - GIC_FDT_IRQ_TYPE_SPI, VERSAL_EFUSE_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_EFUSE_CTRL, - 2, MM_PMC_EFUSE_CTRL_SIZE); - qemu_fdt_setprop(s->fdt, name, "compatible", compat, sizeof(compat)); - g_free(name); -} - -static void fdt_add_efuse_cache_node(VersalVirt *s) -{ - const char compat[] =3D TYPE_XLNX_VERSAL_EFUSE_CACHE; - char *name =3D g_strdup_printf("/xlnx_pmc_efuse_cache@%x", - MM_PMC_EFUSE_CACHE); - - qemu_fdt_add_subnode(s->fdt, name); - - qemu_fdt_setprop_sized_cells(s->fdt, name, "reg", - 2, MM_PMC_EFUSE_CACHE, - 2, MM_PMC_EFUSE_CACHE_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; @@ -393,7 +358,7 @@ static void bbram_attach_drive(XlnxBBRam *dev) } } =20 -static void efuse_attach_drive(XlnxEFuse *dev) +static void efuse_attach_drive(VersalVirt *s) { DriveInfo *dinfo; BlockBackend *blk; @@ -401,7 +366,7 @@ static void efuse_attach_drive(XlnxEFuse *dev) dinfo =3D drive_get_by_index(IF_PFLASH, 1); blk =3D dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; if (blk) { - qdev_prop_set_drive(DEVICE(dev), "drive", blk); + versal_efuse_attach_drive(&s->soc, blk); } } =20 @@ -483,8 +448,6 @@ static void versal_virt_init(MachineState *machine) fdt_add_timer_nodes(s); fdt_add_rtc_node(s); fdt_add_bbram_node(s); - fdt_add_efuse_ctrl_node(s); - fdt_add_efuse_cache_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); @@ -498,7 +461,7 @@ static void versal_virt_init(MachineState *machine) bbram_attach_drive(&s->soc.pmc.bbram); =20 /* Attach efuse backend, if given */ - efuse_attach_drive(&s->soc.pmc.efuse); + efuse_attach_drive(s); =20 /* Plug SD cards */ for (i =3D 0; i < versal_get_num_sdhci(VERSAL_VER_VERSAL); i++) { diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 946c0170674..f8291ac614b 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -33,6 +33,7 @@ #include "hw/dma/xlnx-zdma.h" #include "hw/misc/xlnx-versal-xramc.h" #include "hw/usb/xlnx-usb-subsystem.h" +#include "hw/nvram/xlnx-versal-efuse.h" =20 #define XLNX_VERSAL_ACPU_TYPE ARM_CPU_TYPE_NAME("cortex-a72") #define XLNX_VERSAL_RCPU_TYPE ARM_CPU_TYPE_NAME("cortex-r5f") @@ -88,6 +89,12 @@ typedef struct VersalMap { int irq; } usb[2]; size_t num_usb; + + struct VersalEfuseMap { + uint64_t ctrl; + uint64_t cache; + int irq; + } efuse; } VersalMap; =20 static const VersalMap VERSAL_MAP =3D { @@ -119,6 +126,8 @@ static const VersalMap VERSAL_MAP =3D { =20 .usb[0] =3D { .xhci =3D 0xfe200000, .ctrl =3D 0xff9d0000, .irq =3D 22 = }, .num_usb =3D 1, + + .efuse =3D { .ctrl =3D 0xf1240000, .cache =3D 0xf1250000, .irq =3D 139= }, }; =20 static const VersalMap *VERSION_TO_MAP[] =3D { @@ -752,42 +761,41 @@ static void versal_create_bbram(Versal *s, qemu_irq *= pic) qdev_get_gpio_in(DEVICE(&s->pmc.apb_irq_orgate), 1)= ); } =20 -static void versal_realize_efuse_part(Versal *s, Object *dev, hwaddr base) +static void versal_create_efuse(Versal *s, + const struct VersalEfuseMap *map) { - SysBusDevice *part =3D SYS_BUS_DEVICE(dev); + DeviceState *bits; + DeviceState *ctrl; + DeviceState *cache; =20 - object_property_set_link(OBJECT(part), "efuse", - OBJECT(&s->pmc.efuse), &error_abort); + ctrl =3D qdev_new(TYPE_XLNX_VERSAL_EFUSE_CTRL); + cache =3D qdev_new(TYPE_XLNX_VERSAL_EFUSE_CACHE); + bits =3D qdev_new(TYPE_XLNX_EFUSE); =20 - sysbus_realize(part, &error_abort); - memory_region_add_subregion(&s->mr_ps, base, - sysbus_mmio_get_region(part, 0)); -} + qdev_prop_set_uint32(bits, "efuse-nr", 3); + qdev_prop_set_uint32(bits, "efuse-size", 8192); =20 -static void versal_create_efuse(Versal *s, qemu_irq *pic) -{ - Object *bits =3D OBJECT(&s->pmc.efuse); - Object *ctrl =3D OBJECT(&s->pmc.efuse_ctrl); - Object *cache =3D OBJECT(&s->pmc.efuse_cache); + object_property_add_child(OBJECT(s), "efuse", OBJECT(bits)); + qdev_realize_and_unref(bits, NULL, &error_abort); =20 - object_initialize_child(OBJECT(s), "efuse-ctrl", &s->pmc.efuse_ctrl, - TYPE_XLNX_VERSAL_EFUSE_CTRL); + object_property_set_link(OBJECT(ctrl), "efuse", OBJECT(bits), &error_a= bort); =20 - object_initialize_child(OBJECT(s), "efuse-cache", &s->pmc.efuse_cache, - TYPE_XLNX_VERSAL_EFUSE_CACHE); + object_property_set_link(OBJECT(cache), "efuse", OBJECT(bits), + &error_abort); =20 - object_initialize_child_with_props(ctrl, "xlnx-efuse@0", bits, - sizeof(s->pmc.efuse), - TYPE_XLNX_EFUSE, &error_abort, - "efuse-nr", "3", - "efuse-size", "8192", - NULL); + object_property_add_child(OBJECT(s), "efuse-cache", OBJECT(cache)); + sysbus_realize_and_unref(SYS_BUS_DEVICE(cache), &error_abort); =20 - qdev_realize(DEVICE(bits), NULL, &error_abort); - versal_realize_efuse_part(s, ctrl, MM_PMC_EFUSE_CTRL); - versal_realize_efuse_part(s, cache, MM_PMC_EFUSE_CACHE); + object_property_add_child(OBJECT(s), "efuse-ctrl", OBJECT(ctrl)); + sysbus_realize_and_unref(SYS_BUS_DEVICE(ctrl), &error_abort); =20 - sysbus_connect_irq(SYS_BUS_DEVICE(ctrl), 0, pic[VERSAL_EFUSE_IRQ]); + memory_region_add_subregion(&s->mr_ps, map->ctrl, + sysbus_mmio_get_region(SYS_BUS_DEVICE(ctrl= ), + 0)); + memory_region_add_subregion(&s->mr_ps, map->cache, + sysbus_mmio_get_region(SYS_BUS_DEVICE(cach= e), + 0)); + versal_sysbus_connect_irq(s, SYS_BUS_DEVICE(ctrl), 0, map->irq); } =20 static void versal_create_pmc_iou_slcr(Versal *s, qemu_irq *pic) @@ -1257,11 +1265,12 @@ static void versal_realize(DeviceState *dev, Error = **errp) versal_create_usb(s, &map->usb[i]); } =20 + versal_create_efuse(s, &map->efuse); + versal_create_pmc_apb_irq_orgate(s, pic); versal_create_rtc(s, pic); versal_create_trng(s, pic); versal_create_bbram(s, pic); - versal_create_efuse(s, pic); versal_create_pmc_iou_slcr(s, pic); versal_create_ospi(s, pic); versal_create_crl(s, pic); @@ -1296,6 +1305,19 @@ void versal_sdhci_plug_card(Versal *s, int sd_idx, B= lockBackend *blk) &error_fatal); } =20 +void versal_efuse_attach_drive(Versal *s, BlockBackend *blk) +{ + DeviceState *efuse; + + efuse =3D DEVICE(versal_get_child(s, "efuse")); + + if (efuse =3D=3D NULL) { + return; + } + + qdev_prop_set_drive(efuse, "drive", blk); +} + int versal_get_num_can(VersalVersion version) { const VersalMap *map =3D VERSION_TO_MAP[version]; --=20 2.43.0