efi/libstub: Use stricter typing for firmware function pointers
[linux-2.6-microblaze.git] / include / linux / efi.h
index 99dfea5..8800776 100644 (file)
@@ -48,6 +48,19 @@ typedef u16 efi_char16_t;            /* UNICODE character */
 typedef u64 efi_physical_addr_t;
 typedef void *efi_handle_t;
 
+#define efi_get_handle_at(array, idx)                                  \
+       (efi_is_native() ? (array)[idx]                                 \
+               : (efi_handle_t)(unsigned long)((u32 *)(array))[idx])
+
+#define efi_get_handle_num(size)                                       \
+       ((size) / (efi_is_native() ? sizeof(efi_handle_t) : sizeof(u32)))
+
+#define for_each_efi_handle(handle, array, size, i)                    \
+       for (i = 0;                                                     \
+            i < efi_get_handle_num(size) &&                            \
+               ((handle = efi_get_handle_at((array), i)) || true);     \
+            i++)
+
 /*
  * The UEFI spec and EDK2 reference implementation both define EFI_GUID as
  * struct { u32 a; u16; b; u16 c; u8 d[8]; }; and so the implied alignment
@@ -251,106 +264,61 @@ typedef struct {
        u32 create_event_ex;
 } __packed efi_boot_services_32_t;
 
-typedef struct {
-       efi_table_hdr_t hdr;
-       u64 raise_tpl;
-       u64 restore_tpl;
-       u64 allocate_pages;
-       u64 free_pages;
-       u64 get_memory_map;
-       u64 allocate_pool;
-       u64 free_pool;
-       u64 create_event;
-       u64 set_timer;
-       u64 wait_for_event;
-       u64 signal_event;
-       u64 close_event;
-       u64 check_event;
-       u64 install_protocol_interface;
-       u64 reinstall_protocol_interface;
-       u64 uninstall_protocol_interface;
-       u64 handle_protocol;
-       u64 __reserved;
-       u64 register_protocol_notify;
-       u64 locate_handle;
-       u64 locate_device_path;
-       u64 install_configuration_table;
-       u64 load_image;
-       u64 start_image;
-       u64 exit;
-       u64 unload_image;
-       u64 exit_boot_services;
-       u64 get_next_monotonic_count;
-       u64 stall;
-       u64 set_watchdog_timer;
-       u64 connect_controller;
-       u64 disconnect_controller;
-       u64 open_protocol;
-       u64 close_protocol;
-       u64 open_protocol_information;
-       u64 protocols_per_handle;
-       u64 locate_handle_buffer;
-       u64 locate_protocol;
-       u64 install_multiple_protocol_interfaces;
-       u64 uninstall_multiple_protocol_interfaces;
-       u64 calculate_crc32;
-       u64 copy_mem;
-       u64 set_mem;
-       u64 create_event_ex;
-} __packed efi_boot_services_64_t;
-
 /*
  * EFI Boot Services table
  */
