Commit 97712289 authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

Merge tag 'efi-zboot-direct-for-v6.2' into efi/next

parents 094226ad c51e97e7

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -7789,7 +7789,6 @@ F: Documentation/admin-guide/efi-stub.rst 
F:	arch/*/include/asm/efi.h

F:	arch/*/kernel/efi.c

F:	arch/arm/boot/compressed/efi-header.S

F:	arch/arm64/kernel/efi-entry.S

F:	arch/x86/platform/efi/

F:	drivers/firmware/efi/

F:	include/linux/efi*.h

arch/arm/include/asm/efi.h

+0 −3
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ void efi_virtmap_unload(void); 


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



struct screen_info *alloc_screen_info(void);

void free_screen_info(struct screen_info *si);



/*

 * A reasonable upper bound for the uncompressed kernel size is 32 MBytes,

 * so we will reserve that amount of memory. We have no easy way to tell what

arch/arm/kernel/efi.c

+5 −26
Original line number Diff line number Diff line
@@ -75,38 +75,13 @@ int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md) 
	return 0;

}



static unsigned long __initdata screen_info_table = EFI_INVALID_TABLE_ADDR;

static unsigned long __initdata cpu_state_table = EFI_INVALID_TABLE_ADDR;



const efi_config_table_type_t efi_arch_tables[] __initconst = {

	{LINUX_EFI_ARM_SCREEN_INFO_TABLE_GUID, &screen_info_table},

	{LINUX_EFI_ARM_CPU_STATE_TABLE_GUID, &cpu_state_table},

	{}

};



static void __init load_screen_info_table(void)

{

	struct screen_info *si;



	if (screen_info_table != EFI_INVALID_TABLE_ADDR) {

		si = early_memremap_ro(screen_info_table, sizeof(*si));

		if (!si) {

			pr_err("Could not map screen_info config table\n");

			return;

		}

		screen_info = *si;

		early_memunmap(si, sizeof(*si));



		/* dummycon on ARM needs non-zero values for columns/lines */

		screen_info.orig_video_cols = 80;

		screen_info.orig_video_lines = 25;



		if (memblock_is_map_memory(screen_info.lfb_base))

			memblock_mark_nomap(screen_info.lfb_base,

					    screen_info.lfb_size);

	}

}



static void __init load_cpu_state_table(void)

{

	if (cpu_state_table != EFI_INVALID_TABLE_ADDR) {
@@ -145,7 +120,11 @@ void __init arm_efi_init(void) 
{

	efi_init();



	load_screen_info_table();

	if (screen_info.orig_video_isVGA == VIDEO_TYPE_EFI) {

		/* dummycon on ARM needs non-zero values for columns/lines */

		screen_info.orig_video_cols = 80;

		screen_info.orig_video_lines = 25;

	}



	/* ARM does not permit early mappings to persist across paging_init() */

	efi_memmap_unmap();

arch/arm64/include/asm/efi.h

+12 −3
Original line number Diff line number Diff line
@@ -84,10 +84,19 @@ static inline unsigned long efi_get_max_initrd_addr(unsigned long image_addr) 
	return (image_addr & ~(SZ_1G - 1UL)) + (1UL << (VA_BITS_MIN - 1));

}



#define alloc_screen_info(x...)		&screen_info



static inline void free_screen_info(struct screen_info *si)

static inline unsigned long efi_get_kimg_min_align(void)

{

	extern bool efi_nokaslr;



	/*

	 * Although relocatable kernels can fix up the misalignment with

	 * respect to MIN_KIMG_ALIGN, the resulting virtual text addresses are

	 * subtly out of sync with those recorded in the vmlinux when kaslr is

	 * disabled but the image required relocation anyway. Therefore retain

	 * 2M alignment if KASLR was explicitly disabled, even if it was not

	 * going to be activated to begin with.

	 */

	return efi_nokaslr ? MIN_KIMG_ALIGN : EFI_KIMG_ALIGN;

}



#define EFI_ALLOC_ALIGN		SZ_64K

arch/arm64/kernel/Makefile

+1 −8
Original line number Diff line number Diff line
@@ -36,12 +36,6 @@ obj-y := debug-monitors.o entry.o irq.o fpsimd.o \ 
			   syscall.o proton-pack.o idreg-override.o idle.o	\

			   patching.o



targets			+= efi-entry.o



OBJCOPYFLAGS := --prefix-symbols=__efistub_

$(obj)/%.stub.o: $(obj)/%.o FORCE

	$(call if_changed,objcopy)



obj-$(CONFIG_COMPAT)			+= sys32.o signal32.o			\

					   sys_compat.o

obj-$(CONFIG_COMPAT)			+= sigreturn32.o
@@ -57,8 +51,7 @@ obj-$(CONFIG_CPU_PM) += sleep.o suspend.o 
obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o

obj-$(CONFIG_JUMP_LABEL)		+= jump_label.o

obj-$(CONFIG_KGDB)			+= kgdb.o

obj-$(CONFIG_EFI)			+= efi.o efi-entry.stub.o		\

					   efi-rt-wrapper.o

obj-$(CONFIG_EFI)			+= efi.o efi-rt-wrapper.o

obj-$(CONFIG_PCI)			+= pci.o

obj-$(CONFIG_ARMV8_DEPRECATED)		+= armv8_deprecated.o

obj-$(CONFIG_ACPI)			+= acpi.o