Commit 8f24f8c2 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar

efi/libstub: Annotate firmware routines as __efiapi

Annotate all the firmware routines (boot services, runtime services and
protocol methods) called in the boot context as __efiapi, and make
it expand to __attribute__((ms_abi)) on 64-bit x86. This allows us
to use the compiler to generate the calls into firmware that use the
MS calling convention instead of the SysV one.
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Cc: Arvind Sankar <nivedita@alum.mit.edu>
Cc: Borislav Petkov <bp@alien8.de>
Cc: James Morse <james.morse@arm.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: https://lkml.kernel.org/r/20191224151025.32482-13-ardb@kernel.orgSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 960a8d01
...@@ -1993,6 +1993,7 @@ config EFI ...@@ -1993,6 +1993,7 @@ config EFI
config EFI_STUB config EFI_STUB
bool "EFI stub support" bool "EFI stub support"
depends on EFI && !X86_USE_3DNOW depends on EFI && !X86_USE_3DNOW
depends on $(cc-option,-mabi=ms) || X86_32
select RELOCATABLE select RELOCATABLE
---help--- ---help---
This kernel feature allows a bzImage to be loaded directly This kernel feature allows a bzImage to be loaded directly
......
...@@ -16,7 +16,7 @@ typedef union efi_uga_draw_protocol efi_uga_draw_protocol_t; ...@@ -16,7 +16,7 @@ typedef union efi_uga_draw_protocol efi_uga_draw_protocol_t;
union efi_uga_draw_protocol { union efi_uga_draw_protocol {
struct { struct {
efi_status_t (*get_mode)(efi_uga_draw_protocol_t *, efi_status_t (__efiapi *get_mode)(efi_uga_draw_protocol_t *,
u32*, u32*, u32*, u32*); u32*, u32*, u32*, u32*);
void *set_mode; void *set_mode;
void *blt; void *blt;
......
...@@ -13,10 +13,12 @@ typedef union efi_rng_protocol efi_rng_protocol_t; ...@@ -13,10 +13,12 @@ typedef union efi_rng_protocol efi_rng_protocol_t;
union efi_rng_protocol { union efi_rng_protocol {
struct { struct {
efi_status_t (*get_info)(efi_rng_protocol_t *, efi_status_t (__efiapi *get_info)(efi_rng_protocol_t *,
unsigned long *, efi_guid_t *); unsigned long *,
efi_status_t (*get_rng)(efi_rng_protocol_t *, efi_guid_t *);
efi_guid_t *, unsigned long, u8 *out); efi_status_t (__efiapi *get_rng)(efi_rng_protocol_t *,
efi_guid_t *, unsigned long,
u8 *out);
}; };
struct { struct {
u32 get_info; u32 get_info;
......
...@@ -48,6 +48,12 @@ typedef u16 efi_char16_t; /* UNICODE character */ ...@@ -48,6 +48,12 @@ typedef u16 efi_char16_t; /* UNICODE character */
typedef u64 efi_physical_addr_t; typedef u64 efi_physical_addr_t;
typedef void *efi_handle_t; typedef void *efi_handle_t;
#ifdef CONFIG_X86_64
#define __efiapi __attribute__((ms_abi))
#else
#define __efiapi
#endif
#define efi_get_handle_at(array, idx) \ #define efi_get_handle_at(array, idx) \
(efi_is_native() ? (array)[idx] \ (efi_is_native() ? (array)[idx] \
: (efi_handle_t)(unsigned long)((u32 *)(array))[idx]) : (efi_handle_t)(unsigned long)((u32 *)(array))[idx])
...@@ -272,13 +278,16 @@ typedef union { ...@@ -272,13 +278,16 @@ typedef union {
efi_table_hdr_t hdr; efi_table_hdr_t hdr;
void *raise_tpl; void *raise_tpl;
void *restore_tpl; void *restore_tpl;
efi_status_t (*allocate_pages)(int, int, unsigned long, efi_status_t (__efiapi *allocate_pages)(int, int, unsigned long,
efi_physical_addr_t *); efi_physical_addr_t *);
efi_status_t (*free_pages)(efi_physical_addr_t, unsigned long); efi_status_t (__efiapi *free_pages)(efi_physical_addr_t,
efi_status_t (*get_memory_map)(unsigned long *, void *, unsigned long *, unsigned long);
efi_status_t (__efiapi *get_memory_map)(unsigned long *, void *,
unsigned long *,
unsigned long *, u32 *); unsigned long *, u32 *);
efi_status_t (*allocate_pool)(int, unsigned long, void **); efi_status_t (__efiapi *allocate_pool)(int, unsigned long,
efi_status_t (*free_pool)(void *); void **);
efi_status_t (__efiapi *free_pool)(void *);
void *create_event; void *create_event;
void *set_timer; void *set_timer;
void *wait_for_event; void *wait_for_event;
...@@ -288,18 +297,22 @@ typedef union { ...@@ -288,18 +297,22 @@ typedef union {
void *install_protocol_interface; void *install_protocol_interface;
void *reinstall_protocol_interface; void *reinstall_protocol_interface;
void *uninstall_protocol_interface; void *uninstall_protocol_interface;
efi_status_t (*handle_protocol)(efi_handle_t, efi_guid_t *, void **); efi_status_t (__efiapi *handle_protocol)(efi_handle_t,
efi_guid_t *, void **);
void *__reserved; void *__reserved;
void *register_protocol_notify; void *register_protocol_notify;
efi_status_t (*locate_handle)(int, efi_guid_t *, void *, efi_status_t (__efiapi *locate_handle)(int, efi_guid_t *,
unsigned long *, efi_handle_t *); void *, unsigned long *,
efi_handle_t *);
void *locate_device_path; void *locate_device_path;
efi_status_t (*install_configuration_table)(efi_guid_t *, void *); efi_status_t (__efiapi *install_configuration_table)(efi_guid_t *,
void *);
void *load_image; void *load_image;
void *start_image; void *start_image;
void *exit; void *exit;
void *unload_image; void *unload_image;
efi_status_t (*exit_boot_services)(efi_handle_t, unsigned long); efi_status_t (__efiapi *exit_boot_services)(efi_handle_t,
unsigned long);
void *get_next_monotonic_count; void *get_next_monotonic_count;
void *stall; void *stall;
void *set_watchdog_timer; void *set_watchdog_timer;
...@@ -310,7 +323,8 @@ typedef union { ...@@ -310,7 +323,8 @@ typedef union {
void *open_protocol_information; void *open_protocol_information;
void *protocols_per_handle; void *protocols_per_handle;
void *locate_handle_buffer; void *locate_handle_buffer;
efi_status_t (*locate_protocol)(efi_guid_t *, void *, void **); efi_status_t (__efiapi *locate_protocol)(efi_guid_t *, void *,
void **);
void *install_multiple_protocol_interfaces; void *install_multiple_protocol_interfaces;
void *uninstall_multiple_protocol_interfaces; void *uninstall_multiple_protocol_interfaces;
void *calculate_crc32; void *calculate_crc32;
...@@ -354,9 +368,10 @@ typedef struct { ...@@ -354,9 +368,10 @@ typedef struct {
typedef union efi_pci_io_protocol efi_pci_io_protocol_t; typedef union efi_pci_io_protocol efi_pci_io_protocol_t;
typedef typedef
efi_status_t (*efi_pci_io_protocol_cfg_t)(efi_pci_io_protocol_t *, efi_status_t (__efiapi *efi_pci_io_protocol_cfg_t)(efi_pci_io_protocol_t *,
EFI_PCI_IO_PROTOCOL_WIDTH, EFI_PCI_IO_PROTOCOL_WIDTH,
u32 offset, unsigned long count, u32 offset,
unsigned long count,
void *buffer); void *buffer);
typedef struct { typedef struct {
...@@ -382,11 +397,11 @@ union efi_pci_io_protocol { ...@@ -382,11 +397,11 @@ union efi_pci_io_protocol {
void *allocate_buffer; void *allocate_buffer;
void *free_buffer; void *free_buffer;
void *flush; void *flush;
efi_status_t (*get_location)(efi_pci_io_protocol_t *, efi_status_t (__efiapi *get_location)(efi_pci_io_protocol_t *,
unsigned long *segment_nr, unsigned long *segment_nr,
unsigned long *bus_nr, unsigned long *bus_nr,
unsigned long *device_nr, unsigned long *device_nr,
unsigned long *function_nr); unsigned long *func_nr);
void *attributes; void *attributes;
void *get_bar_attributes; void *get_bar_attributes;
void *set_bar_attributes; void *set_bar_attributes;
...@@ -441,15 +456,16 @@ typedef union apple_properties_protocol apple_properties_protocol_t; ...@@ -441,15 +456,16 @@ typedef union apple_properties_protocol apple_properties_protocol_t;
union apple_properties_protocol { union apple_properties_protocol {
struct { struct {
unsigned long version; unsigned long version;
efi_status_t (*get)(apple_properties_protocol_t *, efi_status_t (__efiapi *get)(apple_properties_protocol_t *,
struct efi_dev_path *, efi_char16_t *, struct efi_dev_path *,
void *, u32 *); efi_char16_t *, void *, u32 *);
efi_status_t (*set)(apple_properties_protocol_t *, efi_status_t (__efiapi *set)(apple_properties_protocol_t *,
struct efi_dev_path *, efi_char16_t *, struct efi_dev_path *,
void *, u32); efi_char16_t *, void *, u32);
efi_status_t (*del)(apple_properties_protocol_t *, efi_status_t (__efiapi *del)(apple_properties_protocol_t *,
struct efi_dev_path *, efi_char16_t *); struct efi_dev_path *,
efi_status_t (*get_all)(apple_properties_protocol_t *, efi_char16_t *);
efi_status_t (__efiapi *get_all)(apple_properties_protocol_t *,
void *buffer, u32 *); void *buffer, u32 *);
}; };
struct { struct {
...@@ -468,7 +484,7 @@ typedef union efi_tcg2_protocol efi_tcg2_protocol_t; ...@@ -468,7 +484,7 @@ typedef union efi_tcg2_protocol efi_tcg2_protocol_t;
union efi_tcg2_protocol { union efi_tcg2_protocol {
struct { struct {
void *get_capability; void *get_capability;
efi_status_t (*get_event_log)(efi_handle_t, efi_status_t (__efiapi *get_event_log)(efi_handle_t,
efi_tcg2_event_log_format, efi_tcg2_event_log_format,
efi_physical_addr_t *, efi_physical_addr_t *,
efi_physical_addr_t *, efi_physical_addr_t *,
...@@ -576,20 +592,20 @@ typedef efi_status_t efi_query_variable_store_t(u32 attributes, ...@@ -576,20 +592,20 @@ typedef efi_status_t efi_query_variable_store_t(u32 attributes,
typedef union { typedef union {
struct { struct {
efi_table_hdr_t hdr; efi_table_hdr_t hdr;
efi_get_time_t *get_time; efi_get_time_t __efiapi *get_time;
efi_set_time_t *set_time; efi_set_time_t __efiapi *set_time;
efi_get_wakeup_time_t *get_wakeup_time; efi_get_wakeup_time_t __efiapi *get_wakeup_time;
efi_set_wakeup_time_t *set_wakeup_time; efi_set_wakeup_time_t __efiapi *set_wakeup_time;
efi_set_virtual_address_map_t *set_virtual_address_map; efi_set_virtual_address_map_t __efiapi *set_virtual_address_map;
void *convert_pointer; void *convert_pointer;
efi_get_variable_t *get_variable; efi_get_variable_t __efiapi *get_variable;
efi_get_next_variable_t *get_next_variable; efi_get_next_variable_t __efiapi *get_next_variable;
efi_set_variable_t *set_variable; efi_set_variable_t __efiapi *set_variable;
efi_get_next_high_mono_count_t *get_next_high_mono_count; efi_get_next_high_mono_count_t __efiapi *get_next_high_mono_count;
efi_reset_system_t *reset_system; efi_reset_system_t __efiapi *reset_system;
efi_update_capsule_t *update_capsule; efi_update_capsule_t __efiapi *update_capsule;
efi_query_capsule_caps_t *query_capsule_caps; efi_query_capsule_caps_t __efiapi *query_capsule_caps;
efi_query_variable_info_t *query_variable_info; efi_query_variable_info_t __efiapi *query_variable_info;
}; };
efi_runtime_services_32_t mixed_mode; efi_runtime_services_32_t mixed_mode;
} efi_runtime_services_t; } efi_runtime_services_t;
...@@ -806,7 +822,7 @@ union efi_loaded_image { ...@@ -806,7 +822,7 @@ union efi_loaded_image {
__aligned_u64 image_size; __aligned_u64 image_size;
unsigned int image_code_type; unsigned int image_code_type;
unsigned int image_data_type; unsigned int image_data_type;
efi_status_t (*unload)(efi_handle_t image_handle); efi_status_t ( __efiapi *unload)(efi_handle_t image_handle);
}; };
struct { struct {
u32 revision; u32 revision;
...@@ -841,18 +857,19 @@ typedef union efi_file_handle efi_file_handle_t; ...@@ -841,18 +857,19 @@ typedef union efi_file_handle efi_file_handle_t;
union efi_file_handle { union efi_file_handle {
struct { struct {
u64 revision; u64 revision;
efi_status_t (*open)(efi_file_handle_t *, efi_status_t (__efiapi *open)(efi_file_handle_t *,
efi_file_handle_t **, efi_file_handle_t **,
efi_char16_t *, u64, u64); efi_char16_t *, u64, u64);
efi_status_t (*close)(efi_file_handle_t *); efi_status_t (__efiapi *close)(efi_file_handle_t *);
void *delete; void *delete;
efi_status_t (*read)(efi_file_handle_t *, unsigned long *, efi_status_t (__efiapi *read)(efi_file_handle_t *,
void *); unsigned long *, void *);
void *write; void *write;
void *get_position; void *get_position;
void *set_position; void *set_position;
efi_status_t (*get_info)(efi_file_handle_t *, efi_guid_t *, efi_status_t (__efiapi *get_info)(efi_file_handle_t *,
unsigned long *, void *); efi_guid_t *, unsigned long *,
void *);
void *set_info; void *set_info;
void *flush; void *flush;
}; };
...@@ -876,7 +893,7 @@ typedef union efi_file_io_interface efi_file_io_interface_t; ...@@ -876,7 +893,7 @@ typedef union efi_file_io_interface efi_file_io_interface_t;
union efi_file_io_interface { union efi_file_io_interface {
struct { struct {
u64 revision; u64 revision;
int (*open_volume)(efi_file_io_interface_t *, int (__efiapi *open_volume)(efi_file_io_interface_t *,
efi_file_handle_t **); efi_file_handle_t **);
}; };
struct { struct {
...@@ -1346,7 +1363,7 @@ struct efivar_entry { ...@@ -1346,7 +1363,7 @@ struct efivar_entry {
union efi_simple_text_output_protocol { union efi_simple_text_output_protocol {
struct { struct {
void *reset; void *reset;
efi_status_t (*output_string)(efi_simple_text_output_protocol_t *, efi_status_t (__efiapi *output_string)(efi_simple_text_output_protocol_t *,
efi_char16_t *); efi_char16_t *);
void *test_string; void *test_string;
}; };
......
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