Commit a604af07 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

efi: Add support for the EFI_MEMORY_ATTRIBUTES_TABLE config table 



This declares the GUID and struct typedef for the new memory attributes
table which contains the permissions that can be used to apply stricter
permissions to UEFI Runtime Services memory regions.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Jones <pjones@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/1461614832-17633-13-git-send-email-matt@codeblueprint.co.uk


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1fd55a9a

drivers/firmware/efi/efi.c

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ struct efi __read_mostly efi = { 
	.config_table		= EFI_INVALID_TABLE_ADDR,

	.esrt			= EFI_INVALID_TABLE_ADDR,

	.properties_table	= EFI_INVALID_TABLE_ADDR,

	.mem_attr_table		= EFI_INVALID_TABLE_ADDR,

};

EXPORT_SYMBOL(efi);
@@ -338,6 +339,7 @@ static __initdata efi_config_table_type_t common_tables[] = { 
	{UGA_IO_PROTOCOL_GUID, "UGA", &efi.uga},

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

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

	{EFI_MEMORY_ATTRIBUTES_TABLE_GUID, "MEMATTR", &efi.mem_attr_table},

	{NULL_GUID, NULL, NULL},

};

include/linux/efi.h

+13 −0
Original line number Diff line number Diff line
@@ -623,6 +623,10 @@ void efi_native_runtime_setup(void); 
	EFI_GUID(0x3152bca5, 0xeade, 0x433d, \

		 0x86, 0x2e, 0xc0, 0x1c, 0xdc, 0x29, 0x1f, 0x44)



#define EFI_MEMORY_ATTRIBUTES_TABLE_GUID \

	EFI_GUID(0xdcfa911d, 0x26eb, 0x469f, \

		 0xa2, 0x20, 0x38, 0xb7, 0xdc, 0x46, 0x12, 0x20)



typedef struct {

	efi_guid_t guid;

	u64 table;
@@ -847,6 +851,14 @@ typedef struct { 


#define EFI_INVALID_TABLE_ADDR		(~0UL)



typedef struct {

	u32 version;

	u32 num_entries;

	u32 desc_size;

	u32 reserved;

	efi_memory_desc_t entry[0];

} efi_memory_attributes_table_t;



/*

 * All runtime access to EFI goes through this structure:

 */
@@ -868,6 +880,7 @@ extern struct efi { 
	unsigned long config_table;	/* config tables */

	unsigned long esrt;		/* ESRT table */

	unsigned long properties_table;	/* properties table */

	unsigned long mem_attr_table;	/* memory attributes table */

	efi_get_time_t *get_time;

	efi_set_time_t *set_time;

	efi_get_wakeup_time_t *get_wakeup_time;

CRA Git | Maintained and supported by SUSTech CRA and CCSE