From ca8b0cc8e9176419960b844abb522a2298a794d6 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 13 Dec 2023 10:30:16 +0100 Subject: tests/acpi: allow tests/data/acpi/virt/SSDT.memhp changes Signed-off-by: Gerd Hoffmann --- tests/qtest/bios-tables-test-allowed-diff.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8b..e569098abd 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,2 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/virt/SSDT.memhp", -- cgit v1.2.3 From c3667412582cdda42b36418bed135db96005bb85 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 13 Dec 2023 08:47:16 +0100 Subject: edk2: update to git snapshot Want pick up edk2 commit cee7ba349c0c ("ArmVirtQemu: Allow EFI memory attributes protocol to be disabled"). Needed to fix issue #1990. Signed-off-by: Gerd Hoffmann --- roms/edk2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roms/edk2 b/roms/edk2 index 819cfc6b42..b8a3eec88c 160000 --- a/roms/edk2 +++ b/roms/edk2 @@ -1 +1 @@ -Subproject commit 819cfc6b42a68790a23509e4fcc58ceb70e1965e +Subproject commit b8a3eec88cc74bbfe7fb389d026cc7d1d8a989c8 -- cgit v1.2.3 From 6f79fa5f097aa41fc96a14dfccdb0ea8d9facd6c Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 13 Dec 2023 08:57:20 +0100 Subject: edk2: update build config, set PcdUninstallMemAttrProtocol = TRUE. Needed to workaround buggy EFI_MEMORY_ATTRIBUTE_PROTOCOL usage in shim.efi. Signed-off-by: Gerd Hoffmann --- roms/edk2-build.config | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/roms/edk2-build.config b/roms/edk2-build.config index bab6a9caeb..0d367dbdb7 100644 --- a/roms/edk2-build.config +++ b/roms/edk2-build.config @@ -22,9 +22,15 @@ SMM_REQUIRE = TRUE [opts.armvirt.silent] DEBUG_PRINT_ERROR_LEVEL = 0x80000000 -[pcds.nx.broken.grub] +[pcds.nx.strict] +PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD5 +PcdUninstallMemAttrProtocol = FALSE + +[pcds.nx.broken.shim.grub] # grub.efi uses EfiLoaderData for code PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1 +# shim.efi has broken MemAttr code +PcdUninstallMemAttrProtocol = TRUE [pcds.workaround.202308] PcdFirstTimeWakeUpAPsBySipi = FALSE @@ -95,7 +101,7 @@ conf = ArmVirtPkg/ArmVirtQemu.dsc arch = ARM opts = common armvirt.silent -pcds = nx.broken.grub +pcds = nx.broken.shim.grub plat = ArmVirtQemu-ARM dest = ../pc-bios cpy1 = FV/QEMU_EFI.fd edk2-arm-code.fd @@ -112,7 +118,7 @@ conf = ArmVirtPkg/ArmVirtQemu.dsc arch = AARCH64 opts = common armvirt.silent -pcds = nx.broken.grub +pcds = nx.broken.shim.grub plat = ArmVirtQemu-AARCH64 dest = ../pc-bios cpy1 = FV/QEMU_EFI.fd edk2-aarch64-code.fd -- cgit v1.2.3 From 5058720151961d79ef3abdacea94327f2c63951a Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 13 Dec 2023 09:29:29 +0100 Subject: edk2: update binaries to git snapshot Resolves: #1990 Signed-off-by: Gerd Hoffmann --- pc-bios/edk2-aarch64-code.fd.bz2 | Bin 1573561 -> 1587761 bytes pc-bios/edk2-arm-code.fd.bz2 | Bin 1560966 -> 1569509 bytes pc-bios/edk2-i386-code.fd.bz2 | Bin 1770410 -> 1773520 bytes pc-bios/edk2-i386-secure-code.fd.bz2 | Bin 2121818 -> 2127480 bytes pc-bios/edk2-riscv-code.fd.bz2 | Bin 1177402 -> 1180314 bytes pc-bios/edk2-x86_64-code.fd.bz2 | Bin 1887921 -> 1891942 bytes pc-bios/edk2-x86_64-microvm.fd.bz2 | Bin 1782629 -> 1783951 bytes pc-bios/edk2-x86_64-secure-code.fd.bz2 | Bin 2200701 -> 2212258 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/pc-bios/edk2-aarch64-code.fd.bz2 b/pc-bios/edk2-aarch64-code.fd.bz2 index 985e69a66a..fdcf89022a 100644 Binary files a/pc-bios/edk2-aarch64-code.fd.bz2 and b/pc-bios/edk2-aarch64-code.fd.bz2 differ diff --git a/pc-bios/edk2-arm-code.fd.bz2 b/pc-bios/edk2-arm-code.fd.bz2 index ae797a8c8e..9d829f4f08 100644 Binary files a/pc-bios/edk2-arm-code.fd.bz2 and b/pc-bios/edk2-arm-code.fd.bz2 differ diff --git a/pc-bios/edk2-i386-code.fd.bz2 b/pc-bios/edk2-i386-code.fd.bz2 index e703c2f954..1a9d392574 100644 Binary files a/pc-bios/edk2-i386-code.fd.bz2 and b/pc-bios/edk2-i386-code.fd.bz2 differ diff --git a/pc-bios/edk2-i386-secure-code.fd.bz2 b/pc-bios/edk2-i386-secure-code.fd.bz2 index 7230d44615..fab0a77b30 100644 Binary files a/pc-bios/edk2-i386-secure-code.fd.bz2 and b/pc-bios/edk2-i386-secure-code.fd.bz2 differ diff --git a/pc-bios/edk2-riscv-code.fd.bz2 b/pc-bios/edk2-riscv-code.fd.bz2 index c1cc08561d..6394fbfff3 100644 Binary files a/pc-bios/edk2-riscv-code.fd.bz2 and b/pc-bios/edk2-riscv-code.fd.bz2 differ diff --git a/pc-bios/edk2-x86_64-code.fd.bz2 b/pc-bios/edk2-x86_64-code.fd.bz2 index 9b7767a3ac..0d325bd483 100644 Binary files a/pc-bios/edk2-x86_64-code.fd.bz2 and b/pc-bios/edk2-x86_64-code.fd.bz2 differ diff --git a/pc-bios/edk2-x86_64-microvm.fd.bz2 b/pc-bios/edk2-x86_64-microvm.fd.bz2 index 17460dd380..829429082b 100644 Binary files a/pc-bios/edk2-x86_64-microvm.fd.bz2 and b/pc-bios/edk2-x86_64-microvm.fd.bz2 differ diff --git a/pc-bios/edk2-x86_64-secure-code.fd.bz2 b/pc-bios/edk2-x86_64-secure-code.fd.bz2 index fd0efeacbf..c6b039819c 100644 Binary files a/pc-bios/edk2-x86_64-secure-code.fd.bz2 and b/pc-bios/edk2-x86_64-secure-code.fd.bz2 differ -- cgit v1.2.3 From 55abfc1ffbe54c00529668903fd99b4bb57a6338 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 13 Dec 2023 10:40:02 +0100 Subject: tests/acpi: update expected data files edk2 firmware update caused a address layout change. DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001) { [ ... ] - Name (MEMA, 0x43C90000) + Name (MEMA, 0x43C80000) } Signed-off-by: Gerd Hoffmann --- tests/data/acpi/virt/SSDT.memhp | Bin 1817 -> 1817 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp index 31ff6ac469..fb3dcde5a1 100644 Binary files a/tests/data/acpi/virt/SSDT.memhp and b/tests/data/acpi/virt/SSDT.memhp differ -- cgit v1.2.3 From 704f7cad5105246822686f65765ab92045f71a3b Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 13 Dec 2023 11:21:13 +0100 Subject: tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes Signed-off-by: Gerd Hoffmann --- tests/qtest/bios-tables-test-allowed-diff.h | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index e569098abd..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,2 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/SSDT.memhp", -- cgit v1.2.3