hw/tpm: add PPI support to tpm-tis-device for ARM64 virt
Add PPI memory region and ACPI _STA, _DSM to tpm-tis-sysbus so Windows 11 ARM64 guests no longer log Event ID 15 errors from tpm.sys on every boot. Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> Signed-off-by: Mohammadfaiz Bawa <mbawa@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20260327173209.148180-4-mbawa@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Mohammadfaiz Bawa committed
Mar 27, 2026 at 23:02 UTC
46cd2c1050f0fde1a384234264ff8afdcb42d82f
2 files changed
+19
-1
hw/arm/virt-acpi-build.c
+8
-1
@@ -240,7 +240,8 @@ static void acpi_dsdt_add_tpm(Aml *scope, VirtMachineState *vms)
240
Aml *dev = aml_device("TPM0");
241
aml_append(dev, aml_name_decl("_HID", aml_string("MSFT0101")));
242
aml_append(dev, aml_name_decl("_STR", aml_string("TPM 2.0 Device")));
243
- aml_append(dev, aml_name_decl("_UID", aml_int(0)));
243
+ aml_append(dev, aml_name_decl("_UID", aml_int(1)));
244
+ aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
245
246
Aml *crs = aml_resource_template();
247
aml_append(crs,
@@ -248,6 +249,12 @@ static void acpi_dsdt_add_tpm(Aml *scope, VirtMachineState *vms)
249
(uint32_t)memory_region_size(sbdev_mr),
250
AML_READ_WRITE));
251
aml_append(dev, aml_name_decl("_CRS", crs));
252
+
253
+ hwaddr ppi_base = platform_bus_get_mmio_addr(pbus, sbdev, 1);
254
+ if (ppi_base != -1) {
255
+ ppi_base += pbus_base;
256
+ tpm_build_ppi_acpi(TPM_IF(sbdev), dev, ppi_base);
257
+ }
258
aml_append(scope, dev);
259
}
260
#endif
hw/tpm/tpm_tis_sysbus.c
+11
@@ -30,6 +30,7 @@
30
#include "hw/core/sysbus.h"
31
#include "tpm_tis.h"
32
#include "qom/object.h"
33
+#include "qemu/memalign.h"
34
35
struct TPMStateSysBus {
36
/*< private >*/
@@ -99,6 +100,7 @@ static void tpm_tis_sysbus_initfn(Object *obj)
100
{
101
TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(obj);
102
TPMState *s = &sbdev->state;
103
+ size_t host_page_size = qemu_real_host_page_size();
104
105
memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
106
s, "tpm-tis-mmio",
@@ -106,6 +108,12 @@ static void tpm_tis_sysbus_initfn(Object *obj)
108
109
sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
110
sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
111
+
112
+ s->ppi.buf = qemu_memalign(host_page_size,
113
+ ROUND_UP(TPM_PPI_ADDR_SIZE, host_page_size));
114
+ memory_region_init_ram_device_ptr(&s->ppi.ram, obj, "tpm-ppi",
115
+ TPM_PPI_ADDR_SIZE, s->ppi.buf);
116
+ sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->ppi.ram);
117
}
118
119
static void tpm_tis_sysbus_realizefn(DeviceState *dev, Error **errp)
@@ -122,6 +130,8 @@ static void tpm_tis_sysbus_realizefn(DeviceState *dev, Error **errp)
130
error_setg(errp, "'tpmdev' property is required");
131
return;
132
}
133
+
134
+ vmstate_register_ram(&s->ppi.ram, dev);
135
}
136
137
static void tpm_tis_sysbus_class_init(ObjectClass *klass, const void *data)
@@ -132,6 +142,7 @@ static void tpm_tis_sysbus_class_init(ObjectClass *klass, const void *data)
142
device_class_set_props(dc, tpm_tis_sysbus_properties);
143
dc->vmsd = &vmstate_tpm_tis_sysbus;
144
tc->model = TPM_MODEL_TPM_TIS;
145
+ tc->ppi_enabled = true;
146
dc->realize = tpm_tis_sysbus_realizefn;
147
device_class_set_legacy_reset(dc, tpm_tis_sysbus_reset);
148
tc->request_completed = tpm_tis_sysbus_request_completed;