Merge branch 'master' into openslxopenslx

1 files changed, 357 insertions, 0 deletions

diff --git a/src/interface/efi/efi_guid.c b/src/interface/efi/efi_guid.c
index f841448f1..c989aebfe 100644
--- a/src/interface/efi/efi_guid.c
+++ b/src/interface/efi/efi_guid.c
@@ -22,10 +22,14 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
+#include <string.h>
+#include <ipxe/uuid.h>
 #include <ipxe/efi/efi.h>
 #include <ipxe/efi/Protocol/AbsolutePointer.h>
 #include <ipxe/efi/Protocol/AcpiTable.h>
+#include <ipxe/efi/Protocol/AdapterInformation.h>
 #include <ipxe/efi/Protocol/AppleNetBoot.h>
 #include <ipxe/efi/Protocol/Arp.h>
 #include <ipxe/efi/Protocol/BlockIo.h>
@@ -42,6 +46,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/efi/Protocol/Dns4.h>
 #include <ipxe/efi/Protocol/Dns6.h>
 #include <ipxe/efi/Protocol/DriverBinding.h>
+#include <ipxe/efi/Protocol/EapConfiguration.h>
 #include <ipxe/efi/Protocol/GraphicsOutput.h>
 #include <ipxe/efi/Protocol/HiiConfigAccess.h>
 #include <ipxe/efi/Protocol/HiiFont.h>
@@ -61,6 +66,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/efi/Protocol/PciIo.h>
 #include <ipxe/efi/Protocol/PciRootBridgeIo.h>
 #include <ipxe/efi/Protocol/PxeBaseCode.h>
+#include <ipxe/efi/Protocol/Rng.h>
 #include <ipxe/efi/Protocol/SerialIo.h>
 #include <ipxe/efi/Protocol/ShimLock.h>
 #include <ipxe/efi/Protocol/SimpleFileSystem.h>
@@ -69,7 +75,10 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/efi/Protocol/SimpleTextIn.h>
 #include <ipxe/efi/Protocol/SimpleTextInEx.h>
 #include <ipxe/efi/Protocol/SimpleTextOut.h>
+#include <ipxe/efi/Protocol/StorageSecurityCommand.h>
+#include <ipxe/efi/Protocol/Supplicant.h>
 #include <ipxe/efi/Protocol/TcgService.h>
+#include <ipxe/efi/Protocol/Tcg2Protocol.h>
 #include <ipxe/efi/Protocol/Tcp4.h>
 #include <ipxe/efi/Protocol/Tcp6.h>
 #include <ipxe/efi/Protocol/Udp4.h>
@@ -80,8 +89,16 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/efi/Protocol/Usb2HostController.h>
 #include <ipxe/efi/Protocol/UsbIo.h>
 #include <ipxe/efi/Protocol/VlanConfig.h>
+#include <ipxe/efi/Protocol/WiFi2.h>
+#include <ipxe/efi/Guid/Acpi.h>
+#include <ipxe/efi/Guid/Fdt.h>
 #include <ipxe/efi/Guid/FileInfo.h>
 #include <ipxe/efi/Guid/FileSystemInfo.h>
+#include <ipxe/efi/Guid/GlobalVariable.h>
+#include <ipxe/efi/Guid/ImageAuthentication.h>
+#include <ipxe/efi/Guid/MicrosoftVendor.h>
+#include <ipxe/efi/Guid/SmBios.h>
+#include <ipxe/efi/Guid/TlsAuthentication.h>
 
 /** @file
  *
@@ -94,6 +111,11 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 	{ 0x607f766c, 0x7455, 0x42be,					\
 	  { 0x93, 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f } }
 
+/* Unicode collation protocol GUID was deleted from EDK2 headers */
+#define EFI_UNICODE_COLLATION_PROTOCOL_GUID				\
+	{ 0x1d85cd7f, 0xf43d, 0x11d2,					\
+	  { 0x9a, 0xc, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } }
+
 /** Absolute pointer protocol GUID */
 EFI_GUID efi_absolute_pointer_protocol_guid
 	= EFI_ABSOLUTE_POINTER_PROTOCOL_GUID;
