* [PATCH v2 0/9] edk2: update to edk2-stable202511
@ 2025-11-28 8:45 Gerd Hoffmann
2025-11-28 8:45 ` [PATCH v2 1/9] tests/acpi: enable updates Gerd Hoffmann
` (8 more replies)
0 siblings, 9 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2025-11-28 8:45 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Michael S. Tsirkin, Gerd Hoffmann,
Igor Mammedov, Ani Sinha
Update edk2 firmware images to latest upstream release.
Noteworthy edk2 upstream change is that 32-bit architectures (ia32 and
arm) are not supported any more, so the qemu builds of these are removed
too.
v2:
- add asl diff to test data update.
- rename rischv builds.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Gerd Hoffmann (9):
tests/acpi: enable updates
edk2: update build script
edk2: update submodule to edk2-stable202511
edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars
edk2: drop 32-bit binaries (ia32 and arm)
edk2: update binaries to edk2-stable202511
edk2: rename risc-v firmware builds
tests/acpi: update expected data files
tests/acpi: disable updates
roms/edk2-build.py | 21 +++++--
tests/qtest/bios-tables-test.c | 40 +++++++-------
pc-bios/descriptors/50-edk2-i386-secure.json | 34 ------------
pc-bios/descriptors/60-edk2-aarch64.json | 2 +-
pc-bios/descriptors/60-edk2-arm.json | 31 -----------
pc-bios/descriptors/60-edk2-i386.json | 33 -----------
pc-bios/descriptors/60-edk2-riscv64.json | 4 +-
pc-bios/descriptors/meson.build | 3 -
pc-bios/edk2-aarch64-code.fd.bz2 | Bin 1565763 -> 1662423 bytes
...m-vars.fd.bz2 => edk2-aarch64-vars.fd.bz2} | Bin
pc-bios/edk2-arm-code.fd.bz2 | Bin 1570311 -> 0 bytes
pc-bios/edk2-i386-code.fd.bz2 | Bin 1780004 -> 0 bytes
pc-bios/edk2-i386-secure-code.fd.bz2 | Bin 1858666 -> 0 bytes
pc-bios/edk2-i386-vars.fd.bz2 | Bin 190 -> 0 bytes
pc-bios/edk2-loongarch64-code.fd.bz2 | Bin 1148383 -> 1178146 bytes
pc-bios/edk2-riscv-code.fd.bz2 | Bin 1296526 -> 0 bytes
pc-bios/edk2-riscv64-code.fd.bz2 | Bin 0 -> 1252448 bytes
...v-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} | Bin
pc-bios/edk2-x86_64-code.fd.bz2 | Bin 1907255 -> 2138026 bytes
pc-bios/edk2-x86_64-microvm.fd.bz2 | Bin 1787244 -> 1996414 bytes
pc-bios/edk2-x86_64-secure-code.fd.bz2 | Bin 1962992 -> 2293816 bytes
pc-bios/meson.build | 10 +---
roms/edk2 | 2 +-
roms/edk2-build.config | 52 +++---------------
roms/edk2-version | 4 +-
tests/data/acpi/aarch64/virt/HEST | Bin 224 -> 224 bytes
tests/data/acpi/aarch64/virt/SSDT.memhp | Bin 1817 -> 1817 bytes
27 files changed, 53 insertions(+), 183 deletions(-)
delete mode 100644 pc-bios/descriptors/50-edk2-i386-secure.json
delete mode 100644 pc-bios/descriptors/60-edk2-arm.json
delete mode 100644 pc-bios/descriptors/60-edk2-i386.json
rename pc-bios/{edk2-arm-vars.fd.bz2 => edk2-aarch64-vars.fd.bz2} (100%)
delete mode 100644 pc-bios/edk2-arm-code.fd.bz2
delete mode 100644 pc-bios/edk2-i386-code.fd.bz2
delete mode 100644 pc-bios/edk2-i386-secure-code.fd.bz2
delete mode 100644 pc-bios/edk2-i386-vars.fd.bz2
delete mode 100644 pc-bios/edk2-riscv-code.fd.bz2
create mode 100644 pc-bios/edk2-riscv64-code.fd.bz2
rename pc-bios/{edk2-riscv-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} (100%)
--
2.52.0
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH v2 1/9] tests/acpi: enable updates 2025-11-28 8:45 [PATCH v2 0/9] edk2: update to edk2-stable202511 Gerd Hoffmann @ 2025-11-28 8:45 ` Gerd Hoffmann 2025-11-28 8:45 ` [PATCH v2 2/9] edk2: update build script Gerd Hoffmann ` (7 subsequent siblings) 8 siblings, 0 replies; 15+ messages in thread From: Gerd Hoffmann @ 2025-11-28 8:45 UTC (permalink / raw) To: qemu-devel Cc: Philippe Mathieu-Daudé, Michael S. Tsirkin, Gerd Hoffmann, Igor Mammedov, Ani Sinha Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- tests/qtest/bios-tables-test-allowed-diff.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8bf4..c3c0d53211c7 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,3 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/aarch64/virt/HEST", +"tests/data/acpi/aarch64/virt/SSDT.memhp", -- 2.52.0 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 2/9] edk2: update build script 2025-11-28 8:45 [PATCH v2 0/9] edk2: update to edk2-stable202511 Gerd Hoffmann 2025-11-28 8:45 ` [PATCH v2 1/9] tests/acpi: enable updates Gerd Hoffmann @ 2025-11-28 8:45 ` Gerd Hoffmann 2025-11-28 13:00 ` Philippe Mathieu-Daudé 2025-11-28 8:45 ` [PATCH v2 3/9] edk2: update submodule to edk2-stable202511 Gerd Hoffmann ` (6 subsequent siblings) 8 siblings, 1 reply; 15+ messages in thread From: Gerd Hoffmann @ 2025-11-28 8:45 UTC (permalink / raw) To: qemu-devel Cc: Philippe Mathieu-Daudé, Michael S. Tsirkin, Gerd Hoffmann, Igor Mammedov, Ani Sinha sync with https://gitlab.com/kraxel/edk2-build-config/ Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- roms/edk2-build.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/roms/edk2-build.py b/roms/edk2-build.py index e564765aaa71..c4bfbae4cffb 100755 --- a/roms/edk2-build.py +++ b/roms/edk2-build.py @@ -51,7 +51,17 @@ def get_toolchain(cfg, build): return cfg[build]['tool'] if cfg.has_option('global', 'tool'): return cfg['global']['tool'] - return 'GCC5' + return 'GCC' + +def get_hostarch(): + mach = os.uname().machine + if mach == 'x86_64': + return 'X64' + if mach == 'aarch64': + return 'AARCH64' + if mach == 'riscv64': + return 'RISCV64' + return 'UNKNOWN' def get_version(cfg, silent = False): coredir = get_coredir(cfg) @@ -137,7 +147,7 @@ def build_run(cmdline, name, section, silent = False, nologs = False): print(f'### exit code: {result.returncode}') else: secs = int(time.time() - start) - print(f'### OK ({int(secs/60)}:{secs%60:02d})') + print(f'### OK ({int(secs)}sec)') else: print(cmdline, flush = True) result = subprocess.run(cmdline, check = False) @@ -191,7 +201,10 @@ def build_one(cfg, build, jobs = None, silent = False, nologs = False): if jobs: cmdline += [ '-n', jobs ] for arch in b['arch'].split(): - cmdline += [ '-a', arch ] + if arch == 'HOST': + cmdline += [ '-a', get_hostarch() ] + else: + cmdline += [ '-a', arch ] if 'opts' in b: for name in b['opts'].split(): section = 'opts.' + name @@ -235,7 +248,7 @@ def build_one(cfg, build, jobs = None, silent = False, nologs = False): def build_basetools(silent = False, nologs = False): build_message('building: BaseTools', silent = silent) - basedir = os.environ['EDK_TOOLS_PATH'] + basedir = os.environ['EDK_TOOLS_PATH'] + '/Source/C' cmdline = [ 'make', '-C', basedir ] build_run(cmdline, 'BaseTools', 'build.basetools', silent, nologs) -- 2.52.0 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v2 2/9] edk2: update build script 2025-11-28 8:45 ` [PATCH v2 2/9] edk2: update build script Gerd Hoffmann @ 2025-11-28 13:00 ` Philippe Mathieu-Daudé 0 siblings, 0 replies; 15+ messages in thread From: Philippe Mathieu-Daudé @ 2025-11-28 13:00 UTC (permalink / raw) To: Gerd Hoffmann, qemu-devel; +Cc: Michael S. Tsirkin, Igor Mammedov, Ani Sinha On 28/11/25 09:45, Gerd Hoffmann wrote: > sync with https://gitlab.com/kraxel/edk2-build-config/ > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > roms/edk2-build.py | 21 +++++++++++++++++---- > 1 file changed, 17 insertions(+), 4 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 3/9] edk2: update submodule to edk2-stable202511 2025-11-28 8:45 [PATCH v2 0/9] edk2: update to edk2-stable202511 Gerd Hoffmann 2025-11-28 8:45 ` [PATCH v2 1/9] tests/acpi: enable updates Gerd Hoffmann 2025-11-28 8:45 ` [PATCH v2 2/9] edk2: update build script Gerd Hoffmann @ 2025-11-28 8:45 ` Gerd Hoffmann 2025-11-28 12:59 ` Philippe Mathieu-Daudé 2025-11-28 8:45 ` [PATCH v2 4/9] edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars Gerd Hoffmann ` (5 subsequent siblings) 8 siblings, 1 reply; 15+ messages in thread From: Gerd Hoffmann @ 2025-11-28 8:45 UTC (permalink / raw) To: qemu-devel Cc: Philippe Mathieu-Daudé, Michael S. Tsirkin, Gerd Hoffmann, Igor Mammedov, Ani Sinha Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- roms/edk2 | 2 +- roms/edk2-version | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roms/edk2 b/roms/edk2 index 4dfdca63a934..46548b1adac8 160000 --- a/roms/edk2 +++ b/roms/edk2 @@ -1 +1 @@ -Subproject commit 4dfdca63a93497203f197ec98ba20e2327e4afe4 +Subproject commit 46548b1adac82211d8d11da12dd914f41e7aa775 diff --git a/roms/edk2-version b/roms/edk2-version index 069f19f8bf49..1c2e9c9819df 100644 --- a/roms/edk2-version +++ b/roms/edk2-version @@ -1,2 +1,2 @@ -EDK2_STABLE = edk2-stable202408 -EDK2_DATE = 08/13/2024 +EDK2_STABLE = edk2-stable202511 +EDK2_DATE = 11/19/2025 -- 2.52.0 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v2 3/9] edk2: update submodule to edk2-stable202511 2025-11-28 8:45 ` [PATCH v2 3/9] edk2: update submodule to edk2-stable202511 Gerd Hoffmann @ 2025-11-28 12:59 ` Philippe Mathieu-Daudé 0 siblings, 0 replies; 15+ messages in thread From: Philippe Mathieu-Daudé @ 2025-11-28 12:59 UTC (permalink / raw) To: Gerd Hoffmann, qemu-devel; +Cc: Michael S. Tsirkin, Igor Mammedov, Ani Sinha On 28/11/25 09:45, Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > roms/edk2 | 2 +- > roms/edk2-version | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 4/9] edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars 2025-11-28 8:45 [PATCH v2 0/9] edk2: update to edk2-stable202511 Gerd Hoffmann ` (2 preceding siblings ...) 2025-11-28 8:45 ` [PATCH v2 3/9] edk2: update submodule to edk2-stable202511 Gerd Hoffmann @ 2025-11-28 8:45 ` Gerd Hoffmann 2025-11-28 12:59 ` Philippe Mathieu-Daudé 2025-11-28 8:45 ` [PATCH v2 7/9] edk2: rename risc-v firmware builds Gerd Hoffmann ` (4 subsequent siblings) 8 siblings, 1 reply; 15+ messages in thread From: Gerd Hoffmann @ 2025-11-28 8:45 UTC (permalink / raw) To: qemu-devel Cc: Philippe Mathieu-Daudé, Michael S. Tsirkin, Gerd Hoffmann, Igor Mammedov, Ani Sinha Upstream edk2 has dropped support for 32-bit architectures. Remove the build config for these builds, update aarch64 (which used to share the 'vars' image with arm). Drop references to the 32-bit builds in a number of places. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- tests/qtest/bios-tables-test.c | 28 ++++++------- pc-bios/descriptors/50-edk2-i386-secure.json | 34 --------------- pc-bios/descriptors/60-edk2-aarch64.json | 2 +- pc-bios/descriptors/60-edk2-arm.json | 31 -------------- pc-bios/descriptors/60-edk2-i386.json | 33 --------------- pc-bios/descriptors/meson.build | 3 -- pc-bios/meson.build | 6 +-- roms/edk2-build.config | 44 ++------------------ 8 files changed, 19 insertions(+), 162 deletions(-) delete mode 100644 pc-bios/descriptors/50-edk2-i386-secure.json delete mode 100644 pc-bios/descriptors/60-edk2-arm.json delete mode 100644 pc-bios/descriptors/60-edk2-i386.json diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 6b892ef23e1a..e65db5e7fce7 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1619,7 +1619,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void) .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", .ram_start = 0x40000000ULL, .scan_len = 256ULL * MiB, @@ -1650,7 +1650,7 @@ static void test_acpi_aarch64_virt_acpi_pci_hotplug(void) .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", .ram_start = 0x40000000ULL, .scan_len = 256ULL * MiB, @@ -1674,7 +1674,7 @@ static void test_acpi_aarch64_virt_pcie_root_port_hpoff(void) .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", .ram_start = 0x40000000ULL, .scan_len = 256ULL * MiB, @@ -1788,7 +1788,7 @@ static void test_acpi_aarch64_virt_tcg_numamem(void) .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", .ram_start = 0x40000000ULL, .scan_len = 128ULL * MiB, @@ -1811,7 +1811,7 @@ static void test_acpi_aarch64_virt_tcg_pxb(void) .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd", .ram_start = 0x40000000ULL, .scan_len = 128ULL * MiB, }; @@ -1844,7 +1844,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_spcr(void) .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", .ram_start = 0x40000000ULL, .scan_len = 128ULL * 1024 * 1024, @@ -1924,7 +1924,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_hmat(void) .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", .ram_start = 0x40000000ULL, .scan_len = 128ULL * MiB, @@ -2200,7 +2200,7 @@ static void test_acpi_aarch64_virt_tcg(void) .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", .ram_start = 0x40000000ULL, .scan_len = 128ULL * MiB, @@ -2221,7 +2221,7 @@ static void test_acpi_aarch64_virt_tcg_topology(void) .variant = ".topology", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", .ram_start = 0x40000000ULL, .scan_len = 128ULL * MiB, @@ -2240,7 +2240,7 @@ static void test_acpi_aarch64_virt_tcg_its_off(void) .variant = ".its_off", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", .ram_start = 0x40000000ULL, .scan_len = 128ULL * 1024 * 1024, @@ -2326,7 +2326,7 @@ static void test_acpi_aarch64_virt_viot(void) .variant = ".viot", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", .ram_start = 0x40000000ULL, .scan_len = 128ULL * MiB, @@ -2344,7 +2344,7 @@ static void test_acpi_aarch64_virt_smmuv3_legacy(void) .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd", .ram_start = 0x40000000ULL, .scan_len = 128ULL * MiB, }; @@ -2383,7 +2383,7 @@ static void test_acpi_aarch64_virt_smmuv3_dev(void) .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd", .ram_start = 0x40000000ULL, .scan_len = 128ULL * MiB, }; @@ -2590,7 +2590,7 @@ static void test_acpi_aarch64_virt_oem_fields(void) .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", .ram_start = 0x40000000ULL, .scan_len = 128ULL * MiB, diff --git a/pc-bios/descriptors/50-edk2-i386-secure.json b/pc-bios/descriptors/50-edk2-i386-secure.json deleted file mode 100644 index d7108c1da05a..000000000000 --- a/pc-bios/descriptors/50-edk2-i386-secure.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "description": "UEFI firmware for i386, with Secure Boot and SMM", - "interface-types": [ - "uefi" - ], - "mapping": { - "device": "flash", - "executable": { - "filename": "@DATADIR@/edk2-i386-secure-code.fd", - "format": "raw" - }, - "nvram-template": { - "filename": "@DATADIR@/edk2-i386-vars.fd", - "format": "raw" - } - }, - "targets": [ - { - "architecture": "i386", - "machines": [ - "pc-q35-*" - ] - } - ], - "features": [ - "acpi-s3", - "requires-smm", - "secure-boot", - "verbose-dynamic" - ], - "tags": [ - - ] -} diff --git a/pc-bios/descriptors/60-edk2-aarch64.json b/pc-bios/descriptors/60-edk2-aarch64.json index 800a21bda691..94926172959c 100644 --- a/pc-bios/descriptors/60-edk2-aarch64.json +++ b/pc-bios/descriptors/60-edk2-aarch64.json @@ -10,7 +10,7 @@ "format": "raw" }, "nvram-template": { - "filename": "@DATADIR@/edk2-arm-vars.fd", + "filename": "@DATADIR@/edk2-aarch64-vars.fd", "format": "raw" } }, diff --git a/pc-bios/descriptors/60-edk2-arm.json b/pc-bios/descriptors/60-edk2-arm.json deleted file mode 100644 index d5f1bba6cc82..000000000000 --- a/pc-bios/descriptors/60-edk2-arm.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "description": "UEFI firmware for arm", - "interface-types": [ - "uefi" - ], - "mapping": { - "device": "flash", - "executable": { - "filename": "@DATADIR@/edk2-arm-code.fd", - "format": "raw" - }, - "nvram-template": { - "filename": "@DATADIR@/edk2-arm-vars.fd", - "format": "raw" - } - }, - "targets": [ - { - "architecture": "arm", - "machines": [ - "virt-*" - ] - } - ], - "features": [ - "verbose-static" - ], - "tags": [ - - ] -} diff --git a/pc-bios/descriptors/60-edk2-i386.json b/pc-bios/descriptors/60-edk2-i386.json deleted file mode 100644 index 2f8dec74fecb..000000000000 --- a/pc-bios/descriptors/60-edk2-i386.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "description": "UEFI firmware for i386", - "interface-types": [ - "uefi" - ], - "mapping": { - "device": "flash", - "executable": { - "filename": "@DATADIR@/edk2-i386-code.fd", - "format": "raw" - }, - "nvram-template": { - "filename": "@DATADIR@/edk2-i386-vars.fd", - "format": "raw" - } - }, - "targets": [ - { - "architecture": "i386", - "machines": [ - "pc-i440fx-*", - "pc-q35-*" - ] - } - ], - "features": [ - "acpi-s3", - "verbose-dynamic" - ], - "tags": [ - - ] -} diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.build index cdd0be01a356..63f1c00b6406 100644 --- a/pc-bios/descriptors/meson.build +++ b/pc-bios/descriptors/meson.build @@ -1,10 +1,7 @@ if unpack_edk2_blobs and get_option('install_blobs') foreach f: [ - '50-edk2-i386-secure.json', '50-edk2-x86_64-secure.json', '60-edk2-aarch64.json', - '60-edk2-arm.json', - '60-edk2-i386.json', '60-edk2-x86_64.json', '60-edk2-loongarch64.json', '60-edk2-riscv64.json' diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 9260aaad78e8..7c3d56478345 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -2,13 +2,9 @@ roms = [] if unpack_edk2_blobs fds = [ 'edk2-aarch64-code.fd', - 'edk2-arm-code.fd', - 'edk2-arm-vars.fd', + 'edk2-aarch64-vars.fd', 'edk2-riscv-code.fd', 'edk2-riscv-vars.fd', - 'edk2-i386-code.fd', - 'edk2-i386-secure-code.fd', - 'edk2-i386-vars.fd', 'edk2-x86_64-code.fd', 'edk2-x86_64-secure-code.fd', 'edk2-loongarch64-code.fd', diff --git a/roms/edk2-build.config b/roms/edk2-build.config index 9e45361fb445..fcf9da8c7681 100644 --- a/roms/edk2-build.config +++ b/roms/edk2-build.config @@ -33,29 +33,6 @@ PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1 # shim.efi has broken MemAttr code PcdUninstallMemAttrProtocol = TRUE -#################################################################################### -# i386 - -[build.ovmf.i386] -desc = ovmf build (32-bit) -conf = OvmfPkg/OvmfPkgIa32.dsc -arch = IA32 -opts = common -plat = OvmfIa32 -dest = ../pc-bios -cpy1 = FV/OVMF_CODE.fd edk2-i386-code.fd -cpy2 = FV/OVMF_VARS.fd edk2-i386-vars.fd - -[build.ovmf.i386.secure] -desc = ovmf build (32-bit, secure boot) -conf = OvmfPkg/OvmfPkgIa32.dsc -arch = IA32 -opts = common - ovmf.sb.smm -plat = OvmfIa32 -dest = ../pc-bios -cpy1 = FV/OVMF_CODE.fd edk2-i386-secure-code.fd - #################################################################################### # x86_64 @@ -87,23 +64,6 @@ plat = MicrovmX64 dest = ../pc-bios cpy1 = FV/MICROVM.fd edk2-x86_64-microvm.fd -#################################################################################### -# arm - -[build.armvirt.arm] -desc = ArmVirt build, 32-bit (arm v7) -conf = ArmVirtPkg/ArmVirtQemu.dsc -arch = ARM -opts = common - armvirt.silent -pcds = nx.broken.shim.grub -plat = ArmVirtQemu-ARM -dest = ../pc-bios -cpy1 = FV/QEMU_EFI.fd edk2-arm-code.fd -cpy2 = FV/QEMU_VARS.fd edk2-arm-vars.fd -pad1 = edk2-arm-code.fd 64m -pad2 = edk2-arm-vars.fd 64m - #################################################################################### # aarch64 @@ -114,10 +74,12 @@ arch = AARCH64 opts = common armvirt.silent pcds = nx.broken.shim.grub -plat = ArmVirtQemu-AARCH64 +plat = ArmVirtQemu-AArch64 dest = ../pc-bios cpy1 = FV/QEMU_EFI.fd edk2-aarch64-code.fd +cpy2 = FV/QEMU_VARS.fd edk2-aarch64-vars.fd pad1 = edk2-aarch64-code.fd 64m +pad2 = edk2-aarch64-vars.fd 64m #################################################################################### # riscv64 -- 2.52.0 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v2 4/9] edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars 2025-11-28 8:45 ` [PATCH v2 4/9] edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars Gerd Hoffmann @ 2025-11-28 12:59 ` Philippe Mathieu-Daudé 0 siblings, 0 replies; 15+ messages in thread From: Philippe Mathieu-Daudé @ 2025-11-28 12:59 UTC (permalink / raw) To: Gerd Hoffmann, qemu-devel; +Cc: Michael S. Tsirkin, Igor Mammedov, Ani Sinha On 28/11/25 09:45, Gerd Hoffmann wrote: > Upstream edk2 has dropped support for 32-bit architectures. Remove the > build config for these builds, update aarch64 (which used to share the > 'vars' image with arm). > > Drop references to the 32-bit builds in a number of places. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > tests/qtest/bios-tables-test.c | 28 ++++++------- > pc-bios/descriptors/50-edk2-i386-secure.json | 34 --------------- > pc-bios/descriptors/60-edk2-aarch64.json | 2 +- > pc-bios/descriptors/60-edk2-arm.json | 31 -------------- > pc-bios/descriptors/60-edk2-i386.json | 33 --------------- > pc-bios/descriptors/meson.build | 3 -- > pc-bios/meson.build | 6 +-- > roms/edk2-build.config | 44 ++------------------ > 8 files changed, 19 insertions(+), 162 deletions(-) > delete mode 100644 pc-bios/descriptors/50-edk2-i386-secure.json > delete mode 100644 pc-bios/descriptors/60-edk2-arm.json > delete mode 100644 pc-bios/descriptors/60-edk2-i386.json Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 7/9] edk2: rename risc-v firmware builds 2025-11-28 8:45 [PATCH v2 0/9] edk2: update to edk2-stable202511 Gerd Hoffmann ` (3 preceding siblings ...) 2025-11-28 8:45 ` [PATCH v2 4/9] edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars Gerd Hoffmann @ 2025-11-28 8:45 ` Gerd Hoffmann 2025-11-28 12:52 ` Philippe Mathieu-Daudé 2025-11-28 8:45 ` [PATCH v2 8/9] tests/acpi: update expected data files Gerd Hoffmann ` (3 subsequent siblings) 8 siblings, 1 reply; 15+ messages in thread From: Gerd Hoffmann @ 2025-11-28 8:45 UTC (permalink / raw) To: qemu-devel Cc: Philippe Mathieu-Daudé, Michael S. Tsirkin, Gerd Hoffmann, Igor Mammedov, Ani Sinha 'riscv' => 'riscv64', for consistency with the other architectures which all have '64' in the name. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- tests/qtest/bios-tables-test.c | 12 ++++++------ pc-bios/descriptors/60-edk2-riscv64.json | 4 ++-- ...2-riscv-code.fd.bz2 => edk2-riscv64-code.fd.bz2} | Bin ...2-riscv-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} | Bin pc-bios/meson.build | 4 ++-- roms/edk2-build.config | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) rename pc-bios/{edk2-riscv-code.fd.bz2 => edk2-riscv64-code.fd.bz2} (100%) rename pc-bios/{edk2-riscv-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} (100%) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index e65db5e7fce7..c50fb166fb7c 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1761,8 +1761,8 @@ static void test_acpi_riscv64_virt_tcg_numamem(void) .machine = "virt", .arch = "riscv64", .tcg_only = true, - .uefi_fl1 = "pc-bios/edk2-riscv-code.fd", - .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd", + .uefi_fl1 = "pc-bios/edk2-riscv64-code.fd", + .uefi_fl2 = "pc-bios/edk2-riscv64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2", .ram_start = 0x80000000ULL, .scan_len = 128ULL * MiB, @@ -1862,8 +1862,8 @@ static void test_acpi_riscv64_virt_tcg_acpi_spcr(void) .machine = "virt", .arch = "riscv64", .tcg_only = true, - .uefi_fl1 = "pc-bios/edk2-riscv-code.fd", - .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd", + .uefi_fl1 = "pc-bios/edk2-riscv64-code.fd", + .uefi_fl2 = "pc-bios/edk2-riscv64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2", .ram_start = 0x80000000ULL, .scan_len = 128ULL * 1024 * 1024, @@ -2177,8 +2177,8 @@ static void test_acpi_riscv64_virt_tcg(void) .machine = "virt", .arch = "riscv64", .tcg_only = true, - .uefi_fl1 = "pc-bios/edk2-riscv-code.fd", - .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd", + .uefi_fl1 = "pc-bios/edk2-riscv64-code.fd", + .uefi_fl2 = "pc-bios/edk2-riscv64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2", .ram_start = 0x80000000ULL, .scan_len = 128ULL * MiB, diff --git a/pc-bios/descriptors/60-edk2-riscv64.json b/pc-bios/descriptors/60-edk2-riscv64.json index 14811ca307f6..7f03083d5e0b 100644 --- a/pc-bios/descriptors/60-edk2-riscv64.json +++ b/pc-bios/descriptors/60-edk2-riscv64.json @@ -6,11 +6,11 @@ "mapping": { "device": "flash", "executable": { - "filename": "@DATADIR@/edk2-riscv-code.fd", + "filename": "@DATADIR@/edk2-riscv64-code.fd", "format": "raw" }, "nvram-template": { - "filename": "@DATADIR@/edk2-riscv-vars.fd", + "filename": "@DATADIR@/edk2-riscv64-vars.fd", "format": "raw" } }, diff --git a/pc-bios/edk2-riscv-code.fd.bz2 b/pc-bios/edk2-riscv64-code.fd.bz2 similarity index 100% rename from pc-bios/edk2-riscv-code.fd.bz2 rename to pc-bios/edk2-riscv64-code.fd.bz2 diff --git a/pc-bios/edk2-riscv-vars.fd.bz2 b/pc-bios/edk2-riscv64-vars.fd.bz2 similarity index 100% rename from pc-bios/edk2-riscv-vars.fd.bz2 rename to pc-bios/edk2-riscv64-vars.fd.bz2 diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 7c3d56478345..591f22a50b93 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -3,8 +3,8 @@ if unpack_edk2_blobs fds = [ 'edk2-aarch64-code.fd', 'edk2-aarch64-vars.fd', - 'edk2-riscv-code.fd', - 'edk2-riscv-vars.fd', + 'edk2-riscv64-code.fd', + 'edk2-riscv64-vars.fd', 'edk2-x86_64-code.fd', 'edk2-x86_64-secure-code.fd', 'edk2-loongarch64-code.fd', diff --git a/roms/edk2-build.config b/roms/edk2-build.config index fcf9da8c7681..96ebc3bcd9e7 100644 --- a/roms/edk2-build.config +++ b/roms/edk2-build.config @@ -89,10 +89,10 @@ conf = OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc arch = RISCV64 plat = RiscVVirtQemu dest = ../pc-bios -cpy1 = FV/RISCV_VIRT_CODE.fd edk2-riscv-code.fd -cpy2 = FV/RISCV_VIRT_VARS.fd edk2-riscv-vars.fd -pad1 = edk2-riscv-code.fd 32m -pad2 = edk2-riscv-vars.fd 32m +cpy1 = FV/RISCV_VIRT_CODE.fd edk2-riscv64-code.fd +cpy2 = FV/RISCV_VIRT_VARS.fd edk2-riscv64-vars.fd +pad1 = edk2-riscv64-code.fd 32m +pad2 = edk2-riscv64-vars.fd 32m #################################################################################### # LoongArch64 -- 2.52.0 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v2 7/9] edk2: rename risc-v firmware builds 2025-11-28 8:45 ` [PATCH v2 7/9] edk2: rename risc-v firmware builds Gerd Hoffmann @ 2025-11-28 12:52 ` Philippe Mathieu-Daudé 0 siblings, 0 replies; 15+ messages in thread From: Philippe Mathieu-Daudé @ 2025-11-28 12:52 UTC (permalink / raw) To: Gerd Hoffmann, qemu-devel; +Cc: Michael S. Tsirkin, Igor Mammedov, Ani Sinha On 28/11/25 09:45, Gerd Hoffmann wrote: > 'riscv' => 'riscv64', for consistency with the other > architectures which all have '64' in the name. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > tests/qtest/bios-tables-test.c | 12 ++++++------ > pc-bios/descriptors/60-edk2-riscv64.json | 4 ++-- > ...2-riscv-code.fd.bz2 => edk2-riscv64-code.fd.bz2} | Bin > ...2-riscv-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} | Bin > pc-bios/meson.build | 4 ++-- > roms/edk2-build.config | 8 ++++---- > 6 files changed, 14 insertions(+), 14 deletions(-) > rename pc-bios/{edk2-riscv-code.fd.bz2 => edk2-riscv64-code.fd.bz2} (100%) > rename pc-bios/{edk2-riscv-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} (100%) Thank you :) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 8/9] tests/acpi: update expected data files 2025-11-28 8:45 [PATCH v2 0/9] edk2: update to edk2-stable202511 Gerd Hoffmann ` (4 preceding siblings ...) 2025-11-28 8:45 ` [PATCH v2 7/9] edk2: rename risc-v firmware builds Gerd Hoffmann @ 2025-11-28 8:45 ` Gerd Hoffmann 2025-11-28 8:45 ` [PATCH v2 9/9] tests/acpi: disable updates Gerd Hoffmann ` (2 subsequent siblings) 8 siblings, 0 replies; 15+ messages in thread From: Gerd Hoffmann @ 2025-11-28 8:45 UTC (permalink / raw) To: qemu-devel Cc: Philippe Mathieu-Daudé, Michael S. Tsirkin, Gerd Hoffmann, Igor Mammedov, Ani Sinha New firmware builds change the memory layout a bit, so some addresses in the acpi tables need an update. --- /tmp/asl-LIXCG3.dsl 2025-11-27 10:26:15.536331817 +0100 +++ /tmp/asl-LSXYG3.dsl 2025-11-27 10:26:15.532094101 +0100 /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * - * Disassembly of tests/data/acpi/aarch64/virt/HEST + * Disassembly of /tmp/aml-CPXYG3 * * ACPI Data Table [HEST] * * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue (in hex) */ [000h 0000 004h] Signature : "HEST" [Hardware Error Source Table] [004h 0004 004h] Table Length : 000000E0 [008h 0008 001h] Revision : 01 -[009h 0009 001h] Checksum : 6C +[009h 0009 001h] Checksum : F0 [00Ah 0010 006h] Oem ID : "BOCHS " [010h 0016 008h] Oem Table ID : "BXPC " [018h 0024 004h] Oem Revision : 00000001 [01Ch 0028 004h] Asl Compiler ID : "BXPC" [020h 0032 004h] Asl Compiler Revision : 00000001 [024h 0036 004h] Error Source Count : 00000002 [028h 0040 002h] Subtable Type : 000A [Generic Hardware Error Source V2] [02Ah 0042 002h] Source Id : 0000 [02Ch 0044 002h] Related Source Id : FFFF [02Eh 0046 001h] Reserved : 00 [02Fh 0047 001h] Enabled : 01 [030h 0048 004h] Records To Preallocate : 00000001 [034h 0052 004h] Max Sections Per Record : 00000001 [038h 0056 004h] Max Raw Data Length : 00000400 [03Ch 0060 00Ch] Error Status Address : [Generic Address Structure] [03Ch 0060 001h] Space ID : 00 [SystemMemory] [03Dh 0061 001h] Bit Width : 40 [03Eh 0062 001h] Bit Offset : 00 [03Fh 0063 001h] Encoded Access Width : 04 [QWord Access:64] -[040h 0064 008h] Address : 0000000043DA0000 +[040h 0064 008h] Address : 0000000046360000 [048h 0072 01Ch] Notify : [Hardware Error Notification Structure] [048h 0072 001h] Notify Type : 08 [SEA] [049h 0073 001h] Notify Length : 1C [04Ah 0074 002h] Configuration Write Enable : 0000 [04Ch 0076 004h] PollInterval : 00000000 [050h 0080 004h] Vector : 00000000 [054h 0084 004h] Polling Threshold Value : 00000000 [058h 0088 004h] Polling Threshold Window : 00000000 [05Ch 0092 004h] Error Threshold Value : 00000000 [060h 0096 004h] Error Threshold Window : 00000000 [064h 0100 004h] Error Status Block Length : 00000400 [068h 0104 00Ch] Read Ack Register : [Generic Address Structure] [068h 0104 001h] Space ID : 00 [SystemMemory] [069h 0105 001h] Bit Width : 40 [06Ah 0106 001h] Bit Offset : 00 [06Bh 0107 001h] Encoded Access Width : 04 [QWord Access:64] -[06Ch 0108 008h] Address : 0000000043DA0010 +[06Ch 0108 008h] Address : 0000000046360010 [074h 0116 008h] Read Ack Preserve : FFFFFFFFFFFFFFFE [07Ch 0124 008h] Read Ack Write : 0000000000000001 [084h 0132 002h] Subtable Type : 000A [Generic Hardware Error Source V2] [086h 0134 002h] Source Id : 0001 [088h 0136 002h] Related Source Id : FFFF [08Ah 0138 001h] Reserved : 00 [08Bh 0139 001h] Enabled : 01 [08Ch 0140 004h] Records To Preallocate : 00000001 [090h 0144 004h] Max Sections Per Record : 00000001 [094h 0148 004h] Max Raw Data Length : 00000400 [098h 0152 00Ch] Error Status Address : [Generic Address Structure] [098h 0152 001h] Space ID : 00 [SystemMemory] [099h 0153 001h] Bit Width : 40 [09Ah 0154 001h] Bit Offset : 00 [09Bh 0155 001h] Encoded Access Width : 04 [QWord Access:64] -[09Ch 0156 008h] Address : 0000000043DA0008 +[09Ch 0156 008h] Address : 0000000046360008 [0A4h 0164 01Ch] Notify : [Hardware Error Notification Structure] [0A4h 0164 001h] Notify Type : 07 [GPIO] [0A5h 0165 001h] Notify Length : 1C [0A6h 0166 002h] Configuration Write Enable : 0000 [0A8h 0168 004h] PollInterval : 00000000 [0ACh 0172 004h] Vector : 00000000 [0B0h 0176 004h] Polling Threshold Value : 00000000 [0B4h 0180 004h] Polling Threshold Window : 00000000 [0B8h 0184 004h] Error Threshold Value : 00000000 [0BCh 0188 004h] Error Threshold Window : 00000000 [0C0h 0192 004h] Error Status Block Length : 00000400 [0C4h 0196 00Ch] Read Ack Register : [Generic Address Structure] [0C4h 0196 001h] Space ID : 00 [SystemMemory] [0C5h 0197 001h] Bit Width : 40 [0C6h 0198 001h] Bit Offset : 00 [0C7h 0199 001h] Encoded Access Width : 04 [QWord Access:64] -[0C8h 0200 008h] Address : 0000000043DA0018 +[0C8h 0200 008h] Address : 0000000046360018 [0D0h 0208 008h] Read Ack Preserve : FFFFFFFFFFFFFFFE [0D8h 0216 008h] Read Ack Write : 0000000000000001 Raw Table Data: Length 224 (0xE0) - 0000: 48 45 53 54 E0 00 00 00 01 6C 42 4F 43 48 53 20 // HEST.....lBOCHS + 0000: 48 45 53 54 E0 00 00 00 01 F0 42 4F 43 48 53 20 // HEST......BOCHS 0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC 0020: 01 00 00 00 02 00 00 00 0A 00 00 00 FF FF 00 01 // ................ 0030: 01 00 00 00 01 00 00 00 00 04 00 00 00 40 00 04 // .............@.. - 0040: 00 00 DA 43 00 00 00 00 08 1C 00 00 00 00 00 00 // ...C............ + 0040: 00 00 36 46 00 00 00 00 08 1C 00 00 00 00 00 00 // ..6F............ 0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................ - 0060: 00 00 00 00 00 04 00 00 00 40 00 04 10 00 DA 43 // .........@.....C + 0060: 00 00 00 00 00 04 00 00 00 40 00 04 10 00 36 46 // .........@....6F 0070: 00 00 00 00 FE FF FF FF FF FF FF FF 01 00 00 00 // ................ 0080: 00 00 00 00 0A 00 01 00 FF FF 00 01 01 00 00 00 // ................ - 0090: 01 00 00 00 00 04 00 00 00 40 00 04 08 00 DA 43 // .........@.....C + 0090: 01 00 00 00 00 04 00 00 00 40 00 04 08 00 36 46 // .........@....6F 00A0: 00 00 00 00 07 1C 00 00 00 00 00 00 00 00 00 00 // ................ 00B0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................ - 00C0: 00 04 00 00 00 40 00 04 18 00 DA 43 00 00 00 00 // .....@.....C.... + 00C0: 00 04 00 00 00 40 00 04 18 00 36 46 00 00 00 00 // .....@....6F.... 00D0: FE FF FF FF FF FF FF FF 01 00 00 00 00 00 00 00 // ................ --- /tmp/asl-0Z3TG3.dsl 2025-11-27 10:27:04.293314293 +0100 +++ /tmp/asl-5IUTG3.dsl 2025-11-27 10:27:04.289235870 +0100 /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20240322 (64-bit version) * Copyright (c) 2000 - 2023 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/aarch64/virt/SSDT.memhp + * Disassembly of /tmp/aml-GDUTG3 * * Original Table Header: * Signature "SSDT" * Length 0x00000719 (1817) * Revision 0x01 - * Checksum 0x9C + * Checksum 0x3D * OEM ID "BOCHS " * OEM Table ID "NVDIMM" * OEM Revision 0x00000001 (1) * Compiler ID "BXPC" * Compiler Version 0x00000001 (1) */ DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001) { Scope (\_SB) { Device (NVDR) { Name (_HID, "ACPI0012" /* NVDIMM Root Device */) // _HID: Hardware ID Method (NCAL, 5, Serialized) { Local6 = MEMA /* \MEMA */ { INPT } Local3 = NCAL (ToUUID ("4309ac30-0d11-11e4-9191-0800200c9a66") /* NVDIMM Device */, One, 0x06, Local0, 0x03) CreateDWordField (Local3, Zero, STTS) Return (STTS) /* \_SB_.NVDR.NV02._LSW.STTS */ } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method { Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x03)) } } } } - Name (MEMA, 0x43DA0000) + Name (MEMA, 0x46360000) } Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- tests/data/acpi/aarch64/virt/HEST | Bin 224 -> 224 bytes tests/data/acpi/aarch64/virt/SSDT.memhp | Bin 1817 -> 1817 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/data/acpi/aarch64/virt/HEST b/tests/data/acpi/aarch64/virt/HEST index 674272922db7d48f7821aa7c83ec76bb3b556d2a..cc1641fdb4e7144a72278f7ef502352139d7b9e1 100644 GIT binary patch delta 56 zcmaFB_<)hi!!<bM0RsaA<A;e{793`73=9km95NFFMJ6V&PTbGQBEVqgHnBjD$;@ry K0xb|(AOZlXP!7ES delta 56 zcmaFB_<)hi!!<bM0RsaAW6ne_3yxdP3=9km95NFFMJ6V&PTbGQBEWFVd18Sc(=F$T K3$#FFfd~M<x)8kp diff --git a/tests/data/acpi/aarch64/virt/SSDT.memhp b/tests/data/acpi/aarch64/virt/SSDT.memhp index 1deb1d2832201a5da7501821f1ea20d3eecb08b2..a6c8bd9ea06c8704f82a35792d6415f42e0de23d 100644 GIT binary patch delta 22 dcmbQqH<OPmIM^jblAVEp(RL#jFFTW&8vr>C1VR7+ delta 22 dcmbQqH<OPmIM^jblAVEpan43AUUsHi&Hz111wsG- -- 2.52.0 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 9/9] tests/acpi: disable updates 2025-11-28 8:45 [PATCH v2 0/9] edk2: update to edk2-stable202511 Gerd Hoffmann ` (5 preceding siblings ...) 2025-11-28 8:45 ` [PATCH v2 8/9] tests/acpi: update expected data files Gerd Hoffmann @ 2025-11-28 8:45 ` Gerd Hoffmann [not found] ` <20251128084524.363989-6-kraxel@redhat.com> 2025-11-28 13:33 ` [PATCH v2 0/9] edk2: update to edk2-stable202511 Igor Mammedov 8 siblings, 0 replies; 15+ messages in thread From: Gerd Hoffmann @ 2025-11-28 8:45 UTC (permalink / raw) To: qemu-devel Cc: Philippe Mathieu-Daudé, Michael S. Tsirkin, Gerd Hoffmann, Igor Mammedov, Ani Sinha Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- tests/qtest/bios-tables-test-allowed-diff.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index c3c0d53211c7..dfb8523c8bf4 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,3 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/HEST", -"tests/data/acpi/aarch64/virt/SSDT.memhp", -- 2.52.0 ^ permalink raw reply related [flat|nested] 15+ messages in thread
[parent not found: <20251128084524.363989-6-kraxel@redhat.com>]
* Re: [PATCH v2 5/9] edk2: drop 32-bit binaries (ia32 and arm) [not found] ` <20251128084524.363989-6-kraxel@redhat.com> @ 2025-11-28 12:57 ` Philippe Mathieu-Daudé 0 siblings, 0 replies; 15+ messages in thread From: Philippe Mathieu-Daudé @ 2025-11-28 12:57 UTC (permalink / raw) To: Gerd Hoffmann, qemu-devel; +Cc: Michael S. Tsirkin, Igor Mammedov, Ani Sinha On 28/11/25 09:45, Gerd Hoffmann wrote: > Keep and rename edk2-arm-vars.fd.bz2 (identical for arm and aarch64) to > reduce confusion. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > ...m-vars.fd.bz2 => edk2-aarch64-vars.fd.bz2} | Bin > pc-bios/edk2-arm-code.fd.bz2 | Bin 1570311 -> 0 bytes > pc-bios/edk2-i386-code.fd.bz2 | Bin 1780004 -> 0 bytes > pc-bios/edk2-i386-secure-code.fd.bz2 | Bin 1858666 -> 0 bytes > pc-bios/edk2-i386-vars.fd.bz2 | Bin 190 -> 0 bytes > 5 files changed, 0 insertions(+), 0 deletions(-) > rename pc-bios/{edk2-arm-vars.fd.bz2 => edk2-aarch64-vars.fd.bz2} (100%) > delete mode 100644 pc-bios/edk2-arm-code.fd.bz2 > delete mode 100644 pc-bios/edk2-i386-code.fd.bz2 > delete mode 100644 pc-bios/edk2-i386-secure-code.fd.bz2 > delete mode 100644 pc-bios/edk2-i386-vars.fd.bz2 Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 0/9] edk2: update to edk2-stable202511 2025-11-28 8:45 [PATCH v2 0/9] edk2: update to edk2-stable202511 Gerd Hoffmann ` (7 preceding siblings ...) [not found] ` <20251128084524.363989-6-kraxel@redhat.com> @ 2025-11-28 13:33 ` Igor Mammedov 2025-11-28 13:34 ` Igor Mammedov 8 siblings, 1 reply; 15+ messages in thread From: Igor Mammedov @ 2025-11-28 13:33 UTC (permalink / raw) To: Gerd Hoffmann Cc: qemu-devel, Philippe Mathieu-Daudé, Michael S. Tsirkin, Ani Sinha On Fri, 28 Nov 2025 09:45:07 +0100 Gerd Hoffmann <kraxel@redhat.com> wrote: > Update edk2 firmware images to latest upstream release. > > Noteworthy edk2 upstream change is that 32-bit architectures (ia32 and > arm) are not supported any more, so the qemu builds of these are removed > too. > > v2: > - add asl diff to test data update. > - rename rischv builds. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: > > Gerd Hoffmann (9): > tests/acpi: enable updates > edk2: update build script > edk2: update submodule to edk2-stable202511 > edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars > edk2: drop 32-bit binaries (ia32 and arm) > edk2: update binaries to edk2-stable202511 > edk2: rename risc-v firmware builds > tests/acpi: update expected data files > tests/acpi: disable updates > > roms/edk2-build.py | 21 +++++-- > tests/qtest/bios-tables-test.c | 40 +++++++------- > pc-bios/descriptors/50-edk2-i386-secure.json | 34 ------------ > pc-bios/descriptors/60-edk2-aarch64.json | 2 +- > pc-bios/descriptors/60-edk2-arm.json | 31 ----------- > pc-bios/descriptors/60-edk2-i386.json | 33 ----------- > pc-bios/descriptors/60-edk2-riscv64.json | 4 +- > pc-bios/descriptors/meson.build | 3 - > pc-bios/edk2-aarch64-code.fd.bz2 | Bin 1565763 -> 1662423 bytes > ...m-vars.fd.bz2 => edk2-aarch64-vars.fd.bz2} | Bin > pc-bios/edk2-arm-code.fd.bz2 | Bin 1570311 -> 0 bytes > pc-bios/edk2-i386-code.fd.bz2 | Bin 1780004 -> 0 bytes > pc-bios/edk2-i386-secure-code.fd.bz2 | Bin 1858666 -> 0 bytes > pc-bios/edk2-i386-vars.fd.bz2 | Bin 190 -> 0 bytes > pc-bios/edk2-loongarch64-code.fd.bz2 | Bin 1148383 -> 1178146 bytes > pc-bios/edk2-riscv-code.fd.bz2 | Bin 1296526 -> 0 bytes > pc-bios/edk2-riscv64-code.fd.bz2 | Bin 0 -> 1252448 bytes > ...v-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} | Bin > pc-bios/edk2-x86_64-code.fd.bz2 | Bin 1907255 -> 2138026 bytes > pc-bios/edk2-x86_64-microvm.fd.bz2 | Bin 1787244 -> 1996414 bytes > pc-bios/edk2-x86_64-secure-code.fd.bz2 | Bin 1962992 -> 2293816 bytes > pc-bios/meson.build | 10 +--- > roms/edk2 | 2 +- > roms/edk2-build.config | 52 +++--------------- > roms/edk2-version | 4 +- > tests/data/acpi/aarch64/virt/HEST | Bin 224 -> 224 bytes > tests/data/acpi/aarch64/virt/SSDT.memhp | Bin 1817 -> 1817 bytes > 27 files changed, 53 insertions(+), 183 deletions(-) > delete mode 100644 pc-bios/descriptors/50-edk2-i386-secure.json > delete mode 100644 pc-bios/descriptors/60-edk2-arm.json > delete mode 100644 pc-bios/descriptors/60-edk2-i386.json > rename pc-bios/{edk2-arm-vars.fd.bz2 => edk2-aarch64-vars.fd.bz2} (100%) > delete mode 100644 pc-bios/edk2-arm-code.fd.bz2 > delete mode 100644 pc-bios/edk2-i386-code.fd.bz2 > delete mode 100644 pc-bios/edk2-i386-secure-code.fd.bz2 > delete mode 100644 pc-bios/edk2-i386-vars.fd.bz2 > delete mode 100644 pc-bios/edk2-riscv-code.fd.bz2 > create mode 100644 pc-bios/edk2-riscv64-code.fd.bz2 > rename pc-bios/{edk2-riscv-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} (100%) > ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 0/9] edk2: update to edk2-stable202511 2025-11-28 13:33 ` [PATCH v2 0/9] edk2: update to edk2-stable202511 Igor Mammedov @ 2025-11-28 13:34 ` Igor Mammedov 0 siblings, 0 replies; 15+ messages in thread From: Igor Mammedov @ 2025-11-28 13:34 UTC (permalink / raw) To: Gerd Hoffmann Cc: qemu-devel, Philippe Mathieu-Daudé, Michael S. Tsirkin, Ani Sinha On Fri, 28 Nov 2025 14:33:28 +0100 Igor Mammedov <imammedo@redhat.com> wrote: > On Fri, 28 Nov 2025 09:45:07 +0100 > Gerd Hoffmann <kraxel@redhat.com> wrote: > > > Update edk2 firmware images to latest upstream release. > > > > Noteworthy edk2 upstream change is that 32-bit architectures (ia32 and > > arm) are not supported any more, so the qemu builds of these are removed > > too. > > > > v2: > > - add asl diff to test data update. > > - rename rischv builds. > > > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > Reviewed-by: Reviewed-by: Igor Mammedov <imammedo@redhat.com> > > > > > Gerd Hoffmann (9): > > tests/acpi: enable updates > > edk2: update build script > > edk2: update submodule to edk2-stable202511 > > edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars > > edk2: drop 32-bit binaries (ia32 and arm) > > edk2: update binaries to edk2-stable202511 > > edk2: rename risc-v firmware builds > > tests/acpi: update expected data files > > tests/acpi: disable updates > > > > roms/edk2-build.py | 21 +++++-- > > tests/qtest/bios-tables-test.c | 40 +++++++------- > > pc-bios/descriptors/50-edk2-i386-secure.json | 34 ------------ > > pc-bios/descriptors/60-edk2-aarch64.json | 2 +- > > pc-bios/descriptors/60-edk2-arm.json | 31 ----------- > > pc-bios/descriptors/60-edk2-i386.json | 33 ----------- > > pc-bios/descriptors/60-edk2-riscv64.json | 4 +- > > pc-bios/descriptors/meson.build | 3 - > > pc-bios/edk2-aarch64-code.fd.bz2 | Bin 1565763 -> 1662423 bytes > > ...m-vars.fd.bz2 => edk2-aarch64-vars.fd.bz2} | Bin > > pc-bios/edk2-arm-code.fd.bz2 | Bin 1570311 -> 0 bytes > > pc-bios/edk2-i386-code.fd.bz2 | Bin 1780004 -> 0 bytes > > pc-bios/edk2-i386-secure-code.fd.bz2 | Bin 1858666 -> 0 bytes > > pc-bios/edk2-i386-vars.fd.bz2 | Bin 190 -> 0 bytes > > pc-bios/edk2-loongarch64-code.fd.bz2 | Bin 1148383 -> 1178146 bytes > > pc-bios/edk2-riscv-code.fd.bz2 | Bin 1296526 -> 0 bytes > > pc-bios/edk2-riscv64-code.fd.bz2 | Bin 0 -> 1252448 bytes > > ...v-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} | Bin > > pc-bios/edk2-x86_64-code.fd.bz2 | Bin 1907255 -> 2138026 bytes > > pc-bios/edk2-x86_64-microvm.fd.bz2 | Bin 1787244 -> 1996414 bytes > > pc-bios/edk2-x86_64-secure-code.fd.bz2 | Bin 1962992 -> 2293816 bytes > > pc-bios/meson.build | 10 +--- > > roms/edk2 | 2 +- > > roms/edk2-build.config | 52 +++--------------- > > roms/edk2-version | 4 +- > > tests/data/acpi/aarch64/virt/HEST | Bin 224 -> 224 bytes > > tests/data/acpi/aarch64/virt/SSDT.memhp | Bin 1817 -> 1817 bytes > > 27 files changed, 53 insertions(+), 183 deletions(-) > > delete mode 100644 pc-bios/descriptors/50-edk2-i386-secure.json > > delete mode 100644 pc-bios/descriptors/60-edk2-arm.json > > delete mode 100644 pc-bios/descriptors/60-edk2-i386.json > > rename pc-bios/{edk2-arm-vars.fd.bz2 => edk2-aarch64-vars.fd.bz2} (100%) > > delete mode 100644 pc-bios/edk2-arm-code.fd.bz2 > > delete mode 100644 pc-bios/edk2-i386-code.fd.bz2 > > delete mode 100644 pc-bios/edk2-i386-secure-code.fd.bz2 > > delete mode 100644 pc-bios/edk2-i386-vars.fd.bz2 > > delete mode 100644 pc-bios/edk2-riscv-code.fd.bz2 > > create mode 100644 pc-bios/edk2-riscv64-code.fd.bz2 > > rename pc-bios/{edk2-riscv-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} (100%) > > > ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2025-11-28 13:34 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-28 8:45 [PATCH v2 0/9] edk2: update to edk2-stable202511 Gerd Hoffmann
2025-11-28 8:45 ` [PATCH v2 1/9] tests/acpi: enable updates Gerd Hoffmann
2025-11-28 8:45 ` [PATCH v2 2/9] edk2: update build script Gerd Hoffmann
2025-11-28 13:00 ` Philippe Mathieu-Daudé
2025-11-28 8:45 ` [PATCH v2 3/9] edk2: update submodule to edk2-stable202511 Gerd Hoffmann
2025-11-28 12:59 ` Philippe Mathieu-Daudé
2025-11-28 8:45 ` [PATCH v2 4/9] edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars Gerd Hoffmann
2025-11-28 12:59 ` Philippe Mathieu-Daudé
2025-11-28 8:45 ` [PATCH v2 7/9] edk2: rename risc-v firmware builds Gerd Hoffmann
2025-11-28 12:52 ` Philippe Mathieu-Daudé
2025-11-28 8:45 ` [PATCH v2 8/9] tests/acpi: update expected data files Gerd Hoffmann
2025-11-28 8:45 ` [PATCH v2 9/9] tests/acpi: disable updates Gerd Hoffmann
[not found] ` <20251128084524.363989-6-kraxel@redhat.com>
2025-11-28 12:57 ` [PATCH v2 5/9] edk2: drop 32-bit binaries (ia32 and arm) Philippe Mathieu-Daudé
2025-11-28 13:33 ` [PATCH v2 0/9] edk2: update to edk2-stable202511 Igor Mammedov
2025-11-28 13:34 ` Igor Mammedov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).