* [PATCH v2 0/3] Delete TCP, PXE, iSCSI driver in MdeModulePkg.
@ 2018-11-05 10:49 Fu Siyuan
2018-11-05 10:49 ` [PATCH v2 1/3] Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF Fu Siyuan
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Fu Siyuan @ 2018-11-05 10:49 UTC (permalink / raw)
To: edk2-devel
V2 Update:
1. Changes for Nt32Pkg and EmulatorPkg have been committed so not
included in this v2 patch.
2. Add missing library instance for NetworkPkg iSCSI driver.
3. The removal of the 3 modules from MdeModulePkg will not be included
in edk2-stable201811 tag, so not included in this v2 patch.
This patch series is to delete the Tcp4Dxe, UefiPxeBcDxe and IScsi4Dxe
drivers in MdeModulePkg. These drivers will not be maintained and can't
co-work with the dual-stack drivers in NetworkPkg.
People should use below NetworkPkg drivers instead:
NetworkPkg/IScsiDxe/IScsiDxe.inf
NetworkPkg/TcpDxe/TcpDxe.inf
NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
These drivers are actively maintained with more bug fixes and new feature
support.
Patch 1~5 update edk2 platform DSC/FDF files to use NetworkPkg drivers.
Patch 6 deletes the TCP,PXE,iSCSI driver in MdeModulePkg.
Patch 7 removes some clarification in NetworkPkg drivers since the
related driver has been deleted in Patch 6.
Fu Siyuan (3):
Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF.
ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF.
OvmfPkg: Replace obsoleted network drivers from platform DSC/FDF.
ArmVirtPkg/ArmVirtQemu.dsc | 13 ++++++-------
ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 10 +++-------
ArmVirtPkg/ArmVirtQemuKernel.dsc | 13 ++++++-------
OvmfPkg/OvmfPkgIa32.dsc | 14 ++++----------
OvmfPkg/OvmfPkgIa32.fdf | 10 +++-------
OvmfPkg/OvmfPkgIa32X64.dsc | 14 ++++----------
OvmfPkg/OvmfPkgIa32X64.fdf | 10 +++-------
OvmfPkg/OvmfPkgX64.dsc | 14 ++++----------
OvmfPkg/OvmfPkgX64.fdf | 10 +++-------
Vlv2TbltDevicePkg/PlatformPkg.fdf | 14 +++-----------
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 14 +++-----------
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 20 ++++----------------
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 20 ++++----------------
Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 20 ++++----------------
14 files changed, 54 insertions(+), 142 deletions(-)
--
2.19.1.windows.1
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 1/3] Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF.
2018-11-05 10:49 [PATCH v2 0/3] Delete TCP, PXE, iSCSI driver in MdeModulePkg Fu Siyuan
@ 2018-11-05 10:49 ` Fu Siyuan
2018-11-05 10:54 ` Wei, David
2018-11-05 10:49 ` [PATCH v2 2/3] ArmVirtPkg: Replace obsoleted network " Fu Siyuan
` (2 subsequent siblings)
3 siblings, 1 reply; 13+ messages in thread
From: Fu Siyuan @ 2018-11-05 10:49 UTC (permalink / raw)
To: edk2-devel; +Cc: David Wei, Mang Guo
V2:
Add missed library instance for NetworkPkg iSCSI driver.
This patch replaces the MdeModulePkg TCP, PXE and iSCSI driver with those
ones in NetworkPkg. These 3 drivers in MdeModulePkg are not being actively
maintained and will be removed from edk2 master soon.
Cc: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
---
Vlv2TbltDevicePkg/PlatformPkg.fdf | 14 +++-----------
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 14 +++-----------
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 20 ++++----------------
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 20 ++++----------------
Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 20 ++++----------------
5 files changed, 18 insertions(+), 70 deletions(-)
diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index b7a0e584deeb..241314bed4e9 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -744,6 +744,9 @@ [FV.FVMAIN]
INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+ INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ INF NetworkPkg/TcpDxe/TcpDxe.inf
+ INF NetworkPkg/IScsiDxe/IScsiDxe.inf
!if $(NETWORK_IP6_ENABLE) == TRUE
INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
@@ -751,22 +754,11 @@ [FV.FVMAIN]
INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
!endif
- !if $(NETWORK_IP6_ENABLE) == TRUE
- INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/TcpDxe/TcpDxe.inf
- !else
- INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
- !endif
!if $(NETWORK_VLAN_ENABLE) == TRUE
INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
!endif
!if $(NETWORK_ISCSI_ENABLE) == TRUE
- !if $(NETWORK_IP6_ENABLE) == TRUE
INF NetworkPkg/IScsiDxe/IScsiDxe.inf
- !else
- INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
- !endif
!endif
!endif
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index eca273e33f88..356649277289 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -700,6 +700,9 @@ [FV.FVMAIN]
INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+ INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ INF NetworkPkg/TcpDxe/TcpDxe.inf
+ INF NetworkPkg/IScsiDxe/IScsiDxe.inf
!if $(NETWORK_IP6_ENABLE) == TRUE
INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
@@ -707,22 +710,11 @@ [FV.FVMAIN]
INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
!endif
- !if $(NETWORK_IP6_ENABLE) == TRUE
- INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/TcpDxe/TcpDxe.inf
- !else
- INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
- !endif
!if $(NETWORK_VLAN_ENABLE) == TRUE
INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
!endif
!if $(NETWORK_ISCSI_ENABLE) == TRUE
- !if $(NETWORK_IP6_ENABLE) == TRUE
INF NetworkPkg/IScsiDxe/IScsiDxe.inf
- !else
- INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
- !endif
!endif
!endif
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 3e3522aee908..f0a689c2c428 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -285,7 +285,7 @@ [LibraryClasses.common]
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if $(FTPM_ENABLE) == TRUE
+!if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
@@ -1528,11 +1528,7 @@ [Components.X64]
!if $(NETWORK_ENABLE) == TRUE
!if $(NETWORK_ISCSI_ENABLE) == TRUE
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/IScsiDxe/IScsiDxe.inf
- !else
- MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
- !endif
+ NetworkPkg/IScsiDxe/IScsiDxe.inf
!endif
!if $(NETWORK_VLAN_ENABLE) == TRUE
MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
@@ -1554,24 +1550,16 @@ [Components.X64]
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf {
- <PcdsPatchableInModule>
- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000
- }
+ NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ NetworkPkg/TcpDxe/TcpDxe.inf
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
!if $(NETWORK_IP6_ENABLE) == TRUE
NetworkPkg/Ip6Dxe/Ip6Dxe.inf
NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
NetworkPkg/IpSecDxe/IpSecDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
NetworkPkg/Udp6Dxe/Udp6Dxe.inf
NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
!endif
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- !else
- MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- !endif
!endif
!if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 55c873d565a3..c7908818b4de 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -285,7 +285,7 @@ [LibraryClasses.common]
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if $(FTPM_ENABLE) == TRUE
+!if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
@@ -1516,11 +1516,7 @@ [Components.IA32]
!if $(NETWORK_ENABLE) == TRUE
!if $(NETWORK_ISCSI_ENABLE) == TRUE
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/IScsiDxe/IScsiDxe.inf
- !else
- MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
- !endif
+ NetworkPkg/IScsiDxe/IScsiDxe.inf
!endif
!if $(NETWORK_VLAN_ENABLE) == TRUE
MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
@@ -1542,24 +1538,16 @@ [Components.IA32]
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf {
- <PcdsPatchableInModule>
- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000
- }
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+ NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ NetworkPkg/TcpDxe/TcpDxe.inf
!if $(NETWORK_IP6_ENABLE) == TRUE
NetworkPkg/Ip6Dxe/Ip6Dxe.inf
NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
NetworkPkg/IpSecDxe/IpSecDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
NetworkPkg/Udp6Dxe/Udp6Dxe.inf
NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
!endif
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- !else
- MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- !endif
!endif
!if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index fa6aa6349167..cc8ad9508e9f 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -285,7 +285,7 @@ [LibraryClasses.common]
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if $(FTPM_ENABLE) == TRUE
+!if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
@@ -1528,11 +1528,7 @@ [Components.X64]
!if $(NETWORK_ENABLE) == TRUE
!if $(NETWORK_ISCSI_ENABLE) == TRUE
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/IScsiDxe/IScsiDxe.inf
- !else
- MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
- !endif
+ NetworkPkg/IScsiDxe/IScsiDxe.inf
!endif
!if $(NETWORK_VLAN_ENABLE) == TRUE
MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
@@ -1554,24 +1550,16 @@ [Components.X64]
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf {
- <PcdsPatchableInModule>
- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000
- }
+ NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ NetworkPkg/TcpDxe/TcpDxe.inf
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
!if $(NETWORK_IP6_ENABLE) == TRUE
NetworkPkg/Ip6Dxe/Ip6Dxe.inf
NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
NetworkPkg/IpSecDxe/IpSecDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
NetworkPkg/Udp6Dxe/Udp6Dxe.inf
NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
!endif
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- !else
- MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- !endif
!endif
!if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
--
2.19.1.windows.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 2/3] ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF.
2018-11-05 10:49 [PATCH v2 0/3] Delete TCP, PXE, iSCSI driver in MdeModulePkg Fu Siyuan
2018-11-05 10:49 ` [PATCH v2 1/3] Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF Fu Siyuan
@ 2018-11-05 10:49 ` Fu Siyuan
2018-11-05 22:36 ` Laszlo Ersek
2018-11-05 10:49 ` [PATCH v2 3/3] OvmfPkg: " Fu Siyuan
2018-11-05 16:47 ` [PATCH v2 0/3] Delete TCP, PXE, iSCSI driver in MdeModulePkg Laszlo Ersek
3 siblings, 1 reply; 13+ messages in thread
From: Fu Siyuan @ 2018-11-05 10:49 UTC (permalink / raw)
To: edk2-devel; +Cc: Laszlo Ersek, Ard Biesheuvel, Julien Grall
V2:
Add missing library instance for NetworkPkg iSCSI driver.
This patch replaces the MdeModulePkg TCP, PXE and iSCSI driver with those
ones in NetworkPkg. These 3 drivers in MdeModulePkg are not being actively
maintained and will be removed from edk2 master soon.
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Julien Grall <julien.grall@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
---
ArmVirtPkg/ArmVirtQemu.dsc | 13 ++++++-------
ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 10 +++-------
ArmVirtPkg/ArmVirtQemuKernel.dsc | 13 ++++++-------
3 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 885c6b14b844..0f403973bea0 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -70,6 +70,9 @@ [LibraryClasses.common.PEIM]
[LibraryClasses.common.UEFI_DRIVER]
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
+ BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+ OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+ IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
################################################################################
#
@@ -346,18 +349,14 @@ [Components.common]
MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+ NetworkPkg/TcpDxe/TcpDxe.inf
+ NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ NetworkPkg/IScsiDxe/IScsiDxe.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
- NetworkPkg/IScsiDxe/IScsiDxe.inf
-!else
- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
- MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
!endif
!if $(HTTP_BOOT_ENABLE) == TRUE
NetworkPkg/DnsDxe/DnsDxe.inf
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index a6390bd4b841..3316f982695f 100644
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -126,18 +126,14 @@ [FV.FvMain]
INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+ INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ INF NetworkPkg/IScsiDxe/IScsiDxe.inf
+ INF NetworkPkg/TcpDxe/TcpDxe.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
- INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-!else
- INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
- INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
!endif
!if $(HTTP_BOOT_ENABLE) == TRUE
INF NetworkPkg/DnsDxe/DnsDxe.inf
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 434d6861a56f..4920a66f2fdb 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -67,6 +67,9 @@ [LibraryClasses.common]
[LibraryClasses.common.UEFI_DRIVER]
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
+ BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+ OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+ IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
[BuildOptions.ARM.EDKII.SEC, BuildOptions.ARM.EDKII.BASE]
# Avoid MOVT/MOVW instruction pairs in code that may end up in the PIE
@@ -335,18 +338,14 @@ [Components.common]
MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+ NetworkPkg/TcpDxe/TcpDxe.inf
+ NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ NetworkPkg/IScsiDxe/IScsiDxe.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
- NetworkPkg/IScsiDxe/IScsiDxe.inf
-!else
- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
- MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
!endif
!if $(HTTP_BOOT_ENABLE) == TRUE
NetworkPkg/DnsDxe/DnsDxe.inf
--
2.19.1.windows.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 3/3] OvmfPkg: Replace obsoleted network drivers from platform DSC/FDF.
2018-11-05 10:49 [PATCH v2 0/3] Delete TCP, PXE, iSCSI driver in MdeModulePkg Fu Siyuan
2018-11-05 10:49 ` [PATCH v2 1/3] Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF Fu Siyuan
2018-11-05 10:49 ` [PATCH v2 2/3] ArmVirtPkg: Replace obsoleted network " Fu Siyuan
@ 2018-11-05 10:49 ` Fu Siyuan
2018-11-05 22:46 ` Laszlo Ersek
2018-11-05 16:47 ` [PATCH v2 0/3] Delete TCP, PXE, iSCSI driver in MdeModulePkg Laszlo Ersek
3 siblings, 1 reply; 13+ messages in thread
From: Fu Siyuan @ 2018-11-05 10:49 UTC (permalink / raw)
To: edk2-devel
Cc: Jordan Justen, Laszlo Ersek, Ard Biesheuvel, Anthony Perard,
Julien Grall
V2:
Add missed library instance for NetworkPkg iSCSI driver.
This patch replaces the MdeModulePkg TCP, PXE and iSCSI driver with those
ones in NetworkPkg. These 3 drivers in MdeModulePkg are not being actively
maintained and will be removed from edk2 master soon.
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Julien Grall <julien.grall@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
---
OvmfPkg/OvmfPkgIa32.dsc | 14 ++++----------
OvmfPkg/OvmfPkgIa32.fdf | 10 +++-------
OvmfPkg/OvmfPkgIa32X64.dsc | 14 ++++----------
OvmfPkg/OvmfPkgIa32X64.fdf | 10 +++-------
OvmfPkg/OvmfPkgX64.dsc | 14 ++++----------
OvmfPkg/OvmfPkgX64.fdf | 10 +++-------
6 files changed, 21 insertions(+), 51 deletions(-)
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 9f07e75050c0..7160e88eaee4 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -189,9 +189,7 @@ [LibraryClasses]
!endif
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
-!if $(NETWORK_IP6_ENABLE) == TRUE
TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-!endif
!if $(HTTP_BOOT_ENABLE) == TRUE
HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
@@ -790,18 +788,14 @@ [Components]
MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-!if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/Ip6Dxe/Ip6Dxe.inf
+ NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
NetworkPkg/TcpDxe/TcpDxe.inf
+ NetworkPkg/IScsiDxe/IScsiDxe.inf
+!if $(NETWORK_IP6_ENABLE) == TRUE
+ NetworkPkg/Ip6Dxe/Ip6Dxe.inf
NetworkPkg/Udp6Dxe/Udp6Dxe.inf
NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/IScsiDxe/IScsiDxe.inf
-!else
- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
- MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
!endif
!if $(HTTP_BOOT_ENABLE) == TRUE
NetworkPkg/DnsDxe/DnsDxe.inf
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 52b8b1fea1fc..1bc2e73bde16 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -309,18 +309,14 @@ [FV.DXEFV]
INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+ INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ INF NetworkPkg/TcpDxe/TcpDxe.inf
+ INF NetworkPkg/IScsiDxe/IScsiDxe.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
- INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-!else
- INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
- INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
!endif
!if $(HTTP_BOOT_ENABLE) == TRUE
INF NetworkPkg/DnsDxe/DnsDxe.inf
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index a4eaeb808c6b..e83e7ffab5b5 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -194,9 +194,7 @@ [LibraryClasses]
!endif
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
-!if $(NETWORK_IP6_ENABLE) == TRUE
TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-!endif
!if $(HTTP_BOOT_ENABLE) == TRUE
HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
@@ -799,18 +797,14 @@ [Components.X64]
MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-!if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/Ip6Dxe/Ip6Dxe.inf
+ NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
NetworkPkg/TcpDxe/TcpDxe.inf
+ NetworkPkg/IScsiDxe/IScsiDxe.inf
+!if $(NETWORK_IP6_ENABLE) == TRUE
+ NetworkPkg/Ip6Dxe/Ip6Dxe.inf
NetworkPkg/Udp6Dxe/Udp6Dxe.inf
NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/IScsiDxe/IScsiDxe.inf
-!else
- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
- MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
!endif
!if $(HTTP_BOOT_ENABLE) == TRUE
NetworkPkg/DnsDxe/DnsDxe.inf
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 70845d6972fd..f36c7e741c8e 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -315,18 +315,14 @@ [FV.DXEFV]
INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+ INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ INF NetworkPkg/TcpDxe/TcpDxe.inf
+ INF NetworkPkg/IScsiDxe/IScsiDxe.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
- INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-!else
- INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
- INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
!endif
!if $(HTTP_BOOT_ENABLE) == TRUE
INF NetworkPkg/DnsDxe/DnsDxe.inf
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index aa3efc5e73b9..c0f86d4ad303 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -194,9 +194,7 @@ [LibraryClasses]
!endif
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
-!if $(NETWORK_IP6_ENABLE) == TRUE
TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-!endif
!if $(HTTP_BOOT_ENABLE) == TRUE
HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
@@ -797,18 +795,14 @@ [Components]
MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-!if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/Ip6Dxe/Ip6Dxe.inf
+ NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
NetworkPkg/TcpDxe/TcpDxe.inf
+ NetworkPkg/IScsiDxe/IScsiDxe.inf
+!if $(NETWORK_IP6_ENABLE) == TRUE
+ NetworkPkg/Ip6Dxe/Ip6Dxe.inf
NetworkPkg/Udp6Dxe/Udp6Dxe.inf
NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/IScsiDxe/IScsiDxe.inf
-!else
- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
- MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
!endif
!if $(HTTP_BOOT_ENABLE) == TRUE
NetworkPkg/DnsDxe/DnsDxe.inf
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 1eb46ac9a2d8..96a114a20bdc 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -315,18 +315,14 @@ [FV.DXEFV]
INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+ INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ INF NetworkPkg/TcpDxe/TcpDxe.inf
+ INF NetworkPkg/IScsiDxe/IScsiDxe.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
- INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-!else
- INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
- INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
!endif
!if $(HTTP_BOOT_ENABLE) == TRUE
INF NetworkPkg/DnsDxe/DnsDxe.inf
--
2.19.1.windows.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 1/3] Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF.
2018-11-05 10:49 ` [PATCH v2 1/3] Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF Fu Siyuan
@ 2018-11-05 10:54 ` Wei, David
0 siblings, 0 replies; 13+ messages in thread
From: Wei, David @ 2018-11-05 10:54 UTC (permalink / raw)
To: Fu, Siyuan, edk2-devel@lists.01.org
Reviewed-by: David Wei <david.wei@intel.com>
Thanks,
David Wei
Intel SSG/STO/UEFI BIOS
-----Original Message-----
From: Fu, Siyuan
Sent: Monday, November 5, 2018 6:49 PM
To: edk2-devel@lists.01.org
Cc: Wei, David <david.wei@intel.com>; Guo, Mang <mang.guo@intel.com>
Subject: [PATCH v2 1/3] Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF.
V2:
Add missed library instance for NetworkPkg iSCSI driver.
This patch replaces the MdeModulePkg TCP, PXE and iSCSI driver with those
ones in NetworkPkg. These 3 drivers in MdeModulePkg are not being actively
maintained and will be removed from edk2 master soon.
Cc: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
---
Vlv2TbltDevicePkg/PlatformPkg.fdf | 14 +++-----------
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 14 +++-----------
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 20 ++++----------------
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 20 ++++----------------
Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 20 ++++----------------
5 files changed, 18 insertions(+), 70 deletions(-)
diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index b7a0e584deeb..241314bed4e9 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -744,6 +744,9 @@ [FV.FVMAIN]
INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+ INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ INF NetworkPkg/TcpDxe/TcpDxe.inf
+ INF NetworkPkg/IScsiDxe/IScsiDxe.inf
!if $(NETWORK_IP6_ENABLE) == TRUE
INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
@@ -751,22 +754,11 @@ [FV.FVMAIN]
INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
!endif
- !if $(NETWORK_IP6_ENABLE) == TRUE
- INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/TcpDxe/TcpDxe.inf
- !else
- INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
- !endif
!if $(NETWORK_VLAN_ENABLE) == TRUE
INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
!endif
!if $(NETWORK_ISCSI_ENABLE) == TRUE
- !if $(NETWORK_IP6_ENABLE) == TRUE
INF NetworkPkg/IScsiDxe/IScsiDxe.inf
- !else
- INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
- !endif
!endif
!endif
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index eca273e33f88..356649277289 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -700,6 +700,9 @@ [FV.FVMAIN]
INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+ INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ INF NetworkPkg/TcpDxe/TcpDxe.inf
+ INF NetworkPkg/IScsiDxe/IScsiDxe.inf
!if $(NETWORK_IP6_ENABLE) == TRUE
INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
@@ -707,22 +710,11 @@ [FV.FVMAIN]
INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
!endif
- !if $(NETWORK_IP6_ENABLE) == TRUE
- INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/TcpDxe/TcpDxe.inf
- !else
- INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
- !endif
!if $(NETWORK_VLAN_ENABLE) == TRUE
INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
!endif
!if $(NETWORK_ISCSI_ENABLE) == TRUE
- !if $(NETWORK_IP6_ENABLE) == TRUE
INF NetworkPkg/IScsiDxe/IScsiDxe.inf
- !else
- INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
- !endif
!endif
!endif
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 3e3522aee908..f0a689c2c428 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -285,7 +285,7 @@ [LibraryClasses.common]
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if $(FTPM_ENABLE) == TRUE
+!if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
@@ -1528,11 +1528,7 @@ [Components.X64]
!if $(NETWORK_ENABLE) == TRUE
!if $(NETWORK_ISCSI_ENABLE) == TRUE
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/IScsiDxe/IScsiDxe.inf
- !else
- MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
- !endif
+ NetworkPkg/IScsiDxe/IScsiDxe.inf
!endif
!if $(NETWORK_VLAN_ENABLE) == TRUE
MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
@@ -1554,24 +1550,16 @@ [Components.X64]
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf {
- <PcdsPatchableInModule>
- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000
- }
+ NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ NetworkPkg/TcpDxe/TcpDxe.inf
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
!if $(NETWORK_IP6_ENABLE) == TRUE
NetworkPkg/Ip6Dxe/Ip6Dxe.inf
NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
NetworkPkg/IpSecDxe/IpSecDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
NetworkPkg/Udp6Dxe/Udp6Dxe.inf
NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
!endif
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- !else
- MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- !endif
!endif
!if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 55c873d565a3..c7908818b4de 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -285,7 +285,7 @@ [LibraryClasses.common]
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if $(FTPM_ENABLE) == TRUE
+!if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
@@ -1516,11 +1516,7 @@ [Components.IA32]
!if $(NETWORK_ENABLE) == TRUE
!if $(NETWORK_ISCSI_ENABLE) == TRUE
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/IScsiDxe/IScsiDxe.inf
- !else
- MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
- !endif
+ NetworkPkg/IScsiDxe/IScsiDxe.inf
!endif
!if $(NETWORK_VLAN_ENABLE) == TRUE
MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
@@ -1542,24 +1538,16 @@ [Components.IA32]
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf {
- <PcdsPatchableInModule>
- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000
- }
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+ NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ NetworkPkg/TcpDxe/TcpDxe.inf
!if $(NETWORK_IP6_ENABLE) == TRUE
NetworkPkg/Ip6Dxe/Ip6Dxe.inf
NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
NetworkPkg/IpSecDxe/IpSecDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
NetworkPkg/Udp6Dxe/Udp6Dxe.inf
NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
!endif
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- !else
- MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- !endif
!endif
!if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index fa6aa6349167..cc8ad9508e9f 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -285,7 +285,7 @@ [LibraryClasses.common]
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if $(FTPM_ENABLE) == TRUE
+!if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
@@ -1528,11 +1528,7 @@ [Components.X64]
!if $(NETWORK_ENABLE) == TRUE
!if $(NETWORK_ISCSI_ENABLE) == TRUE
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/IScsiDxe/IScsiDxe.inf
- !else
- MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
- !endif
+ NetworkPkg/IScsiDxe/IScsiDxe.inf
!endif
!if $(NETWORK_VLAN_ENABLE) == TRUE
MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
@@ -1554,24 +1550,16 @@ [Components.X64]
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf {
- <PcdsPatchableInModule>
- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000
- }
+ NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ NetworkPkg/TcpDxe/TcpDxe.inf
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
!if $(NETWORK_IP6_ENABLE) == TRUE
NetworkPkg/Ip6Dxe/Ip6Dxe.inf
NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
NetworkPkg/IpSecDxe/IpSecDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
NetworkPkg/Udp6Dxe/Udp6Dxe.inf
NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
!endif
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- !else
- MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- !endif
!endif
!if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
--
2.19.1.windows.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 0/3] Delete TCP, PXE, iSCSI driver in MdeModulePkg.
2018-11-05 10:49 [PATCH v2 0/3] Delete TCP, PXE, iSCSI driver in MdeModulePkg Fu Siyuan
` (2 preceding siblings ...)
2018-11-05 10:49 ` [PATCH v2 3/3] OvmfPkg: " Fu Siyuan
@ 2018-11-05 16:47 ` Laszlo Ersek
3 siblings, 0 replies; 13+ messages in thread
From: Laszlo Ersek @ 2018-11-05 16:47 UTC (permalink / raw)
To: Fu Siyuan, edk2-devel
On 11/05/18 11:49, Fu Siyuan wrote:
> V2 Update:
> [...]
My preliminary (meta) comments:
https://lists.01.org/pipermail/edk2-devel/2018-November/031914.html
Will follow up later.
Laszlo
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 2/3] ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF.
2018-11-05 10:49 ` [PATCH v2 2/3] ArmVirtPkg: Replace obsoleted network " Fu Siyuan
@ 2018-11-05 22:36 ` Laszlo Ersek
2018-11-06 0:54 ` Fu, Siyuan
0 siblings, 1 reply; 13+ messages in thread
From: Laszlo Ersek @ 2018-11-05 22:36 UTC (permalink / raw)
To: Fu Siyuan; +Cc: edk2-devel, Leif Lindholm (Linaro address), Ard Biesheuvel
On 11/05/18 11:49, Fu Siyuan wrote:
> V2:
> Add missing library instance for NetworkPkg iSCSI driver.
>
> This patch replaces the MdeModulePkg TCP, PXE and iSCSI driver with those
> ones in NetworkPkg. These 3 drivers in MdeModulePkg are not being actively
> maintained and will be removed from edk2 master soon.
>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Julien Grall <julien.grall@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
> ---
> ArmVirtPkg/ArmVirtQemu.dsc | 13 ++++++-------
> ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 10 +++-------
> ArmVirtPkg/ArmVirtQemuKernel.dsc | 13 ++++++-------
> 3 files changed, 15 insertions(+), 21 deletions(-)
>
> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> index 885c6b14b844..0f403973bea0 100644
> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> @@ -70,6 +70,9 @@ [LibraryClasses.common.PEIM]
>
> [LibraryClasses.common.UEFI_DRIVER]
> UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
(1) I couldn't participate in the discussion last week; I was away. On
my return, I have now seen multiple related threads. I guess I can
describe my general concern here.
My general concern is that the edk2 network stack can no longer be built
without OpenSSL. (As long as we include the iSCSI driver in the "edk2
network stack".) Is that intentional?
I'm not asking for additional documentation regarding this fact, given
commit 0bcbdf9c7445 ("NetworkPkg/IScsiDxe: Add the clarification
compared to IScsiDxe in MdeModulePkg.", 2018-09-27). I'm just asking if
we've considered this and find it acceptable.
(2) Once we remove the IPv4-only drivers, the INF file comments added in:
897720daef33 NetworkPkg/TcpDxe: Add the clarification compared to
Tcp4Dxe in MdeModulePkg.
0bcbdf9c7445 NetworkPkg/IScsiDxe: Add the clarification compared to
IScsiDxe in MdeModulePkg.
24c55f5dcc31 NetworkPkg/UefiPxeBcDxe: Add the clarification compared
to UefiPxeBcDxe in MdeModulePkg.
should be updated, because the comparisons to MdeModulePkg drivers will
no longer make sense.
(3) These library class resolutions are already spelled out in
"ArmVirtPkg/ArmVirt.dsc.inc". Please see under the comment
#
# CryptoPkg libraries needed by multiple firmware features
#
We shouldn't duplicate those lib class resolutions.
(4) In particular, the "CryptoPkg/Library/OpensslLib/OpensslLib.inf"
instance contains TLS support, and it is overkill for just IPv6. The
"OpensslLibCrypto.inf" instance is sufficient.
>
> ################################################################################
> #
> @@ -346,18 +349,14 @@ [Components.common]
> MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> + NetworkPkg/TcpDxe/TcpDxe.inf
> + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> + NetworkPkg/IScsiDxe/IScsiDxe.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
> - NetworkPkg/IScsiDxe/IScsiDxe.inf
> -!else
> - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
> - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
> !endif
> !if $(HTTP_BOOT_ENABLE) == TRUE
> NetworkPkg/DnsDxe/DnsDxe.inf
(5) This change will break the build (without NETWORK_IP6_ENABLE).
Namely, "NetworkPkg/IScsiDxe/IScsiDxe.inf" would be compiled
unconditionally. However, "NetworkPkg/IScsiDxe/IScsiDxe.inf" depends on
the TcpIoLib class -- as the sole driver in the edk2 tree --, and we
only resolve that lib class (in "ArmVirtPkg/ArmVirt.dsc.inc") if
NETWORK_IP6_ENABLE is defined.
* If we decide that "NetworkPkg/IScsiDxe/IScsiDxe.inf" is an integral
part of the edk2 network driver stack (even without NETWORK_IP6_ENABLE),
then:
- we should make the current TcpIoLib class resolution unconditional,
- we should make the current IntrinsicLib / OpensslLib / BaseCryptLib
resolutions unconditional,
* Otherwise (= if we consider "NetworkPkg/IScsiDxe/IScsiDxe.inf"
optional for networking), we should introduce NETWORK_ISCSI_ENABLE, and
*replace* NETWORK_IP6_ENABLE with NETWORK_ISCSI_ENABLE in the above lib
class resolutions. (And also make the DSC / FDF inclusion of
"NetworkPkg/IScsiDxe/IScsiDxe.inf" dependent on the new
NETWORK_ISCSI_ENABLE.)
Thanks
Laszlo
> diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> index a6390bd4b841..3316f982695f 100644
> --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> @@ -126,18 +126,14 @@ [FV.FvMain]
> INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> + INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> + INF NetworkPkg/TcpDxe/TcpDxe.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
> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> -!else
> - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
> - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
> !endif
> !if $(HTTP_BOOT_ENABLE) == TRUE
> INF NetworkPkg/DnsDxe/DnsDxe.inf
> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> index 434d6861a56f..4920a66f2fdb 100644
> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> @@ -67,6 +67,9 @@ [LibraryClasses.common]
>
> [LibraryClasses.common.UEFI_DRIVER]
> UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
>
> [BuildOptions.ARM.EDKII.SEC, BuildOptions.ARM.EDKII.BASE]
> # Avoid MOVT/MOVW instruction pairs in code that may end up in the PIE
> @@ -335,18 +338,14 @@ [Components.common]
> MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> + NetworkPkg/TcpDxe/TcpDxe.inf
> + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> + NetworkPkg/IScsiDxe/IScsiDxe.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
> - NetworkPkg/IScsiDxe/IScsiDxe.inf
> -!else
> - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
> - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
> !endif
> !if $(HTTP_BOOT_ENABLE) == TRUE
> NetworkPkg/DnsDxe/DnsDxe.inf
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 3/3] OvmfPkg: Replace obsoleted network drivers from platform DSC/FDF.
2018-11-05 10:49 ` [PATCH v2 3/3] OvmfPkg: " Fu Siyuan
@ 2018-11-05 22:46 ` Laszlo Ersek
2018-11-06 11:26 ` Ard Biesheuvel
0 siblings, 1 reply; 13+ messages in thread
From: Laszlo Ersek @ 2018-11-05 22:46 UTC (permalink / raw)
To: Fu Siyuan, edk2-devel; +Cc: Anthony Perard, Jordan Justen
On 11/05/18 11:49, Fu Siyuan wrote:
> V2:
> Add missed library instance for NetworkPkg iSCSI driver.
>
> This patch replaces the MdeModulePkg TCP, PXE and iSCSI driver with those
> ones in NetworkPkg. These 3 drivers in MdeModulePkg are not being actively
> maintained and will be removed from edk2 master soon.
>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: Julien Grall <julien.grall@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
> ---
> OvmfPkg/OvmfPkgIa32.dsc | 14 ++++----------
> OvmfPkg/OvmfPkgIa32.fdf | 10 +++-------
> OvmfPkg/OvmfPkgIa32X64.dsc | 14 ++++----------
> OvmfPkg/OvmfPkgIa32X64.fdf | 10 +++-------
> OvmfPkg/OvmfPkgX64.dsc | 14 ++++----------
> OvmfPkg/OvmfPkgX64.fdf | 10 +++-------
> 6 files changed, 21 insertions(+), 51 deletions(-)
>
> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> index 9f07e75050c0..7160e88eaee4 100644
> --- a/OvmfPkg/OvmfPkgIa32.dsc
> +++ b/OvmfPkg/OvmfPkgIa32.dsc
> @@ -189,9 +189,7 @@ [LibraryClasses]
> !endif
> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>
> -!if $(NETWORK_IP6_ENABLE) == TRUE
> TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> -!endif
>
> !if $(HTTP_BOOT_ENABLE) == TRUE
> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> @@ -790,18 +788,14 @@ [Components]
> MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> -!if $(NETWORK_IP6_ENABLE) == TRUE
> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> NetworkPkg/TcpDxe/TcpDxe.inf
> + NetworkPkg/IScsiDxe/IScsiDxe.inf
> +!if $(NETWORK_IP6_ENABLE) == TRUE
> + NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - NetworkPkg/IScsiDxe/IScsiDxe.inf
> -!else
> - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
> - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
> !endif
> !if $(HTTP_BOOT_ENABLE) == TRUE
> NetworkPkg/DnsDxe/DnsDxe.inf
> diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
> index 52b8b1fea1fc..1bc2e73bde16 100644
> --- a/OvmfPkg/OvmfPkgIa32.fdf
> +++ b/OvmfPkg/OvmfPkgIa32.fdf
> @@ -309,18 +309,14 @@ [FV.DXEFV]
> INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> + INF NetworkPkg/TcpDxe/TcpDxe.inf
> + INF NetworkPkg/IScsiDxe/IScsiDxe.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
> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> -!else
> - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
> - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
> !endif
> !if $(HTTP_BOOT_ENABLE) == TRUE
> INF NetworkPkg/DnsDxe/DnsDxe.inf
> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> index a4eaeb808c6b..e83e7ffab5b5 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -194,9 +194,7 @@ [LibraryClasses]
> !endif
> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>
> -!if $(NETWORK_IP6_ENABLE) == TRUE
> TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> -!endif
>
> !if $(HTTP_BOOT_ENABLE) == TRUE
> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> @@ -799,18 +797,14 @@ [Components.X64]
> MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> -!if $(NETWORK_IP6_ENABLE) == TRUE
> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> NetworkPkg/TcpDxe/TcpDxe.inf
> + NetworkPkg/IScsiDxe/IScsiDxe.inf
> +!if $(NETWORK_IP6_ENABLE) == TRUE
> + NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - NetworkPkg/IScsiDxe/IScsiDxe.inf
> -!else
> - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
> - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
> !endif
> !if $(HTTP_BOOT_ENABLE) == TRUE
> NetworkPkg/DnsDxe/DnsDxe.inf
> diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
> index 70845d6972fd..f36c7e741c8e 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.fdf
> +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
> @@ -315,18 +315,14 @@ [FV.DXEFV]
> INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> + INF NetworkPkg/TcpDxe/TcpDxe.inf
> + INF NetworkPkg/IScsiDxe/IScsiDxe.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
> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> -!else
> - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
> - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
> !endif
> !if $(HTTP_BOOT_ENABLE) == TRUE
> INF NetworkPkg/DnsDxe/DnsDxe.inf
> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> index aa3efc5e73b9..c0f86d4ad303 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -194,9 +194,7 @@ [LibraryClasses]
> !endif
> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>
> -!if $(NETWORK_IP6_ENABLE) == TRUE
> TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> -!endif
>
> !if $(HTTP_BOOT_ENABLE) == TRUE
> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> @@ -797,18 +795,14 @@ [Components]
> MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> -!if $(NETWORK_IP6_ENABLE) == TRUE
> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> NetworkPkg/TcpDxe/TcpDxe.inf
> + NetworkPkg/IScsiDxe/IScsiDxe.inf
> +!if $(NETWORK_IP6_ENABLE) == TRUE
> + NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - NetworkPkg/IScsiDxe/IScsiDxe.inf
> -!else
> - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
> - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
> !endif
> !if $(HTTP_BOOT_ENABLE) == TRUE
> NetworkPkg/DnsDxe/DnsDxe.inf
> diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
> index 1eb46ac9a2d8..96a114a20bdc 100644
> --- a/OvmfPkg/OvmfPkgX64.fdf
> +++ b/OvmfPkg/OvmfPkgX64.fdf
> @@ -315,18 +315,14 @@ [FV.DXEFV]
> INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> + INF NetworkPkg/TcpDxe/TcpDxe.inf
> + INF NetworkPkg/IScsiDxe/IScsiDxe.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
> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> -!else
> - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
> - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
> !endif
> !if $(HTTP_BOOT_ENABLE) == TRUE
> INF NetworkPkg/DnsDxe/DnsDxe.inf
>
Assuming we consider "NetworkPkg/IScsiDxe/IScsiDxe.inf" an integral part
of the edk2 networking stack, without which (and its OpenSSL dependency)
noone would ever want to build OVMF, this patch is OK.
I don't know what other OVMF users think about this; personally I'm ok
with it.
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Thanks
Laszlo
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 2/3] ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF.
2018-11-05 22:36 ` Laszlo Ersek
@ 2018-11-06 0:54 ` Fu, Siyuan
2018-11-06 14:58 ` Laszlo Ersek
0 siblings, 1 reply; 13+ messages in thread
From: Fu, Siyuan @ 2018-11-06 0:54 UTC (permalink / raw)
To: Laszlo Ersek; +Cc: edk2-devel@lists.01.org
Hi, Laszlo
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Laszlo Ersek
> Sent: Tuesday, November 6, 2018 6:37 AM
> To: Fu, Siyuan <siyuan.fu@intel.com>
> Cc: edk2-devel@lists.01.org
> Subject: Re: [edk2] [PATCH v2 2/3] ArmVirtPkg: Replace obsoleted network
> drivers from platform DSC/FDF.
>
> On 11/05/18 11:49, Fu Siyuan wrote:
> > V2:
> > Add missing library instance for NetworkPkg iSCSI driver.
> >
> > This patch replaces the MdeModulePkg TCP, PXE and iSCSI driver with
> those
> > ones in NetworkPkg. These 3 drivers in MdeModulePkg are not being
> actively
> > maintained and will be removed from edk2 master soon.
> >
> > Cc: Laszlo Ersek <lersek@redhat.com>
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Cc: Julien Grall <julien.grall@linaro.org>
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
> > ---
> > ArmVirtPkg/ArmVirtQemu.dsc | 13 ++++++-------
> > ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 10 +++-------
> > ArmVirtPkg/ArmVirtQemuKernel.dsc | 13 ++++++-------
> > 3 files changed, 15 insertions(+), 21 deletions(-)
> >
> > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> > index 885c6b14b844..0f403973bea0 100644
> > --- a/ArmVirtPkg/ArmVirtQemu.dsc
> > +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> > @@ -70,6 +70,9 @@ [LibraryClasses.common.PEIM]
> >
> > [LibraryClasses.common.UEFI_DRIVER]
> > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> > + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> > + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> > + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
>
> (1) I couldn't participate in the discussion last week; I was away. On
> my return, I have now seen multiple related threads. I guess I can
> describe my general concern here.
>
> My general concern is that the edk2 network stack can no longer be built
> without OpenSSL. (As long as we include the iSCSI driver in the "edk2
> network stack".) Is that intentional?
>
> I'm not asking for additional documentation regarding this fact, given
> commit 0bcbdf9c7445 ("NetworkPkg/IScsiDxe: Add the clarification
> compared to IScsiDxe in MdeModulePkg.", 2018-09-27). I'm just asking if
> we've considered this and find it acceptable.
The MdeModulePkg iSCSI driver can be built without OpenSSL because it writes
its own crypto functions in IScsiDxe/Md5.c, that's not allowed by
current edk2 security development guide line. We should always use the
crypto APIs provided by OpenSSL instead of reinvent a new implementation.
So yes, it's the intentional, and even if we decide not to delete the
MdeModulePkg iSCSI driver, there will be another patch to delete its own
Md5.c and use OpenSSL API.
>
>
> (2) Once we remove the IPv4-only drivers, the INF file comments added in:
>
> 897720daef33 NetworkPkg/TcpDxe: Add the clarification compared to
> Tcp4Dxe in MdeModulePkg.
> 0bcbdf9c7445 NetworkPkg/IScsiDxe: Add the clarification compared to
> IScsiDxe in MdeModulePkg.
> 24c55f5dcc31 NetworkPkg/UefiPxeBcDxe: Add the clarification compared
> to UefiPxeBcDxe in MdeModulePkg.
>
> should be updated, because the comparisons to MdeModulePkg drivers will
> no longer make sense.
You are right, my V1 patch 6/7 deletes the MdeModulePkg code and 7/7 removes
these comments in NetworkPkg drivers' INF file. Since we decided to keep
the MdeModulePkg driver in edk2-stable201811 tag, I removed the 6/7 and 7/7
in v2 patch. These changes will be sent out in a separate patch later.
I will try to include more details in the patch description in future
to let you known the background.
>
>
> (3) These library class resolutions are already spelled out in
> "ArmVirtPkg/ArmVirt.dsc.inc". Please see under the comment
>
> #
> # CryptoPkg libraries needed by multiple firmware features
> #
>
> We shouldn't duplicate those lib class resolutions.
Just see it, will send out a v3 patch for the ARM package.
>
>
> (4) In particular, the "CryptoPkg/Library/OpensslLib/OpensslLib.inf"
> instance contains TLS support, and it is overkill for just IPv6. The
> "OpensslLibCrypto.inf" instance is sufficient.
>
TLS is required by HTTP boot driver so I put OpensslLib instance as
default, but it's a good suggestion. I will update the NetworkPkg Wiki
page to tell platform owners to use the smaller crypto library instance
if they don't need HTTP.
> >
> >
> ##########################################################################
> ######
> > #
> > @@ -346,18 +349,14 @@ [Components.common]
> > MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> > + NetworkPkg/TcpDxe/TcpDxe.inf
> > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > + NetworkPkg/IScsiDxe/IScsiDxe.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
> > - NetworkPkg/IScsiDxe/IScsiDxe.inf
> > -!else
> > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
> > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
> > !endif
> > !if $(HTTP_BOOT_ENABLE) == TRUE
> > NetworkPkg/DnsDxe/DnsDxe.inf
>
> (5) This change will break the build (without NETWORK_IP6_ENABLE).
>
> Namely, "NetworkPkg/IScsiDxe/IScsiDxe.inf" would be compiled
> unconditionally. However, "NetworkPkg/IScsiDxe/IScsiDxe.inf" depends on
> the TcpIoLib class -- as the sole driver in the edk2 tree --, and we
> only resolve that lib class (in "ArmVirtPkg/ArmVirt.dsc.inc") if
> NETWORK_IP6_ENABLE is defined.
>
>
> * If we decide that "NetworkPkg/IScsiDxe/IScsiDxe.inf" is an integral
> part of the edk2 network driver stack (even without NETWORK_IP6_ENABLE),
> then:
> - we should make the current TcpIoLib class resolution unconditional,
> - we should make the current IntrinsicLib / OpensslLib / BaseCryptLib
> resolutions unconditional,
>
> * Otherwise (= if we consider "NetworkPkg/IScsiDxe/IScsiDxe.inf"
> optional for networking), we should introduce NETWORK_ISCSI_ENABLE, and
> *replace* NETWORK_IP6_ENABLE with NETWORK_ISCSI_ENABLE in the above lib
> class resolutions. (And also make the DSC / FDF inclusion of
> "NetworkPkg/IScsiDxe/IScsiDxe.inf" dependent on the new
> NETWORK_ISCSI_ENABLE.)
>
> Thanks
> Laszlo
>
> > diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> > index a6390bd4b841..3316f982695f 100644
> > --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> > +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> > @@ -126,18 +126,14 @@ [FV.FvMain]
> > INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> > INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> > + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > + INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> > + INF NetworkPkg/TcpDxe/TcpDxe.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
> > - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> > -!else
> > - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
> > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
> > !endif
> > !if $(HTTP_BOOT_ENABLE) == TRUE
> > INF NetworkPkg/DnsDxe/DnsDxe.inf
> > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> > index 434d6861a56f..4920a66f2fdb 100644
> > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> > @@ -67,6 +67,9 @@ [LibraryClasses.common]
> >
> > [LibraryClasses.common.UEFI_DRIVER]
> > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> > + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> > + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> > + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
> >
> > [BuildOptions.ARM.EDKII.SEC, BuildOptions.ARM.EDKII.BASE]
> > # Avoid MOVT/MOVW instruction pairs in code that may end up in the
> PIE
> > @@ -335,18 +338,14 @@ [Components.common]
> > MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> > + NetworkPkg/TcpDxe/TcpDxe.inf
> > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > + NetworkPkg/IScsiDxe/IScsiDxe.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
> > - NetworkPkg/IScsiDxe/IScsiDxe.inf
> > -!else
> > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
> > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
> > !endif
> > !if $(HTTP_BOOT_ENABLE) == TRUE
> > NetworkPkg/DnsDxe/DnsDxe.inf
> >
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 3/3] OvmfPkg: Replace obsoleted network drivers from platform DSC/FDF.
2018-11-05 22:46 ` Laszlo Ersek
@ 2018-11-06 11:26 ` Ard Biesheuvel
2018-11-06 14:58 ` Laszlo Ersek
0 siblings, 1 reply; 13+ messages in thread
From: Ard Biesheuvel @ 2018-11-06 11:26 UTC (permalink / raw)
To: Laszlo Ersek
Cc: Fu Siyuan, edk2-devel@lists.01.org, Anthony Perard, Jordan Justen
On 5 November 2018 at 23:46, Laszlo Ersek <lersek@redhat.com> wrote:
> On 11/05/18 11:49, Fu Siyuan wrote:
>> V2:
>> Add missed library instance for NetworkPkg iSCSI driver.
>>
>> This patch replaces the MdeModulePkg TCP, PXE and iSCSI driver with those
>> ones in NetworkPkg. These 3 drivers in MdeModulePkg are not being actively
>> maintained and will be removed from edk2 master soon.
>>
>> Cc: Jordan Justen <jordan.l.justen@intel.com>
>> Cc: Laszlo Ersek <lersek@redhat.com>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Cc: Anthony Perard <anthony.perard@citrix.com>
>> Cc: Julien Grall <julien.grall@linaro.org>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
>> ---
>> OvmfPkg/OvmfPkgIa32.dsc | 14 ++++----------
>> OvmfPkg/OvmfPkgIa32.fdf | 10 +++-------
>> OvmfPkg/OvmfPkgIa32X64.dsc | 14 ++++----------
>> OvmfPkg/OvmfPkgIa32X64.fdf | 10 +++-------
>> OvmfPkg/OvmfPkgX64.dsc | 14 ++++----------
>> OvmfPkg/OvmfPkgX64.fdf | 10 +++-------
>> 6 files changed, 21 insertions(+), 51 deletions(-)
>>
>> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
>> index 9f07e75050c0..7160e88eaee4 100644
>> --- a/OvmfPkg/OvmfPkgIa32.dsc
>> +++ b/OvmfPkg/OvmfPkgIa32.dsc
>> @@ -189,9 +189,7 @@ [LibraryClasses]
>> !endif
>> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>>
>> -!if $(NETWORK_IP6_ENABLE) == TRUE
>> TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
>> -!endif
>>
>> !if $(HTTP_BOOT_ENABLE) == TRUE
>> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
>> @@ -790,18 +788,14 @@ [Components]
>> MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
>> MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
>> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
>> -!if $(NETWORK_IP6_ENABLE) == TRUE
>> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf
>> + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> NetworkPkg/TcpDxe/TcpDxe.inf
>> + NetworkPkg/IScsiDxe/IScsiDxe.inf
>> +!if $(NETWORK_IP6_ENABLE) == TRUE
>> + NetworkPkg/Ip6Dxe/Ip6Dxe.inf
>> NetworkPkg/Udp6Dxe/Udp6Dxe.inf
>> NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
>> NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
>> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> - NetworkPkg/IScsiDxe/IScsiDxe.inf
>> -!else
>> - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
>> - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
>> !endif
>> !if $(HTTP_BOOT_ENABLE) == TRUE
>> NetworkPkg/DnsDxe/DnsDxe.inf
>> diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
>> index 52b8b1fea1fc..1bc2e73bde16 100644
>> --- a/OvmfPkg/OvmfPkgIa32.fdf
>> +++ b/OvmfPkg/OvmfPkgIa32.fdf
>> @@ -309,18 +309,14 @@ [FV.DXEFV]
>> INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
>> INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
>> INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
>> + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> + INF NetworkPkg/TcpDxe/TcpDxe.inf
>> + INF NetworkPkg/IScsiDxe/IScsiDxe.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
>> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
>> -!else
>> - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
>> - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
>> !endif
>> !if $(HTTP_BOOT_ENABLE) == TRUE
>> INF NetworkPkg/DnsDxe/DnsDxe.inf
>> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
>> index a4eaeb808c6b..e83e7ffab5b5 100644
>> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
>> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
>> @@ -194,9 +194,7 @@ [LibraryClasses]
>> !endif
>> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>>
>> -!if $(NETWORK_IP6_ENABLE) == TRUE
>> TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
>> -!endif
>>
>> !if $(HTTP_BOOT_ENABLE) == TRUE
>> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
>> @@ -799,18 +797,14 @@ [Components.X64]
>> MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
>> MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
>> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
>> -!if $(NETWORK_IP6_ENABLE) == TRUE
>> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf
>> + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> NetworkPkg/TcpDxe/TcpDxe.inf
>> + NetworkPkg/IScsiDxe/IScsiDxe.inf
>> +!if $(NETWORK_IP6_ENABLE) == TRUE
>> + NetworkPkg/Ip6Dxe/Ip6Dxe.inf
>> NetworkPkg/Udp6Dxe/Udp6Dxe.inf
>> NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
>> NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
>> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> - NetworkPkg/IScsiDxe/IScsiDxe.inf
>> -!else
>> - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
>> - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
>> !endif
>> !if $(HTTP_BOOT_ENABLE) == TRUE
>> NetworkPkg/DnsDxe/DnsDxe.inf
>> diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
>> index 70845d6972fd..f36c7e741c8e 100644
>> --- a/OvmfPkg/OvmfPkgIa32X64.fdf
>> +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
>> @@ -315,18 +315,14 @@ [FV.DXEFV]
>> INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
>> INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
>> INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
>> + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> + INF NetworkPkg/TcpDxe/TcpDxe.inf
>> + INF NetworkPkg/IScsiDxe/IScsiDxe.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
>> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
>> -!else
>> - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
>> - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
>> !endif
>> !if $(HTTP_BOOT_ENABLE) == TRUE
>> INF NetworkPkg/DnsDxe/DnsDxe.inf
>> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
>> index aa3efc5e73b9..c0f86d4ad303 100644
>> --- a/OvmfPkg/OvmfPkgX64.dsc
>> +++ b/OvmfPkg/OvmfPkgX64.dsc
>> @@ -194,9 +194,7 @@ [LibraryClasses]
>> !endif
>> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>>
>> -!if $(NETWORK_IP6_ENABLE) == TRUE
>> TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
>> -!endif
>>
>> !if $(HTTP_BOOT_ENABLE) == TRUE
>> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
>> @@ -797,18 +795,14 @@ [Components]
>> MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
>> MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
>> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
>> -!if $(NETWORK_IP6_ENABLE) == TRUE
>> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf
>> + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> NetworkPkg/TcpDxe/TcpDxe.inf
>> + NetworkPkg/IScsiDxe/IScsiDxe.inf
>> +!if $(NETWORK_IP6_ENABLE) == TRUE
>> + NetworkPkg/Ip6Dxe/Ip6Dxe.inf
>> NetworkPkg/Udp6Dxe/Udp6Dxe.inf
>> NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
>> NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
>> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> - NetworkPkg/IScsiDxe/IScsiDxe.inf
>> -!else
>> - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
>> - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
>> !endif
>> !if $(HTTP_BOOT_ENABLE) == TRUE
>> NetworkPkg/DnsDxe/DnsDxe.inf
>> diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
>> index 1eb46ac9a2d8..96a114a20bdc 100644
>> --- a/OvmfPkg/OvmfPkgX64.fdf
>> +++ b/OvmfPkg/OvmfPkgX64.fdf
>> @@ -315,18 +315,14 @@ [FV.DXEFV]
>> INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
>> INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
>> INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
>> + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> + INF NetworkPkg/TcpDxe/TcpDxe.inf
>> + INF NetworkPkg/IScsiDxe/IScsiDxe.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
>> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
>> -!else
>> - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
>> - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
>> - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
>> !endif
>> !if $(HTTP_BOOT_ENABLE) == TRUE
>> INF NetworkPkg/DnsDxe/DnsDxe.inf
>>
>
> Assuming we consider "NetworkPkg/IScsiDxe/IScsiDxe.inf" an integral part
> of the edk2 networking stack, without which (and its OpenSSL dependency)
> noone would ever want to build OVMF, this patch is OK.
>
> I don't know what other OVMF users think about this; personally I'm ok
> with it.
>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>
I think that is fine.
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Since the delta between NETWORK_IP6_ENABLE on vs off is decreasing,
any chance we could drop it altogether at some point?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 2/3] ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF.
2018-11-06 0:54 ` Fu, Siyuan
@ 2018-11-06 14:58 ` Laszlo Ersek
0 siblings, 0 replies; 13+ messages in thread
From: Laszlo Ersek @ 2018-11-06 14:58 UTC (permalink / raw)
To: Fu, Siyuan; +Cc: edk2-devel@lists.01.org
On 11/06/18 01:54, Fu, Siyuan wrote:
> Hi, Laszlo
>
>> -----Original Message-----
>> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>> Laszlo Ersek
>> I'm not asking for additional documentation regarding this fact, given
>> commit 0bcbdf9c7445 ("NetworkPkg/IScsiDxe: Add the clarification
>> compared to IScsiDxe in MdeModulePkg.", 2018-09-27). I'm just asking if
>> we've considered this and find it acceptable.
>
> The MdeModulePkg iSCSI driver can be built without OpenSSL because it writes
> its own crypto functions in IScsiDxe/Md5.c, that's not allowed by
> current edk2 security development guide line. We should always use the
> crypto APIs provided by OpenSSL instead of reinvent a new implementation.
Ah, that makes a lot of sense. I've wondered about this difference in
dependencies for a long time.
[...]
Thanks,
Laszlo
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 3/3] OvmfPkg: Replace obsoleted network drivers from platform DSC/FDF.
2018-11-06 11:26 ` Ard Biesheuvel
@ 2018-11-06 14:58 ` Laszlo Ersek
2018-11-06 15:00 ` Ard Biesheuvel
0 siblings, 1 reply; 13+ messages in thread
From: Laszlo Ersek @ 2018-11-06 14:58 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Fu Siyuan, edk2-devel@lists.01.org, Anthony Perard, Jordan Justen
On 11/06/18 12:26, Ard Biesheuvel wrote:
> On 5 November 2018 at 23:46, Laszlo Ersek <lersek@redhat.com> wrote:
>> Assuming we consider "NetworkPkg/IScsiDxe/IScsiDxe.inf" an integral part
>> of the edk2 networking stack, without which (and its OpenSSL dependency)
>> noone would ever want to build OVMF, this patch is OK.
>>
>> I don't know what other OVMF users think about this; personally I'm ok
>> with it.
>>
>> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>>
>
> I think that is fine.
>
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>
> Since the delta between NETWORK_IP6_ENABLE on vs off is decreasing,
> any chance we could drop it altogether at some point?
I believe I'd prefer flipping the default value at the most. UEFI has
been gaining new features like there's no tomorrow, and I find the
parallel (?) growth of the OVMF binary (mainly DXEFV) uncomfortable.
I'd like to continue offering knobs to keep the included features under
control.
Thanks
Laszlo
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 3/3] OvmfPkg: Replace obsoleted network drivers from platform DSC/FDF.
2018-11-06 14:58 ` Laszlo Ersek
@ 2018-11-06 15:00 ` Ard Biesheuvel
0 siblings, 0 replies; 13+ messages in thread
From: Ard Biesheuvel @ 2018-11-06 15:00 UTC (permalink / raw)
To: Laszlo Ersek
Cc: Fu Siyuan, edk2-devel@lists.01.org, Anthony Perard, Jordan Justen
On 6 November 2018 at 15:58, Laszlo Ersek <lersek@redhat.com> wrote:
> On 11/06/18 12:26, Ard Biesheuvel wrote:
>> On 5 November 2018 at 23:46, Laszlo Ersek <lersek@redhat.com> wrote:
>
>>> Assuming we consider "NetworkPkg/IScsiDxe/IScsiDxe.inf" an integral part
>>> of the edk2 networking stack, without which (and its OpenSSL dependency)
>>> noone would ever want to build OVMF, this patch is OK.
>>>
>>> I don't know what other OVMF users think about this; personally I'm ok
>>> with it.
>>>
>>> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>>>
>>
>> I think that is fine.
>>
>> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>
>> Since the delta between NETWORK_IP6_ENABLE on vs off is decreasing,
>> any chance we could drop it altogether at some point?
>
> I believe I'd prefer flipping the default value at the most. UEFI has
> been gaining new features like there's no tomorrow, and I find the
> parallel (?) growth of the OVMF binary (mainly DXEFV) uncomfortable.
>
> I'd like to continue offering knobs to keep the included features under
> control.
>
Fair enough. From a testing/coverage POV, flipping the default already
improves the situation significantly, so I can live with that.
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2018-11-06 15:00 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-05 10:49 [PATCH v2 0/3] Delete TCP, PXE, iSCSI driver in MdeModulePkg Fu Siyuan
2018-11-05 10:49 ` [PATCH v2 1/3] Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF Fu Siyuan
2018-11-05 10:54 ` Wei, David
2018-11-05 10:49 ` [PATCH v2 2/3] ArmVirtPkg: Replace obsoleted network " Fu Siyuan
2018-11-05 22:36 ` Laszlo Ersek
2018-11-06 0:54 ` Fu, Siyuan
2018-11-06 14:58 ` Laszlo Ersek
2018-11-05 10:49 ` [PATCH v2 3/3] OvmfPkg: " Fu Siyuan
2018-11-05 22:46 ` Laszlo Ersek
2018-11-06 11:26 ` Ard Biesheuvel
2018-11-06 14:58 ` Laszlo Ersek
2018-11-06 15:00 ` Ard Biesheuvel
2018-11-05 16:47 ` [PATCH v2 0/3] Delete TCP, PXE, iSCSI driver in MdeModulePkg Laszlo Ersek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox