From: Ard Biesheuvel <ardb@xxxxxxxxxx> Hello Linus, Please pull the EFI updates described below. Details are in the tag. Note the removal of the EFI fake memory map support - this is believed to be unused and no longer worth supporting. However, we could easily bring it back if needed. (With recent developments regarding confidential VMs and unaccepted memory, combined with kexec, creating a known inaccurate view of the firmware's memory map and handing it to the OS is a feature we can live without, hence the removal. Alternatively, I could imagine making this feature mutually exclusive with those confidential VM related features, but let's try simply removing it first) The following changes since commit f2661062f16b2de5d7b6a5c42a9a5c96326b8454: Linux 6.10-rc5 (2024-06-23 17:08:54 -0400) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-next-for-v6.11 for you to fetch changes up to 4a2ebb082297f41803742729642961532e54079e: efi: Replace efi_memory_attributes_table_t 0-sized array with flexible array (2024-07-12 10:06:01 +0200) ---------------------------------------------------------------- EFI updates for v6.11 - Drop support for the 'fake' EFI memory map on x86 - Add an SMBIOS based tweak to the EFI stub instructing the firmware on x86 Macbook Pros to keep both GPUs enabled - Replace 0-sized array with flexible array in EFI memory attributes table handling - Drop redundant BSS clearing when booting via the native PE entrypoint on x86 - Avoid returning EFI_SUCCESS when aborting on an out-of-memory condition - Cosmetic tweak for arm64 KASLR loading logic ---------------------------------------------------------------- Aditya Garg (1): x86/efistub: Call Apple set_os protocol on dual GPU Intel Macs Ard Biesheuvel (6): x86/efi: Drop support for fake EFI memory maps efistub/smbios: Simplify SMBIOS enumeration API x86/efistub: Enable SMBIOS protocol handling for x86 x86/efistub: Avoid returning EFI_SUCCESS on error x86/efistub: Drop redundant clearing of BSS arm64/efistub: Clean up KASLR logic Kees Cook (2): efi: Rename efi_early_memdesc_ptr() to efi_memdesc_ptr() efi: Replace efi_memory_attributes_table_t 0-sized array with flexible array Documentation/admin-guide/kernel-parameters.txt | 21 --- arch/x86/Kconfig | 20 --- arch/x86/boot/compressed/kaslr.c | 43 ++--- arch/x86/include/asm/efi.h | 22 +-- arch/x86/kernel/setup.c | 1 - arch/x86/platform/efi/Makefile | 1 - arch/x86/platform/efi/efi.c | 2 - arch/x86/platform/efi/fake_mem.c | 197 ----------------------- arch/x86/platform/efi/memmap.c | 1 + drivers/firmware/efi/libstub/Makefile | 2 +- drivers/firmware/efi/libstub/arm64-stub.c | 13 +- drivers/firmware/efi/libstub/arm64.c | 3 +- drivers/firmware/efi/libstub/efistub.h | 9 +- drivers/firmware/efi/libstub/kaslr.c | 20 +-- drivers/firmware/efi/libstub/relocate.c | 2 +- drivers/firmware/efi/libstub/smbios.c | 43 +++-- drivers/firmware/efi/libstub/unaccepted_memory.c | 2 +- drivers/firmware/efi/libstub/x86-stub.c | 83 ++++++++-- drivers/firmware/efi/memattr.c | 2 +- include/linux/efi.h | 15 +- 20 files changed, 146 insertions(+), 356 deletions(-) delete mode 100644 arch/x86/platform/efi/fake_mem.c