From 9f5c8503d10f43b4236439a5a58c3f25a8a6c5e1 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Tue, 17 Mar 2020 18:35:21 -0700 Subject: mb/emulation/qemu-q35: Increase max size of ACPI tables When the TPM is enabled in QEMU the fw_cfg interface will return ~200KiB of ACPI tables, so this needs to be increased from the default in order to be able to boot. This is seen when using a TPM with qemu as it will hang when processing the fw_cfg tables. qemu-system-x86_64 \ -machine q35 -enable-kvm -vga virtio -serial stdio \ -drive 'id=hd,file=disk.bin' -bios coreboot.rom \ -chardev 'socket,id=swtpm,path=/tmp/swtpm/swtpm-sock' \ -tpmdev 'emulator,id=tpm0,chardev=swtpm' \ -device 'tpm-tis,tpmdev=tpm0' Change-Id: I21980aace8e86e636f5ae7b55148f4c31404edba Signed-off-by: Duncan Laurie Reviewed-on: https://review.coreboot.org/c/coreboot/+/39833 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/mainboard/emulation/qemu-q35/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig index ee430d0aeb..71841fb591 100644 --- a/src/mainboard/emulation/qemu-q35/Kconfig +++ b/src/mainboard/emulation/qemu-q35/Kconfig @@ -51,6 +51,11 @@ config MMCONF_BASE_ADDRESS hex default 0xb0000000 +# fw_cfg tables can be larger than the default when TPM is enabled +config MAX_ACPI_TABLE_SIZE_KB + int + default 224 + # Skip the first 64KiB as coreboot table pointer is installed # at address 0 config DCACHE_RAM_BASE -- cgit v1.2.3