Commit 76f09aa4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull EFI changes from Ingo Molnar:
 "Main changes in this cycle are:

   - arm64 efi stub fixes, preservation of FP/SIMD registers across
     firmware calls, and conversion of the EFI stub code into a static
     library - Ard Biesheuvel

   - Xen EFI support - Daniel Kiper

   - Support for autoloading the efivars driver - Lee, Chun-Yi

   - Use the PE/COFF headers in the x86 EFI boot stub to request that
     the stub be loaded with CONFIG_PHYSICAL_ALIGN alignment - Michael
     Brown

   - Consolidate all the x86 EFI quirks into one file - Saurabh Tangri

   - Additional error logging in x86 EFI boot stub - Ulf Winkelvos

   - Support loading initrd above 4G in EFI boot stub - Yinghai Lu

   - EFI reboot patches for ACPI hardware reduced platforms"

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)
  efi/arm64: Handle missing virtual mapping for UEFI System Table
  arch/x86/xen: Silence compiler warnings
  xen: Silence compiler warnings
  x86/efi: Request desired alignment via the PE/COFF headers
  x86/efi: Add better error logging to EFI boot stub
  efi: Autoload efivars
  efi: Update stale locking comment for struct efivars
  arch/x86: Remove efi_set_rtc_mmss()
  arch/x86: Replace plain strings with constants
  xen: Put EFI machinery in place
  xen: Define EFI related stuff
  arch/x86: Remove redundant set_bit(EFI_MEMMAP) call
  arch/x86: Remove redundant set_bit(EFI_SYSTEM_TABLES) call
  efi: Introduce EFI_PARAVIRT flag
  arch/x86: Do not access EFI memory map if it is not available
  efi: Use early_mem*() instead of early_io*()
  arch/ia64: Define early_memunmap()
  x86/reboot: Add EFI reboot quirk for ACPI Hardware Reduced flag
  efi/reboot: Allow powering off machines using EFI
  efi/reboot: Add generic wrapper around EfiResetSystem()
  ...
parents e9c9eeca 99a5603e

arch/arm64/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -347,12 +347,18 @@ config CMDLINE_FORCE 
	  This is useful if you cannot or don't want to change the

	  command-line options your boot loader passes to the kernel.



config EFI_STUB

	bool



config EFI

	bool "UEFI runtime support"

	depends on OF && !CPU_BIG_ENDIAN

	select LIBFDT

	select UCS2_STRING

	select EFI_PARAMS_FROM_FDT

	select EFI_RUNTIME_WRAPPERS

	select EFI_STUB

	select EFI_ARMSTUB

	default y

	help

	  This option provides support for runtime services provided

arch/arm64/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ core-$(CONFIG_XEN) += arch/arm64/xen/ 
core-$(CONFIG_CRYPTO) += arch/arm64/crypto/

libs-y		:= arch/arm64/lib/ $(libs-y)

libs-y		+= $(LIBGCC)

libs-$(CONFIG_EFI_STUB) += drivers/firmware/efi/libstub/



# Default target when executing plain make

KBUILD_IMAGE	:= Image.gz

arch/arm64/include/asm/efi.h

+33 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _ASM_EFI_H



#include <asm/io.h>

#include <asm/neon.h>



#ifdef CONFIG_EFI

extern void efi_init(void);
@@ -11,4 +12,36 @@ extern void efi_idmap_init(void); 
#define efi_idmap_init()

#endif



#define efi_call_virt(f, ...)						\

({									\

	efi_##f##_t *__f = efi.systab->runtime->f;			\

	efi_status_t __s;						\

									\

	kernel_neon_begin();						\

	__s = __f(__VA_ARGS__);						\

	kernel_neon_end();						\

	__s;								\

})



#define __efi_call_virt(f, ...)						\

({									\

	efi_##f##_t *__f = efi.systab->runtime->f;			\

									\

	kernel_neon_begin();						\

	__f(__VA_ARGS__);						\

	kernel_neon_end();						\

})



/* arch specific definitions used by the stub code */



/*

 * AArch64 requires the DTB to be 8-byte aligned in the first 512MiB from

 * start of kernel and may not cross a 2MiB boundary. We set alignment to

 * 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



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



#endif /* _ASM_EFI_H */

arch/arm64/kernel/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 


CPPFLAGS_vmlinux.lds	:= -DTEXT_OFFSET=$(TEXT_OFFSET)

AFLAGS_head.o		:= -DTEXT_OFFSET=$(TEXT_OFFSET)

CFLAGS_efi-stub.o 	:= -DTEXT_OFFSET=$(TEXT_OFFSET) \

			   -I$(src)/../../../scripts/dtc/libfdt

CFLAGS_efi-stub.o 	:= -DTEXT_OFFSET=$(TEXT_OFFSET)



CFLAGS_REMOVE_ftrace.o = -pg

CFLAGS_REMOVE_insn.o = -pg

arch/arm64/kernel/efi-stub.c

+9 −39
Original line number Diff line number Diff line
@@ -10,40 +10,10 @@ 
 *

 */

#include <linux/efi.h>

#include <linux/libfdt.h>

#include <asm/efi.h>

#include <asm/sections.h>



/*

 * AArch64 requires the DTB to be 8-byte aligned in the first 512MiB from

 * start of kernel and may not cross a 2MiB boundary. We set alignment to

 * 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



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



static void efi_char16_printk(efi_system_table_t *sys_table_arg,

			      efi_char16_t *str);



static efi_status_t efi_open_volume(efi_system_table_t *sys_table,

				    void *__image, void **__fh);

static efi_status_t efi_file_close(void *handle);



static efi_status_t

efi_file_read(void *handle, unsigned long *size, void *addr);



static efi_status_t

efi_file_size(efi_system_table_t *sys_table, void *__fh,

	      efi_char16_t *filename_16, void **handle, u64 *file_sz);



/* Include shared EFI stub code */

#include "../../../drivers/firmware/efi/efi-stub-helper.c"

#include "../../../drivers/firmware/efi/fdt.c"

#include "../../../drivers/firmware/efi/arm-stub.c"





static efi_status_t handle_kernel_image(efi_system_table_t *sys_table,

efi_status_t handle_kernel_image(efi_system_table_t *sys_table,

				 unsigned long *image_addr,

				 unsigned long *image_size,

				 unsigned long *reserve_addr,
@@ -69,7 +39,7 @@ static efi_status_t handle_kernel_image(efi_system_table_t *sys_table, 
		if (*image_addr != (dram_base + TEXT_OFFSET)) {

			pr_efi_err(sys_table, "Failed to alloc kernel memory\n");

			efi_free(sys_table, kernel_memsize, *image_addr);

			return EFI_ERROR;

			return EFI_LOAD_ERROR;

		}

		*image_size = kernel_memsize;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE