@samitouri / QOSamiQemu / commits / beadd272c1

acpi: introduce WDAT table for GWDT

Add build_gwdt_wdat() to generate a Watchdog Action Table designed for SBSA Generic Watchdog Timer. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Message-ID: <20260702145856.1539572-7-imammedo@redhat.com>

Igor Mammedov committed Jul 2, 2026 at 16:58 UTC beadd272c10289c0086d66fc5d1a0c5229127916
4 files changed +136
hw/acpi/meson.build
+2
@@ -31,11 +31,13 @@ acpi_ss.add(when: 'CONFIG_ACPI_ERST', if_true: files('erst.c'))
31 acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'))
32 stub_ss.add(files('ipmi-stub.c'))
33 stub_ss.add(files('acpi-x86-stub.c'))
34 +acpi_ss.add(when: 'CONFIG_WDT_SBSA', if_true: files('wdat-gwdt.c'))
35 if have_tpm
36 acpi_ss.add(files('tpm.c'))
37 endif
38 stub_ss.add(files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c'))
39 stub_ss.add(files('pci-bridge-stub.c'))
40 +stub_ss.add(files('wdat-gwdt-stub.c'))
41 system_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss)
42 system_ss.add(when: 'CONFIG_GHES_CPER', if_true: files('ghes_cper.c'))
43 stub_ss.add(files('ghes_cper_stub.c'))
hw/acpi/wdat-gwdt-stub.c new
+16
@@ -0,0 +1,16 @@
1 +/*
2 + * Copyright Red Hat, Inc. 2026
3 + * Author(s): Igor Mammedov <imammedo@redhat.com>
4 + *
5 + * SPDX-License-Identifier: GPL-2.0-or-later
6 + */
7 +
8 +#include "qemu/osdep.h"
9 +#include "hw/acpi/wdat-gwdt.h"
10 +
11 +void build_gwdt_wdat(GArray *table_data, BIOSLinker *linker, const char *oem_id,
12 + const char *oem_table_id, uint64_t rbase, uint64_t cbase,
13 + uint64_t freq)
14 +{
15 + g_assert_not_reached();
16 +}
hw/acpi/wdat-gwdt.c new
+99
@@ -0,0 +1,99 @@
1 +/*
2 + * SBSA GWDT Watchdog Action Table (WDAT)
3 + *
4 + * Copyright Red Hat, Inc. 2026
5 + * Author(s): Igor Mammedov <imammedo@redhat.com>
6 + *
7 + * SPDX-License-Identifier: GPL-2.0-or-later
8 + */
9 +
10 +#include "qemu/osdep.h"
11 +#include "hw/acpi/aml-build.h"
12 +#include "hw/acpi/wdat-gwdt.h"
13 +#include "hw/acpi/wdat.h"
14 +#include "hw/watchdog/sbsa_gwdt.h"
15 +
16 +#define GWDT_REG(base, reg_offset, reg_width) { \
17 + .space_id = AML_AS_SYSTEM_MEMORY, \
18 + .address = base + reg_offset, .bit_width = reg_width, \
19 + .access_width = AML_DWORD_ACC };
20 +
21 +/*
22 + * "Hardware Watchdog Timers Design Specification"
23 + * https://uefi.org/acpi 'Watchdog Action Table (WDAT)'
24 + */
25 +void build_gwdt_wdat(GArray *table_data, BIOSLinker *linker, const char *oem_id,
26 + const char *oem_table_id, uint64_t rbase, uint64_t cbase,
27 + uint64_t freq)
28 +{
29 + AcpiTable table = { .sig = "WDAT", .rev = 1, .oem_id = oem_id,
30 + .oem_table_id = oem_table_id };
31 +
32 + struct AcpiGenericAddress wrr = GWDT_REG(rbase, 0x0, 32);
33 + struct AcpiGenericAddress wor_l = GWDT_REG(cbase, SBSA_GWDT_WOR, 32);
34 + struct AcpiGenericAddress wcs = GWDT_REG(cbase, SBSA_GWDT_WCS, 32);
35 +
36 + acpi_table_begin(&table, table_data);
37 + build_append_int_noprefix(table_data, 0x20, 4); /* Watchdog Header Length */
38 + /*
39 + * PCI location fields are set to 0xff to indicate
40 + * that the watchdog is not a PCI device.
41 + */
42 + build_append_int_noprefix(table_data, 0xff, 2); /* PCI Segment */
43 + build_append_int_noprefix(table_data, 0xff, 1); /* PCI Bus Number */
44 + build_append_int_noprefix(table_data, 0xff, 1); /* PCI Device Number */
45 + build_append_int_noprefix(table_data, 0xff, 1); /* PCI Function Number */
46 + build_append_int_noprefix(table_data, 0, 3); /* Reserved */
47 + /*
48 + * WDAT spec: "The clock interval that the WDT uses must be
49 + * greater than or equal to 1 millisecond."
50 + */
51 + g_assert(freq <= 1000);
52 + /* Timer Period, ms */
53 + build_append_int_noprefix(table_data, 1000 / freq, 4);
54 + /*
55 + * WDAT spec: "The time-out period before the WDT fires is recommended
56 + * to be at least 5 minutes."
57 + * Set max count to 10min and min count to 5sec.
58 + */
59 + build_append_int_noprefix(table_data, 600 * freq, 4); /* Maximum Count */
60 + build_append_int_noprefix(table_data, 5 * freq, 4); /* Minimum Count */
61 + /*
62 + * WATCHDOG_ENABLED | WATCHDOG_STOPPED_IN_SLEEP_STATE
63 + */
64 + build_append_int_noprefix(table_data, 0x81, 1); /* Watchdog Flags */
65 + build_append_int_noprefix(table_data, 0, 3); /* Reserved */
66 + /*
67 + * watchdog instruction entries
68 + */
69 + build_append_int_noprefix(table_data, 8, 4);
70 + /* Action table: WCS (control/status) register actions */
71 + build_append_wdat_ins(table_data, WDAT_ACTION_QUERY_RUNNING_STATE,
72 + WDAT_INS_READ_VALUE,
73 + wcs, 0x1, 0x1);
74 + build_append_wdat_ins(table_data, WDAT_ACTION_SET_RUNNING_STATE,
75 + WDAT_INS_WRITE_VALUE | WDAT_INS_PRESERVE_REGISTER,
76 + wcs, 1, 0x00000001);
77 + build_append_wdat_ins(table_data, WDAT_ACTION_QUERY_STOPPED_STATE,
78 + WDAT_INS_READ_VALUE,
79 + wcs, 0x0, 0x00000001);
80 + build_append_wdat_ins(table_data, WDAT_ACTION_SET_STOPPED_STATE,
81 + WDAT_INS_WRITE_VALUE | WDAT_INS_PRESERVE_REGISTER,
82 + wcs, 0x0, 0x00000001);
83 + build_append_wdat_ins(table_data, WDAT_ACTION_QUERY_WATCHDOG_STATUS,
84 + WDAT_INS_READ_VALUE,
85 + wcs, 0x4, 0x00000004);
86 + /* WOR (offset) and WRR (refresh) register actions */
87 + build_append_wdat_ins(table_data, WDAT_ACTION_SET_COUNTDOWN_PERIOD,
88 + WDAT_INS_WRITE_COUNTDOWN,
89 + wor_l, 0, 0xffffffff);
90 + /* WRR: any write refreshes the watchdog, value is ignored */
91 + build_append_wdat_ins(table_data, WDAT_ACTION_RESET,
92 + WDAT_INS_WRITE_VALUE,
93 + wrr, 0x1, 0x1);
94 + build_append_wdat_ins(table_data, WDAT_ACTION_SET_WATCHDOG_STATUS,
95 + WDAT_INS_WRITE_VALUE | WDAT_INS_PRESERVE_REGISTER,
96 + wrr, 0x4, 0x4);
97 +
98 + acpi_table_end(linker, &table);
99 +}
include/hw/acpi/wdat-gwdt.h new
+19
@@ -0,0 +1,19 @@
1 +/*
2 + * GWDT Watchdog Action Table (WDAT) definition
3 + *
4 + * Copyright Red Hat, Inc. 2026
5 + * Author(s): Igor Mammedov <imammedo@redhat.com>
6 + *
7 + * SPDX-License-Identifier: GPL-2.0-or-later
8 + */
9 +#ifndef QEMU_HW_ACPI_WDAT_GWDT_H
10 +#define QEMU_HW_ACPI_WDAT_GWDT_H
11 +
12 +#include "hw/acpi/aml-build.h"
13 +#include "hw/watchdog/sbsa_gwdt.h"
14 +
15 +void build_gwdt_wdat(GArray *table_data, BIOSLinker *linker, const char *oem_id,
16 + const char *oem_table_id, uint64_t rbase, uint64_t cbase,
17 + uint64_t freq);
18 +
19 +#endif /* QEMU_HW_ACPI_WDAT_GWDT_H */