@@ -102,6 +124,10 @@ EFI_GUID efi_absolute_pointer_protocol_guid
 EFI_GUID efi_acpi_table_protocol_guid
 	= EFI_ACPI_TABLE_PROTOCOL_GUID;
 
+/** Adapter information protocol GUID */
+EFI_GUID efi_adapter_information_protocol_guid
+	= EFI_ADAPTER_INFORMATION_PROTOCOL_GUID;
+
 /** Apple NetBoot protocol GUID */
 EFI_GUID efi_apple_net_boot_protocol_guid
 	= EFI_APPLE_NET_BOOT_PROTOCOL_GUID;
@@ -182,6 +208,10 @@ EFI_GUID efi_dns6_service_binding_protocol_guid
 EFI_GUID efi_driver_binding_protocol_guid
 	= EFI_DRIVER_BINDING_PROTOCOL_GUID;
 
+/** EAP configuration protocol GUID */
+EFI_GUID efi_eap_configuration_protocol_guid
+	= EFI_EAP_CONFIGURATION_PROTOCOL_GUID;
+
 /** Graphics output protocol GUID */
 EFI_GUID efi_graphics_output_protocol_guid
 	= EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
@@ -290,6 +320,10 @@ EFI_GUID efi_pci_root_bridge_io_protocol_guid
 EFI_GUID efi_pxe_base_code_protocol_guid
 	= EFI_PXE_BASE_CODE_PROTOCOL_GUID;
 
+/** Random number generator protocol GUID */
+EFI_GUID efi_rng_protocol_guid
+	= EFI_RNG_PROTOCOL_GUID;
+
 /** Serial I/O protocol GUID */
 EFI_GUID efi_serial_io_protocol_guid
 	= EFI_SERIAL_IO_PROTOCOL_GUID;
@@ -322,10 +356,22 @@ EFI_GUID efi_simple_text_input_ex_protocol_guid
 EFI_GUID efi_simple_text_output_protocol_guid
 	= EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID;
 
+/** Storage security protocol GUID */
+EFI_GUID efi_storage_security_command_protocol_guid
+	= EFI_STORAGE_SECURITY_COMMAND_PROTOCOL_GUID;
+
+/** Supplicant protocol GUID */
+EFI_GUID efi_supplicant_protocol_guid
+	= EFI_SUPPLICANT_PROTOCOL_GUID;
+
 /** TCG protocol GUID */
 EFI_GUID efi_tcg_protocol_guid
 	= EFI_TCG_PROTOCOL_GUID;
 
+/** TCG2 protocol GUID */
+EFI_GUID efi_tcg2_protocol_guid
+	= EFI_TCG2_PROTOCOL_GUID;
+
 /** TCPv4 protocol GUID */
 EFI_GUID efi_tcp4_protocol_guid
 	= EFI_TCP4_PROTOCOL_GUID;
@@ -386,8 +432,319 @@ EFI_GUID efi_usb_io_protocol_guid
 EFI_GUID efi_vlan_config_protocol_guid
 	= EFI_VLAN_CONFIG_PROTOCOL_GUID;
 
+/** WiFi 2 protocol GUID */
+EFI_GUID efi_wifi2_protocol_guid
+	= EFI_WIRELESS_MAC_CONNECTION_II_PROTOCOL_GUID;
+
+/** ACPI 1.0 table GUID */
+EFI_GUID efi_acpi_10_table_guid
+	= ACPI_10_TABLE_GUID;
+
+/** ACPI 2.0 table GUID */
+EFI_GUID efi_acpi_20_table_guid
+	= EFI_ACPI_20_TABLE_GUID;
+
+/** FDT table GUID */
+EFI_GUID efi_fdt_table_guid
+	= FDT_TABLE_GUID;
+
+/** SMBIOS table GUID */
+EFI_GUID efi_smbios_table_guid
+	= SMBIOS_TABLE_GUID;
+
+/** SMBIOS3 table GUID */
+EFI_GUID efi_smbios3_table_guid
+	= SMBIOS3_TABLE_GUID;
+
+/** X.509 certificate GUID */
+EFI_GUID efi_cert_x509_guid = EFI_CERT_X509_GUID;
+
 /** File information GUID */
 EFI_GUID efi_file_info_id = EFI_FILE_INFO_ID;
 
 /** File system information GUID */
 EFI_GUID efi_file_system_info_id = EFI_FILE_SYSTEM_INFO_ID;
