efi/libstub: Extend native protocol definitions with mixed_mode aliases (1786e830) · Commits · 戴 / test

arch/x86/boot/compressed/eboot.h

+11 −4

Original line number	Diff line number	Diff line
		@@ -24,10 +24,17 @@ typedef struct {
		u64 blt;
		} efi_uga_draw_protocol_64_t;

		typedef struct {
		typedef union {
		struct {
		void *get_mode;
		void *set_mode;
		void *blt;
		};
		struct {
		u32 get_mode;
		u32 set_mode;
		u32 blt;
		} mixed_mode;
		} efi_uga_draw_protocol_t;

		#endif /* BOOT_COMPRESSED_EBOOT_H */

drivers/firmware/efi/libstub/arm-stub.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -40,9 +40,9 @@ static u64 virtmap_base = EFI_RT_VIRTUAL_BASE;
		void efi_char16_printk(efi_system_table_t *sys_table_arg,
		efi_char16_t *str)
		{
		struct efi_simple_text_output_protocol *out;
		efi_simple_text_output_protocol_t *out;

		out = (struct efi_simple_text_output_protocol *)sys_table_arg->con_out;
		out = (efi_simple_text_output_protocol_t *)sys_table_arg->con_out;
		out->output_string(out, str);
		}

drivers/firmware/efi/libstub/random.c

+14 −8

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@

		#include "efistub.h"

		typedef struct efi_rng_protocol efi_rng_protocol_t;
		typedef union efi_rng_protocol efi_rng_protocol_t;

		typedef struct {
		u32 get_info;
		@@ -21,19 +21,25 @@ typedef struct {
		u64 get_rng;
		} efi_rng_protocol_64_t;

		struct efi_rng_protocol {
		efi_status_t (get_info)(struct efi_rng_protocol ,
		union efi_rng_protocol {
		struct {
		efi_status_t (get_info)(efi_rng_protocol_t ,
		unsigned long , efi_guid_t );
		efi_status_t (get_rng)(struct efi_rng_protocol ,
		efi_status_t (get_rng)(efi_rng_protocol_t ,
		efi_guid_t , unsigned long, u8 out);
		};
		struct {
		u32 get_info;
		u32 get_rng;
		} mixed_mode;
		};

		efi_status_t efi_get_random_bytes(efi_system_table_t *sys_table_arg,
		unsigned long size, u8 *out)
		{
		efi_guid_t rng_proto = EFI_RNG_PROTOCOL_GUID;
		efi_status_t status;
		struct efi_rng_protocol *rng = NULL;
		efi_rng_protocol_t *rng = NULL;

		status = efi_call_early(locate_protocol, &rng_proto, NULL,
		(void **)&rng);
		@@ -162,7 +168,7 @@ efi_status_t efi_random_get_seed(efi_system_table_t *sys_table_arg)
		efi_guid_t rng_proto = EFI_RNG_PROTOCOL_GUID;
		efi_guid_t rng_algo_raw = EFI_RNG_ALGORITHM_RAW;
		efi_guid_t rng_table_guid = LINUX_EFI_RANDOM_SEED_TABLE_GUID;
		struct efi_rng_protocol *rng = NULL;
		efi_rng_protocol_t *rng = NULL;
		struct linux_efi_random_seed *seed = NULL;
		efi_status_t status;

include/linux/efi.h

+330 −166

Original line number	Diff line number	Diff line
		@@ -315,7 +315,8 @@ typedef struct {
		/*
		* EFI Boot Services table
		*/
		typedef struct {
		typedef union {
		struct {
		efi_table_hdr_t hdr;
		void *raise_tpl;
		void *restore_tpl;
		@@ -364,6 +365,8 @@ typedef struct {
		void *copy_mem;
		void *set_mem;
		void *create_event_ex;
		};
		efi_boot_services_32_t mixed_mode;
		} efi_boot_services_t;

		typedef enum {
		@@ -401,11 +404,24 @@ typedef struct {
		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;
		void *write;
		} efi_pci_io_protocol_access_t;

		typedef struct {
		efi_pci_io_protocol_cfg_t read;
		efi_pci_io_protocol_cfg_t write;
		} efi_pci_io_protocol_config_access_t;

		typedef struct {
		u32 poll_mem;
		u32 poll_io;
		@@ -446,12 +462,13 @@ typedef struct {
		u64 romimage;
		} efi_pci_io_protocol_64_t;

		typedef struct {
		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_access_t pci;
		efi_pci_io_protocol_config_access_t pci;
		void *copy_mem;
		void *map;
		void *unmap;
		@@ -464,7 +481,27 @@ typedef struct {
		void *set_bar_attributes;
		uint64_t romsize;
		void *romimage;
		} efi_pci_io_protocol_t;
		};
		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
		@@ -502,6 +539,33 @@ typedef struct {
		u64 get_all;
		} apple_properties_protocol_64_t;

		struct efi_dev_path;

		typedef union apple_properties_protocol apple_properties_protocol_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 struct {
		u32 get_capability;
		u32 get_event_log;
		@@ -524,16 +588,32 @@ typedef struct {

		typedef u32 efi_tcg2_event_log_format;

		typedef struct {
		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 *);
		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;
		};
		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
		@@ -618,7 +698,8 @@ typedef efi_status_t efi_query_variable_store_t(u32 attributes,
		unsigned long size,
		bool nonblocking);

		typedef struct {
		typedef union {
		struct {
		efi_table_hdr_t hdr;
		efi_get_time_t *get_time;
		efi_set_time_t *set_time;
		@@ -634,6 +715,8 @@ typedef struct {
		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);
		@@ -719,9 +802,12 @@ typedef struct {
		u32 table;
		} efi_config_table_32_t;

		typedef struct {
		typedef union {
		struct {
		efi_guid_t guid;
		unsigned long table;
		};
		efi_config_table_32_t mixed_mode;
		} efi_config_table_t;

		typedef struct {
		@@ -773,7 +859,8 @@ typedef struct {
		u32 tables;
		} efi_system_table_32_t;

		typedef struct {
		typedef union {
		struct {
		efi_table_hdr_t hdr;
		unsigned long fw_vendor; /* physical addr of CHAR16 vendor string */
		u32 fw_revision;
		@@ -787,6 +874,8 @@ typedef struct {
		efi_boot_services_t *boottime;
		unsigned long nr_tables;
		unsigned long tables;
		};
		efi_system_table_32_t mixed_mode;
		} efi_system_table_t;

		/*
		@@ -856,7 +945,10 @@ typedef struct {
		u64 unload;
		} efi_loaded_image_64_t;

		typedef struct {
		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;
		@@ -870,8 +962,23 @@ typedef struct {
		unsigned int image_code_type;
		unsigned int image_data_type;
		efi_status_t (*unload)(efi_handle_t image_handle);
		} efi_loaded_image_t;

		};
		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;
		@@ -912,23 +1019,40 @@ typedef struct {
		u64 flush;
		} efi_file_handle_64_t;

		typedef struct _efi_file_handle {
		typedef union efi_file_handle efi_file_handle_t;

		union efi_file_handle {
		struct {
		u64 revision;
		efi_status_t (open)(struct _efi_file_handle ,
		struct _efi_file_handle **,
		efi_status_t (open)(efi_file_handle_t ,
		efi_file_handle_t **,
		efi_char16_t *, u64, u64);
		efi_status_t (close)(struct _efi_file_handle );
		efi_status_t (close)(efi_file_handle_t );
		void *delete;
		efi_status_t (read)(struct _efi_file_handle , unsigned long *,
		efi_status_t (read)(efi_file_handle_t , unsigned long *,
		void *);
		void *write;
		void *get_position;
		void *set_position;
		efi_status_t (get_info)(struct _efi_file_handle , efi_guid_t *,
		efi_status_t (get_info)(efi_file_handle_t , efi_guid_t *,
		unsigned long , void );
		void *set_info;
		void *flush;
		} efi_file_handle_t;
		};
		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;
		@@ -940,11 +1064,19 @@ typedef struct {
		u64 open_volume;
		} efi_file_io_interface_64_t;

		typedef struct _efi_file_io_interface {
		typedef union efi_file_io_interface efi_file_io_interface_t;

		union efi_file_io_interface {
		struct {
		u64 revision;
		int (open_volume)(struct _efi_file_io_interface ,
		int (open_volume)(efi_file_io_interface_t ,
		efi_file_handle_t **);
		} efi_file_io_interface_t;
		};
		struct {
		u64 revision;
		u32 open_volume;
		} mixed_mode;
		} ;

		#define EFI_FILE_MODE_READ 0x0000000000000001
		#define EFI_FILE_MODE_WRITE 0x0000000000000002
		@@ -1416,11 +1548,21 @@ typedef struct {
		u64 test_string;
		} efi_simple_text_output_protocol_64_t;

		struct efi_simple_text_output_protocol {
		typedef union efi_simple_text_output_protocol efi_simple_text_output_protocol_t;

		union efi_simple_text_output_protocol {
		struct {
		void *reset;
		efi_status_t (output_string)(void , void *);
		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
		#define PIXEL_BGR_RESERVED_8BIT_PER_COLOR 1
		@@ -1462,14 +1604,26 @@ typedef struct {
		u64 frame_buffer_size;
		} efi_graphics_output_protocol_mode_64_t;

		typedef struct {
		typedef union efi_graphics_output_protocol_mode efi_graphics_output_protocol_mode_t;

		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;
		} efi_graphics_output_protocol_mode_t;
		};
		struct {
		u32 max_mode;
		u32 mode;
		u32 info;
		u32 size_of_info;
		u64 frame_buffer_base;
		u32 frame_buffer_size;
		} mixed_mode;
		};

		typedef struct {
		u32 query_mode;
		@@ -1485,12 +1639,22 @@ typedef struct {
		u64 mode;
		} efi_graphics_output_protocol_64_t;

		typedef struct {
		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;
		} efi_graphics_output_protocol_t;
		};
		struct {
		u32 query_mode;
		u32 set_mode;
		u32 blt;
		u32 mode;
		} mixed_mode;
		};

		extern struct list_head efivar_sysfs_list;

Admin message