summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@google.com>2020-03-17 18:35:21 -0700
committerPatrick Georgi <pgeorgi@google.com>2020-03-31 10:40:01 +0000
commit9f5c8503d10f43b4236439a5a58c3f25a8a6c5e1 (patch)
treea6eafc213009d0313d597846ddc4c53d14b8b3e2
parentf02bf35e009e7e4c721bcc3fdf10693e4157dcf9 (diff)
downloadcoreboot-9f5c8503d10f43b4236439a5a58c3f25a8a6c5e1.tar.xz
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 <dlaurie@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/39833 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--src/mainboard/emulation/qemu-q35/Kconfig5
1 files changed, 5 insertions, 0 deletions
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