Commit 3552fdf2 authored by Lukas Wunner's avatar Lukas Wunner Committed by Ingo Molnar

efi: Allow bitness-agnostic protocol calls

We already have a macro to invoke boot services which on x86 adapts
automatically to the bitness of the EFI firmware:  efi_call_early().

The macro allows sharing of functions across arches and bitness variants
as long as those functions only call boot services.  However in practice
functions in the EFI stub contain a mix of boot services calls and
protocol calls.

Add an efi_call_proto() macro for bitness-agnostic protocol calls to
allow sharing more code across arches as well as deduplicating 32 bit
and 64 bit code paths.

On x86, implement it using a new efi_table_attr() macro for bitness-
agnostic table lookups.  Refactor efi_call_early() to make use of the
same macro.  (The resulting object code remains identical.)
Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
Cc: Andreas Noever <andreas.noever@gmail.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Jones <pjones@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20161112213237.8804-8-matt@codeblueprint.co.ukSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 46cd4b75
...@@ -57,6 +57,9 @@ void efi_virtmap_unload(void); ...@@ -57,6 +57,9 @@ void efi_virtmap_unload(void);
#define __efi_call_early(f, ...) f(__VA_ARGS__) #define __efi_call_early(f, ...) f(__VA_ARGS__)
#define efi_is_64bit() (false) #define efi_is_64bit() (false)
#define efi_call_proto(protocol, f, instance, ...) \
((protocol##_t *)instance)->f(instance, ##__VA_ARGS__)
struct screen_info *alloc_screen_info(efi_system_table_t *sys_table_arg); struct screen_info *alloc_screen_info(efi_system_table_t *sys_table_arg);
void free_screen_info(efi_system_table_t *sys_table, struct screen_info *si); void free_screen_info(efi_system_table_t *sys_table, struct screen_info *si);
......
...@@ -51,6 +51,9 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); ...@@ -51,6 +51,9 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md);
#define __efi_call_early(f, ...) f(__VA_ARGS__) #define __efi_call_early(f, ...) f(__VA_ARGS__)
#define efi_is_64bit() (true) #define efi_is_64bit() (true)
#define efi_call_proto(protocol, f, instance, ...) \
((protocol##_t *)instance)->f(instance, ##__VA_ARGS__)
#define alloc_screen_info(x...) &screen_info #define alloc_screen_info(x...) &screen_info
#define free_screen_info(x...) #define free_screen_info(x...)
......
...@@ -210,12 +210,18 @@ static inline bool efi_is_64bit(void) ...@@ -210,12 +210,18 @@ static inline bool efi_is_64bit(void)
return __efi_early()->is64; return __efi_early()->is64;
} }
#define efi_table_attr(table, attr, instance) \
(efi_is_64bit() ? \
((table##_64_t *)(unsigned long)instance)->attr : \
((table##_32_t *)(unsigned long)instance)->attr)
#define efi_call_proto(protocol, f, instance, ...) \
__efi_early()->call(efi_table_attr(protocol, f, instance), \
instance, ##__VA_ARGS__)
#define efi_call_early(f, ...) \ #define efi_call_early(f, ...) \
__efi_early()->call(efi_is_64bit() ? \ __efi_early()->call(efi_table_attr(efi_boot_services, f, \
((efi_boot_services_64_t *)(unsigned long) \ __efi_early()->boot_services), __VA_ARGS__)
__efi_early()->boot_services)->f : \
((efi_boot_services_32_t *)(unsigned long) \
__efi_early()->boot_services)->f, __VA_ARGS__)
#define __efi_call_early(f, ...) \ #define __efi_call_early(f, ...) \
__efi_early()->call((unsigned long)f, __VA_ARGS__); __efi_early()->call((unsigned long)f, __VA_ARGS__);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment