On Tue, Nov 22, 2016 at 12:31:39AM +0000, David Howells wrote:
> Provide the ability to perform mixed-mode runtime service calls for x86 in
> the same way that commit 0a637ee61247bd4bed9b2a07568ef7a1cfc76187 provides
Small nit, checkpatch usually complains that this should be written as
12-character SHA-1 followed by the commit subject, i.e.
0a637ee61247 ("x86/efi: Allow invocation of arbitrary boot services")
Other than that LGTM. Same for patch 2 of this series.
Thanks,
Lukas
> the ability to invoke arbitrary boot services.
>
> Suggested-by: Lukas Wunner <[email protected]>
> Signed-off-by: David Howells <[email protected]>
> ---
>
> arch/x86/boot/compressed/eboot.c | 1 +
> arch/x86/boot/compressed/head_32.S | 6 +++---
> arch/x86/boot/compressed/head_64.S | 8 ++++----
> arch/x86/include/asm/efi.h | 5 +++++
> 4 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/arch/x86/boot/compressed/eboot.c
> b/arch/x86/boot/compressed/eboot.c
> index ff01c8fc76f7..c8c32ebcdfdb 100644
> --- a/arch/x86/boot/compressed/eboot.c
> +++ b/arch/x86/boot/compressed/eboot.c
> @@ -32,6 +32,7 @@ static void setup_boot_services##bits(struct efi_config *c)
> \
> \
> table = (typeof(table))sys_table; \
> \
> + c->runtime_services = table->runtime; \
> c->boot_services = table->boottime; \
> c->text_output = table->con_out; \
> }
> diff --git a/arch/x86/boot/compressed/head_32.S
> b/arch/x86/boot/compressed/head_32.S
> index fd0b6a272dd5..d85b9625e836 100644
> --- a/arch/x86/boot/compressed/head_32.S
> +++ b/arch/x86/boot/compressed/head_32.S
> @@ -82,7 +82,7 @@ ENTRY(efi_pe_entry)
>
> /* Relocate efi_config->call() */
> leal efi32_config(%esi), %eax
> - add %esi, 32(%eax)
> + add %esi, 40(%eax)
> pushl %eax
>
> call make_boot_params
> @@ -108,7 +108,7 @@ ENTRY(efi32_stub_entry)
>
> /* Relocate efi_config->call() */
> leal efi32_config(%esi), %eax
> - add %esi, 32(%eax)
> + add %esi, 40(%eax)
> pushl %eax
> 2:
> call efi_main
> @@ -264,7 +264,7 @@ relocated:
> #ifdef CONFIG_EFI_STUB
> .data
> efi32_config:
> - .fill 4,8,0
> + .fill 5,8,0
> .long efi_call_phys
> .long 0
> .byte 0
> diff --git a/arch/x86/boot/compressed/head_64.S
> b/arch/x86/boot/compressed/head_64.S
> index efdfba21a5b2..beab8322f72a 100644
> --- a/arch/x86/boot/compressed/head_64.S
> +++ b/arch/x86/boot/compressed/head_64.S
> @@ -265,7 +265,7 @@ ENTRY(efi_pe_entry)
> /*
> * Relocate efi_config->call().
> */
> - addq %rbp, efi64_config+32(%rip)
> + addq %rbp, efi64_config+40(%rip)
>
> movq %rax, %rdi
> call make_boot_params
> @@ -285,7 +285,7 @@ handover_entry:
> * Relocate efi_config->call().
> */
> movq efi_config(%rip), %rax
> - addq %rbp, 32(%rax)
> + addq %rbp, 40(%rax)
> 2:
> movq efi_config(%rip), %rdi
> call efi_main
> @@ -457,14 +457,14 @@ efi_config:
> #ifdef CONFIG_EFI_MIXED
> .global efi32_config
> efi32_config:
> - .fill 4,8,0
> + .fill 5,8,0
> .quad efi64_thunk
> .byte 0
> #endif
>
> .global efi64_config
> efi64_config:
> - .fill 4,8,0
> + .fill 5,8,0
> .quad efi_call
> .byte 1
> #endif /* CONFIG_EFI_STUB */
> diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
> index e99675b9c861..2f77bcefe6b4 100644
> --- a/arch/x86/include/asm/efi.h
> +++ b/arch/x86/include/asm/efi.h
> @@ -191,6 +191,7 @@ static inline efi_status_t
> efi_thunk_set_virtual_address_map(
> struct efi_config {
> u64 image_handle;
> u64 table;
> + u64 runtime_services;
> u64 boot_services;
> u64 text_output;
> efi_status_t (*call)(unsigned long, ...);
> @@ -226,6 +227,10 @@ static inline bool efi_is_64bit(void)
> #define __efi_call_early(f, ...) \
> __efi_early()->call((unsigned long)f, __VA_ARGS__);
>
> +#define efi_call_runtime(f, ...) \
> + __efi_early()->call(efi_table_attr(efi_runtime_services, f, \
> + __efi_early()->runtime_services), __VA_ARGS__)
> +
> extern bool efi_reboot_required(void);
>
> #else
>
