Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a13b0077 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Matt Fleming
Browse files

efi/arm64: efistub: Move shared dependencies to <asm/efi.h> 



This moves definitions depended upon both by code under arch/arm64/boot
and under drivers/firmware/efi to <asm/efi.h>. This is in preparation of
turning the stub code under drivers/firmware/efi into a static library.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent f23cf8bd

arch/arm64/include/asm/efi.h

+12 −0
Original line number Diff line number Diff line
@@ -32,4 +32,16 @@ extern void efi_idmap_init(void); 
	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/efi-stub.c

+1 −10
Original line number Diff line number Diff line
@@ -10,19 +10,10 @@ 
 *

 */

#include <linux/efi.h>

#include <asm/efi.h>

#include <linux/libfdt.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);