Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf924863 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Matt Fleming
Browse files

efi: Add support for UEFIv2.5 Properties table 



Version 2.5 of the UEFI spec introduces a new configuration table
called the 'EFI Properties table'. Currently, it is only used to
convey whether the Memory Protection feature is enabled, which splits
PE/COFF images into separate code and data memory regions.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Acked-by: default avatarDave Young <dyoung@redhat.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 8be4432e

drivers/firmware/efi/efi.c

+16 −14
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ struct efi __read_mostly efi = { 
	.runtime		= EFI_INVALID_TABLE_ADDR,

	.config_table		= EFI_INVALID_TABLE_ADDR,

	.esrt			= EFI_INVALID_TABLE_ADDR,

	.properties_table	= EFI_INVALID_TABLE_ADDR,

};

EXPORT_SYMBOL(efi);
@@ -365,6 +366,7 @@ static __initdata efi_config_table_type_t common_tables[] = { 
	{SMBIOS3_TABLE_GUID, "SMBIOS 3.0", &efi.smbios3},

	{UGA_IO_PROTOCOL_GUID, "UGA", &efi.uga},

	{EFI_SYSTEM_RESOURCE_TABLE_GUID, "ESRT", &efi.esrt},

	{EFI_PROPERTIES_TABLE_GUID, "PROP", &efi.properties_table},

	{NULL_GUID, NULL, NULL},

};

include/linux/efi.h

+13 −0
Original line number Diff line number Diff line
@@ -596,6 +596,9 @@ void efi_native_runtime_setup(void); 
#define DEVICE_TREE_GUID \

    EFI_GUID(  0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 )



#define EFI_PROPERTIES_TABLE_GUID \

    EFI_GUID(  0x880aaca3, 0x4adc, 0x4a04, 0x90, 0x79, 0xb7, 0x47, 0x34, 0x08, 0x25, 0xe5 )



typedef struct {

	efi_guid_t guid;

	u64 table;
@@ -809,6 +812,15 @@ typedef struct _efi_file_io_interface { 
#define EFI_FILE_MODE_WRITE	0x0000000000000002

#define EFI_FILE_MODE_CREATE	0x8000000000000000



typedef struct {

	u32 version;

	u32 length;

	u64 memory_protection_attribute;

} efi_properties_table_t;



#define EFI_PROPERTIES_TABLE_VERSION	0x00010000

#define EFI_PROPERTIES_RUNTIME_MEMORY_PROTECTION_NON_EXECUTABLE_PE_DATA	0x1



#define EFI_INVALID_TABLE_ADDR		(~0UL)



/*
@@ -831,6 +843,7 @@ extern struct efi { 
	unsigned long runtime;		/* runtime table */

	unsigned long config_table;	/* config tables */

	unsigned long esrt;		/* ESRT table */

	unsigned long properties_table;	/* properties table */

	efi_get_time_t *get_time;

	efi_set_time_t *set_time;

	efi_get_wakeup_time_t *get_wakeup_time;