* Ard Biesheuvel <ardb@xxxxxxxxxx> wrote: > The following changes since commit 4444f8541dad16fefd9b8807ad1451e806ef1d94: > > efi: Allow disabling PCI busmastering on bridges during boot (2020-01-10 18:55:04 +0100) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-next > > for you to fetch changes up to 743c5dd59f7e4b9e7a28be6a8f0e8d03271a98ab: > > efi: Fix handling of multiple efi_fake_mem= entries (2020-01-13 10:41:53 +0100) > > ---------------------------------------------------------------- > Third and final batch of EFI updates for v5.6: > - A few touchups for the x86 libstub changes that have already been queued > up. > - Fix memory leaks and crash bugs in the EFI fake_mem driver, which may be > used more heavily in the future for device-dax soft reservation (Dan) > - Avoid RWX mappings in the EFI page tables when possible. > - Avoid PCIe probing failures if the EFI framebuffer is probed first when > the new of_devlink feature is active. > - Move the support code for the old EFI memory mapping style into its only > user, the SGI UV1+ support code. > > ---------------------------------------------------------------- > Anshuman Khandual (1): > efi: Fix comment for efi_mem_type() wrt absent physical addresses > > Ard Biesheuvel (7): > efi/libstub/x86: use const attribute for efi_is_64bit() > efi/libstub/x86: use mandatory 16-byte stack alignment in mixed mode > x86/mm: fix NX bit clearing issue in kernel_map_pages_in_pgd > efi/x86: don't map the entire kernel text RW for mixed mode > efi/x86: avoid RWX mappings for all of DRAM > efi/x86: limit EFI old memory map to SGI UV machines > efi/arm: defer probe of PCIe backed efifb on DT systems > > Arnd Bergmann (1): > efi/libstub/x86: fix unused-variable warning > > Dan Williams (4): > efi: Add a flags parameter to efi_memory_map > efi: Add tracking for dynamically allocated memmaps > efi: Fix efi_memmap_alloc() leaks > efi: Fix handling of multiple efi_fake_mem= entries > > Documentation/admin-guide/kernel-parameters.txt | 3 +- > arch/x86/boot/compressed/eboot.c | 16 +- > arch/x86/boot/compressed/efi_thunk_64.S | 46 ++---- > arch/x86/boot/compressed/head_64.S | 7 +- > arch/x86/include/asm/efi.h | 28 ++-- > arch/x86/kernel/kexec-bzimage64.c | 2 +- > arch/x86/mm/pat/set_memory.c | 8 +- > arch/x86/platform/efi/efi.c | 40 +++-- > arch/x86/platform/efi/efi_64.c | 190 ++++-------------------- > arch/x86/platform/efi/quirks.c | 44 +++--- > arch/x86/platform/uv/bios_uv.c | 164 +++++++++++++++++++- > drivers/firmware/efi/arm-init.c | 107 ++++++++++++- > drivers/firmware/efi/efi.c | 2 +- > drivers/firmware/efi/fake_mem.c | 43 +++--- > drivers/firmware/efi/memmap.c | 95 ++++++++---- > include/linux/efi.h | 17 ++- > 16 files changed, 471 insertions(+), 341 deletions(-) Thanks Ard, I've applied these and the 3 fixes in the second series to tip:efi/core. It all merged nicely and looks good here. Let me know if there's anything amiss. Thanks, Ingo