+
+/** Global variable GUID */
+EFI_GUID efi_global_variable = EFI_GLOBAL_VARIABLE;
+
+/** Image security database GUID */
+EFI_GUID efi_image_security_database_guid = EFI_IMAGE_SECURITY_DATABASE_GUID;
+
+/** Microsoft vendor GUID */
+EFI_GUID efi_microsoft_vendor_guid = MICROSOFT_VENDOR_GUID;
+
+/** TLS CA certificate variable GUID */
+EFI_GUID efi_tls_ca_certificate_guid = EFI_TLS_CA_CERTIFICATE_GUID;
+
+/** HttpBootDxe module GUID */
+static EFI_GUID efi_http_boot_dxe_guid = {
+	0xecebcb00, 0xd9c8, 0x11e4,
+	{ 0xaf, 0x3d, 0x8c, 0xdc, 0xd4, 0x26, 0xc9, 0x73 }
+};
+
+/** IScsiDxe module GUID */
+static EFI_GUID efi_iscsi_dxe_guid = {
+	0x86cddf93, 0x4872, 0x4597,
+	{ 0x8a, 0xf9, 0xa3, 0x5a, 0xe4, 0xd3, 0x72, 0x5f }
+};
+
+/** Old IScsi4Dxe module GUID */
+static EFI_GUID efi_iscsi4_dxe_guid = {
+	0x4579b72d, 0x7ec4, 0x4dd4,
+	{ 0x84, 0x86, 0x08, 0x3c, 0x86, 0xb1, 0x82, 0xa7 }
+};
+
+/** UefiPxeBcDxe module GUID */
+static EFI_GUID efi_uefi_pxe_bc_dxe_guid = {
+	0xb95e9fda, 0x26de, 0x48d2,
+	{ 0x88, 0x07, 0x1f, 0x91, 0x07, 0xac, 0x5e, 0x3a }
+};
+
+/** VlanConfigDxe module GUID */
+static EFI_GUID efi_vlan_config_dxe_guid = {
+	0xe4f61863, 0xfe2c, 0x4b56,
+	{ 0xa8, 0xf4, 0x08, 0x51, 0x9b, 0xc4, 0x39, 0xdf }
+};
+
+/** WiFiConnectionMgrDxe module GUID */
+static EFI_GUID efi_wifi_connection_mgr_dxe_guid = {
+	0x99b7c019, 0x4789, 0x4829,
+	{ 0xa7, 0xbd, 0x0d, 0x4b, 0xaa, 0x62, 0x28, 0x72 }
+};
+
+/** A well-known GUID */
+struct efi_well_known_guid {
+	/** GUID */
+	EFI_GUID *guid;
+	/** Name */
+	const char *name;
+};
+
+/** Well-known GUIDs */
+static struct efi_well_known_guid efi_well_known_guids[] = {
+	{ &efi_absolute_pointer_protocol_guid,
+	  "AbsolutePointer" },
+	{ &efi_acpi_10_table_guid,
+	  "Acpi10" },
+	{ &efi_acpi_20_table_guid,
+	  "Acpi20" },
+	{ &efi_acpi_table_protocol_guid,
+	  "AcpiTable" },
+	{ &efi_adapter_information_protocol_guid,
+	  "AdapterInfo" },
+	{ &efi_apple_net_boot_protocol_guid,
+	  "AppleNetBoot" },
+	{ &efi_arp_protocol_guid,
+	  "Arp" },
+	{ &efi_arp_service_binding_protocol_guid,
+	  "ArpSb" },
+	{ &efi_block_io_protocol_guid,
+	  "BlockIo" },
+	{ &efi_block_io2_protocol_guid,
+	  "BlockIo2" },
+	{ &efi_bus_specific_driver_override_protocol_guid,
+	  "BusSpecificDriverOverride" },
+	{ &efi_cert_x509_guid,
+	  "CertX509" },
+	{ &efi_component_name_protocol_guid,
+	  "ComponentName" },
+	{ &efi_component_name2_protocol_guid,
+	  "ComponentName2" },
+	{ &efi_console_control_protocol_guid,
+	  "ConsoleControl" },
+	{ &efi_device_path_protocol_guid,
+	  "DevicePath" },
+	{ &efi_driver_binding_protocol_guid,
+	  "DriverBinding" },
+	{ &efi_dhcp4_protocol_guid,
+	  "Dhcp4" },
+	{ &efi_dhcp4_service_binding_protocol_guid,
+	  "Dhcp4Sb" },
+	{ &efi_dhcp6_protocol_guid,
+	  "Dhcp6" },
+	{ &efi_dhcp6_service_binding_protocol_guid,
+	  "Dhcp6Sb" },
+	{ &efi_disk_io_protocol_guid,
+	  "DiskIo" },
+	{ &efi_dns4_protocol_guid,
+	  "Dns4" },
+	{ &efi_dns4_service_binding_protocol_guid,
+	  "Dns4Sb" },
+	{ &efi_dns6_protocol_guid,
+	  "Dns6" },
+	{ &efi_dns6_service_binding_protocol_guid,
+	  "Dns6Sb" },
+	{ &efi_eap_configuration_protocol_guid,
+	  "EapConfig" },
+	{ &efi_fdt_table_guid,
+	  "Fdt" },
+	{ &efi_global_variable,
+	  "GlobalVar" },
+	{ &efi_graphics_output_protocol_guid,
+	  "GraphicsOutput" },
+	{ &efi_hii_config_access_protocol_guid,
+	  "HiiConfigAccess" },
+	{ &efi_hii_font_protocol_guid,
+	  "HiiFont" },
+	{ &efi_http_boot_dxe_guid,
+	  "HttpBootDxe" },
+	{ &efi_http_protocol_guid,
+	  "Http" },
+	{ &efi_http_service_binding_protocol_guid,
+	  "HttpSb" },
+	{ &efi_image_security_database_guid,
+	  "ImageSecDb" },
+	{ &efi_ip4_protocol_guid,
+	  "Ip4" },
+	{ &efi_ip4_config_protocol_guid,
+	  "Ip4Config" },
+	{ &efi_ip4_config2_protocol_guid,
+	  "Ip4Config2" },
+	{ &efi_ip4_service_binding_protocol_guid,
+	  "Ip4Sb" },
+	{ &efi_ip6_protocol_guid,
+	  "Ip6" },
+	{ &efi_ip6_config_protocol_guid,
+	  "Ip6Config" },
+	{ &efi_ip6_service_binding_protocol_guid,
+	  "Ip6Sb" },
+	{ &efi_iscsi_dxe_guid,
+	  "IScsiDxe" },
+	{ &efi_iscsi4_dxe_guid,
+	  "IScsi4Dxe" },
+	{ &efi_load_file_protocol_guid,
+	  "LoadFile" },
+	{ &efi_load_file2_protocol_guid,
+	  "LoadFile2" },
+	{ &efi_loaded_image_protocol_guid,
+	  "LoadedImage" },
+	{ &efi_loaded_image_device_path_protocol_guid,
+	  "LoadedImageDevicePath"},
+	{ &efi_managed_network_protocol_guid,
+	  "ManagedNetwork" },
+	{ &efi_managed_network_service_binding_protocol_guid,
+	  "ManagedNetworkSb" },
+	{ &efi_microsoft_vendor_guid,
+	  "Microsoft" },
+	{ &efi_mtftp4_protocol_guid,
+	  "Mtftp4" },
+	{ &efi_mtftp4_service_binding_protocol_guid,
+	  "Mtftp4Sb" },
+	{ &efi_mtftp6_protocol_guid,
+	  "Mtftp6" },
+	{ &efi_mtftp6_service_binding_protocol_guid,
+	  "Mtftp6Sb" },
+	{ &efi_nii_protocol_guid,
+	  "Nii" },
+	{ &efi_nii31_protocol_guid,
+	  "Nii31" },
+	{ &efi_pci_io_protocol_guid,
+	  "PciIo" },
+	{ &efi_pci_root_bridge_io_protocol_guid,
+	  "PciRootBridgeIo" },
+	{ &efi_pxe_base_code_protocol_guid,
+	  "PxeBaseCode" },
+	{ &efi_rng_protocol_guid,
+	  "Rng" },
+	{ &efi_serial_io_protocol_guid,
+	  "SerialIo" },
+	{ &efi_shim_lock_protocol_guid,
+	  "ShimLock" },
+	{ &efi_simple_file_system_protocol_guid,
+	  "SimpleFileSystem" },
+	{ &efi_simple_network_protocol_guid,
+	  "SimpleNetwork" },
+	{ &efi_simple_pointer_protocol_guid,
+	  "SimplePointer" },
+	{ &efi_simple_text_input_protocol_guid,
+	  "SimpleTextInput" },
+	{ &efi_simple_text_input_ex_protocol_guid,
+	  "SimpleTextInputEx" },
+	{ &efi_simple_text_output_protocol_guid,
+	  "SimpleTextOutput" },
+	{ &efi_smbios_table_guid,
+	  "Smbios" },
+	{ &efi_smbios3_table_guid,
+	  "Smbios3" },
+	{ &efi_storage_security_command_protocol_guid,
+	  "StorageSecurityCommand" },
+	{ &efi_supplicant_protocol_guid,
+	  "Supplicant" },
+	{ &efi_tcg_protocol_guid,
+	  "Tcg" },
+	{ &efi_tcg2_protocol_guid,
+	  "Tcg2" },
+	{ &efi_tcp4_protocol_guid,
+	  "Tcp4" },
+	{ &efi_tcp4_service_binding_protocol_guid,
+	  "Tcp4Sb" },
+	{ &efi_tcp6_protocol_guid,
+	  "Tcp6" },
+	{ &efi_tcp6_service_binding_protocol_guid,
+	  "Tcp6Sb" },
+	{ &efi_tls_ca_certificate_guid,
+	  "TlsCaCert" },
+	{ &efi_tree_protocol_guid,
+	  "TrEE" },
+	{ &efi_udp4_protocol_guid,
+	  "Udp4" },
+	{ &efi_udp4_service_binding_protocol_guid,
+	  "Udp4Sb" },
+	{ &efi_udp6_protocol_guid,
+	  "Udp6" },
+	{ &efi_udp6_service_binding_protocol_guid,
+	  "Udp6Sb" },
+	{ &efi_uefi_pxe_bc_dxe_guid,
+	  "UefiPxeBcDxe" },
+	{ &efi_uga_draw_protocol_guid,
+	  "UgaDraw" },
+	{ &efi_unicode_collation_protocol_guid,
+	  "UnicodeCollation" },
+	{ &efi_usb_hc_protocol_guid,
+	  "UsbHc" },
+	{ &efi_usb2_hc_protocol_guid,
+	  "Usb2Hc" },
+	{ &efi_usb_io_protocol_guid,
+	  "UsbIo" },
+	{ &efi_vlan_config_protocol_guid,
+	  "VlanConfig" },
+	{ &efi_vlan_config_dxe_guid,
+	  "VlanConfigDxe" },
+	{ &efi_wifi2_protocol_guid,
+	  "Wifi2" },
+	{ &efi_wifi_connection_mgr_dxe_guid,
+	  "WiFiConnectionMgrDxe" },
+};
+
+/**
+ * Convert GUID to a printable string
+ *
+ * @v guid		GUID
+ * @ret string		Printable string
+ */
+const __attribute__ (( pure )) char * efi_guid_ntoa ( CONST EFI_GUID *guid ) {
+	union {
+		union uuid uuid;
+		EFI_GUID guid;
+	} u;
+	unsigned int i;
+
+	/* Sanity check */
+	if ( ! guid )
+		return NULL;
+
+	/* Check for a match against well-known GUIDs */
+	for ( i = 0 ; i < ( sizeof ( efi_well_known_guids ) /
+			    sizeof ( efi_well_known_guids[0] ) ) ; i++ ) {
+		if ( memcmp ( guid, efi_well_known_guids[i].guid,
+			      sizeof ( *guid ) ) == 0 ) {
+			return efi_well_known_guids[i].name;
+		}
+	}
+
+	/* Convert GUID to standard endianness */
+	memcpy ( &u.guid, guid, sizeof ( u.guid ) );
+	uuid_mangle ( &u.uuid );
+	return uuid_ntoa ( &u.uuid );
+}