From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0DE3ACD6E79 for ; Fri, 5 Jun 2026 14:46:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wVVoI-0005vq-NM; Fri, 05 Jun 2026 10:46:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wVVoB-0005ry-2Q for qemu-arm@nongnu.org; Fri, 05 Jun 2026 10:46:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wVVo8-00086U-3F for qemu-arm@nongnu.org; Fri, 05 Jun 2026 10:46:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780670757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pO/8EQJqkdldDQ4QRfncy2KBneiT/v+JJKUfe2mKjoo=; b=QcWKXMvWk7vJvP9mBMrTjO7+7qAluUUCTcZ0j/gktfCtc4f+FH/QXs5nc/dpZQTIN7HafJ o9LiDgYHBTzliGqbVdiftluUKTuw/fWj5P7aCeJADeycHmcVLo7yDwMYnncXmBke2pmSZt 5nRtL33qlIrc3xeRJU5SgLxcGpMbUFk= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-404-IXAUWGmhN-yY1qVRsi0Vog-1; Fri, 05 Jun 2026 10:45:56 -0400 X-MC-Unique: IXAUWGmhN-yY1qVRsi0Vog-1 X-Mimecast-MFC-AGG-ID: IXAUWGmhN-yY1qVRsi0Vog_1780670755 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-45ef697092fso1267328f8f.1 for ; Fri, 05 Jun 2026 07:45:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780670755; x=1781275555; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=pO/8EQJqkdldDQ4QRfncy2KBneiT/v+JJKUfe2mKjoo=; b=K/8DM1HWU7KrOmgLc80ZD9bz9JjlSTo/6VPo0BosFI5jMh8IDrYfon/Gw8p0s7XVVf fVhuL0prY9lqzI5VBQTHRC0SdTYCX9X5cApidNtQgTfOvbPx6Vir876Rmlt9hcuSqvK8 ktARxYeG6gfq4ZR0FSvXMEZwSti0y2eNl3/n1zLHjqagmloG6YcZT0WJPn9sSs1L7mPE aU93nar1RZGRc2Yr3OIOrXGGNSMavzVeveV/oAIR80dpurd5escUpb9MHm5zvVKveyVG +kHaeKz0txyJFgjdBMpdJZcUrYh0xmZL/nSDgjTd54+JG+bdHarMbLca2o2IBaZbmDtA yCRw== X-Forwarded-Encrypted: i=1; AFNElJ/z3RkgQgSswXWzDh/1V2oNWhgQm0ZUjpSWVh0GvrVO/lUy3IiqH87+mqvRKhT+L3ghbjtKChsaGg==@nongnu.org X-Gm-Message-State: AOJu0Yxr/a2AocBDc4rL0/RoUPTJlD/oIrQberDlzgo8PiNNiRuBsRgd 2K4iFY4r6/BytRuwdXADEWkO1KGHOpFPcG4fNpma02OPSeKQzYxqh+mH2PgkXuRIiSuI7b/Rp1F NL7Nz/lu4EDSyDAiBprol6LCMQPsxd/4OZLZ8t5LYhuMI/CXJgwQq9Q== X-Gm-Gg: Acq92OF9CfDg55IKUGZj7ClzLYV88xgtW15qntxpTRkeKgjipxQOGBxgIAXR+4/NQJi mRxySY5L6/r0pxEwcm2m/6XtXt2n3nmAcFoDlU85+F+PJuZ4557GfoOwK974PzguFW+9/9OedQq lvkUvg3oCdYUCKOWLDDHLLoclzXf80wUgJ9z3Hs8G7LWijWXJmPiCrHzut1ECeqnmiByuhBc7jZ W1OLktJVHJACskfZVCr13uauhBX/OoYNjLaTYYIjVHWWlAyDybVVi+SnR3sK/Z6zfZzPkLviJXL lUxMPD2mUmSLm01+wo7I6LpXiUoWgYWdUxooScnE8zza9mhxzPiSZL8XsFcRK5G3nVpHZiB2IlM Kuon3zciRAs4gBePZ X-Received: by 2002:a05:600c:5246:b0:489:5022:39a4 with SMTP id 5b1f17b1804b1-490c25d800dmr62687975e9.9.1780670754967; Fri, 05 Jun 2026 07:45:54 -0700 (PDT) X-Received: by 2002:a05:600c:5246:b0:489:5022:39a4 with SMTP id 5b1f17b1804b1-490c25d800dmr62687315e9.9.1780670754465; Fri, 05 Jun 2026 07:45:54 -0700 (PDT) Received: from imammedo ([213.175.37.14]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490bc23394asm159722215e9.0.2026.06.05.07.45.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2026 07:45:53 -0700 (PDT) Date: Fri, 5 Jun 2026 16:45:49 +0200 From: Igor Mammedov To: Eric Auger Cc: qemu-devel@nongnu.org, mst@redhat.com, anisinha@redhat.com, pbonzini@redhat.com, peter.maydell@linaro.org, shannon.zhaosl@gmail.com, philmd@linaro.org, zhao1.liu@intel.com, rad@semihalf.com, leif.lindholm@oss.qualcomm.com, qemu-arm@nongnu.org Subject: Re: [PATCH v2 09/21] arm: virt: create sbsa_gwdt watchdog Message-ID: <20260605164549.6bd95592@imammedo> In-Reply-To: <7d67628a-6fa0-4c4e-a469-a80adc902549@redhat.com> References: <20260303092532.2410177-1-imammedo@redhat.com> <20260303092532.2410177-10-imammedo@redhat.com> <7d67628a-6fa0-4c4e-a469-a80adc902549@redhat.com> X-Mailer: Claws Mail 4.4.0 (GTK 3.24.52; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 6v0Y9hZcvNQ6Cjq-iaaEHslQluPgyvIn67ARe1fkC7A_1780670755 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org On Thu, 4 Jun 2026 18:48:28 +0200 Eric Auger wrote: > Hi Igor, > > On 3/3/26 10:25 AM, Igor Mammedov wrote: > > Allow to use SBSA generic watchdog with virt machine type. > > (includes conditional generation of corresponding FDT and > > ACPI GTDT descriptors) > > > > Use '-device sbsa_gwdt' to command line to enable it. > don't we use '-' instead of '_' in general. At least this is the case > for dynamically instantiable arm-smmuv3 device. Better to align device names are usually ABI, when the get leaked to users, and another place it might break would be migration. I agree with s/_/-/, but let me check/test. if it doesn't break migration, I think we are good to go with rename. > > also this is the terminology used in the fdt compat string > $id: http://devicetree.org/schemas/watchdog/arm,sbsa-gwdt.yaml# > const: arm,sbsa-gwdt > > > > > Tested with Fedora 43: > > FDT: -M virt,acpi=off -device sbsa_gwdt > > ACPI: -M virt -device sbsa_gwdt > > > > Signed-off-by: Igor Mammedov > > --- > > hw/arm/Kconfig | 1 + > > hw/arm/virt-acpi-build.c | 33 +++++++++++++++++++++++++++++++-- > > hw/arm/virt.c | 2 ++ > > hw/core/sysbus-fdt.c | 32 ++++++++++++++++++++++++++++++++ > > hw/watchdog/sbsa_gwdt.c | 1 + > > 5 files changed, 67 insertions(+), 2 deletions(-) > > > > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > > index c66c452737..1222efadd1 100644 > > --- a/hw/arm/Kconfig > > +++ b/hw/arm/Kconfig > > @@ -36,6 +36,7 @@ config ARM_VIRT > > select VIRTIO_MEM_SUPPORTED > > select ACPI_CXL > > select ACPI_HMAT > > + select WDT_SBSA > > > > config CUBIEBOARD > > bool > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > > index 719d2f994e..9c14b1d4d5 100644 > > --- a/hw/arm/virt-acpi-build.c > > +++ b/hw/arm/virt-acpi-build.c > > @@ -64,6 +64,7 @@ > > #include "hw/virtio/virtio-acpi.h" > > #include "target/arm/cpu.h" > > #include "target/arm/multiprocessing.h" > > +#include "hw/watchdog/sbsa_gwdt.h" > > > > #define ARM_SPI_BASE 32 > > > > @@ -863,6 +864,8 @@ build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > > const uint32_t irqflags = 0; /* Interrupt is Level triggered */ > > AcpiTable table = { .sig = "GTDT", .rev = 3, .oem_id = vms->oem_id, > > .oem_table_id = vms->oem_table_id }; > > + uint32_t gtdt_start = table_data->len; > > + Object *wdt = object_resolve_type_unambiguous(TYPE_WDT_SBSA, NULL); > > > > acpi_table_begin(&table, table_data); > > > > @@ -893,10 +896,15 @@ build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > > build_append_int_noprefix(table_data, irqflags, 4); > > /* CntReadBase Physical address */ > > build_append_int_noprefix(table_data, 0xFFFFFFFFFFFFFFFF, 8); > > + > > /* Platform Timer Count */ > > - build_append_int_noprefix(table_data, 0, 4); > > + build_append_int_noprefix(table_data, wdt ? 1 : 0, 4); > > /* Platform Timer Offset */ > > - build_append_int_noprefix(table_data, 0, 4); > > + build_append_int_noprefix(table_data, > > + wdt ? (table_data->len - gtdt_start) + > > + 4 + 4 + 4 /* len of this & following 2 fields to skip */ > > + : 0, 4); > > + > > if (vms->ns_el2_virt_timer_irq) { > > /* Virtual EL2 Timer GSIV */ > > build_append_int_noprefix(table_data, ARCH_TIMER_NS_EL2_VIRT_IRQ, 4); > > @@ -906,6 +914,27 @@ build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > > build_append_int_noprefix(table_data, 0, 4); > > build_append_int_noprefix(table_data, 0, 4); > > } > > + > > + /* ACPI 6.5 spec: 5.2.25.2 ARM Generic Watchdog Structure (Table 5-124) */ > 5.124 > > + if (wdt) { > > + PlatformBusDevice *pbus = PLATFORM_BUS_DEVICE(vms->platform_bus_dev); > > + SysBusDevice *sd = SYS_BUS_DEVICE(wdt); > > + hwaddr mmio_base = vms->memmap[VIRT_PLATFORM_BUS].base; > > + hwaddr rbase = mmio_base + platform_bus_get_mmio_addr(pbus, sd, 0); > > + hwaddr cbase = mmio_base + platform_bus_get_mmio_addr(pbus, sd, 1); > > + int irq = ARM_SPI_BASE + vms->irqmap[VIRT_PLATFORM_BUS] + > > + platform_bus_get_irqn(pbus, sd, 0); > > + > > + build_append_int_noprefix(table_data, 1 /* Type: Watchdog GT */, 1); > > + build_append_int_noprefix(table_data, 28 /* Length */, 2); > > + build_append_int_noprefix(table_data, 0, 1); /* Reserved */ > > + /* RefreshFrame Physical Address */ > > + build_append_int_noprefix(table_data, rbase, 8); > > + /* WatchdogControlFrame Physical Address */ > > + build_append_int_noprefix(table_data, cbase, 8); > > + build_append_int_noprefix(table_data, irq, 4); /* Watchdog Timer GSIV */ > > + build_append_int_noprefix(table_data, 0, 4); /* Watchdog Timer Flags */ > level, active high, non secure > > + } > > acpi_table_end(linker, &table); > > } > > > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > > index cab2e21e8a..a87991b591 100644 > > --- a/hw/arm/virt.c > > +++ b/hw/arm/virt.c > > @@ -95,6 +95,7 @@ > > #include "hw/cxl/cxl.h" > > #include "hw/cxl/cxl_host.h" > > #include "qemu/guest-random.h" > > +#include "hw/watchdog/sbsa_gwdt.h" > > > > static GlobalProperty arm_virt_compat_defaults[] = { > > { TYPE_VIRTIO_IOMMU_PCI, "aw-bits", "48" }, > > @@ -3474,6 +3475,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) > > machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); > > machine_class_allow_dynamic_sysbus_dev(mc, TYPE_UEFI_VARS_SYSBUS); > > machine_class_allow_dynamic_sysbus_dev(mc, TYPE_ARM_SMMUV3); > > + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_WDT_SBSA); > > #ifdef CONFIG_TPM > > machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); > > #endif > > diff --git a/hw/core/sysbus-fdt.c b/hw/core/sysbus-fdt.c > > index 89d0c46445..76aa1bc579 100644 > > --- a/hw/core/sysbus-fdt.c > > +++ b/hw/core/sysbus-fdt.c > > @@ -36,6 +36,7 @@ > > #include "hw/display/ramfb.h" > > #include "hw/uefi/var-service-api.h" > > #include "hw/arm/fdt.h" > > +#include "hw/watchdog/sbsa_gwdt.h" > > > > /* > > * internal struct that contains the information to create dynamic > > @@ -118,6 +119,36 @@ static int add_uefi_vars_node(SysBusDevice *sbdev, void *opaque) > > return 0; > > } > > > > +static int add_sbsa_gwdt_node(SysBusDevice *sbdev, void *opaque) > > +{ > > + PlatformBusFDTData *data = opaque; > > + PlatformBusDevice *pbus = data->pbus; > > + const char *parent_node = data->pbus_node_name; > > + void *fdt = data->fdt; > > + uint64_t cbase, rbase; > > + char *nodename; > > + int irq; > > + > > + cbase = platform_bus_get_mmio_addr(pbus, sbdev, 1); /* control frame */ > > + rbase = platform_bus_get_mmio_addr(pbus, sbdev, 0); /* refresh frame */ > > + irq = platform_bus_get_irqn(pbus, sbdev, 0); > > + > > + nodename = g_strdup_printf("%s/watchdog@%" PRIx64, parent_node, cbase); > > + qemu_fdt_add_subnode(fdt, nodename); > > + > > + qemu_fdt_setprop_string(fdt, nodename, "compatible", "arm,sbsa-gwdt"); > > + qemu_fdt_setprop_cells(fdt, nodename, "reg", > > + cbase, SBSA_GWDT_CMMIO_SIZE, > > + rbase, SBSA_GWDT_RMMIO_SIZE); > > + qemu_fdt_setprop_cells(fdt, nodename, "interrupts", > > + GIC_FDT_IRQ_TYPE_SPI, data->irq_start + irq, > > + GIC_FDT_IRQ_FLAGS_LEVEL_HI); > > + qemu_fdt_setprop_cell(fdt, nodename, "timeout-sec", 30); > > + > > + g_free(nodename); > > + return 0; > > +} > > + > > static int no_fdt_node(SysBusDevice *sbdev, void *opaque) > > { > > return 0; > > @@ -140,6 +171,7 @@ static const BindingEntry bindings[] = { > > TYPE_BINDING(TYPE_ARM_SMMUV3, no_fdt_node), > > TYPE_BINDING(TYPE_RAMFB_DEVICE, no_fdt_node), > > TYPE_BINDING(TYPE_UEFI_VARS_SYSBUS, add_uefi_vars_node), > > + TYPE_BINDING(TYPE_WDT_SBSA, add_sbsa_gwdt_node), > > TYPE_BINDING("", NULL), /* last element */ > > }; > > > > diff --git a/hw/watchdog/sbsa_gwdt.c b/hw/watchdog/sbsa_gwdt.c > > index acb970e8b3..c4dd8005b7 100644 > > --- a/hw/watchdog/sbsa_gwdt.c > > +++ b/hw/watchdog/sbsa_gwdt.c > > @@ -285,6 +285,7 @@ static void wdt_sbsa_gwdt_class_init(ObjectClass *klass, const void *data) > > dc->realize = wdt_sbsa_gwdt_realize; > > device_class_set_legacy_reset(dc, wdt_sbsa_gwdt_reset); > > dc->hotpluggable = false; > > + dc->user_creatable = true; > > set_bit(DEVICE_CATEGORY_WATCHDOG, dc->categories); > > dc->vmsd = &vmstate_sbsa_gwdt; > > dc->desc = "SBSA-compliant generic watchdog device"; > Thanks > > Eric > >