OvmfPkg: enable the IPv6 support

There are several network stack drivers in MdeModulePkg or NetworkPkg.
Currently, we only use the drivers from MdeModulePkg which only provides
the IPv4 support. This commit adds the IPv6 drivers in NetworkPkg into
OVMF.

Here is the table of drivers from Laszlo.

currently included  related driver  add or replace
from MdeModulePkg   in NetworkPkg   from NetworkPkg
------------------  --------------  ---------------
SnpDxe              n/a             n/a
DpcDxe              n/a             n/a
MnpDxe              n/a             n/a
VlanConfigDxe       n/a             n/a
ArpDxe              n/a             n/a
Dhcp4Dxe            Dhcp6Dxe        add
Ip4ConfigDxe        Ip6Dxe          add
Ip4Dxe              Ip6Dxe          add
Mtftp4Dxe           Mtftp6Dxe       add
Tcp4Dxe             TcpDxe          replace
Udp4Dxe             Udp6Dxe         add
UefiPxeBcDxe        UefiPxeBcDxe    replace
IScsiDxe            IScsiDxe        replace

Since the TcpDxe, UefiPxeBcDxe, and IScsiDxe drivers in NetworkPkg also
support IPv4, we replace the ones in MdeModulePkg.

To enable the IPv6 support, build OVMF with "-D NETWORK_IP6_ENABLE".
A special case is NetworkPkg/IScsiDxe. It requires openssl. For convenience,
NetworkPkg/IScsiDxe is enabled only if both IPv6 and SecureBoot are enabled.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Gary Lin <glin@suse.com>
[lersek@redhat.com: typo fix in commit message; specil -> special]
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16543 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 102 insertions, 6 deletions

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 659810248a..dca7c6e516 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -34,6 +34,7 @@
   # -D FLAG=VALUE

   #

   DEFINE SECURE_BOOT_ENABLE      = FALSE

+  DEFINE NETWORK_IP6_ENABLE      = FALSE

 

 [BuildOptions]

   GCC:*_UNIXGCC_*_CC_FLAGS             = -DMDEPKG_NDEBUG

@@ -119,6 +120,9 @@
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

   TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

+!if $(NETWORK_IP6_ENABLE) == TRUE

+  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf

+!endif

 !endif

 

   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf

@@ -516,10 +520,24 @@
   MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf

   MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

   MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

+!if $(NETWORK_IP6_ENABLE) == TRUE

+  NetworkPkg/Ip6Dxe/Ip6Dxe.inf

+  NetworkPkg/TcpDxe/TcpDxe.inf

+  NetworkPkg/Udp6Dxe/Udp6Dxe.inf

+  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

+  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

+  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  NetworkPkg/IScsiDxe/IScsiDxe.inf

+!else

+  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

+!endif

+!else

+  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

   MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

   MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

+!endif

   OvmfPkg/VirtioNetDxe/VirtioNet.inf

 

   #

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 932aefa22e..f47e7ddc78 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -308,10 +308,24 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
   INF  MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf

   INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

   INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

   INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

+!if $(NETWORK_IP6_ENABLE) == TRUE

+  INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf

+  INF  NetworkPkg/TcpDxe/TcpDxe.inf

+  INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf

+  INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

+  INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

+  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  INF  NetworkPkg/IScsiDxe/IScsiDxe.inf

+!else

+  INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

+!endif

+!else

+  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

   INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

   INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

+!endif

   INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf

 

 #

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 4de961f1ca..085f43eaf1 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -34,6 +34,7 @@
   # -D FLAG=VALUE

   #

   DEFINE SECURE_BOOT_ENABLE      = FALSE

+  DEFINE NETWORK_IP6_ENABLE      = FALSE

 

 [BuildOptions]

   GCC:*_UNIXGCC_*_CC_FLAGS             = -DMDEPKG_NDEBUG

@@ -124,6 +125,9 @@
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

   TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

+!if $(NETWORK_IP6_ENABLE) == TRUE

+  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf

+!endif

 !endif

 

   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf

@@ -523,10 +527,24 @@
   MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf

   MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

   MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

+!if $(NETWORK_IP6_ENABLE) == TRUE

+  NetworkPkg/Ip6Dxe/Ip6Dxe.inf

+  NetworkPkg/TcpDxe/TcpDxe.inf

+  NetworkPkg/Udp6Dxe/Udp6Dxe.inf

+  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

+  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

+  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  NetworkPkg/IScsiDxe/IScsiDxe.inf

+!else

+  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

+!endif

+!else

+  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

   MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

   MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

+!endif

   OvmfPkg/VirtioNetDxe/VirtioNet.inf

 

   #

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 048d8bfc2d..4c034460d5 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -308,10 +308,24 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
   INF  MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf

   INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

   INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

   INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

+!if $(NETWORK_IP6_ENABLE) == TRUE

+  INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf

+  INF  NetworkPkg/TcpDxe/TcpDxe.inf

+  INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf

+  INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

+  INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

+  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  INF  NetworkPkg/IScsiDxe/IScsiDxe.inf

+!else

+  INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

+!endif

+!else

+  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

   INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

   INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

+!endif

   INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf

 

 #

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 6c38081de1..17d674cd34 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -34,6 +34,7 @@
   # -D FLAG=VALUE

   #

   DEFINE SECURE_BOOT_ENABLE      = FALSE

+  DEFINE NETWORK_IP6_ENABLE      = FALSE

 

 [BuildOptions]

   GCC:*_UNIXGCC_*_CC_FLAGS             = -DMDEPKG_NDEBUG

@@ -124,6 +125,9 @@
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

   TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

+!if $(NETWORK_IP6_ENABLE) == TRUE

+  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf

+!endif

 !endif

 

   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf

@@ -521,10 +525,24 @@
   MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf

   MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

   MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

+!if $(NETWORK_IP6_ENABLE) == TRUE

+  NetworkPkg/Ip6Dxe/Ip6Dxe.inf

+  NetworkPkg/TcpDxe/TcpDxe.inf

+  NetworkPkg/Udp6Dxe/Udp6Dxe.inf

+  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

+  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

+  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  NetworkPkg/IScsiDxe/IScsiDxe.inf

+!else

+  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

+!endif

+!else

+  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

   MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

   MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

+!endif

   OvmfPkg/VirtioNetDxe/VirtioNet.inf

 

   #

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index bcf0b9d652..2323eb2edf 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -308,10 +308,24 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
   INF  MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf

   INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

   INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

   INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

+!if $(NETWORK_IP6_ENABLE) == TRUE

+  INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf

+  INF  NetworkPkg/TcpDxe/TcpDxe.inf

+  INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf

+  INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

+  INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

+  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  INF  NetworkPkg/IScsiDxe/IScsiDxe.inf

+!else

+  INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

+!endif

+!else

+  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

   INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

   INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

+!endif

   INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf

 

 #