Commit 3711c94f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull EFI updates from Ingo Molnar:
 "The main changes in this cycle were:

   - move BGRT handling to drivers/acpi so it can be shared between x86
     and ARM

   - bring the EFI stub's initrd and FDT allocation logic in line with
     the latest changes to the arm64 boot protocol

   - improvements and fixes to the EFI stub's command line parsing
     routines

   - randomize the virtual mapping of the UEFI runtime services on
     ARM/arm64

   - ... and other misc enhancements, cleanups and fixes"

* 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi/libstub/arm: Don't use TASK_SIZE when randomizing the RT space
  ef/libstub/arm/arm64: Randomize the base of the UEFI rt services region
  efi/libstub/arm/arm64: Disable debug prints on 'quiet' cmdline arg
  efi/libstub: Unify command line param parsing
  efi/libstub: Fix harmless command line parsing bug
  efi/arm32-stub: Allow boot-time allocations in the vmlinux region
  x86/efi: Clean up a minor mistake in comment
  efi/pstore: Return error code (if any) from efi_pstore_write()
  efi/bgrt: Enable ACPI BGRT handling on arm64
  x86/efi/bgrt: Move efi-bgrt handling out of arch/x86
  efi/arm-stub: Round up FDT allocation to mapping size
  efi/arm-stub: Correct FDT and initrd allocation rules for arm64
parents 174ddfd5 197decef

arch/arm/include/asm/efi.h

+13 −1
Original line number Diff line number Diff line
@@ -85,6 +85,18 @@ static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt) 
 */

#define ZIMAGE_OFFSET_LIMIT	SZ_128M

#define MIN_ZIMAGE_OFFSET	MAX_UNCOMP_KERNEL_SIZE

#define MAX_FDT_OFFSET		ZIMAGE_OFFSET_LIMIT



/* on ARM, the FDT should be located in the first 128 MB of RAM */

static inline unsigned long efi_get_max_fdt_addr(unsigned long dram_base)

{

	return dram_base + ZIMAGE_OFFSET_LIMIT;

}



/* on ARM, the initrd should be loaded in a lowmem region */

static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base,

						    unsigned long image_addr)

{

	return dram_base + SZ_512M;

}



#endif /* _ASM_ARM_EFI_H */

arch/arm64/include/asm/efi.h

+23 −1
Original line number Diff line number Diff line 
#ifndef _ASM_EFI_H

#define _ASM_EFI_H



#include <asm/boot.h>

#include <asm/cpufeature.h>

#include <asm/io.h>

#include <asm/mmu_context.h>
@@ -46,7 +47,28 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); 
 * 2MiB so we know it won't cross a 2MiB boundary.

 */

#define EFI_FDT_ALIGN	SZ_2M   /* used by allocate_new_fdt_and_exit_boot() */

#define MAX_FDT_OFFSET	SZ_512M



/* on arm64, the FDT may be located anywhere in system RAM */

static inline unsigned long efi_get_max_fdt_addr(unsigned long dram_base)

{

	return ULONG_MAX;

}



/*

 * On arm64, we have to ensure that the initrd ends up in the linear region,

 * which is a 1 GB aligned region of size '1UL << (VA_BITS - 1)' that is

 * guaranteed to cover the kernel Image.

 *

 * Since the EFI stub is part of the kernel Image, we can relax the

 * usual requirements in Documentation/arm64/booting.txt, which still

 * apply to other bootloaders, and are required for some kernel

 * configurations.

 */

static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base,

						    unsigned long image_addr)

{

	return (image_addr & ~(SZ_1G - 1UL)) + (1UL << (VA_BITS - 1));

}



#define efi_call_early(f, ...)		sys_table_arg->boottime->f(__VA_ARGS__)

#define __efi_call_early(f, ...)	f(__VA_ARGS__)

arch/arm64/kernel/acpi.c

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/acpi.h>

#include <linux/bootmem.h>

#include <linux/cpumask.h>

#include <linux/efi-bgrt.h>

#include <linux/init.h>

#include <linux/irq.h>

#include <linux/irqdomain.h>
@@ -233,6 +234,8 @@ done: 
			early_init_dt_scan_chosen_stdout();

	} else {

		parse_spcr(earlycon_init_is_deferred);

		if (IS_ENABLED(CONFIG_ACPI_BGRT))

			acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt);

	}

}

arch/x86/kernel/acpi/boot.c

+0 −6
Original line number Diff line number Diff line
@@ -1564,12 +1564,6 @@ int __init early_acpi_boot_init(void) 
	return 0;

}



static int __init acpi_parse_bgrt(struct acpi_table_header *table)

{

	efi_bgrt_init(table);

	return 0;

}



int __init acpi_boot_init(void)

{

	/* those are executed after early-quirks are executed */

arch/x86/platform/efi/Makefile

+0 −1
Original line number Diff line number Diff line 
OBJECT_FILES_NON_STANDARD_efi_thunk_$(BITS).o := y



obj-$(CONFIG_EFI) 		+= quirks.o efi.o efi_$(BITS).o efi_stub_$(BITS).o

obj-$(CONFIG_ACPI_BGRT) += efi-bgrt.o

obj-$(CONFIG_EARLY_PRINTK_EFI)	+= early_printk.o

obj-$(CONFIG_EFI_MIXED)		+= efi_thunk_$(BITS).o

CRA Git | Maintained and supported by SUSTech CRA and CCSE