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

Commit 7fb2b43c authored by Ingo Molnar's avatar Ingo Molnar
Browse files

efi: Reorganize the GUID table to make it easier to read 



Re-organize the GUID table so that every GUID takes a single line.

This makes each line super long, but if you have a large enough terminal
(or zoom out of a small terminal) then you can see the structure at
a glance - which is more readable than it was the case with the
multi-line layout.

Acked-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Joe Perches <joe@perches.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Jones <pjones@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20160627104920.GA9099@gmail.com


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

include/linux/efi.h

+36 −109
Original line number Diff line number Diff line
@@ -538,9 +538,11 @@ void efi_native_runtime_setup(void); 
/*

 * EFI Configuration Table and GUID definitions

 *

 * These should be formatted roughly like the ones in the UEFI SPEC has

 * them.  It makes them easier to grep for, and they look the same when

 * you're staring at them.  Here's the guide:

 * These are all defined in a single line to make them easier to

 * grep for and to see them at a glance - while still having a

 * similar structure to the definitions in the spec.

 *

 * Here's how they are structured:

 *

 * GUID: 12345678-1234-1234-1234-123456789012

 * Spec:
@@ -548,119 +550,44 @@ void efi_native_runtime_setup(void); 
 *        {0x12345678,0x1234,0x1234,\

 *          {0x12,0x34,0x12,0x34,0x56,0x78,0x90,0x12}}

 * Here:

 *	#define SOME_PROTOCOL_GUID \

 *		EFI_GUID(0x12345678, 0x1234,  0x1234, \

 *			 0x12, 0x34, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12)

 *      ^ tab   ^tab    ^ space

 *	#define SOME_PROTOCOL_GUID		EFI_GUID(0x12345678, 0x1234, 0x1234,  0x12, 0x34, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12)

 *					^ tabs					    ^extra space

 *

 * Note that the 'extra space' separates the values at the same place

 * where the UEFI SPEC breaks the line.

 */

#define NULL_GUID \

	EFI_GUID(0x00000000, 0x0000, 0x0000, \

		 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)



#define MPS_TABLE_GUID    \

	EFI_GUID(0xeb9d2d2f, 0x2d88, 0x11d3, \

		 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)



#define ACPI_TABLE_GUID    \

	EFI_GUID(0xeb9d2d30, 0x2d88, 0x11d3, \

		 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)



#define ACPI_20_TABLE_GUID    \

	EFI_GUID(0x8868e871, 0xe4f1, 0x11d3, \

		 0xbc, 0x22, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81)



#define SMBIOS_TABLE_GUID    \

	EFI_GUID(0xeb9d2d31, 0x2d88, 0x11d3, \

		 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)



#define SMBIOS3_TABLE_GUID    \

	EFI_GUID(0xf2fd1544, 0x9794, 0x4a2c, \

		 0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94)



#define SAL_SYSTEM_TABLE_GUID    \

	EFI_GUID(0xeb9d2d32, 0x2d88, 0x11d3, \

		 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)



#define HCDP_TABLE_GUID	\

	EFI_GUID(0xf951938d, 0x620b, 0x42ef, \

		 0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98)



#define UGA_IO_PROTOCOL_GUID \

	EFI_GUID(0x61a4d49e, 0x6f68, 0x4f1b, \

		 0xb9, 0x22, 0xa8, 0x6e, 0xed, 0x0b, 0x07, 0xa2)



#define EFI_GLOBAL_VARIABLE_GUID \

	EFI_GUID(0x8be4df61, 0x93ca, 0x11d2, \

		 0xaa, 0x0d, 0x00, 0xe0, 0x98, 0x03, 0x2b, 0x8c)



#define UV_SYSTEM_TABLE_GUID \

	EFI_GUID(0x3b13a7d4, 0x633e, 0x11dd, \

		 0x93, 0xec, 0xda, 0x25, 0x56, 0xd8, 0x95, 0x93)



#define LINUX_EFI_CRASH_GUID \

	EFI_GUID(0xcfc8fc79, 0xbe2e, 0x4ddc, \

		 0x97, 0xf0, 0x9f, 0x98, 0xbf, 0xe2, 0x98, 0xa0)



#define LOADED_IMAGE_PROTOCOL_GUID \

	EFI_GUID(0x5b1b31a1, 0x9562, 0x11d2, \

		 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)



#define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID \

	EFI_GUID(0x9042a9de, 0x23dc, 0x4a38, \

		 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a)



#define EFI_UGA_PROTOCOL_GUID \

	EFI_GUID(0x982c298b, 0xf4fa, 0x41cb, \

		 0xb8, 0x38, 0x77, 0xaa, 0x68, 0x8f, 0xb8, 0x39)



#define EFI_PCI_IO_PROTOCOL_GUID \

	EFI_GUID(0x4cf5b200, 0x68b8, 0x4ca5, \

		 0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x02, 0x9a)



#define EFI_FILE_INFO_ID \

	EFI_GUID(0x9576e92, 0x6d3f, 0x11d2, \

		 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)



#define EFI_SYSTEM_RESOURCE_TABLE_GUID \

	EFI_GUID(0xb122a263, 0x3661, 0x4f68, \

		 0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80)



