| Message ID | 1375847113-24884-13-git-send-email-roy.franz@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 <roy.franz@linaro.org> > --- > 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.
On Wed, Aug 7, 2013 at 6:09 AM, Matt Fleming <matt@console-pimps.org> wrote: > 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 <roy.franz@linaro.org> >> --- >> 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 I'll get this in the next version. Thanks, Roy
On Tue, 2013-08-06 at 20:45 -0700, 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 <roy.franz@linaro.org> > --- > 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) > > typedef struct { > u32 type; > @@ -157,11 +160,12 @@ typedef struct { > efi_table_hdr_t hdr; > void *raise_tpl; > void *restore_tpl; > - void *allocate_pages; > - void *free_pages; > - void *get_memory_map; > - void *allocate_pool; > - void *free_pool; > + int (*allocate_pages)(int, int, unsigned long, efi_physical_addr_t *); > + int (*free_pages)(efi_physical_addr_t, unsigned long); All of the actual function pointers that were added should return an efi_status_t instead of int. On arm64, I was seeing an unrecognizable error status because the truncation from 64 to 32 bits. --Mark
Thanks Mark - I'll get that in the next version of the patches. On Fri, Aug 9, 2013 at 7:10 AM, Mark Salter <msalter@redhat.com> wrote: > On Tue, 2013-08-06 at 20:45 -0700, 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 <roy.franz@linaro.org> >> --- >> 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) >> >> typedef struct { >> u32 type; >> @@ -157,11 +160,12 @@ typedef struct { >> efi_table_hdr_t hdr; >> void *raise_tpl; >> void *restore_tpl; >> - void *allocate_pages; >> - void *free_pages; >> - void *get_memory_map; >> - void *allocate_pool; >> - void *free_pool; >> + int (*allocate_pages)(int, int, unsigned long, efi_physical_addr_t *); >> + int (*free_pages)(efi_physical_addr_t, unsigned long); > > All of the actual function pointers that were added should return an > efi_status_t instead of int. On arm64, I was seeing an unrecognizable > error status because the truncation from 64 to 32 bits. > > --Mark > >
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) typedef struct { u32 type; @@ -157,11 +160,12 @@ typedef struct { efi_table_hdr_t hdr; void *raise_tpl; void *restore_tpl; - void *allocate_pages; - void *free_pages; - void *get_memory_map; - void *allocate_pool; - void *free_pool; + int (*allocate_pages)(int, int, unsigned long, efi_physical_addr_t *); + int (*free_pages)(efi_physical_addr_t, unsigned long); + int (*get_memory_map)(unsigned long *, void *, unsigned long *, + unsigned long *, u32 *); + int (*allocate_pool)(int, unsigned long, void **); + int (*free_pool)(void *); void *create_event; void *set_timer; void *wait_for_event; @@ -171,7 +175,7 @@ typedef struct { void *install_protocol_interface; void *reinstall_protocol_interface; void *uninstall_protocol_interface; - void *handle_protocol; + int (*handle_protocol)(efi_handle_t, efi_guid_t *, void **); void *__reserved; void *register_protocol_notify; void *locate_handle; @@ -181,7 +185,7 @@ typedef struct { void *start_image; void *exit; void *unload_image; - void *exit_boot_services; + int (*exit_boot_services)(efi_handle_t, unsigned long); void *get_next_monotonic_count; void *stall; void *set_watchdog_timer; @@ -488,10 +492,6 @@ typedef struct { unsigned long unload; } efi_loaded_image_t; -typedef struct { - u64 revision; - void *open_volume; -} efi_file_io_interface_t; typedef struct { u64 size; @@ -504,20 +504,28 @@ typedef struct { efi_char16_t filename[1]; } efi_file_info_t; -typedef struct { +typedef struct _efi_file_handle { u64 revision; - void *open; - void *close; + int (*open)(struct _efi_file_handle *, struct _efi_file_handle **, + efi_char16_t *, u64, u64); + int (*close)(struct _efi_file_handle *); void *delete; - void *read; + int (*read)(struct _efi_file_handle *, unsigned long *, void *); void *write; void *get_position; void *set_position; - void *get_info; + int (*get_info)(struct _efi_file_handle *, efi_guid_t *, + unsigned long *, void *); void *set_info; void *flush; } efi_file_handle_t; +typedef struct _efi_file_io_interface { + u64 revision; + int (*open_volume)(struct _efi_file_io_interface *, + efi_file_handle_t **); +} efi_file_io_interface_t; + #define EFI_FILE_MODE_READ 0x0000000000000001 #define EFI_FILE_MODE_WRITE 0x0000000000000002 #define EFI_FILE_MODE_CREATE 0x8000000000000000 @@ -787,7 +795,7 @@ struct efivar_entry { struct efi_simple_text_output_protocol { void *reset; - void *output_string; + int (*output_string)(void *, void *); void *test_string; };
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 <roy.franz@linaro.org> --- include/linux/efi.h | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-)