[efi] Add IPv6 versions of existing IPv4 headers and GUID definitions

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

2 files changed, 72 insertions, 0 deletions

diff --git a/src/interface/efi/efi_debug.c b/src/interface/efi/efi_debug.c
index 02cbf9fa4..8922fa2a5 100644
--- a/src/interface/efi/efi_debug.c
+++ b/src/interface/efi/efi_debug.c
@@ -99,6 +99,10 @@ static struct efi_well_known_guid efi_well_known_guids[] = {
 	  "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_graphics_output_protocol_guid,
@@ -113,6 +117,12 @@ static struct efi_well_known_guid efi_well_known_guids[] = {
 	  "Ip4Config" },
 	{ &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_iscsi4_dxe_guid,
 	  "IScsi4Dxe" },
 	{ &efi_load_file_protocol_guid,
@@ -131,6 +141,10 @@ static struct efi_well_known_guid efi_well_known_guids[] = {
 	  "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,
@@ -163,12 +177,20 @@ static struct efi_well_known_guid efi_well_known_guids[] = {
 	  "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_uga_draw_protocol_guid,
 	  "UgaDraw" },
 	{ &efi_unicode_collation_protocol_guid,
diff --git a/src/interface/efi/efi_guid.c b/src/interface/efi/efi_guid.c
index 25c342ffb..b9f8e1550 100644
--- a/src/interface/efi/efi_guid.c
+++ b/src/interface/efi/efi_guid.c
@@ -37,6 +37,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/efi/Protocol/DevicePath.h>
 #include <ipxe/efi/Protocol/DevicePathToText.h>
 #include <ipxe/efi/Protocol/Dhcp4.h>
+#include <ipxe/efi/Protocol/Dhcp6.h>
 #include <ipxe/efi/Protocol/DiskIo.h>
 #include <ipxe/efi/Protocol/DriverBinding.h>
 #include <ipxe/efi/Protocol/GraphicsOutput.h>
@@ -44,11 +45,14 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/efi/Protocol/HiiFont.h>
 #include <ipxe/efi/Protocol/Ip4.h>
 #include <ipxe/efi/Protocol/Ip4Config.h>
+#include <ipxe/efi/Protocol/Ip6.h>
+#include <ipxe/efi/Protocol/Ip6Config.h>
 #include <ipxe/efi/Protocol/LoadFile.h>
 #include <ipxe/efi/Protocol/LoadFile2.h>
 #include <ipxe/efi/Protocol/LoadedImage.h>
 #include <ipxe/efi/Protocol/ManagedNetwork.h>
 #include <ipxe/efi/Protocol/Mtftp4.h>
+#include <ipxe/efi/Protocol/Mtftp6.h>
 #include <ipxe/efi/Protocol/NetworkInterfaceIdentifier.h>
 #include <ipxe/efi/Protocol/PciIo.h>
 #include <ipxe/efi/Protocol/PciRootBridgeIo.h>
@@ -63,7 +67,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/efi/Protocol/SimpleTextOut.h>
 #include <ipxe/efi/Protocol/TcgService.h>
 #include <ipxe/efi/Protocol/Tcp4.h>
+#include <ipxe/efi/Protocol/Tcp6.h>
 #include <ipxe/efi/Protocol/Udp4.h>
+#include <ipxe/efi/Protocol/Udp6.h>
 #include <ipxe/efi/Protocol/UgaDraw.h>
 #include <ipxe/efi/Protocol/UnicodeCollation.h>
 #include <ipxe/efi/Protocol/UsbHostController.h>
@@ -140,6 +146,14 @@ EFI_GUID efi_dhcp4_protocol_guid
 EFI_GUID efi_dhcp4_service_binding_protocol_guid
 	= EFI_DHCP4_SERVICE_BINDING_PROTOCOL_GUID;
 
+/** DHCPv6 protocol GUID */
+EFI_GUID efi_dhcp6_protocol_guid
+	= EFI_DHCP6_PROTOCOL_GUID;
+
+/** DHCPv6 service binding protocol GUID */
+EFI_GUID efi_dhcp6_service_binding_protocol_guid
+	= EFI_DHCP6_SERVICE_BINDING_PROTOCOL_GUID;
+
 /** Disk I/O protocol GUID */
 EFI_GUID efi_disk_io_protocol_guid
 	= EFI_DISK_IO_PROTOCOL_GUID;
@@ -172,6 +186,18 @@ EFI_GUID efi_ip4_config_protocol_guid
 EFI_GUID efi_ip4_service_binding_protocol_guid
 	= EFI_IP4_SERVICE_BINDING_PROTOCOL_GUID;
 
+/** IPv6 protocol GUID */
+EFI_GUID efi_ip6_protocol_guid
+	= EFI_IP6_PROTOCOL_GUID;
+
+/** IPv6 configuration protocol GUID */
+EFI_GUID efi_ip6_config_protocol_guid
+	= EFI_IP6_CONFIG_PROTOCOL_GUID;
+
+/** IPv6 service binding protocol GUID */
+EFI_GUID efi_ip6_service_binding_protocol_guid
+	= EFI_IP6_SERVICE_BINDING_PROTOCOL_GUID;
+
 /** Load file protocol GUID */
 EFI_GUID efi_load_file_protocol_guid
 	= EFI_LOAD_FILE_PROTOCOL_GUID;
@@ -204,6 +230,14 @@ EFI_GUID efi_mtftp4_protocol_guid
 EFI_GUID efi_mtftp4_service_binding_protocol_guid
 	= EFI_MTFTP4_SERVICE_BINDING_PROTOCOL_GUID;
 
+/** MTFTPv6 protocol GUID */
+EFI_GUID efi_mtftp6_protocol_guid
+	= EFI_MTFTP6_PROTOCOL_GUID;
+
+/** MTFTPv6 service binding protocol GUID */
+EFI_GUID efi_mtftp6_service_binding_protocol_guid
+	= EFI_MTFTP6_SERVICE_BINDING_PROTOCOL_GUID;
+
 /** Network interface identifier protocol GUID (old version) */
 EFI_GUID efi_nii_protocol_guid
 	= EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_GUID;
@@ -268,6 +302,14 @@ EFI_GUID efi_tcp4_protocol_guid
 EFI_GUID efi_tcp4_service_binding_protocol_guid
 	= EFI_TCP4_SERVICE_BINDING_PROTOCOL_GUID;
 
+/** TCPv6 protocol GUID */
+EFI_GUID efi_tcp6_protocol_guid
+	= EFI_TCP6_PROTOCOL_GUID;
+
+/** TCPv6 service binding protocol GUID */
+EFI_GUID efi_tcp6_service_binding_protocol_guid
+	= EFI_TCP6_SERVICE_BINDING_PROTOCOL_GUID;
+
 /** TrEE protocol GUID */
 EFI_GUID efi_tree_protocol_guid
 	= EFI_TREE_PROTOCOL_GUID;
@@ -280,6 +322,14 @@ EFI_GUID efi_udp4_protocol_guid
 EFI_GUID efi_udp4_service_binding_protocol_guid
 	= EFI_UDP4_SERVICE_BINDING_PROTOCOL_GUID;
 
+/** UDPv6 protocol GUID */
+EFI_GUID efi_udp6_protocol_guid
+	= EFI_UDP6_PROTOCOL_GUID;
+
+/** UDPv6 service binding protocol GUID */
+EFI_GUID efi_udp6_service_binding_protocol_guid
+	= EFI_UDP6_SERVICE_BINDING_PROTOCOL_GUID;
+
 /** UGA draw protocol GUID */
 EFI_GUID efi_uga_draw_protocol_guid
 	= EFI_UGA_DRAW_PROTOCOL_GUID;