-typedef struct {
-       efi_table_hdr_t hdr;
-       void *raise_tpl;
-       void *restore_tpl;
-       efi_status_t (*allocate_pages)(int, int, unsigned long,
-                                      efi_physical_addr_t *);
-       efi_status_t (*free_pages)(efi_physical_addr_t, unsigned long);
-       efi_status_t (*get_memory_map)(unsigned long *, void *, unsigned long *,
-                                      unsigned long *, u32 *);
-       efi_status_t (*allocate_pool)(int, unsigned long, void **);
-       efi_status_t (*free_pool)(void *);
-       void *create_event;
-       void *set_timer;
-       void *wait_for_event;
-       void *signal_event;
-       void *close_event;
-       void *check_event;
-       void *install_protocol_interface;
-       void *reinstall_protocol_interface;
-       void *uninstall_protocol_interface;
-       efi_status_t (*handle_protocol)(efi_handle_t, efi_guid_t *, void **);
-       void *__reserved;
-       void *register_protocol_notify;
-       efi_status_t (*locate_handle)(int, efi_guid_t *, void *,
-                                     unsigned long *, efi_handle_t *);
-       void *locate_device_path;
-       efi_status_t (*install_configuration_table)(efi_guid_t *, void *);
-       void *load_image;
-       void *start_image;
-       void *exit;
-       void *unload_image;
-       efi_status_t (*exit_boot_services)(efi_handle_t, unsigned long);
-       void *get_next_monotonic_count;
-       void *stall;
-       void *set_watchdog_timer;
-       void *connect_controller;
-       void *disconnect_controller;
-       void *open_protocol;
-       void *close_protocol;
-       void *open_protocol_information;
-       void *protocols_per_handle;
-       void *locate_handle_buffer;
-       efi_status_t (*locate_protocol)(efi_guid_t *, void *, void **);
-       void *install_multiple_protocol_interfaces;
-       void *uninstall_multiple_protocol_interfaces;
-       void *calculate_crc32;
-       void *copy_mem;
-       void *set_mem;
-       void *create_event_ex;
+typedef union {
+       struct {
+               efi_table_hdr_t hdr;
+               void *raise_tpl;
+               void *restore_tpl;
+               efi_status_t (*allocate_pages)(int, int, unsigned long,
+                                              efi_physical_addr_t *);
+               efi_status_t (*free_pages)(efi_physical_addr_t, unsigned long);
+               efi_status_t (*get_memory_map)(unsigned long *, void *, unsigned long *,
+                                              unsigned long *, u32 *);
+               efi_status_t (*allocate_pool)(int, unsigned long, void **);
+               efi_status_t (*free_pool)(void *);
+               void *create_event;
+               void *set_timer;
+               void *wait_for_event;
+               void *signal_event;
+               void *close_event;
+               void *check_event;
+               void *install_protocol_interface;
+               void *reinstall_protocol_interface;
+               void *uninstall_protocol_interface;
+               efi_status_t (*handle_protocol)(efi_handle_t, efi_guid_t *, void **);
+               void *__reserved;
+               void *register_protocol_notify;
+               efi_status_t (*locate_handle)(int, efi_guid_t *, void *,
+                                             unsigned long *, efi_handle_t *);
+               void *locate_device_path;
+               efi_status_t (*install_configuration_table)(efi_guid_t *, void *);
+               void *load_image;
+               void *start_image;
+               void *exit;
+               void *unload_image;
+               efi_status_t (*exit_boot_services)(efi_handle_t, unsigned long);
+               void *get_next_monotonic_count;
+               void *stall;
+               void *set_watchdog_timer;
+               void *connect_controller;
+               void *disconnect_controller;
+               void *open_protocol;
+               void *close_protocol;
+               void *open_protocol_information;
+               void *protocols_per_handle;
+               void *locate_handle_buffer;
+               efi_status_t (*locate_protocol)(efi_guid_t *, void *, void **);
+               void *install_multiple_protocol_interfaces;
+               void *uninstall_multiple_protocol_interfaces;
+               void *calculate_crc32;
+               void *copy_mem;
+               void *set_mem;
+               void *create_event_ex;
+       };
+       efi_boot_services_32_t mixed_mode;
 } efi_boot_services_t;
 
 typedef enum {
@@ -383,10 +351,13 @@ typedef struct {
        u32 write;
 } efi_pci_io_protocol_access_32_t;
 
-typedef struct {
-       u64 read;
-       u64 write;
-} efi_pci_io_protocol_access_64_t;
+typedef union efi_pci_io_protocol efi_pci_io_protocol_t;
+
+typedef
+efi_status_t (*efi_pci_io_protocol_cfg_t)(efi_pci_io_protocol_t *,
+                                         EFI_PCI_IO_PROTOCOL_WIDTH,
+                                         u32 offset, unsigned long count,
+                                         void *buffer);
 
 typedef struct {
        void *read;
@@ -394,64 +365,54 @@ typedef struct {
 } efi_pci_io_protocol_access_t;
 
 typedef struct {
-       u32 poll_mem;
-       u32 poll_io;
-       efi_pci_io_protocol_access_32_t mem;
-       efi_pci_io_protocol_access_32_t io;
-       efi_pci_io_protocol_access_32_t pci;
-       u32 copy_mem;
-       u32 map;
-       u32 unmap;
-       u32 allocate_buffer;
-       u32 free_buffer;
-       u32 flush;
-       u32 get_location;
-       u32 attributes;
-       u32 get_bar_attributes;
-       u32 set_bar_attributes;
-       u64 romsize;
-       u32 romimage;
-} efi_pci_io_protocol_32_t;
+       efi_pci_io_protocol_cfg_t read;
+       efi_pci_io_protocol_cfg_t write;
+} efi_pci_io_protocol_config_access_t;
 
-typedef struct {
-       u64 poll_mem;
-       u64 poll_io;
-       efi_pci_io_protocol_access_64_t mem;
-       efi_pci_io_protocol_access_64_t io;
-       efi_pci_io_protocol_access_64_t pci;
-       u64 copy_mem;
-       u64 map;
-       u64 unmap;
-       u64 allocate_buffer;
-       u64 free_buffer;
-       u64 flush;
-       u64 get_location;
-       u64 attributes;
-       u64 get_bar_attributes;
-       u64 set_bar_attributes;
-       u64 romsize;
-       u64 romimage;
-} efi_pci_io_protocol_64_t;
-
-typedef struct {
-       void *poll_mem;
-       void *poll_io;
-       efi_pci_io_protocol_access_t mem;
-       efi_pci_io_protocol_access_t io;
-       efi_pci_io_protocol_access_t pci;
-       void *copy_mem;
-       void *map;
-       void *unmap;
-       void *allocate_buffer;
-       void *free_buffer;
-       void *flush;
-       void *get_location;
-       void *attributes;
-       void *get_bar_attributes;
-       void *set_bar_attributes;
-       uint64_t romsize;
-       void *romimage;
-} efi_pci_io_protocol_t;
+union efi_pci_io_protocol {
+       struct {
+               void *poll_mem;
+               void *poll_io;
+               efi_pci_io_protocol_access_t mem;
+               efi_pci_io_protocol_access_t io;
+               efi_pci_io_protocol_config_access_t pci;
+               void *copy_mem;
+               void *map;
+               void *unmap;
+               void *allocate_buffer;
+               void *free_buffer;
+               void *flush;
+               efi_status_t (*get_location)(efi_pci_io_protocol_t *,
+                                            unsigned long *segment_nr,
+                                            unsigned long *bus_nr,
+                                            unsigned long *device_nr,
+                                            unsigned long *function_nr);
+               void *attributes;
+               void *get_bar_attributes;
+               void *set_bar_attributes;
+               uint64_t romsize;
+               void *romimage;
+       };
+       struct {
+               u32 poll_mem;
+               u32 poll_io;
+               efi_pci_io_protocol_access_32_t mem;
+               efi_pci_io_protocol_access_32_t io;
+               efi_pci_io_protocol_access_32_t pci;
+               u32 copy_mem;
+               u32 map;
+               u32 unmap;
+               u32 allocate_buffer;
+               u32 free_buffer;
+               u32 flush;
+               u32 get_location;
+               u32 attributes;
+               u32 get_bar_attributes;
+               u32 set_bar_attributes;
+               u64 romsize;
+               u32 romimage;
+       } mixed_mode;
+};
 
 #define EFI_PCI_IO_ATTRIBUTE_ISA_MOTHERBOARD_IO 0x0001
 #define EFI_PCI_IO_ATTRIBUTE_ISA_IO 0x0002
@@ -473,54 +434,61 @@ typedef struct {
 #define EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO_16 0x20000
 #define EFI_PCI_IO_ATTRIBUTE_VGA_IO_16 0x40000
 
-typedef struct {
-       u32 version;
-       u32 get;
-       u32 set;
-       u32 del;
-       u32 get_all;
-} apple_properties_protocol_32_t;
-
-typedef struct {
-       u64 version;
-       u64 get;
-       u64 set;
-       u64 del;
-       u64 get_all;
-} apple_properties_protocol_64_t;
+struct efi_dev_path;
 
-typedef struct {
-       u32 get_capability;
-       u32 get_event_log;
-       u32 hash_log_extend_event;
-       u32 submit_command;
-       u32 get_active_pcr_banks;
-       u32 set_active_pcr_banks;
-       u32 get_result_of_set_active_pcr_banks;
-} efi_tcg2_protocol_32_t;
+typedef union apple_properties_protocol apple_properties_protocol_t;
 
-typedef struct {
-       u64 get_capability;
-       u64 get_event_log;
-       u64 hash_log_extend_event;
-       u64 submit_command;
-       u64 get_active_pcr_banks;
-       u64 set_active_pcr_banks;
-       u64 get_result_of_set_active_pcr_banks;
-} efi_tcg2_protocol_64_t;
+union apple_properties_protocol {
+       struct {
+               unsigned long version;
+               efi_status_t (*get)(apple_properties_protocol_t *,
+                                   struct efi_dev_path *, efi_char16_t *,
+                                   void *, u32 *);
+               efi_status_t (*set)(apple_properties_protocol_t *,
+                                   struct efi_dev_path *, efi_char16_t *,
+                                   void *, u32);
+               efi_status_t (*del)(apple_properties_protocol_t *,
+                                   struct efi_dev_path *, efi_char16_t *);
+               efi_status_t (*get_all)(apple_properties_protocol_t *,
+                                       void *buffer, u32 *);
+       };
+       struct {
+               u32 version;
+               u32 get;
+               u32 set;
+               u32 del;
+               u32 get_all;
+       } mixed_mode;
+};
 
 typedef u32 efi_tcg2_event_log_format;
 
-typedef struct {
-       void *get_capability;
-       efi_status_t (*get_event_log)(efi_handle_t, efi_tcg2_event_log_format,
-               efi_physical_addr_t *, efi_physical_addr_t *, efi_bool_t *);
-       void *hash_log_extend_event;
-       void *submit_command;
-       void *get_active_pcr_banks;
-       void *set_active_pcr_banks;
-       void *get_result_of_set_active_pcr_banks;
-} efi_tcg2_protocol_t;
+typedef union efi_tcg2_protocol efi_tcg2_protocol_t;
+
+union efi_tcg2_protocol {
+       struct {
+               void *get_capability;
+               efi_status_t (*get_event_log)(efi_handle_t,
+                                             efi_tcg2_event_log_format,
+                                             efi_physical_addr_t *,
+                                             efi_physical_addr_t *,
+                                             efi_bool_t *);
+               void *hash_log_extend_event;
+               void *submit_command;
+               void *get_active_pcr_banks;
+               void *set_active_pcr_banks;
+               void *get_result_of_set_active_pcr_banks;
+       };
+       struct {
+               u32 get_capability;
+               u32 get_event_log;
+               u32 hash_log_extend_event;
+               u32 submit_command;
+               u32 get_active_pcr_banks;
+               u32 set_active_pcr_banks;
+               u32 get_result_of_set_active_pcr_banks;
+       } mixed_mode;
+};
 
 /*
  * Types and defines for EFI ResetSystem
@@ -605,22 +573,25 @@ typedef efi_status_t efi_query_variable_store_t(u32 attributes,
                                                unsigned long size,
                                                bool nonblocking);
 
-typedef struct {
-       efi_table_hdr_t                 hdr;
-       efi_get_time_t                  *get_time;
-       efi_set_time_t                  *set_time;
-       efi_get_wakeup_time_t           *get_wakeup_time;
-       efi_set_wakeup_time_t           *set_wakeup_time;
-       efi_set_virtual_address_map_t   *set_virtual_address_map;
-       void                            *convert_pointer;
-       efi_get_variable_t              *get_variable;
-       efi_get_next_variable_t         *get_next_variable;
-       efi_set_variable_t              *set_variable;
-       efi_get_next_high_mono_count_t  *get_next_high_mono_count;
-       efi_reset_system_t              *reset_system;
-       efi_update_capsule_t            *update_capsule;
-       efi_query_capsule_caps_t        *query_capsule_caps;
-       efi_query_variable_info_t       *query_variable_info;
+typedef union {
+       struct {
+               efi_table_hdr_t                 hdr;
+               efi_get_time_t                  *get_time;
+               efi_set_time_t                  *set_time;
+               efi_get_wakeup_time_t           *get_wakeup_time;
+               efi_set_wakeup_time_t           *set_wakeup_time;
+               efi_set_virtual_address_map_t   *set_virtual_address_map;
+               void                            *convert_pointer;
+               efi_get_variable_t              *get_variable;
+               efi_get_next_variable_t         *get_next_variable;
+               efi_set_variable_t              *set_variable;
+               efi_get_next_high_mono_count_t  *get_next_high_mono_count;
+               efi_reset_system_t              *reset_system;
+               efi_update_capsule_t            *update_capsule;
+               efi_query_capsule_caps_t        *query_capsule_caps;
+               efi_query_variable_info_t       *query_variable_info;
+       };
+       efi_runtime_services_32_t mixed_mode;
 } efi_runtime_services_t;
 
 void efi_native_runtime_setup(void);
@@ -706,9 +677,12 @@ typedef struct {
        u32 table;
 } efi_config_table_32_t;
 
-typedef struct {
-       efi_guid_t guid;
-       unsigned long table;
+typedef union {
+       struct {
+               efi_guid_t guid;
+               void *table;
+       };
+       efi_config_table_32_t mixed_mode;
 } efi_config_table_t;
 
 typedef struct {
@@ -760,20 +734,25 @@ typedef struct {
        u32 tables;
 } efi_system_table_32_t;
 
-typedef struct {
-       efi_table_hdr_t hdr;
-       unsigned long fw_vendor;        /* physical addr of CHAR16 vendor string */
-       u32 fw_revision;
-       unsigned long con_in_handle;
-       unsigned long con_in;
-       unsigned long con_out_handle;
-       unsigned long con_out;
-       unsigned long stderr_handle;
-       unsigned long stderr;
-       efi_runtime_services_t *runtime;
-       efi_boot_services_t *boottime;
-       unsigned long nr_tables;
-       unsigned long tables;
+typedef union efi_simple_text_output_protocol efi_simple_text_output_protocol_t;
+
+typedef union {
+       struct {
+               efi_table_hdr_t hdr;
+               unsigned long fw_vendor;        /* physical addr of CHAR16 vendor string */
+               u32 fw_revision;
+               unsigned long con_in_handle;
+               unsigned long con_in;
+               unsigned long con_out_handle;
+               efi_simple_text_output_protocol_t *con_out;
+               unsigned long stderr_handle;
+               unsigned long stderr;
+               efi_runtime_services_t *runtime;
+               efi_boot_services_t *boottime;
+               unsigned long nr_tables;
+               unsigned long tables;
+       };
+       efi_system_table_32_t mixed_mode;
 } efi_system_table_t;
 
 /*
@@ -811,54 +790,40 @@ struct efi_fdt_params {
        u32 desc_ver;
 };
 
-typedef struct {
-       u32 revision;
-       u32 parent_handle;
-       u32 system_table;
-       u32 device_handle;
-       u32 file_path;
-       u32 reserved;
-       u32 load_options_size;
-       u32 load_options;
-       u32 image_base;
-       __aligned_u64 image_size;
-       unsigned int image_code_type;
-       unsigned int image_data_type;
-       unsigned long unload;
-} efi_loaded_image_32_t;
-
-typedef struct {
-       u32 revision;
-       u64 parent_handle;
-       u64 system_table;
-       u64 device_handle;
-       u64 file_path;
-       u64 reserved;
-       u32 load_options_size;
-       u64 load_options;
-       u64 image_base;
-       __aligned_u64 image_size;
-       unsigned int image_code_type;
-       unsigned int image_data_type;
-       unsigned long unload;
-} efi_loaded_image_64_t;
-
-typedef struct {
-       u32 revision;
-       void *parent_handle;
-       efi_system_table_t *system_table;
-       void *device_handle;
-       void *file_path;
-       void *reserved;
-       u32 load_options_size;
-       void *load_options;
-       void *image_base;
-       __aligned_u64 image_size;
-       unsigned int image_code_type;
-       unsigned int image_data_type;
-       unsigned long unload;
-} efi_loaded_image_t;
+typedef union efi_loaded_image efi_loaded_image_t;
 
+union efi_loaded_image {
+       struct {
+               u32 revision;
+               efi_handle_t parent_handle;
+               efi_system_table_t *system_table;
+               efi_handle_t device_handle;
+               void *file_path;
+               void *reserved;
+               u32 load_options_size;
+               void *load_options;
+               void *image_base;
+               __aligned_u64 image_size;
+               unsigned int image_code_type;
+               unsigned int image_data_type;
+               efi_status_t (*unload)(efi_handle_t image_handle);
+       };
+       struct {
+               u32 revision;
+               u32 parent_handle;
+               u32 system_table;
+               u32 device_handle;
+               u32 file_path;
+               u32 reserved;
+               u32 load_options_size;
+               u32 load_options;
+               u32 image_base;
+               __aligned_u64 image_size;
+               unsigned int image_code_type;
+               unsigned int image_data_type;
+               u32 unload;
+       } mixed_mode;
+};
 
 typedef struct {
        u64 size;
@@ -871,67 +836,54 @@ typedef struct {
        efi_char16_t filename[1];
 } efi_file_info_t;
 
-typedef struct {
-       u64 revision;
-       u32 open;
-       u32 close;
-       u32 delete;
-       u32 read;
-       u32 write;
-       u32 get_position;
-       u32 set_position;
-       u32 get_info;
-       u32 set_info;
-       u32 flush;
-} efi_file_handle_32_t;
-
-typedef struct {
-       u64 revision;
-       u64 open;
-       u64 close;
-       u64 delete;
-       u64 read;
-       u64 write;
-       u64 get_position;
-       u64 set_position;
-       u64 get_info;
-       u64 set_info;
-       u64 flush;
-} efi_file_handle_64_t;
-
-typedef struct _efi_file_handle {
-       u64 revision;
-       efi_status_t (*open)(struct _efi_file_handle *,
-                            struct _efi_file_handle **,
-                            efi_char16_t *, u64, u64);
-       efi_status_t (*close)(struct _efi_file_handle *);
-       void *delete;
-       efi_status_t (*read)(struct _efi_file_handle *, unsigned long *,
-                            void *);
-       void *write;
-       void *get_position;
-       void *set_position;
-       efi_status_t (*get_info)(struct _efi_file_handle *, efi_guid_t *,
-                       unsigned long *, void *);
-       void *set_info;
-       void *flush;
-} efi_file_handle_t;
+typedef union efi_file_handle efi_file_handle_t;
 
-typedef struct {
-       u64 revision;
-       u32 open_volume;
-} efi_file_io_interface_32_t;
+union efi_file_handle {
+       struct {
+               u64 revision;
+               efi_status_t (*open)(efi_file_handle_t *,
+                                    efi_file_handle_t **,
+                                    efi_char16_t *, u64, u64);
+               efi_status_t (*close)(efi_file_handle_t *);
+               void *delete;
+               efi_status_t (*read)(efi_file_handle_t *, unsigned long *,
+                                    void *);
+               void *write;
+               void *get_position;
+               void *set_position;
+               efi_status_t (*get_info)(efi_file_handle_t *, efi_guid_t *,
+                               unsigned long *, void *);
+               void *set_info;
+               void *flush;
+       };
+       struct {
+               u64 revision;
+               u32 open;
+               u32 close;
+               u32 delete;
+               u32 read;
+               u32 write;
+               u32 get_position;
+               u32 set_position;
+               u32 get_info;
+               u32 set_info;
+               u32 flush;
+       } mixed_mode;
+};
 
-typedef struct {
-       u64 revision;
-       u64 open_volume;
-} efi_file_io_interface_64_t;
+typedef union efi_file_io_interface efi_file_io_interface_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;
+union efi_file_io_interface {
+       struct {
+               u64 revision;
+               int (*open_volume)(efi_file_io_interface_t *,
+                                  efi_file_handle_t **);
+       };
+       struct {
+               u64 revision;
+               u32 open_volume;
+       } mixed_mode;
+};
 
 #define EFI_FILE_MODE_READ     0x0000000000000001
 #define EFI_FILE_MODE_WRITE    0x0000000000000002
@@ -1391,22 +1343,18 @@ struct efivar_entry {
        bool deleting;
 };
 
-typedef struct {
-       u32 reset;
-       u32 output_string;
-       u32 test_string;
-} efi_simple_text_output_protocol_32_t;
-
-typedef struct {
-       u64 reset;
-       u64 output_string;
-       u64 test_string;
-} efi_simple_text_output_protocol_64_t;
-
-struct efi_simple_text_output_protocol {
-       void *reset;
-       efi_status_t (*output_string)(void *, void *);
-       void *test_string;
+union efi_simple_text_output_protocol {
+       struct {
+               void *reset;
+               efi_status_t (*output_string)(efi_simple_text_output_protocol_t *,
+                                             efi_char16_t *);
+               void *test_string;
+       };
+       struct {
+               u32 reset;
+               u32 output_string;
+               u32 test_string;
+       } mixed_mode;
 };
 
 #define PIXEL_RGB_RESERVED_8BIT_PER_COLOR              0
@@ -1415,73 +1363,59 @@ struct efi_simple_text_output_protocol {
 #define PIXEL_BLT_ONLY                                 3
 #define PIXEL_FORMAT_MAX                               4
 
-struct efi_pixel_bitmask {
+typedef struct {
        u32 red_mask;
        u32 green_mask;
        u32 blue_mask;
        u32 reserved_mask;
-};
+} efi_pixel_bitmask_t;
 
-struct efi_graphics_output_mode_info {
+typedef struct {
        u32 version;
        u32 horizontal_resolution;
        u32 vertical_resolution;
        int pixel_format;
-       struct efi_pixel_bitmask pixel_information;
+       efi_pixel_bitmask_t pixel_information;
        u32 pixels_per_scan_line;
-} __packed;
-
-struct efi_graphics_output_protocol_mode_32 {
-       u32 max_mode;
-       u32 mode;
-       u32 info;
-       u32 size_of_info;
-       u64 frame_buffer_base;
-       u32 frame_buffer_size;
-} __packed;
-
-struct efi_graphics_output_protocol_mode_64 {
-       u32 max_mode;
-       u32 mode;
-       u64 info;
-       u64 size_of_info;
-       u64 frame_buffer_base;
-       u64 frame_buffer_size;
-} __packed;
-
-struct efi_graphics_output_protocol_mode {
-       u32 max_mode;
-       u32 mode;
-       unsigned long info;
-       unsigned long size_of_info;
-       u64 frame_buffer_base;
-       unsigned long frame_buffer_size;
-} __packed;
-
-struct efi_graphics_output_protocol_32 {
-       u32 query_mode;
-       u32 set_mode;
-       u32 blt;
-       u32 mode;
-};
+} efi_graphics_output_mode_info_t;
 
-struct efi_graphics_output_protocol_64 {
-       u64 query_mode;
-       u64 set_mode;
-       u64 blt;
-       u64 mode;
-};
+typedef union efi_graphics_output_protocol_mode efi_graphics_output_protocol_mode_t;
 
-struct efi_graphics_output_protocol {
-       unsigned long query_mode;
-       unsigned long set_mode;
-       unsigned long blt;
-       struct efi_graphics_output_protocol_mode *mode;
+union efi_graphics_output_protocol_mode {
+       struct {
+               u32 max_mode;
+               u32 mode;
+               efi_graphics_output_mode_info_t *info;
+               unsigned long size_of_info;
+               efi_physical_addr_t frame_buffer_base;
+               unsigned long frame_buffer_size;
+       };
+       struct {
+               u32 max_mode;
+               u32 mode;
+               u32 info;
+               u32 size_of_info;
+               u64 frame_buffer_base;
+               u32 frame_buffer_size;
+       } mixed_mode;
 };
 
-typedef efi_status_t (*efi_graphics_output_protocol_query_mode)(
-       struct efi_graphics_output_protocol *, u32, unsigned long *,
-       struct efi_graphics_output_mode_info **);
+typedef union efi_graphics_output_protocol efi_graphics_output_protocol_t;
+
+union efi_graphics_output_protocol {
+       struct {
+               void *query_mode;
+               void *set_mode;
+               void *blt;
+               efi_graphics_output_protocol_mode_t *mode;
+       };
+       struct {
+               u32 query_mode;
+               u32 set_mode;
+               u32 blt;
+               u32 mode;
+       } mixed_mode;
+};
 
 extern struct list_head efivar_sysfs_list;