[PATCH 12/17] Add proper definitions for some EFI function pointers.
From: Matt Fleming <hidden>
Date: 2013-08-07 13:09:56
Also in:
linux-efi, lkml
From: Matt Fleming <hidden>
Date: 2013-08-07 13:09:56
Also in:
linux-efi, lkml
On Tue, 06 Aug, at 08:45:08PM, Roy Franz wrote:
The x86/AMD64 EFI stubs must us a call wrapper to convert between the Linux and EFI ABIs, so void pointers are sufficient. For ARM, the ABIs are compatible, so we can directly invoke the function pointers. The functions that are used by the ARM stub are updated to match the EFI definitions. Signed-off-by: Roy Franz <redacted> --- include/linux/efi.h | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-)diff --git a/include/linux/efi.h b/include/linux/efi.h index 51f5641..96bb866 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h@@ -39,6 +39,8 @@ typedef unsigned long efi_status_t; typedef u8 efi_bool_t; typedef u16 efi_char16_t; /* UNICODE character */ +typedef u64 efi_physical_addr_t; +typedef void *efi_handle_t; typedef struct {@@ -96,6 +98,7 @@ typedef struct { #define EFI_MEMORY_DESCRIPTOR_VERSION 1 #define EFI_PAGE_SHIFT 12 +#define EFI_PAGE_SIZE (1UL << EFI_PAGE_SHIFT)
It would be worth getting rid of the EFI_PAGE_SIZE definition in arch/x86/boot/compressed/eboot.h now that we have one here. -- Matt Fleming, Intel Open Source Technology Center