#define EFI_FILE_SYSTEM_GUID \

	EFI_GUID(0x964e5b22, 0x6459, 0x11d2, \

		 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)



#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)



#define EFI_RNG_PROTOCOL_GUID \

	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)



#define EFI_CONSOLE_OUT_DEVICE_GUID \

	EFI_GUID(0xd3b36f2c, 0xd551, 0x11d4, \

		 0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)

#define NULL_GUID				EFI_GUID(0x00000000, 0x0000, 0x0000,  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)

#define MPS_TABLE_GUID				EFI_GUID(0xeb9d2d2f, 0x2d88, 0x11d3,  0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)

#define ACPI_TABLE_GUID				EFI_GUID(0xeb9d2d30, 0x2d88, 0x11d3,  0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)

#define ACPI_20_TABLE_GUID			EFI_GUID(0x8868e871, 0xe4f1, 0x11d3,  0xbc, 0x22, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81)

#define SMBIOS_TABLE_GUID			EFI_GUID(0xeb9d2d31, 0x2d88, 0x11d3,  0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)

#define SMBIOS3_TABLE_GUID			EFI_GUID(0xf2fd1544, 0x9794, 0x4a2c,  0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94)

#define SAL_SYSTEM_TABLE_GUID			EFI_GUID(0xeb9d2d32, 0x2d88, 0x11d3,  0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)

#define HCDP_TABLE_GUID				EFI_GUID(0xf951938d, 0x620b, 0x42ef,  0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98)

#define UGA_IO_PROTOCOL_GUID			EFI_GUID(0x61a4d49e, 0x6f68, 0x4f1b,  0xb9, 0x22, 0xa8, 0x6e, 0xed, 0x0b, 0x07, 0xa2)

#define EFI_GLOBAL_VARIABLE_GUID		EFI_GUID(0x8be4df61, 0x93ca, 0x11d2,  0xaa, 0x0d, 0x00, 0xe0, 0x98, 0x03, 0x2b, 0x8c)

#define UV_SYSTEM_TABLE_GUID			EFI_GUID(0x3b13a7d4, 0x633e, 0x11dd,  0x93, 0xec, 0xda, 0x25, 0x56, 0xd8, 0x95, 0x93)

#define LINUX_EFI_CRASH_GUID			EFI_GUID(0xcfc8fc79, 0xbe2e, 0x4ddc,  0x97, 0xf0, 0x9f, 0x98, 0xbf, 0xe2, 0x98, 0xa0)

#define LOADED_IMAGE_PROTOCOL_GUID		EFI_GUID(0x5b1b31a1, 0x9562, 0x11d2,  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)

#define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID	EFI_GUID(0x9042a9de, 0x23dc, 0x4a38,  0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a)

#define EFI_UGA_PROTOCOL_GUID			EFI_GUID(0x982c298b, 0xf4fa, 0x41cb,  0xb8, 0x38, 0x77, 0xaa, 0x68, 0x8f, 0xb8, 0x39)

#define EFI_PCI_IO_PROTOCOL_GUID		EFI_GUID(0x4cf5b200, 0x68b8, 0x4ca5,  0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x02, 0x9a)

#define EFI_FILE_INFO_ID			EFI_GUID(0x09576e92, 0x6d3f, 0x11d2,  0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)

#define EFI_SYSTEM_RESOURCE_TABLE_GUID		EFI_GUID(0xb122a263, 0x3661, 0x4f68,  0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80)

#define EFI_FILE_SYSTEM_GUID			EFI_GUID(0x964e5b22, 0x6459, 0x11d2,  0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)

#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)

#define EFI_RNG_PROTOCOL_GUID			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)

#define EFI_CONSOLE_OUT_DEVICE_GUID		EFI_GUID(0xd3b36f2c, 0xd551, 0x11d4,  0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)



/*

 * This GUID is used to pass to the kernel proper the struct screen_info

 * structure that was populated by the stub based on the GOP protocol instance

 * associated with ConOut

 */

#define LINUX_EFI_ARM_SCREEN_INFO_TABLE_GUID \

	EFI_GUID(0xe03fc20a, 0x85dc, 0x406e, \

		 0xb9, 0xe, 0x4a, 0xb5, 0x02, 0x37, 0x1d, 0x95)



#define LINUX_EFI_LOADER_ENTRY_GUID \

	EFI_GUID(0x4a67b082, 0x0a4c, 0x41cf, \

		 0xb6, 0xc7, 0x44, 0x0b, 0x29, 0xbb, 0x8c, 0x4f)

#define LINUX_EFI_ARM_SCREEN_INFO_TABLE_GUID	EFI_GUID(0xe03fc20a, 0x85dc, 0x406e,  0xb9, 0x0e, 0x4a, 0xb5, 0x02, 0x37, 0x1d, 0x95)

#define LINUX_EFI_LOADER_ENTRY_GUID		EFI_GUID(0x4a67b082, 0x0a4c, 0x41cf,  0xb6, 0xc7, 0x44, 0x0b, 0x29, 0xbb, 0x8c, 0x4f)



typedef struct {

	efi_guid_t guid;