[efi] Allow efi_guid_ntoa() to be used in non-EFI builds

The debug message transcription of well-known EFI GUIDs does not
require any EFI boot services calls.  Move this code from efi_debug.c
to efi_guid.c, to allow it to be linked in to non-EFI builds.

We continue to rely on linker garbage collection to ensure that the
code is omitted completely from any non-debug builds.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/interface/efi/efi_debug.c b/src/interface/efi/efi_debug.c
index 81c442179ef3a03dc2ddaa5c1c861e7ca06567fb..030c6a93e8ba077e0d15a15c85ee08d08084705e 100644 (file)
--- a/src/interface/efi/efi_debug.c
+++ b/src/interface/efi/efi_debug.c
@@ -31,9 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  */
 
 #include <stdio.h>
-#include <string.h>
 #include <errno.h>
-#include <ipxe/uuid.h>
 #include <ipxe/base16.h>
 #include <ipxe/vsprintf.h>
 #include <ipxe/efi/efi.h>
@@ -47,240 +45,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 static EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *efidpt;
 EFI_REQUEST_PROTOCOL ( EFI_DEVICE_PATH_TO_TEXT_PROTOCOL, &efidpt );
 
-/** 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 }
-};
-
-/** 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_table_protocol_guid,
-         "AcpiTable" },
-       { &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_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_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_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_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_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_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" },
-};
-
-/**
- * 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 );
-}
-
 /**
  * Name locate search type
  *

diff --git a/src/interface/efi/efi_guid.c b/src/interface/efi/efi_guid.c
index bd45d05b91fbe1b20e7a02f8e3f574164c4ca0ae..bd35b94cc4852afafac861d43df5165e5049106e 100644 (file)
--- a/src/interface/efi/efi_guid.c
+++ b/src/interface/efi/efi_guid.c
@@ -23,6 +23,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
+#include <string.h>
+#include <ipxe/uuid.h>
 #include <ipxe/efi/efi.h>
 #include <ipxe/efi/Protocol/AbsolutePointer.h>
 #include <ipxe/efi/Protocol/AcpiTable.h>
@@ -400,3 +402,237 @@ 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;
+
+/** 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 }
+};
+
+/** 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_table_protocol_guid,
+         "AcpiTable" },
+       { &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_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_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_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_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_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_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" },
+};
+
+/**
+ * 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 );
+}