[edk2] [PATCH 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC
Remove EdkShellBinPkg in CorebootPayloadPkg, EmulatorPkg, Nt32Pkg and OvmfPkg. Replace EdkShellBinPkg with EdkShellPkg in Vlv2TbltDevicePkg. shenglei (5): CorebootPayloadPkg: Remove EdkShellBinPkg in FDF EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC Nt32Pkg: Remove EdkShellBinPkg in FDF,DSC and DEC OvmfPkg: Remove EdkShellBinPkg in FDF Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg CorebootPayloadPkg/CorebootPayloadPkg.fdf | 8 EmulatorPkg/EmulatorPkg.dec | 2 +- EmulatorPkg/EmulatorPkg.fdf | 4 Nt32Pkg/Nt32Pkg.dec | 2 +- Nt32Pkg/Nt32Pkg.dsc | 4 ++-- Nt32Pkg/Nt32Pkg.fdf | 4 OvmfPkg/OvmfPkgIa32.fdf | 4 OvmfPkg/OvmfPkgIa32X64.fdf| 4 OvmfPkg/OvmfPkgX64.fdf| 4 Vlv2TbltDevicePkg/PlatformPkg.fdf | 5 + Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 5 + Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 1 + Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 1 + Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 1 + 14 files changed, 9 insertions(+), 40 deletions(-) -- 2.18.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH 3/5] Nt32Pkg: Remove EdkShellBinPkg in FDF, DSC and DEC
Remove EdkShellBinPkg in Nt32Pkg.dec, Nt32Pkg.dsc and Nt32Pkg.fdf. https://bugzilla.tianocore.org/show_bug.cgi?id=1108 Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: shenglei --- Nt32Pkg/Nt32Pkg.dec | 2 +- Nt32Pkg/Nt32Pkg.dsc | 4 ++-- Nt32Pkg/Nt32Pkg.fdf | 4 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Nt32Pkg/Nt32Pkg.dec b/Nt32Pkg/Nt32Pkg.dec index 06da067bc1..7b2cb8e8d0 100644 --- a/Nt32Pkg/Nt32Pkg.dec +++ b/Nt32Pkg/Nt32Pkg.dec @@ -89,7 +89,7 @@ gEfiNt32PkgTokenSpaceGuid.PcdWinNtVirtualDisk|L"FW;40960;512"|VOID*|0x1001 gEfiNt32PkgTokenSpaceGuid.PcdWinNtSerialPort|L"COM1!COM2"|VOID*|0x1002 gEfiNt32PkgTokenSpaceGuid.PcdWinNtUga|L"UGA Window 1!UGA Window 2"|VOID*|0x1003 - gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"|VOID*|0x1004 + gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L"."|VOID*|0x1004 gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize|L"64!64"|VOID*|0x1005 gEfiNt32PkgTokenSpaceGuid.PcdWinNtConsole|L"Bus Driver Console Window"|VOID*|0x100a gEfiNt32PkgTokenSpaceGuid.PcdWinNtGop|L"UGA Window 1!UGA Window 2"|VOID*|0x100d diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index 58d9f8787d..089dec191e 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -316,10 +316,10 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 [PcdsDynamicDefault.Ia32] - gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\..\..\..\EdkShellBinPkg\Bin\Ia32\Apps"|VOID*|106 + gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L"."|VOID*|106 [PcdsDynamicDefault.x64] - gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\..\..\..\EdkShellBinPkg\Bin\X64\Apps"|VOID*|106 + gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L"."|VOID*|106 [PcdsDynamicHii.common.DEFAULT] gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn|L"SetupConsoleConfig"|gEfiNt32PkgTokenSpaceGuid|0x0|80 diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf index db2719fd99..d1b856b5a3 100644 --- a/Nt32Pkg/Nt32Pkg.fdf +++ b/Nt32Pkg/Nt32Pkg.fdf @@ -288,11 +288,7 @@ INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf # for binary shell, binary fat and logo module. # -!ifndef $(USE_OLD_SHELL) INF ShellPkg/Application/Shell/Shell.inf -!else -INF EdkShellBinPkg/FullShell/FullShell.inf -!endif INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf -- 2.18.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH 5/5] Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg
Replace EdkShellBinPkg with ShellPkg in PlatformPkg.fdf,
PlatformPkgGcc.fdf, PlatformPkgGccX64.dsc,
PlatformPkgIA32.dsc and PlatformPkgX64.dsc.
https://bugzilla.tianocore.org/show_bug.cgi?id=1108
Cc: David Wei
Cc: zailiang sun
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei
---
Vlv2TbltDevicePkg/PlatformPkg.fdf | 5 +
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf| 5 +
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 1 +
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 1 +
Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 1 +
5 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf
b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index b7a0e584de..89c488372d 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -709,10 +709,7 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
#
# UEFI Shell
#
-FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile)
{
-#SECTION PE32 =
EdkShellBinPkg/FullShell/$(EDK_DXE_ARCHITECTURE)/Shell_Full.efi
-SECTION PE32 = ShellBinPkg/UefiShell/$(EDK_DXE_ARCHITECTURE)/Shell.efi
- }
+INF ShellPkg/Application/Shell/Shell.inf
#
# dp command
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index eca273e33f..e7bbda1a56 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -665,10 +665,7 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
#
# UEFI Shell
#
-FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile)
{
-#SECTION PE32 =
EdkShellBinPkg/FullShell/$(EDK_DXE_ARCHITECTURE)/Shell_Full.efi
-SECTION PE32 = ShellBinPkg/UefiShell/$(EDK_DXE_ARCHITECTURE)/Shell.efi
- }
+INF ShellPkg/Application/Shell/Shell.inf
#
# dp command
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 3e3522aee9..af2e701372 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -1462,6 +1462,7 @@
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf
+ ShellPkg/Application/Shell/Shell.inf
!if $(SATA_ENABLE) == TRUE
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf
!endif
diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 55c873d565..38403f8f20 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -1450,6 +1450,7 @@
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf
+ ShellPkg/Application/Shell/Shell.inf
!if $(SATA_ENABLE) == TRUE
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf
!endif
diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index fa6aa63491..13499b7c9e 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -1462,6 +1462,7 @@
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf
+ ShellPkg/Application/Shell/Shell.inf
!if $(SATA_ENABLE) == TRUE
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf
!endif
--
2.18.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH 2/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC
Remove EdkShellBinPkg in EmulatorPkg.dec and
EmulatorPkg.fdf.
https://bugzilla.tianocore.org/show_bug.cgi?id=1108
Cc: Jordan Justen
Cc: Ruiyu Ni
Cc: Andrew Fish
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei
---
EmulatorPkg/EmulatorPkg.dec | 2 +-
EmulatorPkg/EmulatorPkg.fdf | 4
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/EmulatorPkg/EmulatorPkg.dec b/EmulatorPkg/EmulatorPkg.dec
index 25f79c92c9..9be8a90e5b 100644
--- a/EmulatorPkg/EmulatorPkg.dec
+++ b/EmulatorPkg/EmulatorPkg.dec
@@ -96,7 +96,7 @@
gEmulatorPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"|VOID*|0x1001
gEmulatorPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window"|VOID*|0x1018
-
gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../../EdkShellBinPkg/bin/ia32/Apps"|VOID*|0x1004
+ gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L"."|VOID*|0x1004
gEmulatorPkgTokenSpaceGuid.PcdEmuSerialPort|L"/dev/ttyS0"|VOID*|0x1002
gEmulatorPkgTokenSpaceGuid.PcdEmuNetworkInterface|L"en0"|VOID*|0x100d
diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf
index 5b5f81443d..915321eb7a 100644
--- a/EmulatorPkg/EmulatorPkg.fdf
+++ b/EmulatorPkg/EmulatorPkg.fdf
@@ -208,12 +208,8 @@ INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
INF FatPkg/EnhancedFatDxe/Fat.inf
-!ifndef $(USE_OLD_SHELL)
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
INF ShellPkg/Application/Shell/Shell.inf
-!else
-INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
-!endif
[Rule.Common.SEC]
FILE SEC = $(NAMED_GUID) {
--
2.18.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH 1/5] CorebootPayloadPkg: Remove EdkShellBinPkg in FDF
Remove EdkShellBinPkg in CorebootPayloadPkg.fdf. https://bugzilla.tianocore.org/show_bug.cgi?id=1108 Cc: Maurice Ma Cc: Prince Agyeman Cc: Benjamin You Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: shenglei --- CorebootPayloadPkg/CorebootPayloadPkg.fdf | 8 1 file changed, 8 deletions(-) diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf index 7994f0c949..741a5c232e 100644 --- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf +++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf @@ -185,14 +185,6 @@ INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf INF ShellPkg/Application/Shell/Shell.inf !endif -!if $(SHELL_TYPE) == FULL_BIN -!if $(ARCH) == IA32 -INF RuleOverride = BINARY USE = IA32 EdkShellBinPkg/FullShell/FullShell.inf -!else -INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf -!endif -!endif - !if $(SHELL_TYPE) == MIN_BIN !if $(ARCH) == IA32 INF RuleOverride = BINARY USE = IA32 ShellBinPkg/MinUefiShell/MinUefiShell.inf -- 2.18.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v1] NetworkPkg/TlsDxe: Fix failure to process multiple TLS records.
Reviewed-by: Fu Siyuan > -Original Message- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of > Jiaxin Wu > Sent: Wednesday, October 31, 2018 1:42 PM > To: edk2-devel@lists.01.org > Cc: Ye, Ting ; Fu, Siyuan ; Wu, > Jiaxin > Subject: [edk2] [PATCH v1] NetworkPkg/TlsDxe: Fix failure to process > multiple TLS records. > > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1290. > > Current implementation failed to parse the multiple TLS record > messages due to the incorrect pointer of TLS record header. This > patch is to resolve that problem. > > Cc: Ye Ting > Cc: Fu Siyuan > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Wu Jiaxin > --- > NetworkPkg/TlsDxe/TlsImpl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/NetworkPkg/TlsDxe/TlsImpl.c b/NetworkPkg/TlsDxe/TlsImpl.c > index ea83dbd04f..2d4169b0a5 100644 > --- a/NetworkPkg/TlsDxe/TlsImpl.c > +++ b/NetworkPkg/TlsDxe/TlsImpl.c > @@ -142,11 +142,11 @@ TlsEncryptPacket ( > } > > BufferOutSize += ThisMessageSize; > > BufferInPtr += TLS_RECORD_HEADER_LENGTH + ThisPlainMessageSize; > -TempRecordHeader += ThisMessageSize; > +TempRecordHeader = (TLS_RECORD_HEADER *)((UINT8 *)TempRecordHeader + > ThisMessageSize); >} > >FreePool (BufferIn); >BufferIn = NULL; > > @@ -315,11 +315,11 @@ TlsDecryptPacket ( > CopyMem (TempRecordHeader, RecordHeaderIn, TLS_RECORD_HEADER_LENGTH); > TempRecordHeader->Length = ThisPlainMessageSize; > BufferOutSize += TLS_RECORD_HEADER_LENGTH + ThisPlainMessageSize; > > BufferInPtr += TLS_RECORD_HEADER_LENGTH + ThisCipherMessageSize; > -TempRecordHeader += TLS_RECORD_HEADER_LENGTH + ThisPlainMessageSize; > +TempRecordHeader = (TLS_RECORD_HEADER *)((UINT8 *)TempRecordHeader + > TLS_RECORD_HEADER_LENGTH + ThisPlainMessageSize); >} > >FreePool (BufferIn); >BufferIn = NULL; > > -- > 2.17.1.windows.2 > > ___ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH v1] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg Drivers.
The PXE/iSCSI/TCP drivers in MdeModulePkg are going to be deprecated. All platform DSC/FDF files should be updated to use the dual-stack drivers in NetworkPkg. Cc: Michael A Kubacki Cc: Jiewen Yao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Fu Siyuan --- Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc | 7 ++- Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf | 7 ++- Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 3 +-- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc index 4d70db6062..6764d46131 100644 --- a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc +++ b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc @@ -1,7 +1,7 @@ ## @file # Platform description. # -# Copyright (c) 2017, Intel Corporation. All rights reserved. +# Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved. # # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License which accompanies this distribution. @@ -26,10 +26,7 @@ MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.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 - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf - #MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf NetworkPkg/Ip6Dxe/Ip6Dxe.inf NetworkPkg/TcpDxe/TcpDxe.inf @@ -42,7 +39,7 @@ NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf NetworkPkg/HttpBootDxe/HttpBootDxe.inf - #NetworkPkg/IScsiDxe/IScsiDxe.inf + NetworkPkg/IScsiDxe/IScsiDxe.inf NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf !endif diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf index 0be408d13b..64f1dd5872 100644 --- a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf +++ b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf @@ -1,7 +1,7 @@ ## @file # FDF file of Platform. # -# Copyright (c) 2017, Intel Corporation. All rights reserved. +# Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved. # # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License which accompanies this distribution. @@ -27,9 +27,6 @@ INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf -#INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf -INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf -#INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf INF NetworkPkg/TcpDxe/TcpDxe.inf @@ -42,7 +39,7 @@ INF NetworkPkg/HttpDxe/HttpDxe.inf INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf -#INF NetworkPkg/IScsiDxe/IScsiDxe.inf +INF NetworkPkg/IScsiDxe/IScsiDxe.inf INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf !endif diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc index 2174eaa609..dd0173a1af 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc @@ -1,7 +1,7 @@ ## @file # Platform description. # -# Copyright (c) 2017, Intel Corporation. All rights reserved. +# Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved. # # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License which accompanies this distribution. @@ -83,7 +83,6 @@ UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf -- 2.19.1.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH v1] NetworkPkg/TlsDxe: Fix failure to process multiple TLS records.
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1290. Current implementation failed to parse the multiple TLS record messages due to the incorrect pointer of TLS record header. This patch is to resolve that problem. Cc: Ye Ting Cc: Fu Siyuan Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Wu Jiaxin --- NetworkPkg/TlsDxe/TlsImpl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NetworkPkg/TlsDxe/TlsImpl.c b/NetworkPkg/TlsDxe/TlsImpl.c index ea83dbd04f..2d4169b0a5 100644 --- a/NetworkPkg/TlsDxe/TlsImpl.c +++ b/NetworkPkg/TlsDxe/TlsImpl.c @@ -142,11 +142,11 @@ TlsEncryptPacket ( } BufferOutSize += ThisMessageSize; BufferInPtr += TLS_RECORD_HEADER_LENGTH + ThisPlainMessageSize; -TempRecordHeader += ThisMessageSize; +TempRecordHeader = (TLS_RECORD_HEADER *)((UINT8 *)TempRecordHeader + ThisMessageSize); } FreePool (BufferIn); BufferIn = NULL; @@ -315,11 +315,11 @@ TlsDecryptPacket ( CopyMem (TempRecordHeader, RecordHeaderIn, TLS_RECORD_HEADER_LENGTH); TempRecordHeader->Length = ThisPlainMessageSize; BufferOutSize += TLS_RECORD_HEADER_LENGTH + ThisPlainMessageSize; BufferInPtr += TLS_RECORD_HEADER_LENGTH + ThisCipherMessageSize; -TempRecordHeader += TLS_RECORD_HEADER_LENGTH + ThisPlainMessageSize; +TempRecordHeader = (TLS_RECORD_HEADER *)((UINT8 *)TempRecordHeader + TLS_RECORD_HEADER_LENGTH + ThisPlainMessageSize); } FreePool (BufferIn); BufferIn = NULL; -- 2.17.1.windows.2 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v5 1/1] ArmPkg/OpteeLib: Add APIs to communicate with OP-TEE
Hi Leif,
No worries :). BTW, thanks for the review.
Regards,
Sumit
On Tue, 30 Oct 2018 at 19:53, Leif Lindholm wrote:
>
> Hi Sumit,
>
> Sorry this got delayed by licensing, plugfest, and then some holiday
> (for me).
>
> Reviewed-by: Leif Lindholm
> Pushed as a0f01e8a22.
>
> /
> Leif
>
> On Mon, Oct 22, 2018 at 11:59:36AM +0530, Sumit Garg wrote:
> > Add following APIs to communicate with OP-TEE pseudo/early TAs:
> > 1. OpteeInit
> > 2. OpteeOpenSession
> > 3. OpteeCloseSession
> > 4. OpteeInvokeFunc
> >
> > Cc: Ard Biesheuvel
> > Cc: Leif Lindholm
> > Cc: Michael D Kinney
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Sumit Garg
> > ---
> > ArmPkg/Library/OpteeLib/OpteeLib.inf | 2 +
> > ArmPkg/Include/Library/OpteeLib.h| 88 +
> > ArmPkg/Library/OpteeLib/OpteeSmc.h | 53 +++
> > ArmPkg/Library/OpteeLib/Optee.c | 392
> > 4 files changed, 535 insertions(+)
> >
> > diff --git a/ArmPkg/Library/OpteeLib/OpteeLib.inf
> > b/ArmPkg/Library/OpteeLib/OpteeLib.inf
> > index 5abd427379cc..e03054a7167d 100644
> > --- a/ArmPkg/Library/OpteeLib/OpteeLib.inf
> > +++ b/ArmPkg/Library/OpteeLib/OpteeLib.inf
> > @@ -23,11 +23,13 @@ [Defines]
> >
> > [Sources]
> >Optee.c
> > + OpteeSmc.h
> >
> > [Packages]
> >ArmPkg/ArmPkg.dec
> >MdePkg/MdePkg.dec
> >
> > [LibraryClasses]
> > + ArmMmuLib
> >ArmSmcLib
> >BaseLib
> > diff --git a/ArmPkg/Include/Library/OpteeLib.h
> > b/ArmPkg/Include/Library/OpteeLib.h
> > index f65d8674d9b8..6884d5681831 100644
> > --- a/ArmPkg/Include/Library/OpteeLib.h
> > +++ b/ArmPkg/Include/Library/OpteeLib.h
> > @@ -25,10 +25,98 @@
> > #define OPTEE_OS_UID2 0xaf630002
> > #define OPTEE_OS_UID3 0xa5d5c51b
> >
> > +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_NONE0x0
> > +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_VALUE_INPUT 0x1
> > +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_VALUE_OUTPUT0x2
> > +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_VALUE_INOUT 0x3
> > +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_MEMORY_INPUT0x9
> > +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_MEMORY_OUTPUT 0xa
> > +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_MEMORY_INOUT0xb
> > +
> > +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_MASK0xff
> > +
> > +#define OPTEE_ORIGIN_COMMUNICATION 0x0002
> > +#define OPTEE_ERROR_COMMUNICATION 0x000E
> > +
> > +typedef struct {
> > + UINT64BufferAddress;
> > + UINT64Size;
> > + UINT64SharedMemoryReference;
> > +} OPTEE_MESSAGE_PARAM_MEMORY;
> > +
> > +typedef struct {
> > + UINT64A;
> > + UINT64B;
> > + UINT64C;
> > +} OPTEE_MESSAGE_PARAM_VALUE;
> > +
> > +typedef struct {
> > + UINT64 Attribute;
> > + union {
> > +OPTEE_MESSAGE_PARAM_MEMORY Memory;
> > +OPTEE_MESSAGE_PARAM_VALUEValue;
> > + } Union;
> > +} OPTEE_MESSAGE_PARAM;
> > +
> > +#define OPTEE_MAX_CALL_PARAMS 4
> > +
> > +typedef struct {
> > + UINT32Command;
> > + UINT32Function;
> > + UINT32Session;
> > + UINT32CancelId;
> > + UINT32Pad;
> > + UINT32Return;
> > + UINT32ReturnOrigin;
> > + UINT32NumParams;
> > +
> > + // NumParams tells the actual number of element in Params
> > + OPTEE_MESSAGE_PARAM Params[OPTEE_MAX_CALL_PARAMS];
> > +} OPTEE_MESSAGE_ARG;
> > +
> > +typedef struct {
> > + EFI_GUID Uuid; // [in] GUID/UUID of the Trusted Application
> > + UINT32Session;// [out] Session id
> > + UINT32Return; // [out] Return value
> > + UINT32ReturnOrigin; // [out] Origin of the return value
> > +} OPTEE_OPEN_SESSION_ARG;
> > +
> > +typedef struct {
> > + UINT32Function; // [in] Trusted Application function, specific
> > to the TA
> > + UINT32Session;// [in] Session id
> > + UINT32Return; // [out] Return value
> > + UINT32ReturnOrigin; // [out] Origin of the return value
> > + OPTEE_MESSAGE_PARAM Params[OPTEE_MAX_CALL_PARAMS]; // Params for
> > function to be invoked
> > +} OPTEE_INVOKE_FUNCTION_ARG;
> > +
> > BOOLEAN
> > EFIAPI
> > IsOpteePresent (
> >VOID
> >);
> >
> > +EFI_STATUS
> > +EFIAPI
> > +OpteeInit (
> > + VOID
> > + );
> > +
> > +EFI_STATUS
> > +EFIAPI
> > +OpteeOpenSession (
> > + IN OUT OPTEE_OPEN_SESSION_ARG *OpenSessionArg
> > + );
> > +
> > +EFI_STATUS
> > +EFIAPI
> > +OpteeCloseSession (
> > + IN UINT32 Session
> > + );
> > +
> > +EFI_STATUS
> > +EFIAPI
> > +OpteeInvokeFunction (
> > + IN OUT OPTEE_INVOKE_FUNCTION_ARG *InvokeFunctionArg
> > + );
> > +
> > #endif
> > diff --git a/ArmPkg/Library/OpteeLib/OpteeSmc.h
> > b/ArmPkg/Library/OpteeLib/OpteeSmc.h
> > new file mode 100644
> > index ..9cccd81810c9
> > --- /dev/null
> > +++ b/ArmPkg/Library/OpteeLib/OpteeSmc.h
> > @@ -0,0 +1,53 @@
> > +/** @file
> > + OP-TEE SMC header file.
> > +
> > + Copyright (c) 2018, Linaro Ltd. All
Re: [edk2] [PATCH V3 4/4] MdeModulePkg EhciDxe: Use common buffer for AsyncInterruptTransfer
Good feedback. On 2018/10/30 20:50, Leif Lindholm wrote: On Tue, Oct 30, 2018 at 09:39:24AM -0300, Ard Biesheuvel wrote: (add back the list) Oi! Go back on holiday! On 30 October 2018 at 09:07, Cohen, Eugene wrote: Has this patch been tested on a system that does not have coherent DMA? It's not clear that this change would actually be faster on a system of that type since using common buffers imply access to uncached memory. Depending on the access patterns the uncached memory access could be more time consuming than cache maintenance operations. The change/idea was based on the statement below. /// /// Provides both read and write access to system memory by both the processor and a /// bus master. The buffer is coherent from both the processor's and the bus master's point of view. /// EfiPciIoOperationBusMasterCommonBuffer, Thanks for raising case about uncached memory access. But after checking the code, for Intel VTd case https://github.com/tianocore/edk2/blob/master/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/BmDma.c#L460 (or no IOMMU case https://github.com/tianocore/edk2/blob/master/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c#L1567), the common buffer is just normal memory buffer. If someone can help do some test/collect some data on a system using common buffers imply access to uncached memory, that will be great. I haven't had time to look at these patches yet. I agree with Eugene's concern: the directional DMA routines are much more performant on implementations with non-coherent DMA, and so common buffers should be avoided unless we are dealing with data structures that are truly shared between the CPU and the device. Since this is obviously not the case here, could we please have some numbers about the performance improvement we are talking about here? Would it be possible to improve the IOMMU handling code instead? We collected the data below on a platform with release image and Intel VTd enabled. The image size of EhciDxe or XhciDxe can reduce about 120+ bytes. EHCI without the patch: ==[ Cumulative ] (Times in microsec.) Cumulative Average ShortestLongest Name Count DurationDurationDurationDuration --- SB00D1DF04462150 4 2 963 EHCI with the patch: ==[ Cumulative ] (Times in microsec.) Cumulative Average ShortestLongest Name Count DurationDurationDurationDuration --- SB00D1DF0270 742 2 2 41 XHCI without the patch: ==[ Cumulative ] (Times in microsec.) Cumulative Average ShortestLongest Name Count DurationDurationDurationDuration --- SB00D14F0215 603 2 2 52 XHCI with the patch: ==[ Cumulative ] (Times in microsec.) Cumulative Average ShortestLongest Name Count DurationDurationDurationDuration --- SB00D14F0 95 294 3 2 52 I believe the performance data really depends on 1. How many AsyncInterruptTransfer handlers (the number of USB keyboard and/or USB bluetooth keyboard?) 2. Data size (for flushing data from PCI controller specific address to mapped system memory address *in original code*) 3. The performance of IoMmu->SetAttribute (for example, the SetAttribute operation on Intel VTd engine caused by the unmap and map for flushing data *in original code*, the SetAttribute operation on IntelVTd engine will involve FlushPageTableMemory, InvalidatePageEntry and etc) On an unrelated note to the concerns above: Why has a fundamental change to the behaviour of one of the industry standard drivers been pushed at the very end of the stable cycle? We thought it was a simple improvement but not fundamental change before Eugene and Ard raised the concern. Thanks, Star Regards, Leif ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] BaseTools ConvertFceToStructurePcd: Fix the array value with empty string
Reviewed-by: Yonghong Zhu
Best Regards,
Zhu Yonghong
-Original Message-
From: Gao, Liming
Sent: Tuesday, October 30, 2018 11:00 PM
To: edk2-devel@lists.01.org
Cc: Zhu, Yonghong
Subject: [Patch] BaseTools ConvertFceToStructurePcd: Fix the array value with
empty string
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao
Cc: Yonghong Zhu
---
BaseTools/Scripts/ConvertFceToStructurePcd.py | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py
b/BaseTools/Scripts/ConvertFceToStructurePcd.py
index 6ca51c4..9240b8f 100644
--- a/BaseTools/Scripts/ConvertFceToStructurePcd.py
+++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py
@@ -303,7 +303,10 @@ class Config(object):
list1 = [t for t in list1 if t != ''] # remove '' form list
first_num = int(list1[0], 16)
if list1[first_num + 1] == 'STRING': # parser STRING
- value = 'L%s' % list1[-1]
+ if list1[-1] == '""':
+value = "{0x0, 0x0}"
+ else:
+value = 'L%s' % list1[-1]
elif list1[first_num + 1] == 'ORDERED_LIST': # parser ORDERED_LIST
value_total = int(list1[first_num + 2])
list2 = list1[-value_total:]
@@ -505,12 +508,22 @@ class mainprocess(object):
inf_list = self.del_repeat(inf_list)
header_list = self.plus(self.del_repeat(header_list))
title_all=list(set(title_list))
-info_list = self.del_repeat(info_list)
+info_list = self.remove_bracket(self.del_repeat(info_list))
for i in range(len(info_list)-1,-1,-1):
if len(info_list[i]) == 0:
info_list.remove(info_list[i])
return keys,title_all,info_list,header_list,inf_list
+ def remove_bracket(self,List):
+for i in List:
+ for j in i:
+tmp = j.split("|")
+if (('L"' in j) and ("[" in j)) or (tmp[1].strip() == '{0x0, 0x0}'):
+ tmp[0] = tmp[0][:tmp[0].index('[')]
+ List[List.index(i)][i.index(j)] = "|".join(tmp)
+else:
+ List[List.index(i)][i.index(j)] = j
+return List
def write_all(self):
title_flag=1
--
2.10.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch V2] BaseTools: Add special handle for '\' use in Pcd Value
From: zhijufan
V2: Follow PEP8 to not multiples import on one line
Case:
gEfiOzmosisPkgTokenSpaceGuid.PcdBootLogFolderPath|L"\\Logs\\"|VOID*|12
Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=1287
Cc: Liming Gao
Cc: Yonghong Zhu
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan
---
BaseTools/Source/Python/Common/Expression.py | 14 +-
BaseTools/Source/Python/Common/Misc.py | 8 ++--
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/BaseTools/Source/Python/Common/Expression.py
b/BaseTools/Source/Python/Common/Expression.py
index 05459b9c26..a21ab5daa7 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -22,6 +22,8 @@ import Common.EdkLogger as EdkLogger
import copy
from Common.DataType import *
import sys
+from random import sample
+import string
ERR_STRING_EXPR = 'This operator cannot be used in string expression:
[%s].'
ERR_SNYTAX = 'Syntax error, the rest of expression cannot be
evaluated: [%s].'
@@ -55,6 +57,8 @@ PcdPattern =
re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')
#
def SplitString(String):
# There might be escaped quote: "abc\"def\\\"ghi", 'abc\'def\\\'ghi'
+RanStr = ''.join(sample(string.ascii_letters + string.digits, 8))
+String = String.replace('', RanStr).strip()
RetList = []
InSingleQuote = False
InDoubleQuote = False
@@ -87,11 +91,16 @@ def SplitString(String):
raise BadExpression(ERR_STRING_TOKEN % Item)
if Item:
RetList.append(Item)
+for i, ch in enumerate(RetList):
+if RanStr in ch:
+RetList[i] = ch.replace(RanStr,'')
return RetList
def SplitPcdValueString(String):
# There might be escaped comma in GUID() or DEVICE_PATH() or " "
# or ' ' or L' ' or L" "
+RanStr = ''.join(sample(string.ascii_letters + string.digits, 8))
+String = String.replace('', RanStr).strip()
RetList = []
InParenthesis = 0
InSingleQuote = False
@@ -124,6 +133,9 @@ def SplitPcdValueString(String):
raise BadExpression(ERR_STRING_TOKEN % Item)
if Item:
RetList.append(Item)
+for i, ch in enumerate(RetList):
+if RanStr in ch:
+RetList[i] = ch.replace(RanStr,'')
return RetList
def IsValidCName(Str):
@@ -390,7 +402,7 @@ class ValueExpression(BaseExpression):
elif not Val:
Val = False
RealVal = '""'
-elif not Val.startswith('L"') and not Val.startswith('{') and not
Val.startswith("L'"):
+elif not Val.startswith('L"') and not Val.startswith('{') and not
Val.startswith("L'") and not Val.startswith("'"):
Val = True
RealVal = '"' + RealVal + '"'
diff --git a/BaseTools/Source/Python/Common/Misc.py
b/BaseTools/Source/Python/Common/Misc.py
index b32b7cdc5f..3b8efb2e71 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -24,6 +24,7 @@ import re
import pickle
import array
import shutil
+from random import sample
from struct import pack
from UserDict import IterableUserDict
from UserList import UserList
@@ -1236,7 +1237,8 @@ def IsFieldValueAnArray (Value):
return False
def AnalyzePcdExpression(Setting):
-Setting = Setting.strip()
+RanStr = ''.join(sample(string.ascii_letters + string.digits, 8))
+Setting = Setting.replace('', RanStr).strip()
# There might be escaped quote in a string: \", \\\" , \', \\\'
Data = Setting
# There might be '|' in string and in ( ... | ... ), replace it with '-'
@@ -1269,7 +1271,9 @@ def AnalyzePcdExpression(Setting):
break
FieldList.append(Setting[StartPos:Pos].strip())
StartPos = Pos + 1
-
+for i, ch in enumerate(FieldList):
+if RanStr in ch:
+FieldList[i] = ch.replace(RanStr,'')
return FieldList
def ParseDevPathValue (Value):
--
2.18.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH v1] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers.
The PXE/iSCSI/TCP drivers in MdeModulePkg are going to be deprecated. All platform DSC/FDF files should be updated to use the dual-stack drivers in NetworkPkg. The NetworkPkg driver have all the functionality compared with MdeModulePkg one, with more bug fixes and new feature added. While its image size will be a little bigger because it contains both IPv4 and IPv6 stack support, so it may cause build error in a platform if the flash space is very tight. Basically, this patch won't cause any other problem if build could pass. I haven't built all the updated platform because the repo ReadMe doesn't provide a method to build them on Windows Environment, so I would very appreciate if anybody can help to test the build or tell me how to build it on Windows. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Fu Siyuan --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 6 +++--- Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 6 +++--- Platform/ARM/SgiPkg/SgiPlatform.fdf | 6 +++--- Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc | 6 +++--- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc| 6 +++--- Platform/Comcast/RDKQemu/RDKQemu.dsc| 10 +++--- Platform/Hisilicon/D03/D03.dsc | 4 ++-- Platform/Hisilicon/D03/D03.fdf | 4 ++-- Platform/Hisilicon/D05/D05.dsc | 9 +++-- Platform/Hisilicon/D05/D05.fdf | 9 +++-- Platform/Hisilicon/D06/D06.dsc | 9 +++-- Platform/Hisilicon/D06/D06.fdf | 9 +++-- Platform/Hisilicon/HiKey/HiKey.dsc | 4 ++-- Platform/Hisilicon/HiKey/HiKey.fdf | 4 ++-- Platform/Hisilicon/HiKey960/HiKey960.dsc| 4 ++-- Platform/Hisilicon/HiKey960/HiKey960.fdf| 4 ++-- Platform/LeMaker/CelloBoard/CelloBoard.dsc | 6 +++--- Platform/LeMaker/CelloBoard/CelloBoard.fdf | 6 +++--- Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 6 +++--- Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf | 6 +++--- Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 ++-- Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 4 ++-- 22 files changed, 58 insertions(+), 74 deletions(-) diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index 9f9885fda8..51327a67df 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -669,11 +669,11 @@ DEFINE DO_CAPSULE = FALSE } MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf + NetworkPkg/TcpDxe/TcpDxe.inf ## Bug https://bugs.linaro.org/show_bug.cgi?id=2239 -# MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf +# NetworkPkg/IScsiDxe/IScsiDxe.inf # # Core Info diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf index 0394b8a96f..bf4e6f3283 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf @@ -204,11 +204,11 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf + INF NetworkPkg/TcpDxe/TcpDxe.inf ## Bug https://bugs.linaro.org/show_bug.cgi?id=2239 -# INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf +# INF NetworkPkg/IScsiDxe/IScsiDxe.inf # # Core Info diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf index fd87563246..c9129841d7 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf @@ -185,10 +185,10 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF
Re: [edk2] Reminder for deleting 3 network drivers in MdeModulePkg
Hi, Leif Just notice that you are saying edk2-stable201811 tag. We need more time to collect community/marketing feedback on deleting these driver, so it may won't be able to catch the stable tag in next month. BestRegards Fu Siyuan > -Original Message- > From: Fu, Siyuan > Sent: Wednesday, October 31, 2018 8:49 AM > To: Leif Lindholm > Cc: edk2-devel@lists.01.org > Subject: RE: [edk2] Reminder for deleting 3 network drivers in > MdeModulePkg > > Hi, Leif > > I think checking the branch is a little better than the tag, because we > may still have critical bug fixes after the official release. > > While any of them are not recommended, always using the NetworkPkg version > driver is the best choice. > > I will modify the edk2 network wiki page for an updated sample DSC/FDF > section, if this patch could pass review w/o objection. > https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg-Getting- > Started-Guide > > > BestRegards > Fu Siyuan > > > > -Original Message- > > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of > > Leif Lindholm > > Sent: Tuesday, October 30, 2018 6:47 PM > > To: Fu, Siyuan > > Cc: edk2-devel@lists.01.org > > Subject: Re: [edk2] Reminder for deleting 3 network drivers in > > MdeModulePkg > > > > Hi Fu Siyan, > > > > On Tue, Oct 30, 2018 at 08:11:52AM +, Fu, Siyuan wrote: > > > People who want to continue use these deleted drivers could go to > > > edk2/UDK2018 branch to get them, but it's *highly not recommended*. > > > > They should also be able to use edk2-stable201811, right? > > > > > *If you have any opposition on deleting these drivers, please let me > > > know before this weekend, thanks.* > > > > I am all for this change. The diffstat is very nice :) > > > > Best Regards, > > > > Leif > > ___ > > edk2-devel mailing list > > edk2-devel@lists.01.org > > https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [edk2-test][Patch] uefi-sct/SctPkg:Assign 0 to the tail of the HwErrRecVariableName
Hi Supreeth, Thank for the comments. I will re-create the patch to add the definition of the HwErrRecVariableNamePrefixLength(8) and HwErrRecVariableNameIndexLength(4). There are two meanings to 2. To record the step number(2) used by the recoverylib or address (byte[2]) to save the recovery data (HwErrRecVariableName) It is not applicable macro definition and just code logic here. What is your opinion? Best Regards Eric -Original Message- From: Supreeth Venkatesh Sent: Wednesday, October 31, 2018 1:00 AM To: Jin, Eric ; edk2-devel@lists.01.org Cc: Wu, Jiaxin ; supreeth.venkat...@arm.com Subject: Re: [edk2-test][Patch] uefi-sct/SctPkg:Assign 0 to the tail of the HwErrRecVariableName Reviewed-by: Supreeth Venkatesh If the below magic number comments(inline) are fixed before commit. On Tue, 2018-10-30 at 16:38 +0800, Eric Jin wrote: > Make the HwErrRecVariableName as valid the string. > Ensure the HwErrRecVariable could be deleted before the test exit. > > Cc: Supreeth Venkatesh > Cc: Jiaxin Wu > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Eric Jin > --- > .../BlackBoxTest/VariableServicesBBTestFunction.c| 12 > +++- > .../BlackBoxTest/VariableServicesBBTestMain.h| 10 > +- > 2 files changed, 16 insertions(+), 6 deletions(-) > > diff --git a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestFunction.c b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestFunction.c > index d1064ce..df1bbe7 100644 > --- a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestFunction.c > +++ b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestFunction.c > @@ -1,7 +1,7 @@ > /** @file > >Copyright 2006 - 2012 Unified EFI, Inc. > - Copyright (c) 2010 - 2012, Intel Corporation. All rights > reserved. > + Copyright (c) 2010 - 2018, Intel Corporation. All rights > reserved. > >This program and the accompanying materials >are licensed and made available under the terms and conditions of > the BSD License @@ -2855,7 +2855,7 @@ HardwareErrorRecordFuncTest ( >UINT64RemainingVariableStorageSize; >UINT64MaximumVariableSize; > > - CHAR16HwErrRecVariableName[13]; > + CHAR16HwErrRecVariableName[HwErrRecVariableNameLen > gth]; >CHAR16HwErrRecVariable[] = L"This is a HwErrRec > variable!"; > >CHAR16GetVariableName[MAX_BUFFER_SIZE]; > @@ -3015,6 +3015,7 @@ HardwareErrorRecordFuncTest ( >HwErrRecVariableName[0] = L'\0'; >SctStrCat ( HwErrRecVariableName, L"HwErrRec" ); >Myitox( MaxNum, HwErrRecVariableName+8 ); I understand this line is not part of this patch, but however can we define "#define" for magic number 8, while we are touching this file. > + HwErrRecVariableName[HwErrRecVariableNameLength-1] = L'\0'; > >// >// Set the new HwErrRec variable to the global variable @@ -3036,8 > +3037,8 @@ HardwareErrorRecordFuncTest ( >// Write reset record >// >RecoveryData[0] = 2; I understand this line is not part of this patch, but however can we define "#define" for magic number 2, while we are touching this file. > - SctStrnCpy ( (CHAR16*)([2]), HwErrRecVariableName, 12 > ); > - RecoveryLib->WriteResetRecord( RecoveryLib, 13*sizeof(CHAR16)+2, > RecoveryData ); > + SctStrnCpy ( (CHAR16*)([2]), HwErrRecVariableName, > HwErrRecVariableNameLength-1 ); "#define" for magic number 2 > + RecoveryLib->WriteResetRecord( RecoveryLib, > HwErrRecVariableNameLength*sizeof(CHAR16)+2, RecoveryData ); "#define" for magic number 2 > >// >// Prompt the user about the cold reset and reset the system @@ > -3052,7 +3053,8 @@ HardwareErrorRecordFuncTest ( >// > step2: >DataSize = 255; > - SctStrnCpy ( HwErrRecVariableName, (CHAR16*)(RecoveryData+2), 12 ); > + HwErrRecVariableName[HwErrRecVariableNameLength-1] = L'\0'; > + SctStrnCpy ( HwErrRecVariableName, (CHAR16*)(RecoveryData+2), "#define" for magic number 2 > HwErrRecVariableNameLength-1 ); >Status = RT->GetVariable ( > HwErrRecVariableName, > , diff --git a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestMain.h b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestMain.h > index 051ae6f..b645b55 100644 > --- a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestMain.h > +++ b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestMain.h > @@ -1,7 +1,7 @@ > /** @file > >Copyright 2006
Re: [edk2] [PATCH v1 0/7] Delete TCP, PXE, iSCSI driver in MdeModulePkg.
Mike, Should I also update the devel branches in edk2-platform? Or the branch owner will take care of it? BestRegards Fu Siyuan > -Original Message- > From: Kinney, Michael D > Sent: Wednesday, October 31, 2018 5:15 AM > To: Fu, Siyuan ; Zeng, Star ; > edk2-devel@lists.01.org; Kinney, Michael D > Cc: Leif Lindholm ; Andrew Fish (af...@apple.com) > ; Laszlo Ersek (ler...@redhat.com) ; > Gao, Liming > Subject: RE: [edk2] [PATCH v1 0/7] Delete TCP, PXE, iSCSI driver in > MdeModulePkg. > > Fu Siyuan, > > Please review edk2-platform/master and prepare a patch > for that branch if there are DSC/FDF files that refer > to the network drivers that are being removed. > > We should never break any platforms in edk2-platform/master. > The commits should be performed to the repos in the correct > order to guarantee no build breaks. > > Thanks, > > Mike > > > -Original Message- > > From: Fu, Siyuan > > Sent: Tuesday, October 30, 2018 1:23 AM > > To: Zeng, Star ; edk2- > > de...@lists.01.org > > Cc: Kinney, Michael D ; Leif > > Lindholm ; Andrew Fish > > (af...@apple.com) ; Laszlo Ersek > > (ler...@redhat.com) ; Gao, Liming > > > > Subject: RE: [edk2] [PATCH v1 0/7] Delete TCP, PXE, > > iSCSI driver in MdeModulePkg. > > > > Hi, Star > > > > This patch only covers the platforms in > > https://github.com/tianocore/edk2 > > > > I will modify the edk2 network wiki page for an updated > > sample DSC/FDF section, if this patch could pass review > > w/o objection. > > https://github.com/tianocore/tianocore.github.io/wiki/Ne > > tworkPkg-Getting-Started-Guide > > > > Let's wait a few days to see if there is any objection > > on deleting these driver first, and I will be happy to > > generate another patch for edk2-platforms then. > > > > Thanks for your reminder. > > > > > > BestRegards > > Fu Siyuan > > > > > -Original Message- > > > From: Zeng, Star > > > Sent: Tuesday, October 30, 2018 3:43 PM > > > To: Fu, Siyuan ; edk2- > > de...@lists.01.org > > > Cc: Kinney, Michael D ; > > Leif Lindholm > > > ; Andrew Fish > > (af...@apple.com) > > > ; Laszlo Ersek (ler...@redhat.com) > > ; > > > Gao, Liming ; Zeng, Star > > > > > Subject: RE: [edk2] [PATCH v1 0/7] Delete TCP, PXE, > > iSCSI driver in > > > MdeModulePkg. > > > > > > Hi Siyuan, > > > > > > Have you checked the platforms in > > https://github.com/tianocore/edk2- > > > platforms to see whether they need to be updated > > accordingly or not? > > > > > > Cc more people. > > > > > > Thanks, > > > Star > > > -Original Message- > > > From: edk2-devel [mailto:edk2-devel- > > boun...@lists.01.org] On Behalf Of Fu > > > Siyuan > > > Sent: Tuesday, October 30, 2018 3:33 PM > > > To: edk2-devel@lists.01.org > > > Subject: [edk2] [PATCH v1 0/7] Delete TCP, PXE, iSCSI > > driver in > > > MdeModulePkg. > > > > > > 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 (7): > > > Nt32Pkg: Replace obsoleted network drivers from NT32 > > platform DSC/FDF. > > > EmulatorPkg: Replace obsoleted network drivers from > > platform DSC/FDF. > > > OvmfPkg: Replace obsoleted network drivers from > > platform DSC/FDF. > > > Vlv2TbltDevicePkg: Replace obsoleted drivers from > > platform DSC/FDF. > > > ArmVirtPkg: Replace obsoleted network drivers from > > platform DSC/FDF. > > > MdeModulePkg: Delete the TCP/PXE/ISCSI drivers in > > MdeModulePkg. > > > NetworkPkg: Remove some clarification from > > TCP/PXE/ISCSI driver INF. > > > > > > .../Network/IScsiDxe/ComponentName.c | 283 > > -- > > > .../Universal/Network/IScsiDxe/IScsiCHAP.c| 430 > > --- > > > .../Universal/Network/IScsiDxe/IScsiConfig.c | 1264 > > --- > > > .../Universal/Network/IScsiDxe/IScsiDhcp.c| 472 > > --- > > > .../Universal/Network/IScsiDxe/IScsiDriver.c | 676 > > > > > .../Network/IScsiDxe/IScsiExtScsiPassThru.c | 412 > > --- > > > .../Universal/Network/IScsiDxe/IScsiIbft.c| 539 > > --- > > > .../Network/IScsiDxe/IScsiInitiatorName.c | 116 > > - > > > .../Universal/Network/IScsiDxe/IScsiMisc.c| 948 > > -- > > > .../Universal/Network/IScsiDxe/IScsiProto.c | 2799 > > --- > > > .../Universal/Network/IScsiDxe/IScsiTcp4Io.c | 487 > > --- > > >
Re: [edk2] Reminder for deleting 3 network drivers in MdeModulePkg
Hi, Leif I think checking the branch is a little better than the tag, because we may still have critical bug fixes after the official release. While any of them are not recommended, always using the NetworkPkg version driver is the best choice. I will modify the edk2 network wiki page for an updated sample DSC/FDF section, if this patch could pass review w/o objection. https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg-Getting-Started-Guide BestRegards Fu Siyuan > -Original Message- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of > Leif Lindholm > Sent: Tuesday, October 30, 2018 6:47 PM > To: Fu, Siyuan > Cc: edk2-devel@lists.01.org > Subject: Re: [edk2] Reminder for deleting 3 network drivers in > MdeModulePkg > > Hi Fu Siyan, > > On Tue, Oct 30, 2018 at 08:11:52AM +, Fu, Siyuan wrote: > > People who want to continue use these deleted drivers could go to > > edk2/UDK2018 branch to get them, but it's *highly not recommended*. > > They should also be able to use edk2-stable201811, right? > > > *If you have any opposition on deleting these drivers, please let me > > know before this weekend, thanks.* > > I am all for this change. The diffstat is very nice :) > > Best Regards, > > Leif > ___ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v1 0/7] Delete TCP, PXE, iSCSI driver in MdeModulePkg.
Hi, Leif I have followed your wiki page to configure my Git when I generate this patch, and I don't know why the files are still unordered and truncated. I will do more test and try to figure out the problem. BestRegards Fu Siyuan > -Original Message- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of > Leif Lindholm > Sent: Tuesday, October 30, 2018 6:51 PM > To: Fu, Siyuan > Cc: edk2-devel@lists.01.org > Subject: Re: [edk2] [PATCH v1 0/7] Delete TCP, PXE, iSCSI driver in > MdeModulePkg. > > On Tue, Oct 30, 2018 at 03:33:21PM +0800, Fu Siyuan wrote: > > 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 (7): > > Nt32Pkg: Replace obsoleted network drivers from NT32 platform DSC/FDF. > > EmulatorPkg: Replace obsoleted network drivers from platform DSC/FDF. > > OvmfPkg: Replace obsoleted network drivers from platform DSC/FDF. > > Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF. > > ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF. > > MdeModulePkg: Delete the TCP/PXE/ISCSI drivers in MdeModulePkg. > > NetworkPkg: Remove some clarification from TCP/PXE/ISCSI driver INF. > > > > .../Network/IScsiDxe/ComponentName.c | 283 -- > > .../Universal/Network/IScsiDxe/IScsiCHAP.c| 430 --- > > .../Universal/Network/IScsiDxe/IScsiConfig.c | 1264 --- > > .../Universal/Network/IScsiDxe/IScsiDhcp.c| 472 --- > > .../Universal/Network/IScsiDxe/IScsiDriver.c | 676 > > .../Network/IScsiDxe/IScsiExtScsiPassThru.c | 412 --- > > .../Universal/Network/IScsiDxe/IScsiIbft.c| 539 --- > > .../Network/IScsiDxe/IScsiInitiatorName.c | 116 - > > .../Universal/Network/IScsiDxe/IScsiMisc.c| 948 -- > > .../Universal/Network/IScsiDxe/IScsiProto.c | 2799 --- > > .../Universal/Network/IScsiDxe/IScsiTcp4Io.c | 487 --- > > If there is a v2, can you follow the steps from > https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt- > git-guide-for-edk2-contributors-and-maintainers#contrib-23 > when generating it, to order the files, and to get rid of the > ... truncation of file names? > > Regards, > > Leif > > > MdeModulePkg/Universal/Network/IScsiDxe/Md5.c | 350 -- > > .../Universal/Network/Tcp4Dxe/ComponentName.c | 433 --- > > .../Universal/Network/Tcp4Dxe/SockImpl.c | 1201 --- > > .../Universal/Network/Tcp4Dxe/SockInterface.c | 990 -- > > .../Network/Tcp4Dxe/Tcp4Dispatcher.c | 717 > > .../Universal/Network/Tcp4Dxe/Tcp4Driver.c| 782 - > > .../Universal/Network/Tcp4Dxe/Tcp4Input.c | 1497 - > > .../Universal/Network/Tcp4Dxe/Tcp4Io.c| 112 - > > .../Universal/Network/Tcp4Dxe/Tcp4Main.c | 674 > > .../Universal/Network/Tcp4Dxe/Tcp4Misc.c | 940 -- > > .../Universal/Network/Tcp4Dxe/Tcp4Option.c| 352 -- > > .../Universal/Network/Tcp4Dxe/Tcp4Output.c| 1238 --- > > .../Universal/Network/Tcp4Dxe/Tcp4Timer.c | 584 > > .../Network/UefiPxeBcDxe/ComponentName.c | 365 -- > > .../Network/UefiPxeBcDxe/PxeBcDhcp.c | 1999 --- > > .../Network/UefiPxeBcDxe/PxeBcDriver.c| 665 > > .../Network/UefiPxeBcDxe/PxeBcImpl.c | 2989 - > > .../Network/UefiPxeBcDxe/PxeBcMtftp.c | 454 --- > > .../Network/UefiPxeBcDxe/PxeBcSupport.c | 221 -- > > ArmVirtPkg/ArmVirtQemu.dsc| 10 +- > > ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 10 +- > > ArmVirtPkg/ArmVirtQemuKernel.dsc | 10 +- > > EmulatorPkg/EmulatorPkg.dsc |2 +- > > EmulatorPkg/EmulatorPkg.fdf |2 +- > > MdeModulePkg/MdeModulePkg.dsc |3 - > > .../Network/IScsiDxe/ComponentName.h | 165 - > > .../Universal/Network/IScsiDxe/IScsi4Dxe.uni | 25 - > > .../Network/IScsiDxe/IScsi4DxeExtra.uni | 20 - > > .../Universal/Network/IScsiDxe/IScsiCHAP.h| 106 - > > .../Universal/Network/IScsiDxe/IScsiCommon.h | 22 - > > .../Universal/Network/IScsiDxe/IScsiConfig.h | 166 - > > .../Network/IScsiDxe/IScsiConfigDxe.vfr | 219 -- > > .../IScsiDxe/IScsiConfigDxeStrings.uni| 62 - > >
Re: [edk2] Building EmulatorPkg and EDK2 project issue.
For emulator, please type below command and see what's happen. build -p EmulatorPkg\EmulatorPkg.dsc -t VS2015x86 -D WIN_SEC_BUILD -a IA32 -m EmulatorPkg/Win/Host/WinHost.inf >-Original Message- >From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of >Prem Kumar >Sent: Tuesday, October 30, 2018 10:04 PM >To: edk2-devel@lists.01.org >Subject: [edk2] Building EmulatorPkg and EDK2 project issue. > >Hi All, > Below are the issue i'm currently facing, > >- EmulatorPkg: > >o Building of EmulatorPkg using below command > >§ build -p EmulatorPkg\EmulatorPkg.dsc -t VS2015x86 -D WIN_SEC_BUILD -a >IA32 > >o But when I try to launch Emulator using below command, it failed. I >searched for WinHost.exe file, and it is not present in Build folder also. > >§ cd Build\EmulatorIA32\DEBUG_VS2015x86\IA32\ && WinHost.exe > >- Building EDK2 project for ARM using LLVM > >o What are the steps/changes need to do in-order to build EDK2 project >for ARM+LLVM configuration. > > >Kindly provide any comments. Any pointer is helpful. > >*Note:* > > Trying to build in Windows environment. Build and launch of Nt32Pkg is >successful. > >-- >Regards, >Prem. >___ >edk2-devel mailing list >edk2-devel@lists.01.org >https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH 1/2] EmbeddedPkg/PrePiMemoryAllocationLib: Added AllocateZeroPool()
Code looks good.
Reviewed-by: Jaben Carsey
> -Original Message-
> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of
> Jeff Brasen
> Sent: Tuesday, October 30, 2018 2:31 PM
> To: edk2-devel@lists.01.org
> Cc: Jeff Brasen
> Subject: [edk2] [PATCH 1/2] EmbeddedPkg/PrePiMemoryAllocationLib:
> Added AllocateZeroPool()
>
> This function is exposed by the MemoryAllocationLib header.
> An AllocateZeroPool() function has been added to fix modules depending on
> this library and this function.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Jeff Brasen
> ---
> .../PrePiMemoryAllocationLib/MemoryAllocationLib.c | 32
> ++
> 1 file changed, 32 insertions(+)
>
> diff --git
> a/EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c
> b/EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c
> index 0e75e23..f93f9cf 100644
> ---
> a/EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c
> +++
> b/EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c
> @@ -16,6 +16,7 @@
> #include
>
> #include
> +#include
> #include
> #include
>
> @@ -195,6 +196,37 @@ AllocatePool (
> }
>
> /**
> + Allocates and zeros a buffer of type EfiBootServicesData.
> +
> + Allocates the number bytes specified by AllocationSize of type
> EfiBootServicesData, clears the
> + buffer with zeros, and returns a pointer to the allocated buffer. If
> AllocationSize is 0, then a
> + valid buffer of 0 size is returned. If there is not enough memory
> remaining
> to satisfy the
> + request, then NULL is returned.
> +
> + @param AllocationSizeThe number of bytes to allocate and zero.
> +
> + @return A pointer to the allocated buffer or NULL if allocation fails.
> +
> +**/
> +VOID *
> +EFIAPI
> +AllocateZeroPool (
> + IN UINTN AllocationSize
> + )
> +{
> + VOID *Buffer;
> +
> + Buffer = AllocatePool (AllocationSize);
> + if (NULL == Buffer) {
> +return NULL;
> + }
> +
> + SetMem (Buffer, AllocationSize, 0);
> +
> + return Buffer;
> +}
> +
> +/**
>Frees a buffer that was previously allocated with one of the pool
> allocation
> functions in the
>Memory Allocation Library.
>
> --
> 2.7.4
>
> ___
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH 2/2] MdeModulePkg/BaseSortLib: Enable for all module types
Reviewed-by: Jaben Carsey > -Original Message- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of > Jeff Brasen > Sent: Tuesday, October 30, 2018 2:31 PM > To: edk2-devel@lists.01.org > Cc: Jeff Brasen > Subject: [edk2] [PATCH 2/2] MdeModulePkg/BaseSortLib: Enable for all > module types > > Expose BaseSortLib for use in SEC and PEI phases. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Jeff Brasen > --- > MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf > b/MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf > index f807cd7..5bd1aa1 100644 > --- a/MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf > +++ b/MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf > @@ -18,9 +18,9 @@ >BASE_NAME = BaseSortLib >MODULE_UNI_FILE= BaseSortLib.uni >FILE_GUID = 03F3331B-F12D-494f-BF37-E55A657F2497 > - MODULE_TYPE= UEFI_DRIVER > + MODULE_TYPE= BASE >VERSION_STRING = 1.0 > - LIBRARY_CLASS = SortLib|DXE_DRIVER DXE_RUNTIME_DRIVER > UEFI_APPLICATION UEFI_DRIVER > + LIBRARY_CLASS = SortLib > > # > # VALID_ARCHITECTURES = IA32 X64 EBC > -- > 2.7.4 > > ___ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH 1/2] EmbeddedPkg/PrePiMemoryAllocationLib: Added AllocateZeroPool()
This function is exposed by the MemoryAllocationLib header.
An AllocateZeroPool() function has been added to fix modules depending on
this library and this function.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jeff Brasen
---
.../PrePiMemoryAllocationLib/MemoryAllocationLib.c | 32 ++
1 file changed, 32 insertions(+)
diff --git a/EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c
b/EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c
index 0e75e23..f93f9cf 100644
--- a/EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c
+++ b/EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c
@@ -16,6 +16,7 @@
#include
#include
+#include
#include
#include
@@ -195,6 +196,37 @@ AllocatePool (
}
/**
+ Allocates and zeros a buffer of type EfiBootServicesData.
+
+ Allocates the number bytes specified by AllocationSize of type
EfiBootServicesData, clears the
+ buffer with zeros, and returns a pointer to the allocated buffer. If
AllocationSize is 0, then a
+ valid buffer of 0 size is returned. If there is not enough memory remaining
to satisfy the
+ request, then NULL is returned.
+
+ @param AllocationSizeThe number of bytes to allocate and zero.
+
+ @return A pointer to the allocated buffer or NULL if allocation fails.
+
+**/
+VOID *
+EFIAPI
+AllocateZeroPool (
+ IN UINTN AllocationSize
+ )
+{
+ VOID *Buffer;
+
+ Buffer = AllocatePool (AllocationSize);
+ if (NULL == Buffer) {
+return NULL;
+ }
+
+ SetMem (Buffer, AllocationSize, 0);
+
+ return Buffer;
+}
+
+/**
Frees a buffer that was previously allocated with one of the pool allocation
functions in the
Memory Allocation Library.
--
2.7.4
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH 2/2] MdeModulePkg/BaseSortLib: Enable for all module types
Expose BaseSortLib for use in SEC and PEI phases. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jeff Brasen --- MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf b/MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf index f807cd7..5bd1aa1 100644 --- a/MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf +++ b/MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf @@ -18,9 +18,9 @@ BASE_NAME = BaseSortLib MODULE_UNI_FILE= BaseSortLib.uni FILE_GUID = 03F3331B-F12D-494f-BF37-E55A657F2497 - MODULE_TYPE= UEFI_DRIVER + MODULE_TYPE= BASE VERSION_STRING = 1.0 - LIBRARY_CLASS = SortLib|DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_APPLICATION UEFI_DRIVER + LIBRARY_CLASS = SortLib # # VALID_ARCHITECTURES = IA32 X64 EBC -- 2.7.4 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH 0/2] SortLib for UEFI SEC
This patch series enables support for BaseSortLib in UEFI SEC Phase. This requires the addition of the AllocateZeroPool which is implemented in the PrePiMemoryAllocationLib. Jeff Brasen (2): EmbeddedPkg/PrePiMemoryAllocationLib: Added AllocateZeroPool() MdeModulePkg/BaseSortLib: Enable for all module types .../PrePiMemoryAllocationLib/MemoryAllocationLib.c | 32 ++ MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf | 4 +-- 2 files changed, 34 insertions(+), 2 deletions(-) -- 2.7.4 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v1 0/7] Delete TCP, PXE, iSCSI driver in MdeModulePkg.
Fu Siyuan, Please review edk2-platform/master and prepare a patch for that branch if there are DSC/FDF files that refer to the network drivers that are being removed. We should never break any platforms in edk2-platform/master. The commits should be performed to the repos in the correct order to guarantee no build breaks. Thanks, Mike > -Original Message- > From: Fu, Siyuan > Sent: Tuesday, October 30, 2018 1:23 AM > To: Zeng, Star ; edk2- > de...@lists.01.org > Cc: Kinney, Michael D ; Leif > Lindholm ; Andrew Fish > (af...@apple.com) ; Laszlo Ersek > (ler...@redhat.com) ; Gao, Liming > > Subject: RE: [edk2] [PATCH v1 0/7] Delete TCP, PXE, > iSCSI driver in MdeModulePkg. > > Hi, Star > > This patch only covers the platforms in > https://github.com/tianocore/edk2 > > I will modify the edk2 network wiki page for an updated > sample DSC/FDF section, if this patch could pass review > w/o objection. > https://github.com/tianocore/tianocore.github.io/wiki/Ne > tworkPkg-Getting-Started-Guide > > Let's wait a few days to see if there is any objection > on deleting these driver first, and I will be happy to > generate another patch for edk2-platforms then. > > Thanks for your reminder. > > > BestRegards > Fu Siyuan > > > -Original Message- > > From: Zeng, Star > > Sent: Tuesday, October 30, 2018 3:43 PM > > To: Fu, Siyuan ; edk2- > de...@lists.01.org > > Cc: Kinney, Michael D ; > Leif Lindholm > > ; Andrew Fish > (af...@apple.com) > > ; Laszlo Ersek (ler...@redhat.com) > ; > > Gao, Liming ; Zeng, Star > > > Subject: RE: [edk2] [PATCH v1 0/7] Delete TCP, PXE, > iSCSI driver in > > MdeModulePkg. > > > > Hi Siyuan, > > > > Have you checked the platforms in > https://github.com/tianocore/edk2- > > platforms to see whether they need to be updated > accordingly or not? > > > > Cc more people. > > > > Thanks, > > Star > > -Original Message- > > From: edk2-devel [mailto:edk2-devel- > boun...@lists.01.org] On Behalf Of Fu > > Siyuan > > Sent: Tuesday, October 30, 2018 3:33 PM > > To: edk2-devel@lists.01.org > > Subject: [edk2] [PATCH v1 0/7] Delete TCP, PXE, iSCSI > driver in > > MdeModulePkg. > > > > 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 (7): > > Nt32Pkg: Replace obsoleted network drivers from NT32 > platform DSC/FDF. > > EmulatorPkg: Replace obsoleted network drivers from > platform DSC/FDF. > > OvmfPkg: Replace obsoleted network drivers from > platform DSC/FDF. > > Vlv2TbltDevicePkg: Replace obsoleted drivers from > platform DSC/FDF. > > ArmVirtPkg: Replace obsoleted network drivers from > platform DSC/FDF. > > MdeModulePkg: Delete the TCP/PXE/ISCSI drivers in > MdeModulePkg. > > NetworkPkg: Remove some clarification from > TCP/PXE/ISCSI driver INF. > > > > .../Network/IScsiDxe/ComponentName.c | 283 > -- > > .../Universal/Network/IScsiDxe/IScsiCHAP.c| 430 > --- > > .../Universal/Network/IScsiDxe/IScsiConfig.c | 1264 > --- > > .../Universal/Network/IScsiDxe/IScsiDhcp.c| 472 > --- > > .../Universal/Network/IScsiDxe/IScsiDriver.c | 676 > > > .../Network/IScsiDxe/IScsiExtScsiPassThru.c | 412 > --- > > .../Universal/Network/IScsiDxe/IScsiIbft.c| 539 > --- > > .../Network/IScsiDxe/IScsiInitiatorName.c | 116 > - > > .../Universal/Network/IScsiDxe/IScsiMisc.c| 948 > -- > > .../Universal/Network/IScsiDxe/IScsiProto.c | 2799 > --- > > .../Universal/Network/IScsiDxe/IScsiTcp4Io.c | 487 > --- > > MdeModulePkg/Universal/Network/IScsiDxe/Md5.c | 350 - > - > > .../Universal/Network/Tcp4Dxe/ComponentName.c | 433 > --- > > .../Universal/Network/Tcp4Dxe/SockImpl.c | 1201 > --- > > .../Universal/Network/Tcp4Dxe/SockInterface.c | 990 > -- > > .../Network/Tcp4Dxe/Tcp4Dispatcher.c | 717 > > > .../Universal/Network/Tcp4Dxe/Tcp4Driver.c| 782 > - > > .../Universal/Network/Tcp4Dxe/Tcp4Input.c | 1497 > - > > .../Universal/Network/Tcp4Dxe/Tcp4Io.c| 112 > - > > .../Universal/Network/Tcp4Dxe/Tcp4Main.c | 674 > > > .../Universal/Network/Tcp4Dxe/Tcp4Misc.c | 940 > -- > > .../Universal/Network/Tcp4Dxe/Tcp4Option.c| 352 > -- > > .../Universal/Network/Tcp4Dxe/Tcp4Output.c| 1238 > --- > >
Re: [edk2] [edk2-test][Patch] uefi-sct/SctPkg:Assign 0 to the tail of the HwErrRecVariableName
Reviewed-by: Supreeth Venkatesh If the below magic number comments(inline) are fixed before commit. On Tue, 2018-10-30 at 16:38 +0800, Eric Jin wrote: > Make the HwErrRecVariableName as valid the string. > Ensure the HwErrRecVariable could be deleted before the test exit. > > Cc: Supreeth Venkatesh > Cc: Jiaxin Wu > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Eric Jin > --- > .../BlackBoxTest/VariableServicesBBTestFunction.c| 12 > +++- > .../BlackBoxTest/VariableServicesBBTestMain.h| 10 > +- > 2 files changed, 16 insertions(+), 6 deletions(-) > > diff --git a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestFunction.c b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestFunction.c > index d1064ce..df1bbe7 100644 > --- a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestFunction.c > +++ b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestFunction.c > @@ -1,7 +1,7 @@ > /** @file > >Copyright 2006 - 2012 Unified EFI, Inc. > - Copyright (c) 2010 - 2012, Intel Corporation. All rights > reserved. > + Copyright (c) 2010 - 2018, Intel Corporation. All rights > reserved. > >This program and the accompanying materials >are licensed and made available under the terms and conditions of > the BSD License > @@ -2855,7 +2855,7 @@ HardwareErrorRecordFuncTest ( >UINT64RemainingVariableStorageSize; >UINT64MaximumVariableSize; > > - CHAR16HwErrRecVariableName[13]; > + CHAR16HwErrRecVariableName[HwErrRecVariableNameLen > gth]; >CHAR16HwErrRecVariable[] = L"This is a HwErrRec > variable!"; > >CHAR16GetVariableName[MAX_BUFFER_SIZE]; > @@ -3015,6 +3015,7 @@ HardwareErrorRecordFuncTest ( >HwErrRecVariableName[0] = L'\0'; >SctStrCat ( HwErrRecVariableName, L"HwErrRec" ); >Myitox( MaxNum, HwErrRecVariableName+8 ); I understand this line is not part of this patch, but however can we define "#define" for magic number 8, while we are touching this file. > + HwErrRecVariableName[HwErrRecVariableNameLength-1] = L'\0'; > >// >// Set the new HwErrRec variable to the global variable > @@ -3036,8 +3037,8 @@ HardwareErrorRecordFuncTest ( >// Write reset record >// >RecoveryData[0] = 2; I understand this line is not part of this patch, but however can we define "#define" for magic number 2, while we are touching this file. > - SctStrnCpy ( (CHAR16*)([2]), HwErrRecVariableName, 12 > ); > - RecoveryLib->WriteResetRecord( RecoveryLib, 13*sizeof(CHAR16)+2, > RecoveryData ); > + SctStrnCpy ( (CHAR16*)([2]), HwErrRecVariableName, > HwErrRecVariableNameLength-1 ); "#define" for magic number 2 > + RecoveryLib->WriteResetRecord( RecoveryLib, > HwErrRecVariableNameLength*sizeof(CHAR16)+2, RecoveryData ); "#define" for magic number 2 > >// >// Prompt the user about the cold reset and reset the system > @@ -3052,7 +3053,8 @@ HardwareErrorRecordFuncTest ( >// > step2: >DataSize = 255; > - SctStrnCpy ( HwErrRecVariableName, (CHAR16*)(RecoveryData+2), 12 > ); > + HwErrRecVariableName[HwErrRecVariableNameLength-1] = L'\0'; > + SctStrnCpy ( HwErrRecVariableName, (CHAR16*)(RecoveryData+2), "#define" for magic number 2 > HwErrRecVariableNameLength-1 ); >Status = RT->GetVariable ( > HwErrRecVariableName, > , > diff --git a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestMain.h b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestMain.h > index 051ae6f..b645b55 100644 > --- a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestMain.h > +++ b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo > xTest/VariableServicesBBTestMain.h > @@ -1,7 +1,7 @@ > /** @file > >Copyright 2006 - 2016 Unified EFI, Inc. > - Copyright (c) 2010 - 2016, Intel Corporation. All rights > reserved. > + Copyright (c) 2010 - 2018, Intel Corporation. All rights > reserved. > >This program and the accompanying materials >are licensed and made available under the terms and conditions of > the BSD License > @@ -125,6 +125,14 @@ Abstract: > #endif > > // > +// The Variable Name of Hardware Error Record Variables > +// defined in the UEFI Spec is HwErrRec. For example, > +// HwErrRec0001, HwErrRec0002, HwErrRecF31A, etc. > +// Consider the tail of string, the length is 13. > +// Good documentation. > +#define HwErrRecVariableNameLength 13 > + > +// > // Global Variables > // >
[edk2] [Patch] BaseTools ConvertFceToStructurePcd: Fix the array value with empty string
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao
Cc: Yonghong Zhu
---
BaseTools/Scripts/ConvertFceToStructurePcd.py | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py
b/BaseTools/Scripts/ConvertFceToStructurePcd.py
index 6ca51c4..9240b8f 100644
--- a/BaseTools/Scripts/ConvertFceToStructurePcd.py
+++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py
@@ -303,7 +303,10 @@ class Config(object):
list1 = [t for t in list1 if t != ''] # remove '' form list
first_num = int(list1[0], 16)
if list1[first_num + 1] == 'STRING': # parser STRING
- value = 'L%s' % list1[-1]
+ if list1[-1] == '""':
+value = "{0x0, 0x0}"
+ else:
+value = 'L%s' % list1[-1]
elif list1[first_num + 1] == 'ORDERED_LIST': # parser ORDERED_LIST
value_total = int(list1[first_num + 2])
list2 = list1[-value_total:]
@@ -505,12 +508,22 @@ class mainprocess(object):
inf_list = self.del_repeat(inf_list)
header_list = self.plus(self.del_repeat(header_list))
title_all=list(set(title_list))
-info_list = self.del_repeat(info_list)
+info_list = self.remove_bracket(self.del_repeat(info_list))
for i in range(len(info_list)-1,-1,-1):
if len(info_list[i]) == 0:
info_list.remove(info_list[i])
return keys,title_all,info_list,header_list,inf_list
+ def remove_bracket(self,List):
+for i in List:
+ for j in i:
+tmp = j.split("|")
+if (('L"' in j) and ("[" in j)) or (tmp[1].strip() == '{0x0, 0x0}'):
+ tmp[0] = tmp[0][:tmp[0].index('[')]
+ List[List.index(i)][i.index(j)] = "|".join(tmp)
+else:
+ List[List.index(i)][i.index(j)] = j
+return List
def write_all(self):
title_flag=1
--
2.10.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] ** NOTICE ** edk2-devel mailing list configuration changes
I'm using Thunderbird 60.2.1 on Linux. If I respond to Leif's message (the one quoted below) with the "reply" button, it's addressed only to him. If I use "reply all", it goes to him, the list, and all other recipients of the original message. (That's what I did on this response.) If I use "reply to mailing list", it goes only to the list. So exactly what I'd expect. No issues here. Brian On 10/30/18 3:49 AM, Leif Lindholm wrote: Hi Mike, That resolves the issue at my end, thanks!. But it would be good to know how it works for others (does Intel have a default mail client config, and could someone else verify the behaviour is how you would normally expect?). Regards, Leif On Mon, Oct 29, 2018 at 10:40:06PM +, Kinney, Michael D wrote: Hi Leif, I can put the reply_goes_to_list option back to "Poster". In that configuration, a user that has a DMARC policy of reject will still have their from address munged. But I noticed that the edk2-devel mailing list is not present when anyone does a Reply-all to an email with a munged from address. That implied to me that everyone would need to check if the edk2-devel mailing has been removed from a Reply-all and add it back manually. This also seems like a non-ideal configuration option. However, the behavior I am seeing could be due to some of my client settings. So I will put the reply_goes_to_list option back to "Poster". Mike -Original Message- From: Leif Lindholm [mailto:leif.lindh...@linaro.org] Sent: Monday, October 29, 2018 2:10 PM To: Kinney, Michael D Cc: EDK II Development ; Cetola, Stephano Subject: Re: [edk2] ** NOTICE ** edk2-devel mailing list configuration changes Hi Mike, I could hypothesise about which email client you may be using :) But let me instead mention that the two email clients I have (mutt and gmail web interface) behave identically - neither adds the original sender to cc when the list server forces a reply-to header. Regards, Leif On Mon, Oct 29, 2018 at 08:49:09PM +, Kinney, Michael D wrote: Leif, Very strange. When I do the same on that email, it shows Paul on the To address line. Mike -Original Message- From: Leif Lindholm [mailto:leif.lindh...@linaro.org] Sent: Monday, October 29, 2018 1:40 PM To: Kinney, Michael D Cc: EDK II Development ; Cetola, Stephano Subject: Re: [edk2] ** NOTICE ** edk2-devel mailing list configuration changes Hi Mike, When I try to "reply-to", the email from Paul A Lohr, sent 10 minutes after your one below, he does not show up in either "to" or "cc". OK, I missed the excitement during the plugfest. I'll go back and see what I can find there. Regards, Leif On Mon, Oct 29, 2018 at 08:23:43PM +, Kinney, Michael D wrote: Leif, I have enabled a different configuration setting that should be better. Please try some emails and let me know if there are any impacts. The reason for these changes is the DMARC related issue that occurred on 10-19-2018 that required a number of users to be disabled. The goal of these changes is to enable those users to be re- activated. Thanks, Mike -Original Message- From: Leif Lindholm [mailto:leif.lindh...@linaro.org] Sent: Monday, October 29, 2018 12:54 PM To: EDK II Development Cc: Kinney, Michael D ; Cetola, Stephano Subject: Re: [edk2] ** NOTICE ** edk2-devel mailing list configuration changes Hi Mike, On Mon, Oct 29, 2018 at 06:42:44PM +, Kinney, Michael D wrote: Some configuration changes have been made to the edk2-devel mailing list to handle posts from a domain with a DMARC Reject/Quarantine policy enabled. If this is detected then the from address is now munged. One side effect of this setting is that the behavior of Reply has changed. Instead of being a reply to the poster of the message, the Reply address is the edk2-devel mailing list. The behaviour looks somewhat broken, since as far as I can tell, replies now longer include the person you're replying to. (This doesn't happen when replying specifically to _you_, because you cc yourself on everything). If you wish to send a private reply to only the poster of the message, you may have to perform some manual steps. Please let me know if you have any concerns about these changes or if these configuration changes cause any other side effects. Can we make sure the person being replied to is at least on cc? Otherwise, we've just broken the workflow for anyone filtering on whether they are on "to" or "cc". Why was this change necessary? Regards, Leif ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel -- Brian J. Johnson Enterprise X86 Lab Hewlett Packard Enterprise brian.john...@hpe.com ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v5 1/1] ArmPkg/OpteeLib: Add APIs to communicate with OP-TEE
Hi Sumit,
Sorry this got delayed by licensing, plugfest, and then some holiday
(for me).
Reviewed-by: Leif Lindholm
Pushed as a0f01e8a22.
/
Leif
On Mon, Oct 22, 2018 at 11:59:36AM +0530, Sumit Garg wrote:
> Add following APIs to communicate with OP-TEE pseudo/early TAs:
> 1. OpteeInit
> 2. OpteeOpenSession
> 3. OpteeCloseSession
> 4. OpteeInvokeFunc
>
> Cc: Ard Biesheuvel
> Cc: Leif Lindholm
> Cc: Michael D Kinney
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Sumit Garg
> ---
> ArmPkg/Library/OpteeLib/OpteeLib.inf | 2 +
> ArmPkg/Include/Library/OpteeLib.h| 88 +
> ArmPkg/Library/OpteeLib/OpteeSmc.h | 53 +++
> ArmPkg/Library/OpteeLib/Optee.c | 392
> 4 files changed, 535 insertions(+)
>
> diff --git a/ArmPkg/Library/OpteeLib/OpteeLib.inf
> b/ArmPkg/Library/OpteeLib/OpteeLib.inf
> index 5abd427379cc..e03054a7167d 100644
> --- a/ArmPkg/Library/OpteeLib/OpteeLib.inf
> +++ b/ArmPkg/Library/OpteeLib/OpteeLib.inf
> @@ -23,11 +23,13 @@ [Defines]
>
> [Sources]
>Optee.c
> + OpteeSmc.h
>
> [Packages]
>ArmPkg/ArmPkg.dec
>MdePkg/MdePkg.dec
>
> [LibraryClasses]
> + ArmMmuLib
>ArmSmcLib
>BaseLib
> diff --git a/ArmPkg/Include/Library/OpteeLib.h
> b/ArmPkg/Include/Library/OpteeLib.h
> index f65d8674d9b8..6884d5681831 100644
> --- a/ArmPkg/Include/Library/OpteeLib.h
> +++ b/ArmPkg/Include/Library/OpteeLib.h
> @@ -25,10 +25,98 @@
> #define OPTEE_OS_UID2 0xaf630002
> #define OPTEE_OS_UID3 0xa5d5c51b
>
> +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_NONE0x0
> +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_VALUE_INPUT 0x1
> +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_VALUE_OUTPUT0x2
> +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_VALUE_INOUT 0x3
> +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_MEMORY_INPUT0x9
> +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_MEMORY_OUTPUT 0xa
> +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_MEMORY_INOUT0xb
> +
> +#define OPTEE_MESSAGE_ATTRIBUTE_TYPE_MASK0xff
> +
> +#define OPTEE_ORIGIN_COMMUNICATION 0x0002
> +#define OPTEE_ERROR_COMMUNICATION 0x000E
> +
> +typedef struct {
> + UINT64BufferAddress;
> + UINT64Size;
> + UINT64SharedMemoryReference;
> +} OPTEE_MESSAGE_PARAM_MEMORY;
> +
> +typedef struct {
> + UINT64A;
> + UINT64B;
> + UINT64C;
> +} OPTEE_MESSAGE_PARAM_VALUE;
> +
> +typedef struct {
> + UINT64 Attribute;
> + union {
> +OPTEE_MESSAGE_PARAM_MEMORY Memory;
> +OPTEE_MESSAGE_PARAM_VALUEValue;
> + } Union;
> +} OPTEE_MESSAGE_PARAM;
> +
> +#define OPTEE_MAX_CALL_PARAMS 4
> +
> +typedef struct {
> + UINT32Command;
> + UINT32Function;
> + UINT32Session;
> + UINT32CancelId;
> + UINT32Pad;
> + UINT32Return;
> + UINT32ReturnOrigin;
> + UINT32NumParams;
> +
> + // NumParams tells the actual number of element in Params
> + OPTEE_MESSAGE_PARAM Params[OPTEE_MAX_CALL_PARAMS];
> +} OPTEE_MESSAGE_ARG;
> +
> +typedef struct {
> + EFI_GUID Uuid; // [in] GUID/UUID of the Trusted Application
> + UINT32Session;// [out] Session id
> + UINT32Return; // [out] Return value
> + UINT32ReturnOrigin; // [out] Origin of the return value
> +} OPTEE_OPEN_SESSION_ARG;
> +
> +typedef struct {
> + UINT32Function; // [in] Trusted Application function, specific
> to the TA
> + UINT32Session;// [in] Session id
> + UINT32Return; // [out] Return value
> + UINT32ReturnOrigin; // [out] Origin of the return value
> + OPTEE_MESSAGE_PARAM Params[OPTEE_MAX_CALL_PARAMS]; // Params for function
> to be invoked
> +} OPTEE_INVOKE_FUNCTION_ARG;
> +
> BOOLEAN
> EFIAPI
> IsOpteePresent (
>VOID
>);
>
> +EFI_STATUS
> +EFIAPI
> +OpteeInit (
> + VOID
> + );
> +
> +EFI_STATUS
> +EFIAPI
> +OpteeOpenSession (
> + IN OUT OPTEE_OPEN_SESSION_ARG *OpenSessionArg
> + );
> +
> +EFI_STATUS
> +EFIAPI
> +OpteeCloseSession (
> + IN UINT32 Session
> + );
> +
> +EFI_STATUS
> +EFIAPI
> +OpteeInvokeFunction (
> + IN OUT OPTEE_INVOKE_FUNCTION_ARG *InvokeFunctionArg
> + );
> +
> #endif
> diff --git a/ArmPkg/Library/OpteeLib/OpteeSmc.h
> b/ArmPkg/Library/OpteeLib/OpteeSmc.h
> new file mode 100644
> index ..9cccd81810c9
> --- /dev/null
> +++ b/ArmPkg/Library/OpteeLib/OpteeSmc.h
> @@ -0,0 +1,53 @@
> +/** @file
> + OP-TEE SMC header file.
> +
> + Copyright (c) 2018, Linaro Ltd. All rights reserved.
> +
> + This program and the accompanying materials
> + are licensed and made available under the terms and conditions of the BSD
> License
> + which accompanies this distribution. The full text of the license may be
> found at
> + http://opensource.org/licenses/bsd-license.php
> +
> + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
Re: [edk2] [Patch] BaseTools: Add special handle for '\' use in Pcd Value
Please separate includes to each on their own line. PEP8 says no to multiples
on one line.
Not:
include random, string
But instead:
include string
include random
Also, if we only need sample from random, can we just use "from random import
sample"?
-Jaben
> -Original Message-
> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of
> Yonghong Zhu
> Sent: Tuesday, October 30, 2018 6:28 AM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming
> Subject: [edk2] [Patch] BaseTools: Add special handle for '\' use in Pcd Value
>
> From: zhijufan
>
> Case:
> gEfiOzmosisPkgTokenSpaceGuid.PcdBootLogFolderPath|L"\\Logs\\"|VOID*
> |12
>
> Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=1287
> Cc: Liming Gao
> Cc: Yonghong Zhu
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Zhiju.Fan
> ---
> BaseTools/Source/Python/Common/Expression.py | 13 -
> BaseTools/Source/Python/Common/Misc.py | 9 ++---
> 2 files changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/BaseTools/Source/Python/Common/Expression.py
> b/BaseTools/Source/Python/Common/Expression.py
> index 05459b9..6eec0de 100644
> --- a/BaseTools/Source/Python/Common/Expression.py
> +++ b/BaseTools/Source/Python/Common/Expression.py
> @@ -20,10 +20,11 @@ from CommonDataClass.Exceptions import
> WrnExpression
> from .Misc import GuidStringToGuidStructureString, ParseFieldValue
> import Common.EdkLogger as EdkLogger
> import copy
> from Common.DataType import *
> import sys
> +import random, string
>
> ERR_STRING_EXPR = 'This operator cannot be used in string expression:
> [%s].'
> ERR_SNYTAX = 'Syntax error, the rest of expression cannot be
> evaluated: [%s].'
> ERR_MATCH = 'No matching right parenthesis.'
> ERR_STRING_TOKEN= 'Bad string token: [%s].'
> @@ -53,10 +54,12 @@ PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-
> z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')
> # Split string to list according double quote
> # For example: abc"de\"f"ghi"jkl"mn will be: ['abc', '"de\"f"', 'ghi',
> '"jkl"',
> 'mn']
> #
> def SplitString(String):
> # There might be escaped quote: "abc\"def\\\"ghi", 'abc\'def\\\'ghi'
> +RanStr = ''.join(random.sample(string.ascii_letters + string.digits, 8))
> +String = String.replace('', RanStr).strip()
> RetList = []
> InSingleQuote = False
> InDoubleQuote = False
> Item = ''
> for i, ch in enumerate(String):
> @@ -85,15 +88,20 @@ def SplitString(String):
> Item += String[i]
> if InSingleQuote or InDoubleQuote:
> raise BadExpression(ERR_STRING_TOKEN % Item)
> if Item:
> RetList.append(Item)
> +for i, ch in enumerate(RetList):
> +if RanStr in ch:
> +RetList[i] = ch.replace(RanStr,'')
> return RetList
>
> def SplitPcdValueString(String):
> # There might be escaped comma in GUID() or DEVICE_PATH() or " "
> # or ' ' or L' ' or L" "
> +RanStr = ''.join(random.sample(string.ascii_letters + string.digits, 8))
> +String = String.replace('', RanStr).strip()
> RetList = []
> InParenthesis = 0
> InSingleQuote = False
> InDoubleQuote = False
> Item = ''
> @@ -122,10 +130,13 @@ def SplitPcdValueString(String):
> Item += String[i]
> if InSingleQuote or InDoubleQuote or InParenthesis:
> raise BadExpression(ERR_STRING_TOKEN % Item)
> if Item:
> RetList.append(Item)
> +for i, ch in enumerate(RetList):
> +if RanStr in ch:
> +RetList[i] = ch.replace(RanStr,'')
> return RetList
>
> def IsValidCName(Str):
> return True if __ValidString.match(Str) else False
>
> @@ -388,11 +399,11 @@ class ValueExpression(BaseExpression):
> if Val == 'L""':
> Val = False
> elif not Val:
> Val = False
> RealVal = '""'
> -elif not Val.startswith('L"') and not Val.startswith('{') and not
> Val.startswith("L'"):
> +elif not Val.startswith('L"') and not Val.startswith('{') and not
> Val.startswith("L'") and not Val.startswith("'"):
> Val = True
> RealVal = '"' + RealVal + '"'
>
> # The expression has been parsed, but the end of expression is not
> reached
> # It means the rest does not comply EBNF of
> diff --git a/BaseTools/Source/Python/Common/Misc.py
> b/BaseTools/Source/Python/Common/Misc.py
> index b32b7cd..b27268a 100644
> --- a/BaseTools/Source/Python/Common/Misc.py
> +++ b/BaseTools/Source/Python/Common/Misc.py
> @@ -15,11 +15,11 @@
> # Import Modules
> #
> from __future__ import absolute_import
> import Common.LongFilePathOs as os
> import sys
> -import string
> +import random, string
> import threading
> import time
> import re
> import pickle
> import array
> @@ -1234,11 +1234,12 @@ def IsFieldValueAnArray (Value):
> if Value[0] == "'" and
[edk2] Building EmulatorPkg and EDK2 project issue.
Hi All, Below are the issue i'm currently facing, - EmulatorPkg: o Building of EmulatorPkg using below command § build -p EmulatorPkg\EmulatorPkg.dsc -t VS2015x86 -D WIN_SEC_BUILD -a IA32 o But when I try to launch Emulator using below command, it failed. I searched for WinHost.exe file, and it is not present in Build folder also. § cd Build\EmulatorIA32\DEBUG_VS2015x86\IA32\ && WinHost.exe - Building EDK2 project for ARM using LLVM o What are the steps/changes need to do in-order to build EDK2 project for ARM+LLVM configuration. Kindly provide any comments. Any pointer is helpful. *Note:* Trying to build in Windows environment. Build and launch of Nt32Pkg is successful. -- Regards, Prem. ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch] BaseTools: Add special handle for '\' use in Pcd Value
From: zhijufan
Case:
gEfiOzmosisPkgTokenSpaceGuid.PcdBootLogFolderPath|L"\\Logs\\"|VOID*|12
Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=1287
Cc: Liming Gao
Cc: Yonghong Zhu
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan
---
BaseTools/Source/Python/Common/Expression.py | 13 -
BaseTools/Source/Python/Common/Misc.py | 9 ++---
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/BaseTools/Source/Python/Common/Expression.py
b/BaseTools/Source/Python/Common/Expression.py
index 05459b9..6eec0de 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -20,10 +20,11 @@ from CommonDataClass.Exceptions import WrnExpression
from .Misc import GuidStringToGuidStructureString, ParseFieldValue
import Common.EdkLogger as EdkLogger
import copy
from Common.DataType import *
import sys
+import random, string
ERR_STRING_EXPR = 'This operator cannot be used in string expression:
[%s].'
ERR_SNYTAX = 'Syntax error, the rest of expression cannot be
evaluated: [%s].'
ERR_MATCH = 'No matching right parenthesis.'
ERR_STRING_TOKEN= 'Bad string token: [%s].'
@@ -53,10 +54,12 @@ PcdPattern =
re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')
# Split string to list according double quote
# For example: abc"de\"f"ghi"jkl"mn will be: ['abc', '"de\"f"', 'ghi',
'"jkl"', 'mn']
#
def SplitString(String):
# There might be escaped quote: "abc\"def\\\"ghi", 'abc\'def\\\'ghi'
+RanStr = ''.join(random.sample(string.ascii_letters + string.digits, 8))
+String = String.replace('', RanStr).strip()
RetList = []
InSingleQuote = False
InDoubleQuote = False
Item = ''
for i, ch in enumerate(String):
@@ -85,15 +88,20 @@ def SplitString(String):
Item += String[i]
if InSingleQuote or InDoubleQuote:
raise BadExpression(ERR_STRING_TOKEN % Item)
if Item:
RetList.append(Item)
+for i, ch in enumerate(RetList):
+if RanStr in ch:
+RetList[i] = ch.replace(RanStr,'')
return RetList
def SplitPcdValueString(String):
# There might be escaped comma in GUID() or DEVICE_PATH() or " "
# or ' ' or L' ' or L" "
+RanStr = ''.join(random.sample(string.ascii_letters + string.digits, 8))
+String = String.replace('', RanStr).strip()
RetList = []
InParenthesis = 0
InSingleQuote = False
InDoubleQuote = False
Item = ''
@@ -122,10 +130,13 @@ def SplitPcdValueString(String):
Item += String[i]
if InSingleQuote or InDoubleQuote or InParenthesis:
raise BadExpression(ERR_STRING_TOKEN % Item)
if Item:
RetList.append(Item)
+for i, ch in enumerate(RetList):
+if RanStr in ch:
+RetList[i] = ch.replace(RanStr,'')
return RetList
def IsValidCName(Str):
return True if __ValidString.match(Str) else False
@@ -388,11 +399,11 @@ class ValueExpression(BaseExpression):
if Val == 'L""':
Val = False
elif not Val:
Val = False
RealVal = '""'
-elif not Val.startswith('L"') and not Val.startswith('{') and not
Val.startswith("L'"):
+elif not Val.startswith('L"') and not Val.startswith('{') and not
Val.startswith("L'") and not Val.startswith("'"):
Val = True
RealVal = '"' + RealVal + '"'
# The expression has been parsed, but the end of expression is not
reached
# It means the rest does not comply EBNF of
diff --git a/BaseTools/Source/Python/Common/Misc.py
b/BaseTools/Source/Python/Common/Misc.py
index b32b7cd..b27268a 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -15,11 +15,11 @@
# Import Modules
#
from __future__ import absolute_import
import Common.LongFilePathOs as os
import sys
-import string
+import random, string
import threading
import time
import re
import pickle
import array
@@ -1234,11 +1234,12 @@ def IsFieldValueAnArray (Value):
if Value[0] == "'" and Value[-1] == "'" and len(list(Value[1:-1])) > 1:
return True
return False
def AnalyzePcdExpression(Setting):
-Setting = Setting.strip()
+RanStr = ''.join(random.sample(string.ascii_letters + string.digits, 8))
+Setting = Setting.replace('', RanStr).strip()
# There might be escaped quote in a string: \", \\\" , \', \\\'
Data = Setting
# There might be '|' in string and in ( ... | ... ), replace it with '-'
NewStr = ''
InSingleQuoteStr = False
@@ -1267,11 +1268,13 @@ def AnalyzePcdExpression(Setting):
if Pos < 0:
FieldList.append(Setting[StartPos:].strip())
break
FieldList.append(Setting[StartPos:Pos].strip())
StartPos = Pos + 1
-
+for i, ch in enumerate(FieldList):
+
Re: [edk2] [PATCH V3 4/4] MdeModulePkg EhciDxe: Use common buffer for AsyncInterruptTransfer
On Tue, Oct 30, 2018 at 09:39:24AM -0300, Ard Biesheuvel wrote: > (add back the list) Oi! Go back on holiday! > On 30 October 2018 at 09:07, Cohen, Eugene wrote: > > Has this patch been tested on a system that does not have coherent DMA? > > > > It's not clear that this change would actually be faster on a system of that > > type since using common buffers imply access to uncached memory. Depending > > on the access patterns the uncached memory access could be more time > > consuming than cache maintenance operations. > > I haven't had time to look at these patches yet. > > I agree with Eugene's concern: the directional DMA routines are much > more performant on implementations with non-coherent DMA, and so > common buffers should be avoided unless we are dealing with data > structures that are truly shared between the CPU and the device. > > Since this is obviously not the case here, could we please have some > numbers about the performance improvement we are talking about here? > Would it be possible to improve the IOMMU handling code instead? On an unrelated note to the concerns above: Why has a fundamental change to the behaviour of one of the industry standard drivers been pushed at the very end of the stable cycle? Regards, Leif ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH V3 4/4] MdeModulePkg EhciDxe: Use common buffer for AsyncInterruptTransfer
(add back the list)
On 30 October 2018 at 09:07, Cohen, Eugene wrote:
> Has this patch been tested on a system that does not have coherent DMA?
>
>
>
> It's not clear that this change would actually be faster on a system of that
> type since using common buffers imply access to uncached memory. Depending
> on the access patterns the uncached memory access could be more time
> consuming than cache maintenance operations.
>
I haven't had time to look at these patches yet.
I agree with Eugene's concern: the directional DMA routines are much
more performant on implementations with non-coherent DMA, and so
common buffers should be avoided unless we are dealing with data
structures that are truly shared between the CPU and the device.
Since this is obviously not the case here, could we please have some
numbers about the performance improvement we are talking about here?
Would it be possible to improve the IOMMU handling code instead?
>
>
> From: edk2-devel On Behalf Of Star Zeng
> Sent: Friday, October 26, 2018 7:41 AM
> To: edk2-devel@lists.01.org
> Cc: Ruiyu Ni ; Hao Wu ; Jiewen Yao
> ; Star Zeng
> Subject: [edk2] [PATCH V3 4/4] MdeModulePkg EhciDxe: Use common buffer for
> AsyncInterruptTransfer
>
>
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1274
>
> In current code, EhcMonitorAsyncRequests (timer handler) will do
> unmap and map operations for AsyncIntTransfers to "Flush data from
> PCI controller specific address to mapped system memory address".
> EhcMonitorAsyncRequests
> EhcFlushAsyncIntMap
> PciIo->Unmap
> IoMmu->SetAttribute
> PciIo->Map
> IoMmu->SetAttribute
>
> This may impact the boot performance.
>
> Since the data buffer for EhcMonitorAsyncRequests is internal
> buffer, we can allocate common buffer by PciIo->AllocateBuffer
> and map the buffer with EfiPciIoOperationBusMasterCommonBuffer,
> then the unmap and map operations can be removed.
>
> ///
> /// Provides both read and write access to system memory by
> /// both the processor and a bus master. The buffer is coherent
> /// from both the processor's and the bus master's point of view.
> ///
> EfiPciIoOperationBusMasterCommonBuffer,
>
> Test done:
> USB KB works normally.
> USB disk read/write works normally.
>
> Cc: Ruiyu Ni
> Cc: Hao Wu
> Cc: Jian J Wang
> Cc: Jiewen Yao
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng
> Reviewed-by: Ruiyu Ni
> Reviewed-by: Hao Wu
> ---
> MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c | 3 ++
> MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c | 78
> +---
> MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.c | 38 ++--
> MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.h | 33 --
> 4 files changed, 57 insertions(+), 95 deletions(-)
>
> diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
> b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
> index 5569f4f9618b..764eeda58ba1 100644
> --- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
> +++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
> @@ -763,6 +763,7 @@ EhcControlTransfer (
> Translator,
> EHC_CTRL_TRANSFER,
> Request,
> + FALSE,
> Data,
> *DataLength,
> NULL,
> @@ -906,6 +907,7 @@ EhcBulkTransfer (
> Translator,
> EHC_BULK_TRANSFER,
> NULL,
> + FALSE,
> Data[0],
> *DataLength,
> NULL,
> @@ -1163,6 +1165,7 @@ EhcSyncInterruptTransfer (
> Translator,
> EHC_INT_TRANSFER_SYNC,
> NULL,
> + FALSE,
> Data,
> *DataLength,
> NULL,
> diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
> b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
> index ec8d796fab11..b067fd02d1ce 100644
> --- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
> +++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
> @@ -778,7 +778,6 @@ EhciDelAsyncIntTransfer (
> EhcUnlinkQhFromPeriod (Ehc, Urb->Qh);
> RemoveEntryList (>UrbList);
>
> - gBS->FreePool (Urb->Data);
> EhcFreeUrb (Ehc, Urb);
> return EFI_SUCCESS;
> }
> @@ -809,7 +808,6 @@ EhciDelAllAsyncIntTransfers (
> EhcUnlinkQhFromPeriod (Ehc, Urb->Qh);
> RemoveEntryList (>UrbList);
>
> - gBS->FreePool (Urb->Data);
> EhcFreeUrb (Ehc, Urb);
> }
> }
> @@ -848,16 +846,8 @@ EhciInsertAsyncIntTransfer (
> IN UINTN Interval
> )
> {
> - VOID *Data;
> URB *Urb;
>
> - Data = AllocatePool (DataLen);
> -
> - if (Data == NULL) {
> - DEBUG ((DEBUG_ERROR, "%a: failed to allocate buffer\n", __FUNCTION__));
> - return NULL;
> - }
> -
> Urb = EhcCreateUrb (
> Ehc,
> DevAddr,
> @@ -868,7 +858,8 @@ EhciInsertAsyncIntTransfer (
> Hub,
> EHC_INT_TRANSFER_ASYNC,
> NULL,
> - Data,
> + TRUE,
> + NULL,
> DataLen,
> Callback,
> Context,
> @@ -877,7 +868,6 @@ EhciInsertAsyncIntTransfer (
>
> if (Urb == NULL) {
> DEBUG ((DEBUG_ERROR, "%a: failed to create URB\n", __FUNCTION__));
> - gBS->FreePool (Data);
> return NULL;
> }
>
> @@ -892,60 +882,6 @@ EhciInsertAsyncIntTransfer (
> }
>
> /**
> - Flush data from PCI controller specific address to mapped system
> - memory address.
> -
> - @param Ehc The EHCI device.
> - @param Urb The URB to unmap.
> -
> - @retval EFI_SUCCESS Success to flush data to mapped system memory.
> - @retval EFI_DEVICE_ERROR Fail to
Re: [edk2] [PATCH v2 1/2] ShellPkg-UefiShellLib: Add a function to fully-qualify paths
>-Original Message-
>From: Ni, Ruiyu [mailto:ruiyu...@intel.com]
>Sent: Tuesday, October 30, 2018 2:33 AM
>To: Dailey, Jim; edk2-devel@lists.01.org
>Cc: Carsey, Jaben
>Subject: RE: [PATCH v2 1/2] ShellPkg-UefiShellLib: Add a function to
>fully-qualify paths
>
>
>> -Original Message-
>> From: jim.dai...@dell.com
>> Sent: Tuesday, October 30, 2018 5:15 AM
>> To: edk2-devel@lists.01.org
>> Cc: Carsey, Jaben ; Ni, Ruiyu
>> Subject: [PATCH v2 1/2] ShellPkg-UefiShellLib: Add a function to
>> fully-qualify
>> paths
>>
>> +CHAR16*
>> +EFIAPI
>> +FullyQualifyPath(
>> + IN CONST CHAR16 *Path
>> + )
>> +{
>> + CONST CHAR16 *WorkingPath;
>> + CONST CHAR16 *InputPath;
>> + CHAR16 *InputFileSystem;
>> + UINTNFileSystemCharCount;
>> + CHAR16 *FullyQualifiedPath;
>> + UINTNSize;
>> +
>> + FullyQualifiedPath = NULL;
>> +
>> + ASSERT(Path != NULL);
>> + //
>> + // Handle erroneous input when asserts are disabled.
>> + //
>> + if (Path == NULL) {
>> +return NULL;
>> + }
>> + //
>> + // In paths that contain ":", like fs0:dir/file.ext and
>> fs2:\fqpath\file.ext,
>> + // we have to consider the file system part separately from the "path"
>> part.
>> + // If there is a file system in the path, we have to get the current
>> working
>> + // directory for that file system. Then we need to use the part of the
>> path
>> + // following the ":". If a path does not contain ":", we use it as given.
>> + //
>> + InputPath = StrStr(Path, L":");
>> + if (InputPath != NULL) {
>> +InputPath++;
>> +FileSystemCharCount = ((UINTN)InputPath - (UINTN)Path +
>> sizeof(CHAR16)) / sizeof(CHAR16);
>> +InputFileSystem = AllocateCopyPool(FileSystemCharCount *
>> sizeof(CHAR16), Path);
>> +if (InputFileSystem != NULL) {
>> + InputFileSystem[FileSystemCharCount - 1] = CHAR_NULL;
>> +}
>> +WorkingPath = ShellGetCurrentDir(InputFileSystem);
>> +SHELL_FREE_NON_NULL(InputFileSystem);
>> +//
>> +// Handle the degenerate case where Path was only a file system
>> reference.
>> +// In that case we return the current working directory of the file
>> system.
>> +//
>> +if (InputPath == NULL) {
>
>The "InputPath" should not be NULL.
You are correct. It will simply point to an empty string if the input path
is only a file system reference (e.g. "FS0:"). I thoughtlessly confused an
empty string with NULL. :-(
Do you want me to delete that comment and the "if" and resubmit, or, assuming
the rest of the patch is acceptable, do you want to delete it and push the
modified patch?
Regards,
Jim
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v1 0/7] Delete TCP, PXE, iSCSI driver in MdeModulePkg.
On Tue, Oct 30, 2018 at 03:33:21PM +0800, Fu Siyuan wrote: > 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 (7): > Nt32Pkg: Replace obsoleted network drivers from NT32 platform DSC/FDF. > EmulatorPkg: Replace obsoleted network drivers from platform DSC/FDF. > OvmfPkg: Replace obsoleted network drivers from platform DSC/FDF. > Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF. > ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF. > MdeModulePkg: Delete the TCP/PXE/ISCSI drivers in MdeModulePkg. > NetworkPkg: Remove some clarification from TCP/PXE/ISCSI driver INF. > > .../Network/IScsiDxe/ComponentName.c | 283 -- > .../Universal/Network/IScsiDxe/IScsiCHAP.c| 430 --- > .../Universal/Network/IScsiDxe/IScsiConfig.c | 1264 --- > .../Universal/Network/IScsiDxe/IScsiDhcp.c| 472 --- > .../Universal/Network/IScsiDxe/IScsiDriver.c | 676 > .../Network/IScsiDxe/IScsiExtScsiPassThru.c | 412 --- > .../Universal/Network/IScsiDxe/IScsiIbft.c| 539 --- > .../Network/IScsiDxe/IScsiInitiatorName.c | 116 - > .../Universal/Network/IScsiDxe/IScsiMisc.c| 948 -- > .../Universal/Network/IScsiDxe/IScsiProto.c | 2799 --- > .../Universal/Network/IScsiDxe/IScsiTcp4Io.c | 487 --- If there is a v2, can you follow the steps from https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-git-guide-for-edk2-contributors-and-maintainers#contrib-23 when generating it, to order the files, and to get rid of the ... truncation of file names? Regards, Leif > MdeModulePkg/Universal/Network/IScsiDxe/Md5.c | 350 -- > .../Universal/Network/Tcp4Dxe/ComponentName.c | 433 --- > .../Universal/Network/Tcp4Dxe/SockImpl.c | 1201 --- > .../Universal/Network/Tcp4Dxe/SockInterface.c | 990 -- > .../Network/Tcp4Dxe/Tcp4Dispatcher.c | 717 > .../Universal/Network/Tcp4Dxe/Tcp4Driver.c| 782 - > .../Universal/Network/Tcp4Dxe/Tcp4Input.c | 1497 - > .../Universal/Network/Tcp4Dxe/Tcp4Io.c| 112 - > .../Universal/Network/Tcp4Dxe/Tcp4Main.c | 674 > .../Universal/Network/Tcp4Dxe/Tcp4Misc.c | 940 -- > .../Universal/Network/Tcp4Dxe/Tcp4Option.c| 352 -- > .../Universal/Network/Tcp4Dxe/Tcp4Output.c| 1238 --- > .../Universal/Network/Tcp4Dxe/Tcp4Timer.c | 584 > .../Network/UefiPxeBcDxe/ComponentName.c | 365 -- > .../Network/UefiPxeBcDxe/PxeBcDhcp.c | 1999 --- > .../Network/UefiPxeBcDxe/PxeBcDriver.c| 665 > .../Network/UefiPxeBcDxe/PxeBcImpl.c | 2989 - > .../Network/UefiPxeBcDxe/PxeBcMtftp.c | 454 --- > .../Network/UefiPxeBcDxe/PxeBcSupport.c | 221 -- > ArmVirtPkg/ArmVirtQemu.dsc| 10 +- > ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 10 +- > ArmVirtPkg/ArmVirtQemuKernel.dsc | 10 +- > EmulatorPkg/EmulatorPkg.dsc |2 +- > EmulatorPkg/EmulatorPkg.fdf |2 +- > MdeModulePkg/MdeModulePkg.dsc |3 - > .../Network/IScsiDxe/ComponentName.h | 165 - > .../Universal/Network/IScsiDxe/IScsi4Dxe.uni | 25 - > .../Network/IScsiDxe/IScsi4DxeExtra.uni | 20 - > .../Universal/Network/IScsiDxe/IScsiCHAP.h| 106 - > .../Universal/Network/IScsiDxe/IScsiCommon.h | 22 - > .../Universal/Network/IScsiDxe/IScsiConfig.h | 166 - > .../Network/IScsiDxe/IScsiConfigDxe.vfr | 219 -- > .../IScsiDxe/IScsiConfigDxeStrings.uni| 62 - > .../Network/IScsiDxe/IScsiConfigNVDataStruc.h | 109 - > .../Universal/Network/IScsiDxe/IScsiDhcp.h| 55 - > .../Universal/Network/IScsiDxe/IScsiDriver.h | 140 - > .../Universal/Network/IScsiDxe/IScsiDxe.inf | 134 - > .../Network/IScsiDxe/IScsiExtScsiPassThru.h | 22 - > .../Universal/Network/IScsiDxe/IScsiIbft.h| 38 - > .../Universal/Network/IScsiDxe/IScsiImpl.h| 168 - > .../Network/IScsiDxe/IScsiInitiatorName.h | 74 - > .../Universal/Network/IScsiDxe/IScsiMisc.h| 317 -- > .../Universal/Network/IScsiDxe/IScsiProto.h | 1005 -- > .../Universal/Network/IScsiDxe/IScsiTcp4Io.h | 142 - > MdeModulePkg/Universal/Network/IScsiDxe/Md5.h | 80 - >
Re: [edk2] Reminder for deleting 3 network drivers in MdeModulePkg
Hi Fu Siyan, On Tue, Oct 30, 2018 at 08:11:52AM +, Fu, Siyuan wrote: > People who want to continue use these deleted drivers could go to > edk2/UDK2018 branch to get them, but it's *highly not recommended*. They should also be able to use edk2-stable201811, right? > *If you have any opposition on deleting these drivers, please let me > know before this weekend, thanks.* I am all for this change. The diffstat is very nice :) Best Regards, Leif ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [edk2-test][Patch] uefi-sct/SctPkg:Assign 0 to the tail of the HwErrRecVariableName
Hi Eric, On Tue, Oct 30, 2018 at 04:38:36PM +0800, Eric Jin wrote: > Make the HwErrRecVariableName as valid the string. > Ensure the HwErrRecVariable could be deleted before the test exit. > > Cc: Supreeth Venkatesh (Sidenote - I don't see Supreeth actually on cc on this patch.) > Cc: Jiaxin Wu > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Eric Jin > --- > .../BlackBoxTest/VariableServicesBBTestFunction.c| 12 > +++- > .../BlackBoxTest/VariableServicesBBTestMain.h| 10 +- > 2 files changed, 16 insertions(+), 6 deletions(-) Could you follow the steps outlined in Laszlo's excellent guide https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-git-guide-for-edk2-contributors-and-maintainers#contrib-23 when generating the patches to send out? For this specific patch, this would have made two major differences: 1) We would have seen the full path to files in the summary above, instead of the .../. 2) It would have ordered the files such that the .h would have been shown before the .c. 2 turns out to make a major difference when reviewing this particular patch, because... > diff --git > a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestFunction.c > > b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestFunction.c > index d1064ce..df1bbe7 100644 > --- > a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestFunction.c > +++ > b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestFunction.c > @@ -1,7 +1,7 @@ > /** @file > >Copyright 2006 - 2012 Unified EFI, Inc. > - Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved. > + Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. > >This program and the accompanying materials >are licensed and made available under the terms and conditions of the BSD > License > @@ -2855,7 +2855,7 @@ HardwareErrorRecordFuncTest ( >UINT64RemainingVariableStorageSize; >UINT64MaximumVariableSize; > > - CHAR16HwErrRecVariableName[13]; > + CHAR16HwErrRecVariableName[HwErrRecVariableNameLength]; ... the first thing I see when I look at this patch is "Hang on, are we permitting runtime-sized arrays?" This could have sent me off on a 15-90 minute task of - triple-checking against the coding style document. - search the mailing list (I recalled _some_ discussions around this recently, but that may have been for Linux, and variable-length arrays) - search the edk2 codebase for precedent. - testing with various toolchains whether they were happy compiling it, getting surprised when it worked in some of them, and then spent additional time figuring out why. It could have, but it didn't. Because the patch is small enough that I decided to read through it in its entirety before going off on investigations. More below. >CHAR16HwErrRecVariable[] = L"This is a HwErrRec variable!"; > >CHAR16GetVariableName[MAX_BUFFER_SIZE]; > @@ -3015,6 +3015,7 @@ HardwareErrorRecordFuncTest ( >HwErrRecVariableName[0] = L'\0'; >SctStrCat ( HwErrRecVariableName, L"HwErrRec" ); >Myitox( MaxNum, HwErrRecVariableName+8 ); > + HwErrRecVariableName[HwErrRecVariableNameLength-1] = L'\0'; > >// >// Set the new HwErrRec variable to the global variable > @@ -3036,8 +3037,8 @@ HardwareErrorRecordFuncTest ( >// Write reset record >// >RecoveryData[0] = 2; > - SctStrnCpy ( (CHAR16*)([2]), HwErrRecVariableName, 12 ); > - RecoveryLib->WriteResetRecord( RecoveryLib, 13*sizeof(CHAR16)+2, > RecoveryData ); > + SctStrnCpy ( (CHAR16*)([2]), HwErrRecVariableName, > HwErrRecVariableNameLength-1 ); > + RecoveryLib->WriteResetRecord( RecoveryLib, > HwErrRecVariableNameLength*sizeof(CHAR16)+2, RecoveryData ); > >// >// Prompt the user about the cold reset and reset the system > @@ -3052,7 +3053,8 @@ HardwareErrorRecordFuncTest ( >// > step2: >DataSize = 255; > - SctStrnCpy ( HwErrRecVariableName, (CHAR16*)(RecoveryData+2), 12 ); > + HwErrRecVariableName[HwErrRecVariableNameLength-1] = L'\0'; > + SctStrnCpy ( HwErrRecVariableName, (CHAR16*)(RecoveryData+2), > HwErrRecVariableNameLength-1 ); >Status = RT->GetVariable ( > HwErrRecVariableName, > , > diff --git > a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.h > > b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.h > index 051ae6f..b645b55 100644 > --- > a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.h >
Re: [edk2] [PATCH v3 1/3] MdeModulePkg/UdfDxe: Check 'Component Type' within a Path Component
> -Original Message- > From: Paulo Alcantara [mailto:pa...@paulo.ac] > Sent: Tuesday, October 30, 2018 9:41 AM > To: edk2-devel@lists.01.org; Wu, Hao A > Cc: Ni, Ruiyu > Subject: Re: [edk2] [PATCH v3 1/3] MdeModulePkg/UdfDxe: Check > 'Component Type' within a Path Component > > Hi Hao Wu, > > On October 29, 2018 10:26:15 PM GMT-03:00, Hao Wu > wrote: > >REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1279 > > > >According to the ECMA-167 standard (3rd Edition - June 1997), Section > >14.16.1.1, valid values are 1 to 5. All other values will be treated as > >a > >corrupted volume. > > > >This commit will add such check within function ResolveSymlink(). > > > >Cc: Leif Lindholm > >Cc: Ruiyu Ni > >Contributed-under: TianoCore Contribution Agreement 1.1 > >Signed-off-by: Hao Wu > >Reviewed-by: Paulo Alcantara > >Reviewed-by: Star Zeng > >--- > > MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c | 7 > +++ > > 1 file changed, 7 insertions(+) > > > >diff --git a/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c > >b/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c > >index b9ebddfe62..c15741a032 100644 > >--- a/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c > >+++ b/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c > >@@ -2257,6 +2257,13 @@ ResolveSymlink ( > > } > > FileName[Index] = L'\0'; > > break; > >+default: > >+ // > >+ // Accoring to the ECMA-167 standard (3rd Edition - June 1997), > >Section > > Minor typo: s/Accoring/According/ Thanks for the catch, Paulo. I will address this before pushing the codes. Best Regards, Hao Wu > > Paulo > > >+ // 14.16.1.1, all other values are reserved. > >+ // > >+ Status = EFI_VOLUME_CORRUPTED; > >+ goto Error_Find_File; > > } > > > > // > > -- > Sent from my Android device with K-9 Mail. Please excuse my brevity. ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH edk2-platforms v1 00/12] Fix D06 SBSA/SBBR issue and improve
Hi Ming,
I don't know when --stat was introduced, but it was a very long time
ago. The oldest version of git I have easily available is 2.1.4, and
that handles it properly.
Something else must be going on.
Regards,
Leif
On Tue, Oct 30, 2018 at 02:54:42PM +0800, Huangming (Mark) wrote:
> Hi Leif,
>
> The cause of '...' is the git version, it is 2.18.0 in my build server.
> I have ask the administrator to upgrade git.
> Should I re-send this set(edk2-platforms) with new git version?
>
> Thanks,
> Ming
>
> On 2018/10/30 0:14, Leif Lindholm wrote:
> > On Mon, Oct 29, 2018 at 11:01:19PM +0800, Ming Huang wrote:
> >> Hi Leif,
> >>
> >> Yes, I generated this patchset with the same git configuration as previous
> >> patchset:
> >> ([PATCH edk2-platforms v5 00/28] Upload for D06 platform)
> >> and use the same command:
> >> git format-patch --stat=1000 --stat-graph-width=20 --cover-letter
> >> --no-binary --subject-prefix="PATCH edk2-platforms" -12 -v 1 -o v1
> >>
> >> I check the URL below, no important different configuration found.
> >> Have problems with this patchset?
> >
> > See below:
> >
> >> Thanks,
> >> Ming
> >>
> >> On 10/29/2018 7:43 PM, Leif Lindholm wrote:
> >>> Hi Ming,
> >>>
> >>> On Mon, Oct 29, 2018 at 11:32:37AM +0800, Ming Huang wrote:
> The major features of this patchset include:
> 1. Modify acpi table for ACS test;
> 2. Enable secure boot for SBBR-SCT;
> 3. Other change for ACS test;
>
> For this SCT issue:
> RT.SetVariable - Create one Time Base Auth Variable, the expect return
> status
> should be EFI_SUCCESS – FAILURE
>
> The resule of fail is effected by the edk2 commit(67943427).
> If Modify Variable.c as below, this case will pass.
> --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
> +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
> @@ -3188,7 +3188,7 @@ VariableServiceSetVariable (
> // Maybe it's the delete operation of common authenticated
> variable at
> // user physical presence.
> //
> if (DataSize != AUTHINFO_SIZE) {
> - return EFI_UNSUPPORTED;
> + return EFI_SECURITY_VIOLATION;
>
> I supect ACS SCT compatible with UEFI 2.7 spec. We will analyze this
> issue
> continue.
>
> Code can also be found in github:
> https://github.com/hisilicon/OpenPlatformPkg.git
> branch: d06-acs-platforms
>
>
> Ming Huang (12):
> Silicon/Hisilicon/D06: Add watchdog to GTDT
> Silicon/Hisilicon/D06: Drop _CID for fwts issue
> Silicon/Hisilicon/D06: Fix fwts issue in Dbg2
> Silicon/Hisilicon/D06: Fix fwts issue in FADT
> Hisilicon/D06: Move some functions to OemMiscLib
> Silicon/Hisilicon: Modify for SBBR fwts SetTime_Func test case
> Hisilicon/D0x: Fix secure boot bug in FlashFvbDxe
> Hisilicon/D06: Fix SBBR-SCT AuthVar issue
> Silicon/Hisilicon/D06: Reserve ECAM resource in DSDT
> Silicon/Hisilicon/D06: Modify GTDT timer flag
> Hisilicon/D06: Modify Gic base
> Silicon/Hisilicon/D06: Set TA as Node 0 for TA boot
>
> Silicon/Hisilicon/HisiPkg.dec | 1 +
> Silicon/Hisilicon/Hisilicon.dsc.inc | 16 ++
> Platform/Hisilicon/D03/D03.dsc| 5 +
> Platform/Hisilicon/D05/D05.dsc| 5 +
> Platform/Hisilicon/D06/D06.dsc| 9 +-
> .../Drivers/FlashFvbDxe/FlashFvbDxe.inf | 2 +
> .../M41T83RealTimeClockLib.inf| 3 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Platform.h | 2 +-
> .../Hisilicon/Include/Library/OemMiscLib.h| 9 +
> .../M41T83RealTimeClock.h | 8 +-
> .../D06/Library/OemMiscLibD06/OemMiscLibD06.c | 82 ++
> .../Drivers/FlashFvbDxe/FlashFvbDxe.c | 14 +-
> .../M41T83RealTimeClockLib.c | 263 --
> .../Hi1620/Hi1620AcpiTables/Dsdt/Com.asl | 1 -
> .../Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl | 48
> .../Hi1620AcpiTables/Dsdt/Hi1620Pci.asl | 36 ++-
> .../Hi1620/Hi1620AcpiTables/Fadt.aslc | 2 +-
> .../Hi1620/Hi1620AcpiTables/Gtdt.aslc | 35 +--
> .../Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc | 4 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Iort.asl| 18 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc | 194 ++---
> .../Hi1620/Hi1620AcpiTables/MadtHi1620.aslc | 2 +-
> >
> > These ... suggest --stat=1000 was not used. Can you verify please?
> >
> > Regards,
> >
> > Leif
> >
> > .
> >
>
> --
> Best Regards,
>
> Ming
>
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v3 0/3] UdfDxe: Additional checks for ResolveSymlink()
Many thanks for the rework. For the series:
Reviewed-by: Leif Lindholm
On Tue, Oct 30, 2018 at 09:26:14AM +0800, Hao Wu wrote:
> V3 changes:
>
> According to Leif's recommendation, split the original patch into 3
> seperate ones.
>
> Since there is no code changes compared with the V2 of the patch, I just
> preserved the 'Reviewed-by' tags by Paulo and Star.
>
> V2 history:
>
> Refine type C check (refer to V1 history below) to eliminate the
> unnecessary CopyMem() call.
>
> V1 history:
>
> The commit will add 3 types of checks for function ResolveSymlink():
>
> A. Check for the value of 'Component Type' field within a Path Component
>
> According to the ECMA-167 standard (3rd Edition - June 1997), Section
> 14.16.1.1, valid values are 1 to 5. All other values will be treated as a
> corrupted volume.
>
> B. Check for the content pointed by 'File'
>
> Since content within 'File' is the output data for ResolveSymlink().
> Checks is added to ensure the content in 'File' is valid. Otherwise,
> possible null pointer dereference issue will occur during the subsequent
> usage of the data returned by ResolveSymlink().
>
> C. Check for possible memory double free/use after free case
>
> For codes:
>
> if (CompareMem ((VOID *), (VOID *)Parent,
> sizeof (UDF_FILE_INFO)) != 0) {
> CleanupFileInformation ();
> }
>
> CopyMem ((VOID *), (VOID *)File, sizeof (UDF_FILE_INFO));
>
> If the contents in 'PreviousFile' and 'File' are the same, call to
> "CleanupFileInformation ();" will free the buffers in 'File'
> as well. This will lead to potential memory double free/use after free
> issues.
>
> Cc: Leif Lindholm
> Cc: Ruiyu Ni
>
> Hao Wu (3):
> MdeModulePkg/UdfDxe: Check 'Component Type' within a Path Component
> MdeModulePkg/UdfDxe: Content check for 'File' in ResolveSymlink()
> MdeModulePkg/UdfDxe: Memory free/use after free in ResolveSymlink()
>
> MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c | 38
> ++--
> 1 file changed, 35 insertions(+), 3 deletions(-)
>
> --
> 2.12.0.windows.1
>
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] ** NOTICE ** edk2-devel mailing list configuration changes
Hi Mike, That resolves the issue at my end, thanks!. But it would be good to know how it works for others (does Intel have a default mail client config, and could someone else verify the behaviour is how you would normally expect?). Regards, Leif On Mon, Oct 29, 2018 at 10:40:06PM +, Kinney, Michael D wrote: > Hi Leif, > > I can put the reply_goes_to_list option back to "Poster". > > In that configuration, a user that has a DMARC policy of > reject will still have their from address munged. > > But I noticed that the edk2-devel mailing list is not > present when anyone does a Reply-all to an email with > a munged from address. That implied to me that everyone > would need to check if the edk2-devel mailing has been > removed from a Reply-all and add it back manually. This > also seems like a non-ideal configuration option. > > However, the behavior I am seeing could be due to some > of my client settings. > > So I will put the reply_goes_to_list option back to > "Poster". > > Mike > > > -Original Message- > > From: Leif Lindholm [mailto:leif.lindh...@linaro.org] > > Sent: Monday, October 29, 2018 2:10 PM > > To: Kinney, Michael D > > Cc: EDK II Development ; > > Cetola, Stephano > > Subject: Re: [edk2] ** NOTICE ** edk2-devel mailing list > > configuration changes > > > > Hi Mike, > > > > I could hypothesise about which email client you may be > > using :) > > > > But let me instead mention that the two email clients I > > have (mutt and > > gmail web interface) behave identically - neither adds > > the original > > sender to cc when the list server forces a reply-to > > header. > > > > Regards, > > > > Leif > > > > On Mon, Oct 29, 2018 at 08:49:09PM +, Kinney, > > Michael D wrote: > > > Leif, > > > > > > Very strange. When I do the same on that email, it > > > shows Paul on the To address line. > > > > > > Mike > > > > > > > -Original Message- > > > > From: Leif Lindholm > > [mailto:leif.lindh...@linaro.org] > > > > Sent: Monday, October 29, 2018 1:40 PM > > > > To: Kinney, Michael D > > > > Cc: EDK II Development ; > > > > Cetola, Stephano > > > > Subject: Re: [edk2] ** NOTICE ** edk2-devel mailing > > list > > > > configuration changes > > > > > > > > Hi Mike, > > > > > > > > When I try to "reply-to", the email from Paul A > > Lohr, > > > > sent 10 minutes > > > > after your one below, he does not show up in either > > "to" > > > > or "cc". > > > > > > > > OK, I missed the excitement during the plugfest. > > I'll go > > > > back and see > > > > what I can find there. > > > > > > > > Regards, > > > > > > > > Leif > > > > > > > > On Mon, Oct 29, 2018 at 08:23:43PM +, Kinney, > > > > Michael D wrote: > > > > > Leif, > > > > > > > > > > I have enabled a different configuration setting > > > > > that should be better. > > > > > > > > > > Please try some emails and let me know if there > > > > > are any impacts. > > > > > > > > > > The reason for these changes is the DMARC related > > > > > issue that occurred on 10-19-2018 that required a > > > > > number of users to be disabled. The goal of these > > > > > changes is to enable those users to be re- > > activated. > > > > > > > > > > Thanks, > > > > > > > > > > Mike > > > > > > > > > > > -Original Message- > > > > > > From: Leif Lindholm > > > > [mailto:leif.lindh...@linaro.org] > > > > > > Sent: Monday, October 29, 2018 12:54 PM > > > > > > To: EDK II Development > > > > > > Cc: Kinney, Michael D > > ; > > > > > > Cetola, Stephano > > > > > > Subject: Re: [edk2] ** NOTICE ** edk2-devel > > mailing > > > > list > > > > > > configuration changes > > > > > > > > > > > > Hi Mike, > > > > > > > > > > > > On Mon, Oct 29, 2018 at 06:42:44PM +, > > Kinney, > > > > > > Michael D wrote: > > > > > > > Some configuration changes have been made to > > > > > > > the edk2-devel mailing list to handle posts > > from > > > > > > > a domain with a DMARC Reject/Quarantine policy > > > > > > > enabled. If this is detected then the from > > address > > > > > > > is now munged. > > > > > > > > > > > > > > One side effect of this setting is that the > > > > > > > behavior of Reply has changed. Instead of > > being > > > > > > > a reply to the poster of the message, the > > Reply > > > > > > > address is the edk2-devel mailing list. > > > > > > > > > > > > The behaviour looks somewhat broken, since as > > far as > > > > I > > > > > > can tell, > > > > > > replies now longer include the person you're > > > > replying > > > > > > to. > > > > > > (This doesn't happen when replying specifically > > to > > > > > > _you_, because you > > > > > > cc yourself on everything). > > > > > > > > > > > > > If you wish to send a private reply to only > > the > > > > > > > poster of the message, you may have to perform > > > > > > > some manual steps. > > > > > > > > > > > > > > Please let me know if you have any concerns > > about > > > > > > > these changes or if these configuration > > changes > > > > > > > cause any other
[edk2] [edk2-test][Patch] uefi-sct/SctPkg:Assign 0 to the tail of the HwErrRecVariableName
Make the HwErrRecVariableName as valid the string. Ensure the HwErrRecVariable could be deleted before the test exit. Cc: Supreeth Venkatesh Cc: Jiaxin Wu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Eric Jin --- .../BlackBoxTest/VariableServicesBBTestFunction.c| 12 +++- .../BlackBoxTest/VariableServicesBBTestMain.h| 10 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestFunction.c index d1064ce..df1bbe7 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestFunction.c @@ -1,7 +1,7 @@ /** @file Copyright 2006 - 2012 Unified EFI, Inc. - Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved. + Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -2855,7 +2855,7 @@ HardwareErrorRecordFuncTest ( UINT64RemainingVariableStorageSize; UINT64MaximumVariableSize; - CHAR16HwErrRecVariableName[13]; + CHAR16HwErrRecVariableName[HwErrRecVariableNameLength]; CHAR16HwErrRecVariable[] = L"This is a HwErrRec variable!"; CHAR16GetVariableName[MAX_BUFFER_SIZE]; @@ -3015,6 +3015,7 @@ HardwareErrorRecordFuncTest ( HwErrRecVariableName[0] = L'\0'; SctStrCat ( HwErrRecVariableName, L"HwErrRec" ); Myitox( MaxNum, HwErrRecVariableName+8 ); + HwErrRecVariableName[HwErrRecVariableNameLength-1] = L'\0'; // // Set the new HwErrRec variable to the global variable @@ -3036,8 +3037,8 @@ HardwareErrorRecordFuncTest ( // Write reset record // RecoveryData[0] = 2; - SctStrnCpy ( (CHAR16*)([2]), HwErrRecVariableName, 12 ); - RecoveryLib->WriteResetRecord( RecoveryLib, 13*sizeof(CHAR16)+2, RecoveryData ); + SctStrnCpy ( (CHAR16*)([2]), HwErrRecVariableName, HwErrRecVariableNameLength-1 ); + RecoveryLib->WriteResetRecord( RecoveryLib, HwErrRecVariableNameLength*sizeof(CHAR16)+2, RecoveryData ); // // Prompt the user about the cold reset and reset the system @@ -3052,7 +3053,8 @@ HardwareErrorRecordFuncTest ( // step2: DataSize = 255; - SctStrnCpy ( HwErrRecVariableName, (CHAR16*)(RecoveryData+2), 12 ); + HwErrRecVariableName[HwErrRecVariableNameLength-1] = L'\0'; + SctStrnCpy ( HwErrRecVariableName, (CHAR16*)(RecoveryData+2), HwErrRecVariableNameLength-1 ); Status = RT->GetVariable ( HwErrRecVariableName, , diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.h index 051ae6f..b645b55 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.h +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.h @@ -1,7 +1,7 @@ /** @file Copyright 2006 - 2016 Unified EFI, Inc. - Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved. + Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -125,6 +125,14 @@ Abstract: #endif // +// The Variable Name of Hardware Error Record Variables +// defined in the UEFI Spec is HwErrRec. For example, +// HwErrRec0001, HwErrRec0002, HwErrRecF31A, etc. +// Consider the tail of string, the length is 13. +// +#define HwErrRecVariableNameLength 13 + +// // Global Variables // -- 2.9.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v1 0/7] Delete TCP, PXE, iSCSI driver in MdeModulePkg.
Hi, Star This patch only covers the platforms in https://github.com/tianocore/edk2 I will modify the edk2 network wiki page for an updated sample DSC/FDF section, if this patch could pass review w/o objection. https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg-Getting-Started-Guide Let's wait a few days to see if there is any objection on deleting these driver first, and I will be happy to generate another patch for edk2-platforms then. Thanks for your reminder. BestRegards Fu Siyuan > -Original Message- > From: Zeng, Star > Sent: Tuesday, October 30, 2018 3:43 PM > To: Fu, Siyuan ; edk2-devel@lists.01.org > Cc: Kinney, Michael D ; Leif Lindholm > ; Andrew Fish (af...@apple.com) > ; Laszlo Ersek (ler...@redhat.com) ; > Gao, Liming ; Zeng, Star > Subject: RE: [edk2] [PATCH v1 0/7] Delete TCP, PXE, iSCSI driver in > MdeModulePkg. > > Hi Siyuan, > > Have you checked the platforms in https://github.com/tianocore/edk2- > platforms to see whether they need to be updated accordingly or not? > > Cc more people. > > Thanks, > Star > -Original Message- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Fu > Siyuan > Sent: Tuesday, October 30, 2018 3:33 PM > To: edk2-devel@lists.01.org > Subject: [edk2] [PATCH v1 0/7] Delete TCP, PXE, iSCSI driver in > MdeModulePkg. > > 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 (7): > Nt32Pkg: Replace obsoleted network drivers from NT32 platform DSC/FDF. > EmulatorPkg: Replace obsoleted network drivers from platform DSC/FDF. > OvmfPkg: Replace obsoleted network drivers from platform DSC/FDF. > Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF. > ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF. > MdeModulePkg: Delete the TCP/PXE/ISCSI drivers in MdeModulePkg. > NetworkPkg: Remove some clarification from TCP/PXE/ISCSI driver INF. > > .../Network/IScsiDxe/ComponentName.c | 283 -- > .../Universal/Network/IScsiDxe/IScsiCHAP.c| 430 --- > .../Universal/Network/IScsiDxe/IScsiConfig.c | 1264 --- > .../Universal/Network/IScsiDxe/IScsiDhcp.c| 472 --- > .../Universal/Network/IScsiDxe/IScsiDriver.c | 676 > .../Network/IScsiDxe/IScsiExtScsiPassThru.c | 412 --- > .../Universal/Network/IScsiDxe/IScsiIbft.c| 539 --- > .../Network/IScsiDxe/IScsiInitiatorName.c | 116 - > .../Universal/Network/IScsiDxe/IScsiMisc.c| 948 -- > .../Universal/Network/IScsiDxe/IScsiProto.c | 2799 --- > .../Universal/Network/IScsiDxe/IScsiTcp4Io.c | 487 --- > MdeModulePkg/Universal/Network/IScsiDxe/Md5.c | 350 -- > .../Universal/Network/Tcp4Dxe/ComponentName.c | 433 --- > .../Universal/Network/Tcp4Dxe/SockImpl.c | 1201 --- > .../Universal/Network/Tcp4Dxe/SockInterface.c | 990 -- > .../Network/Tcp4Dxe/Tcp4Dispatcher.c | 717 > .../Universal/Network/Tcp4Dxe/Tcp4Driver.c| 782 - > .../Universal/Network/Tcp4Dxe/Tcp4Input.c | 1497 - > .../Universal/Network/Tcp4Dxe/Tcp4Io.c| 112 - > .../Universal/Network/Tcp4Dxe/Tcp4Main.c | 674 > .../Universal/Network/Tcp4Dxe/Tcp4Misc.c | 940 -- > .../Universal/Network/Tcp4Dxe/Tcp4Option.c| 352 -- > .../Universal/Network/Tcp4Dxe/Tcp4Output.c| 1238 --- > .../Universal/Network/Tcp4Dxe/Tcp4Timer.c | 584 > .../Network/UefiPxeBcDxe/ComponentName.c | 365 -- > .../Network/UefiPxeBcDxe/PxeBcDhcp.c | 1999 --- > .../Network/UefiPxeBcDxe/PxeBcDriver.c| 665 > .../Network/UefiPxeBcDxe/PxeBcImpl.c | 2989 - > .../Network/UefiPxeBcDxe/PxeBcMtftp.c | 454 --- > .../Network/UefiPxeBcDxe/PxeBcSupport.c | 221 -- > ArmVirtPkg/ArmVirtQemu.dsc| 10 +- > ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 10 +- > ArmVirtPkg/ArmVirtQemuKernel.dsc | 10 +- > EmulatorPkg/EmulatorPkg.dsc |2 +- > EmulatorPkg/EmulatorPkg.fdf |2 +- > MdeModulePkg/MdeModulePkg.dsc |3 - > .../Network/IScsiDxe/ComponentName.h | 165 - > .../Universal/Network/IScsiDxe/IScsi4Dxe.uni | 25 - > .../Network/IScsiDxe/IScsi4DxeExtra.uni | 20 - >
Re: [edk2] [PATCH v1 7/7] NetworkPkg: Remove some clarification from TCP/PXE/ISCSI driver INF.
Reviewed-by: Ye Ting -Original Message- From: Fu, Siyuan Sent: Tuesday, October 30, 2018 3:33 PM To: edk2-devel@lists.01.org Cc: Wu, Jiaxin ; Ye, Ting Subject: [PATCH v1 7/7] NetworkPkg: Remove some clarification from TCP/PXE/ISCSI driver INF. This patch is to remove the clarification about usage/difference between those drivers in MdeModulePkg and NetworkPkg, since the MdeModulePkg ones have been deleted now. Cc: Jiaxin Wu Cc: Ye Ting Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Fu Siyuan --- NetworkPkg/IScsiDxe/IScsiDxe.inf | 10 -- NetworkPkg/TcpDxe/TcpDxe.inf | 6 -- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf | 6 -- 3 files changed, 22 deletions(-) diff --git a/NetworkPkg/IScsiDxe/IScsiDxe.inf b/NetworkPkg/IScsiDxe/IScsiDxe.inf index 195dc191250f..bdf1313aa957 100644 --- a/NetworkPkg/IScsiDxe/IScsiDxe.inf +++ b/NetworkPkg/IScsiDxe/IScsiDxe.inf @@ -4,16 +4,6 @@ # The iSCSI driver provides iSCSI service in the preboot environment and supports # booting over iSCSI. This driver supports both IPv4 and IPv6 network stack. # -# Notes: -# 1) This driver can't co-work with the IScsiDxe driver in MdeModulePkg. -# 2) This driver includes more bug fixes and supports more features (e.g. IPv6, Dns -# support for target URL configuration, iSCSI keyword support) than the IscsiDxe -# driver in MdeModulePkg. So, we recommend using this driver even though both of -# them can be used. -# 3) This driver depends on OpenSSL. To use this driver, please follow the -# instructions found in the file "OpenSSL-HOWTO.txt" located in -# CryptoPkg\Library\OpensslLib to enable the OpenSSL building first. -# # Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved. # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License diff --git a/NetworkPkg/TcpDxe/TcpDxe.inf b/NetworkPkg/TcpDxe/TcpDxe.inf index 9433fb875cba..c4e3de7ec5ce 100644 --- a/NetworkPkg/TcpDxe/TcpDxe.inf +++ b/NetworkPkg/TcpDxe/TcpDxe.inf @@ -5,12 +5,6 @@ # It might provide TCPv4 Protocol or TCPv6 Protocol or both of them that depends on which network # stack has been loaded in system. This driver supports both IPv4 and IPv6 network stack. # -# Notes: -# 1) This driver can't co-work with the Tcp4Dxe driver in MdeModulePkg. -# 2) This driver includes more bug fixes and supports more features (e.g. IPv6, TCP Cancel -# function) than the Tcp4Dxe driver in MdeModulePkg. So, we recommend using this driver -# even though both of them can be used. -# # Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved. # # This program and the accompanying materials diff --git a/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf b/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf index 130a5456e2c1..63430711e71b 100644 --- a/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf +++ b/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf @@ -5,12 +5,6 @@ # PXE-compatible device for network access or booting. This driver supports # both IPv4 and IPv6 network stack. # -# Notes: -# 1) This driver can't co-work with the UefiPxeBcDxe driver in MdeModulePkg. -# 2) This driver includes more bug fixes and supports more features (e.g. IPv6, -# MTFTP windowsize) than the UefiPxeBcDxe driver in MdeModulePkg. So, we -# recommend using this driver even though both of them can be used. -# # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved. # # This program and the accompanying materials -- 2.18.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] Reminder for deleting 3 network drivers in MdeModulePkg
Hi, All This email is a reminder for the patch series "Delete TCP, PXE, iSCSI driver in MdeModulePkg" https://lists.01.org/pipermail/edk2-devel/2018-October/031605.html, which *intend to delete 3 network drivers from edk2 repository*. Please help to review this email and also the patch series to provide your feedback before this weekend. Below is a driver list which we want to *delete* from edk2 master, because these drivers have not been actively maintained for a long time, and can't co-work with the dual-stack drivers in NetworkPkg. MdeModulePkg/Universal/Network/Tcp4Dxe (will be deleted) MdeModulePkg/Universal/Network/UefiPxeBcDxe (will be deleted) MdeModulePkg/Universal/Network/IScsiDxe (will be deleted) Below drivers in NetworkPkg contains all the functionalities compared with the MdeModulePkg version, with more bug fixes and more new feature added: NetworkPkg/TcpDxe/TcpDxe.inf NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf NetworkPkg/IScsiDxe/IScsiDxe.inf People who want to continue use these deleted drivers could go to edk2/UDK2018 branch to get them, but it's *highly not recommended*. *If you have any opposition on deleting these drivers, please let me know before this weekend, thanks.* Bugzilla link for this issue: https://bugzilla.tianocore.org/show_bug.cgi?id=1278 BestRegards Fu Siyuan ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH 1/1] Vlv2TbltDevicePkg/SmBiosMiscDxe: fix the comparison of characters
Dereference MatchLang before comparing it with a character.
Cc: David Wei
Cc: Mang Guo
Cc: Michael D Kinney
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Gary Lin
---
.../SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
index 7cf3453a62f4..612e1261fdaa 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
@@ -73,7 +73,7 @@ CurrentLanguageMatch (
// Find the best matching RFC 4646 language, compute the offset.
//
CompareLength = AsciiStrLen (BestLanguage);
-for (MatchLang = Languages, (*Offset) = 0; MatchLang != '\0'; (*Offset)++)
{
+for (MatchLang = Languages, (*Offset) = 0; *MatchLang != '\0';
(*Offset)++) {
//
// Seek to the end of current match language.
//
--
2.19.0
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v1 2/7] EmulatorPkg: Replace obsoleted network drivers from platform DSC/FDF.
Reviewed-by: Ruiyu Ni Thanks/Ray > -Original Message- > From: edk2-devel On Behalf Of Fu > Siyuan > Sent: Tuesday, October 30, 2018 3:33 PM > To: edk2-devel@lists.01.org > Cc: Ni, Ruiyu ; Justen, Jordan L > > Subject: [edk2] [PATCH v1 2/7] EmulatorPkg: Replace obsoleted network > drivers from platform DSC/FDF. > > 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 > Cc: Andrew Fish > Cc: Ruiyu Ni > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Fu Siyuan > --- > EmulatorPkg/EmulatorPkg.dsc | 2 +- > EmulatorPkg/EmulatorPkg.fdf | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc > index c8c444fe1c89..3bfb48b9 100644 > --- a/EmulatorPkg/EmulatorPkg.dsc > +++ b/EmulatorPkg/EmulatorPkg.dsc > @@ -378,8 +378,8 @@ [Components] >MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf >MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf >MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > + NetworkPkg/TcpDxe/TcpDxe.inf > >MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf >MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf > index 5b5f81443dff..4595796d5185 100644 > --- a/EmulatorPkg/EmulatorPkg.fdf > +++ b/EmulatorPkg/EmulatorPkg.fdf > @@ -203,7 +203,7 @@ [FV.FvRecovery] > INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > -INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > +INF NetworkPkg/TcpDxe/TcpDxe.inf > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > INF FatPkg/EnhancedFatDxe/Fat.inf > -- > 2.18.0.windows.1 > > ___ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v1 1/7] Nt32Pkg: Replace obsoleted network drivers from NT32 platform DSC/FDF.
Reviewed-by: Ruiyu Ni Thanks/Ray > -Original Message- > From: edk2-devel On Behalf Of Fu > Siyuan > Sent: Tuesday, October 30, 2018 3:33 PM > To: edk2-devel@lists.01.org > Cc: Ni, Ruiyu ; Wu, Hao A > Subject: [edk2] [PATCH v1 1/7] Nt32Pkg: Replace obsoleted network drivers > from NT32 platform DSC/FDF. > > 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: Ruiyu Ni > Cc: Hao Wu > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Fu Siyuan > --- > Nt32Pkg/Nt32Pkg.dsc | 12 > Nt32Pkg/Nt32Pkg.fdf | 12 > 2 files changed, 8 insertions(+), 16 deletions(-) > > diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index > 58d9f8787dde..4293ca39fdec 100644 > --- a/Nt32Pkg/Nt32Pkg.dsc > +++ b/Nt32Pkg/Nt32Pkg.dsc > @@ -4,7 +4,7 @@ > # The Emulation Platform can be used to debug individual modules, prior to > creating > #a real platform. This also provides an example for how an DSC is > created. > # > -# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved. > +# Copyright (c) 2006 - 2018, Intel Corporation. All rights > +reserved. > # Copyright (c) 2015, Hewlett-Packard Development Company, L.P. # > (C) Copyright 2016 Hewlett Packard Enterprise Development LP # @@ - > 468,20 +468,16 @@ [Components] >MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf >MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf >MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > + NetworkPkg/TcpDxe/TcpDxe.inf > + NetworkPkg/IScsiDxe/IScsiDxe.inf >Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf > > !if $(NETWORK_IP6_ENABLE) == TRUE >NetworkPkg/Ip6Dxe/Ip6Dxe.inf >NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > - NetworkPkg/TcpDxe/TcpDxe.inf >NetworkPkg/Udp6Dxe/Udp6Dxe.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 > >NetworkPkg/HttpBootDxe/HttpBootDxe.inf > diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf index > db2719fd99df..65d9bf812b5b 100644 > --- a/Nt32Pkg/Nt32Pkg.fdf > +++ b/Nt32Pkg/Nt32Pkg.fdf > @@ -1,7 +1,7 @@ > ## @file > # This is NT32 FDF file with UEFI HII features enabled # -# Copyright (c) > 2007 > - 2017, Intel Corporation. All rights reserved. > +# Copyright (c) 2007 - 2018, Intel Corporation. All rights > +reserved. > # (C) Copyright 2016 Hewlett Packard Enterprise Development LP # > #This program and the accompanying materials > @@ -257,19 +257,15 @@ [FV.FvRecovery] > 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/TcpDxe/TcpDxe.inf > +INF NetworkPkg/IScsiDxe/IScsiDxe.inf > INF Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf > !if $(NETWORK_IP6_ENABLE) == TRUE > INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf > INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf > INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > -INF NetworkPkg/TcpDxe/TcpDxe.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 > INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf > INF NetworkPkg/DnsDxe/DnsDxe.inf > -- > 2.18.0.windows.1 > > ___ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] FmpDevicePkg DSC: Add NOOPT target to verify NOOPT target
Reviewed-by: Star Zeng -Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Liming Gao Sent: Tuesday, October 30, 2018 3:50 PM To: edk2-devel@lists.01.org Cc: Zeng, Star Subject: [edk2] [Patch] FmpDevicePkg DSC: Add NOOPT target to verify NOOPT target Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao Cc: Star Zeng --- FmpDevicePkg/FmpDevicePkg.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc index 444cd1f..62f4608 100644 --- a/FmpDevicePkg/FmpDevicePkg.dsc +++ b/FmpDevicePkg/FmpDevicePkg.dsc @@ -37,7 +37,7 @@ DSC_SPECIFICATION = 0x00010005 OUTPUT_DIRECTORY = Build/FmpDevicePkg SUPPORTED_ARCHITECTURES= IA32|X64|ARM|AARCH64 - BUILD_TARGETS = DEBUG|RELEASE + BUILD_TARGETS = DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER = DEFAULT # -- 2.10.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch] FmpDevicePkg DSC: Add NOOPT target to verify NOOPT target
Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao Cc: Star Zeng --- FmpDevicePkg/FmpDevicePkg.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc index 444cd1f..62f4608 100644 --- a/FmpDevicePkg/FmpDevicePkg.dsc +++ b/FmpDevicePkg/FmpDevicePkg.dsc @@ -37,7 +37,7 @@ DSC_SPECIFICATION = 0x00010005 OUTPUT_DIRECTORY = Build/FmpDevicePkg SUPPORTED_ARCHITECTURES= IA32|X64|ARM|AARCH64 - BUILD_TARGETS = DEBUG|RELEASE + BUILD_TARGETS = DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER = DEFAULT # -- 2.10.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v1 0/7] Delete TCP, PXE, iSCSI driver in MdeModulePkg.
Hi Siyuan, Have you checked the platforms in https://github.com/tianocore/edk2-platforms to see whether they need to be updated accordingly or not? Cc more people. Thanks, Star -Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Fu Siyuan Sent: Tuesday, October 30, 2018 3:33 PM To: edk2-devel@lists.01.org Subject: [edk2] [PATCH v1 0/7] Delete TCP, PXE, iSCSI driver in MdeModulePkg. 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 (7): Nt32Pkg: Replace obsoleted network drivers from NT32 platform DSC/FDF. EmulatorPkg: Replace obsoleted network drivers from platform DSC/FDF. OvmfPkg: Replace obsoleted network drivers from platform DSC/FDF. Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF. ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF. MdeModulePkg: Delete the TCP/PXE/ISCSI drivers in MdeModulePkg. NetworkPkg: Remove some clarification from TCP/PXE/ISCSI driver INF. .../Network/IScsiDxe/ComponentName.c | 283 -- .../Universal/Network/IScsiDxe/IScsiCHAP.c| 430 --- .../Universal/Network/IScsiDxe/IScsiConfig.c | 1264 --- .../Universal/Network/IScsiDxe/IScsiDhcp.c| 472 --- .../Universal/Network/IScsiDxe/IScsiDriver.c | 676 .../Network/IScsiDxe/IScsiExtScsiPassThru.c | 412 --- .../Universal/Network/IScsiDxe/IScsiIbft.c| 539 --- .../Network/IScsiDxe/IScsiInitiatorName.c | 116 - .../Universal/Network/IScsiDxe/IScsiMisc.c| 948 -- .../Universal/Network/IScsiDxe/IScsiProto.c | 2799 --- .../Universal/Network/IScsiDxe/IScsiTcp4Io.c | 487 --- MdeModulePkg/Universal/Network/IScsiDxe/Md5.c | 350 -- .../Universal/Network/Tcp4Dxe/ComponentName.c | 433 --- .../Universal/Network/Tcp4Dxe/SockImpl.c | 1201 --- .../Universal/Network/Tcp4Dxe/SockInterface.c | 990 -- .../Network/Tcp4Dxe/Tcp4Dispatcher.c | 717 .../Universal/Network/Tcp4Dxe/Tcp4Driver.c| 782 - .../Universal/Network/Tcp4Dxe/Tcp4Input.c | 1497 - .../Universal/Network/Tcp4Dxe/Tcp4Io.c| 112 - .../Universal/Network/Tcp4Dxe/Tcp4Main.c | 674 .../Universal/Network/Tcp4Dxe/Tcp4Misc.c | 940 -- .../Universal/Network/Tcp4Dxe/Tcp4Option.c| 352 -- .../Universal/Network/Tcp4Dxe/Tcp4Output.c| 1238 --- .../Universal/Network/Tcp4Dxe/Tcp4Timer.c | 584 .../Network/UefiPxeBcDxe/ComponentName.c | 365 -- .../Network/UefiPxeBcDxe/PxeBcDhcp.c | 1999 --- .../Network/UefiPxeBcDxe/PxeBcDriver.c| 665 .../Network/UefiPxeBcDxe/PxeBcImpl.c | 2989 - .../Network/UefiPxeBcDxe/PxeBcMtftp.c | 454 --- .../Network/UefiPxeBcDxe/PxeBcSupport.c | 221 -- ArmVirtPkg/ArmVirtQemu.dsc| 10 +- ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 10 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 10 +- EmulatorPkg/EmulatorPkg.dsc |2 +- EmulatorPkg/EmulatorPkg.fdf |2 +- MdeModulePkg/MdeModulePkg.dsc |3 - .../Network/IScsiDxe/ComponentName.h | 165 - .../Universal/Network/IScsiDxe/IScsi4Dxe.uni | 25 - .../Network/IScsiDxe/IScsi4DxeExtra.uni | 20 - .../Universal/Network/IScsiDxe/IScsiCHAP.h| 106 - .../Universal/Network/IScsiDxe/IScsiCommon.h | 22 - .../Universal/Network/IScsiDxe/IScsiConfig.h | 166 - .../Network/IScsiDxe/IScsiConfigDxe.vfr | 219 -- .../IScsiDxe/IScsiConfigDxeStrings.uni| 62 - .../Network/IScsiDxe/IScsiConfigNVDataStruc.h | 109 - .../Universal/Network/IScsiDxe/IScsiDhcp.h| 55 - .../Universal/Network/IScsiDxe/IScsiDriver.h | 140 - .../Universal/Network/IScsiDxe/IScsiDxe.inf | 134 - .../Network/IScsiDxe/IScsiExtScsiPassThru.h | 22 - .../Universal/Network/IScsiDxe/IScsiIbft.h| 38 - .../Universal/Network/IScsiDxe/IScsiImpl.h| 168 - .../Network/IScsiDxe/IScsiInitiatorName.h | 74 - .../Universal/Network/IScsiDxe/IScsiMisc.h| 317 -- .../Universal/Network/IScsiDxe/IScsiProto.h | 1005 -- .../Universal/Network/IScsiDxe/IScsiTcp4Io.h | 142 - MdeModulePkg/Universal/Network/IScsiDxe/Md5.h | 80 - .../Universal/Network/Tcp4Dxe/SockImpl.h | 131 - .../Universal/Network/Tcp4Dxe/Socket.h
[edk2] [PATCH v1 7/7] NetworkPkg: Remove some clarification from TCP/PXE/ISCSI driver INF.
This patch is to remove the clarification about usage/difference between those drivers in MdeModulePkg and NetworkPkg, since the MdeModulePkg ones have been deleted now. Cc: Jiaxin Wu Cc: Ye Ting Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Fu Siyuan --- NetworkPkg/IScsiDxe/IScsiDxe.inf | 10 -- NetworkPkg/TcpDxe/TcpDxe.inf | 6 -- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf | 6 -- 3 files changed, 22 deletions(-) diff --git a/NetworkPkg/IScsiDxe/IScsiDxe.inf b/NetworkPkg/IScsiDxe/IScsiDxe.inf index 195dc191250f..bdf1313aa957 100644 --- a/NetworkPkg/IScsiDxe/IScsiDxe.inf +++ b/NetworkPkg/IScsiDxe/IScsiDxe.inf @@ -4,16 +4,6 @@ # The iSCSI driver provides iSCSI service in the preboot environment and supports # booting over iSCSI. This driver supports both IPv4 and IPv6 network stack. # -# Notes: -# 1) This driver can't co-work with the IScsiDxe driver in MdeModulePkg. -# 2) This driver includes more bug fixes and supports more features (e.g. IPv6, Dns -# support for target URL configuration, iSCSI keyword support) than the IscsiDxe -# driver in MdeModulePkg. So, we recommend using this driver even though both of -# them can be used. -# 3) This driver depends on OpenSSL. To use this driver, please follow the -# instructions found in the file "OpenSSL-HOWTO.txt" located in -# CryptoPkg\Library\OpensslLib to enable the OpenSSL building first. -# # Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved. # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License diff --git a/NetworkPkg/TcpDxe/TcpDxe.inf b/NetworkPkg/TcpDxe/TcpDxe.inf index 9433fb875cba..c4e3de7ec5ce 100644 --- a/NetworkPkg/TcpDxe/TcpDxe.inf +++ b/NetworkPkg/TcpDxe/TcpDxe.inf @@ -5,12 +5,6 @@ # It might provide TCPv4 Protocol or TCPv6 Protocol or both of them that depends on which network # stack has been loaded in system. This driver supports both IPv4 and IPv6 network stack. # -# Notes: -# 1) This driver can't co-work with the Tcp4Dxe driver in MdeModulePkg. -# 2) This driver includes more bug fixes and supports more features (e.g. IPv6, TCP Cancel -# function) than the Tcp4Dxe driver in MdeModulePkg. So, we recommend using this driver -# even though both of them can be used. -# # Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved. # # This program and the accompanying materials diff --git a/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf b/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf index 130a5456e2c1..63430711e71b 100644 --- a/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf +++ b/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf @@ -5,12 +5,6 @@ # PXE-compatible device for network access or booting. This driver supports # both IPv4 and IPv6 network stack. # -# Notes: -# 1) This driver can't co-work with the UefiPxeBcDxe driver in MdeModulePkg. -# 2) This driver includes more bug fixes and supports more features (e.g. IPv6, -# MTFTP windowsize) than the UefiPxeBcDxe driver in MdeModulePkg. So, we -# recommend using this driver even though both of them can be used. -# # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved. # # This program and the accompanying materials -- 2.18.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH v1 2/7] EmulatorPkg: Replace obsoleted network drivers from platform DSC/FDF.
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 Cc: Andrew Fish Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Fu Siyuan --- EmulatorPkg/EmulatorPkg.dsc | 2 +- EmulatorPkg/EmulatorPkg.fdf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index c8c444fe1c89..3bfb48b9 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -378,8 +378,8 @@ [Components] MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf + NetworkPkg/TcpDxe/TcpDxe.inf MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf index 5b5f81443dff..4595796d5185 100644 --- a/EmulatorPkg/EmulatorPkg.fdf +++ b/EmulatorPkg/EmulatorPkg.fdf @@ -203,7 +203,7 @@ [FV.FvRecovery] INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf -INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf +INF NetworkPkg/TcpDxe/TcpDxe.inf INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf -- 2.18.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH v1 4/7] Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF.
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
Cc: Mang Guo
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Fu Siyuan
---
Vlv2TbltDevicePkg/PlatformPkg.fdf | 14 +++---
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf| 14 +++---
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 18 +++---
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 18 +++---
Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 18 +++---
5 files changed, 15 insertions(+), 67 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..322793257e0b 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -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 {
-
- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000
-}
+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
-
[edk2] [PATCH v1 3/7] OvmfPkg: Replace obsoleted network drivers from platform DSC/FDF.
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 Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Anthony Perard Cc: Julien Grall Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Fu Siyuan --- OvmfPkg/OvmfPkgIa32.dsc| 12 OvmfPkg/OvmfPkgIa32.fdf| 10 +++--- OvmfPkg/OvmfPkgIa32X64.dsc | 12 OvmfPkg/OvmfPkgIa32X64.fdf | 10 +++--- OvmfPkg/OvmfPkgX64.dsc | 12 OvmfPkg/OvmfPkgX64.fdf | 10 +++--- 6 files changed, 21 insertions(+), 45 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 9f07e75050c0..bdd1169c58a2 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -790,18 +790,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..d4b09b38194d 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -799,18 +799,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
[edk2] [PATCH v1 5/7] ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF.
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 Cc: Ard Biesheuvel Cc: Julien Grall Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Fu Siyuan --- ArmVirtPkg/ArmVirtQemu.dsc | 10 +++--- ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 10 +++--- ArmVirtPkg/ArmVirtQemuKernel.dsc | 10 +++--- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 885c6b14b844..b3f1b23e3890 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -346,18 +346,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..e3ed713cbb39 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -335,18 +335,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.18.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH v1 1/7] Nt32Pkg: Replace obsoleted network drivers from NT32 platform DSC/FDF.
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: Ruiyu Ni Cc: Hao Wu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Fu Siyuan --- Nt32Pkg/Nt32Pkg.dsc | 12 Nt32Pkg/Nt32Pkg.fdf | 12 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index 58d9f8787dde..4293ca39fdec 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -4,7 +4,7 @@ # The Emulation Platform can be used to debug individual modules, prior to creating #a real platform. This also provides an example for how an DSC is created. # -# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved. +# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. # Copyright (c) 2015, Hewlett-Packard Development Company, L.P. # (C) Copyright 2016 Hewlett Packard Enterprise Development LP # @@ -468,20 +468,16 @@ [Components] MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf + NetworkPkg/TcpDxe/TcpDxe.inf + NetworkPkg/IScsiDxe/IScsiDxe.inf Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf !if $(NETWORK_IP6_ENABLE) == TRUE NetworkPkg/Ip6Dxe/Ip6Dxe.inf NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - NetworkPkg/TcpDxe/TcpDxe.inf NetworkPkg/Udp6Dxe/Udp6Dxe.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 NetworkPkg/HttpBootDxe/HttpBootDxe.inf diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf index db2719fd99df..65d9bf812b5b 100644 --- a/Nt32Pkg/Nt32Pkg.fdf +++ b/Nt32Pkg/Nt32Pkg.fdf @@ -1,7 +1,7 @@ ## @file # This is NT32 FDF file with UEFI HII features enabled # -# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved. +# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved. # (C) Copyright 2016 Hewlett Packard Enterprise Development LP # #This program and the accompanying materials @@ -257,19 +257,15 @@ [FV.FvRecovery] 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/TcpDxe/TcpDxe.inf +INF NetworkPkg/IScsiDxe/IScsiDxe.inf INF Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf !if $(NETWORK_IP6_ENABLE) == TRUE INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf -INF NetworkPkg/TcpDxe/TcpDxe.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 INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf INF NetworkPkg/DnsDxe/DnsDxe.inf -- 2.18.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH v1 0/7] Delete TCP, PXE, iSCSI driver in MdeModulePkg.
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 (7): Nt32Pkg: Replace obsoleted network drivers from NT32 platform DSC/FDF. EmulatorPkg: Replace obsoleted network drivers from platform DSC/FDF. OvmfPkg: Replace obsoleted network drivers from platform DSC/FDF. Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF. ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF. MdeModulePkg: Delete the TCP/PXE/ISCSI drivers in MdeModulePkg. NetworkPkg: Remove some clarification from TCP/PXE/ISCSI driver INF. .../Network/IScsiDxe/ComponentName.c | 283 -- .../Universal/Network/IScsiDxe/IScsiCHAP.c| 430 --- .../Universal/Network/IScsiDxe/IScsiConfig.c | 1264 --- .../Universal/Network/IScsiDxe/IScsiDhcp.c| 472 --- .../Universal/Network/IScsiDxe/IScsiDriver.c | 676 .../Network/IScsiDxe/IScsiExtScsiPassThru.c | 412 --- .../Universal/Network/IScsiDxe/IScsiIbft.c| 539 --- .../Network/IScsiDxe/IScsiInitiatorName.c | 116 - .../Universal/Network/IScsiDxe/IScsiMisc.c| 948 -- .../Universal/Network/IScsiDxe/IScsiProto.c | 2799 --- .../Universal/Network/IScsiDxe/IScsiTcp4Io.c | 487 --- MdeModulePkg/Universal/Network/IScsiDxe/Md5.c | 350 -- .../Universal/Network/Tcp4Dxe/ComponentName.c | 433 --- .../Universal/Network/Tcp4Dxe/SockImpl.c | 1201 --- .../Universal/Network/Tcp4Dxe/SockInterface.c | 990 -- .../Network/Tcp4Dxe/Tcp4Dispatcher.c | 717 .../Universal/Network/Tcp4Dxe/Tcp4Driver.c| 782 - .../Universal/Network/Tcp4Dxe/Tcp4Input.c | 1497 - .../Universal/Network/Tcp4Dxe/Tcp4Io.c| 112 - .../Universal/Network/Tcp4Dxe/Tcp4Main.c | 674 .../Universal/Network/Tcp4Dxe/Tcp4Misc.c | 940 -- .../Universal/Network/Tcp4Dxe/Tcp4Option.c| 352 -- .../Universal/Network/Tcp4Dxe/Tcp4Output.c| 1238 --- .../Universal/Network/Tcp4Dxe/Tcp4Timer.c | 584 .../Network/UefiPxeBcDxe/ComponentName.c | 365 -- .../Network/UefiPxeBcDxe/PxeBcDhcp.c | 1999 --- .../Network/UefiPxeBcDxe/PxeBcDriver.c| 665 .../Network/UefiPxeBcDxe/PxeBcImpl.c | 2989 - .../Network/UefiPxeBcDxe/PxeBcMtftp.c | 454 --- .../Network/UefiPxeBcDxe/PxeBcSupport.c | 221 -- ArmVirtPkg/ArmVirtQemu.dsc| 10 +- ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 10 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 10 +- EmulatorPkg/EmulatorPkg.dsc |2 +- EmulatorPkg/EmulatorPkg.fdf |2 +- MdeModulePkg/MdeModulePkg.dsc |3 - .../Network/IScsiDxe/ComponentName.h | 165 - .../Universal/Network/IScsiDxe/IScsi4Dxe.uni | 25 - .../Network/IScsiDxe/IScsi4DxeExtra.uni | 20 - .../Universal/Network/IScsiDxe/IScsiCHAP.h| 106 - .../Universal/Network/IScsiDxe/IScsiCommon.h | 22 - .../Universal/Network/IScsiDxe/IScsiConfig.h | 166 - .../Network/IScsiDxe/IScsiConfigDxe.vfr | 219 -- .../IScsiDxe/IScsiConfigDxeStrings.uni| 62 - .../Network/IScsiDxe/IScsiConfigNVDataStruc.h | 109 - .../Universal/Network/IScsiDxe/IScsiDhcp.h| 55 - .../Universal/Network/IScsiDxe/IScsiDriver.h | 140 - .../Universal/Network/IScsiDxe/IScsiDxe.inf | 134 - .../Network/IScsiDxe/IScsiExtScsiPassThru.h | 22 - .../Universal/Network/IScsiDxe/IScsiIbft.h| 38 - .../Universal/Network/IScsiDxe/IScsiImpl.h| 168 - .../Network/IScsiDxe/IScsiInitiatorName.h | 74 - .../Universal/Network/IScsiDxe/IScsiMisc.h| 317 -- .../Universal/Network/IScsiDxe/IScsiProto.h | 1005 -- .../Universal/Network/IScsiDxe/IScsiTcp4Io.h | 142 - MdeModulePkg/Universal/Network/IScsiDxe/Md5.h | 80 - .../Universal/Network/Tcp4Dxe/SockImpl.h | 131 - .../Universal/Network/Tcp4Dxe/Socket.h| 954 -- .../Universal/Network/Tcp4Dxe/Tcp4Driver.h| 342 -- .../Universal/Network/Tcp4Dxe/Tcp4Dxe.inf | 94 - .../Universal/Network/Tcp4Dxe/Tcp4Dxe.uni | 23 - .../Network/Tcp4Dxe/Tcp4DxeExtra.uni | 20 - .../Universal/Network/Tcp4Dxe/Tcp4Func.h | 781 - .../Universal/Network/Tcp4Dxe/Tcp4Main.h | 494 --- .../Universal/Network/Tcp4Dxe/Tcp4Option.h| 130 -
Re: [edk2] [PATCH v2 1/2] ShellPkg-UefiShellLib: Add a function to fully-qualify paths
> -Original Message-
> From: jim.dai...@dell.com
> Sent: Tuesday, October 30, 2018 5:15 AM
> To: edk2-devel@lists.01.org
> Cc: Carsey, Jaben ; Ni, Ruiyu
> Subject: [PATCH v2 1/2] ShellPkg-UefiShellLib: Add a function to fully-qualify
> paths
>
> +CHAR16*
> +EFIAPI
> +FullyQualifyPath(
> + IN CONST CHAR16 *Path
> + )
> +{
> + CONST CHAR16 *WorkingPath;
> + CONST CHAR16 *InputPath;
> + CHAR16 *InputFileSystem;
> + UINTNFileSystemCharCount;
> + CHAR16 *FullyQualifiedPath;
> + UINTNSize;
> +
> + FullyQualifiedPath = NULL;
> +
> + ASSERT(Path != NULL);
> + //
> + // Handle erroneous input when asserts are disabled.
> + //
> + if (Path == NULL) {
> +return NULL;
> + }
> + //
> + // In paths that contain ":", like fs0:dir/file.ext and
> fs2:\fqpath\file.ext,
> + // we have to consider the file system part separately from the "path"
> part.
> + // If there is a file system in the path, we have to get the current
> working
> + // directory for that file system. Then we need to use the part of the path
> + // following the ":". If a path does not contain ":", we use it as given.
> + //
> + InputPath = StrStr(Path, L":");
> + if (InputPath != NULL) {
> +InputPath++;
> +FileSystemCharCount = ((UINTN)InputPath - (UINTN)Path +
> sizeof(CHAR16)) / sizeof(CHAR16);
> +InputFileSystem = AllocateCopyPool(FileSystemCharCount *
> sizeof(CHAR16), Path);
> +if (InputFileSystem != NULL) {
> + InputFileSystem[FileSystemCharCount - 1] = CHAR_NULL;
> +}
> +WorkingPath = ShellGetCurrentDir(InputFileSystem);
> +SHELL_FREE_NON_NULL(InputFileSystem);
> +//
> +// Handle the degenerate case where Path was only a file system
> reference.
> +// In that case we return the current working directory of the file
> system.
> +//
> +if (InputPath == NULL) {
The "InputPath" should not be NULL.
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
