Re: [edk2-devel] [PATCH] IntelFrameworkModulePkg/DebugLib: Fix string copy issue

2019-05-21 Thread Liming Gao
Yes. MdeModulePkg one is correct. The issue is only in IntelFrameworkModulePkg 
one. 

This is a regression issue. Before remove IntelFrameworkModulePkg, it is still 
required to be fixed. 

Thanks
Liming
> -Original Message-
> From: Ni, Ray
> Sent: Wednesday, May 22, 2019 1:22 PM
> To: devel@edk2.groups.io; Gao, Zhichao 
> Cc: Gao, Liming ; Wu, Hao A 
> Subject: RE: [edk2-devel] [PATCH] IntelFrameworkModulePkg/DebugLib: Fix 
> string copy issue
> 
> Can the library in MdeModulePkg be used?
> The IntelFrameworkPkg/IntelFrameworkModulePkg will be removed in June.
> 
> > -Original Message-
> > From: devel@edk2.groups.io  On Behalf Of Gao,
> > Zhichao
> > Sent: Tuesday, May 21, 2019 3:50 PM
> > To: devel@edk2.groups.io
> > Cc: Gao, Liming ; Wu, Hao A 
> > Subject: [edk2-devel] [PATCH] IntelFrameworkModulePkg/DebugLib: Fix
> > string copy issue
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1826
> >
> > There is a bug to use AsciiStrCpyS to copy a truncated string. If would 
> > cause
> > an assert because the truncated length is always less than the source string
> > length. It should use the AsciiStrnCpyS instead.
> >
> > Cc: Liming Gao 
> > Cc: Hao A Wu 
> > Signed-off-by: Zhichao Gao 
> > ---
> >  .../Library/PeiDxeDebugLibReportStatusCode/DebugLib.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git
> > a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> > bugLib.c
> > b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> > bugLib.c
> > index e92601f89e..1840b6d683 100644
> > ---
> > a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> > bugLib.c
> > +++
> > b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> > b
> > +++ ugLib.c
> > @@ -150,7 +150,7 @@ DebugPrintMarker (
> >FormatString  = (CHAR8 *)((UINT64 *)(DebugInfo + 1) + 12);
> >
> >//
> > -  // Copy the Format string into the record
> > +  // Copy the Format string into the record. It will be truncated if it's 
> > too long.
> >//
> >// According to the content structure of Buffer shown above, the size of
> >// the FormatString buffer is the size of Buffer minus the Padding @@ -
> > 158,7 +158,7 @@ DebugPrintMarker (
> >// variable arguments (12 * sizeof (UINT64)).
> >//
> >DestBufferSize = sizeof (Buffer) - 4 - sizeof (EFI_DEBUG_INFO) - 12 * 
> > sizeof
> > (UINT64);
> > -  AsciiStrCpyS (FormatString, DestBufferSize / sizeof (CHAR8), Format);
> > +  AsciiStrnCpyS (FormatString, DestBufferSize / sizeof (CHAR8), Format,
> > + DestBufferSize / sizeof (CHAR8) - 1);
> >
> >//
> >// The first 12 * sizeof (UINT64) bytes following EFI_DEBUG_INFO are for
> > variable arguments
> > --
> > 2.21.0.windows.1
> >
> >
> > 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41193): https://edk2.groups.io/g/devel/message/41193
Mute This Topic: https://groups.io/mt/31694427/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [PATCH] IntelFrameworkModulePkg/DebugLib: Fix string copy issue

2019-05-21 Thread Ni, Ray
Can the library in MdeModulePkg be used?
The IntelFrameworkPkg/IntelFrameworkModulePkg will be removed in June.

> -Original Message-
> From: devel@edk2.groups.io  On Behalf Of Gao,
> Zhichao
> Sent: Tuesday, May 21, 2019 3:50 PM
> To: devel@edk2.groups.io
> Cc: Gao, Liming ; Wu, Hao A 
> Subject: [edk2-devel] [PATCH] IntelFrameworkModulePkg/DebugLib: Fix
> string copy issue
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1826
> 
> There is a bug to use AsciiStrCpyS to copy a truncated string. If would cause
> an assert because the truncated length is always less than the source string
> length. It should use the AsciiStrnCpyS instead.
> 
> Cc: Liming Gao 
> Cc: Hao A Wu 
> Signed-off-by: Zhichao Gao 
> ---
>  .../Library/PeiDxeDebugLibReportStatusCode/DebugLib.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git
> a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> bugLib.c
> b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> bugLib.c
> index e92601f89e..1840b6d683 100644
> ---
> a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> bugLib.c
> +++
> b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> b
> +++ ugLib.c
> @@ -150,7 +150,7 @@ DebugPrintMarker (
>FormatString  = (CHAR8 *)((UINT64 *)(DebugInfo + 1) + 12);
> 
>//
> -  // Copy the Format string into the record
> +  // Copy the Format string into the record. It will be truncated if it's 
> too long.
>//
>// According to the content structure of Buffer shown above, the size of
>// the FormatString buffer is the size of Buffer minus the Padding @@ -
> 158,7 +158,7 @@ DebugPrintMarker (
>// variable arguments (12 * sizeof (UINT64)).
>//
>DestBufferSize = sizeof (Buffer) - 4 - sizeof (EFI_DEBUG_INFO) - 12 * 
> sizeof
> (UINT64);
> -  AsciiStrCpyS (FormatString, DestBufferSize / sizeof (CHAR8), Format);
> +  AsciiStrnCpyS (FormatString, DestBufferSize / sizeof (CHAR8), Format,
> + DestBufferSize / sizeof (CHAR8) - 1);
> 
>//
>// The first 12 * sizeof (UINT64) bytes following EFI_DEBUG_INFO are for
> variable arguments
> --
> 2.21.0.windows.1
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41192): https://edk2.groups.io/g/devel/message/41192
Mute This Topic: https://groups.io/mt/31694427/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [RFC][edk2-platform][Add new packages in Platform\Intel directory]

2019-05-21 Thread Kubacki, Michael A
In that case, I’d like to move the proposed name to BoardSupportPkg.

Thanks,
Michael

From: Gao, Liming
Sent: Tuesday, May 21, 2019 9:00 PM
To: Kubacki, Michael A ; devel@edk2.groups.io
Subject: RE: [edk2-devel] [RFC][edk2-platform][Add new packages in 
Platform\Intel directory]

Michael:
 I am OK for both name. I think they have same meaning. To avoid the common 
word in Package name, such as Generic or Universal, BoardSupportPkg name may be 
better.

Thanks
Liming
From: Kubacki, Michael A [mailto:michael.a.kuba...@intel.com]
Sent: Monday, May 20, 2019 1:30 PM
To: Gao; Gao, Liming mailto:liming@intel.com>>; 
devel@edk2.groups.io
Subject: Re: [edk2-devel] [RFC][edk2-platform][Add new packages in 
Platform\Intel directory]


Hi Liming,

I agree with the need for both packages. We should wait at least another day 
for any additional feedback on the package name GenericBoardPkg. That name may 
give the impression the package can generically be used on various boards 
whereas the intent here is a package containing common or supporting board 
functionality. An alternative name to consider is BoardSupportPkg.

As a reminder, ensure the separation of content follows 8.1 (or update the 
document if necessary):

https://edk2-docs.gitbooks.io/edk-ii-minimum-platform-specification/8_stage_6_advanced_feature_selection/

Thanks,

Michael

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41191): https://edk2.groups.io/g/devel/message/41191
Mute This Topic: https://groups.io/mt/31629687/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [Patch edk2-platform 2/3] Platform/Intel/Vlv2TbltDevicePkg: Add NetworkPkg.dec as the package dependency

2019-05-21 Thread Sun, Zailiang
Reviewed-by: Zailiang Sun 

> -Original Message-
> From: Gao, Liming
> Sent: Monday, May 20, 2019 9:10 PM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang ; Qian, Yi 
> Subject: [Patch edk2-platform 2/3] Platform/Intel/Vlv2TbltDevicePkg: Add
> NetworkPkg.dec as the package dependency
> 
> NetLib will be moved from MdeModulePkg and NetworkPkg.
> So, the module that consumes NetLib need to depend on NetworkPkg.dec.
> 
> Signed-off-by: Liming Gao 
> Cc: Zailiang Sun 
> Cc: Yi Qian 
> ---
>  .../Intel/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf  | 1 +
>  .../IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf|
> 1 +
>  Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf   | 3
> ++-
>  3 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.i
> nf
> b/Platform/Intel/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.i
> nf
> index d3bef0fa39..66d11c6cda 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.i
> nf
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBd
> +++ sLib.inf
> @@ -48,6 +48,7 @@
>SecurityPkg/SecurityPkg.dec
>SignedCapsulePkg/SignedCapsulePkg.dec
>SourceLevelDebugPkg/SourceLevelDebugPkg.dec
> +  NetworkPkg/NetworkPkg.dec
> 
>  [LibraryClasses]
>DxeServicesTableLib
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Li
> brary/GenericBdsLib/GenericBdsLib.inf
> b/Platform/Intel/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Li
> brary/GenericBdsLib/GenericBdsLib.inf
> index e3c8a6fa27..795a9de4b8 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Li
> brary/GenericBdsLib/GenericBdsLib.inf
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/
> +++ Library/GenericBdsLib/GenericBdsLib.inf
> @@ -44,6 +44,7 @@
>IntelFrameworkPkg/IntelFrameworkPkg.dec
>IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
>ShellPkg/ShellPkg.dec
> +  NetworkPkg/NetworkPkg.dec
> 
>  [LibraryClasses]
>DevicePathLib
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
> index 37e54a92a8..09917eb702 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
> @@ -2,7 +2,7 @@
>  # Component name for module MiscSubclass  #  # FIX ME!
> -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> +# Copyright (c) 2006 - 2019, Intel Corporation. All rights
> +reserved.
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -89,6 +89,7 @@
>MdePkg/MdePkg.dec
>IntelFrameworkPkg/IntelFrameworkPkg.dec
>Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
> +  NetworkPkg/NetworkPkg.dec
> 
>  [LibraryClasses]
>HiiLib
> --
> 2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41189): https://edk2.groups.io/g/devel/message/41189
Mute This Topic: https://groups.io/mt/31684916/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [edk2-platforms][PATCH v1 06/16] Hisilicon/D0x: Use StatusCode Router & Handler in MdeModulePkg

2019-05-21 Thread Ni, Ray
> -Original Message-
> From: devel@edk2.groups.io  On Behalf Of Wu, Hao
> A
> Sent: Monday, May 20, 2019 4:50 PM
> To: devel@edk2.groups.io; ard.biesheu...@linaro.org; Leif Lindholm
> 
> Cc: Kinney, Michael D 
> Subject: Re: [edk2-devel] [edk2-platforms][PATCH v1 06/16] Hisilicon/D0x:
> Use StatusCode Router & Handler in MdeModulePkg
> 
> > -Original Message-
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Ard
> > Biesheuvel
> > Sent: Friday, May 17, 2019 11:34 PM
> > To: Leif Lindholm
> > Cc: Wu, Hao A; edk2-devel-groups-io; Kinney, Michael D
> > Subject: Re: [edk2-devel] [edk2-platforms][PATCH v1 06/16] Hisilicon/D0x:
> Use
> > StatusCode Router & Handler in MdeModulePkg
> >
> > On Wed, 15 May 2019 at 21:47, Leif Lindholm 
> > wrote:
> > >
> > > On Tue, May 14, 2019 at 10:08:21AM +0800, Hao A Wu wrote:
> > > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
> > > >
> > > > This commit adopts a similar approach to edk2 commit
> > > > a6d594c5fabd8da2273d2794826ec086cf9c3c04.
> > > >
> > > > Currently, Hisilicon platforms use modules from under
> > > > "IntelFrameworkModulePkg/Universal/StatusCode/", which produce
> > > > EFI_PEI_PROGRESS_CODE_PPI and EFI_STATUS_CODE_PROTOCOL
> directly,
> > and write
> > > > the status codes, as they are reported, to the serial port or to a 
> > > > memory
> > > > buffer. This is called "handling" the status codes.
> > > >
> > > > MdeModulePkg offers a PEIM under
> > > > "MdeModulePkg/Universal/ReportStatusCodeRouter/Pei" that
> produces
> > both
> > > > EFI_PEI_PROGRESS_CODE_PPI and EFI_PEI_RSC_HANDLER_PPI, and a
> > runtime DXE
> > > > driver under
> > "MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe"
> > > > that produces both EFI_STATUS_CODE_PROTOCOL and
> > EFI_RSC_HANDLER_PROTOCOL.
> > > >
> > > > MdeModulePkg also offers status code handler modules under
> > > > MdeModulePkg/Universal/StatusCodeHandler/ that depend on
> > > > EFI_PEI_RSC_HANDLER_PPI and EFI_RSC_HANDLER_PROTOCOL,
> > respectively.
> > > >
> > > > The StatusCodeHandler modules register themselves with
> > > > ReportStatusCodeRouter through EFI_PEI_RSC_HANDLER_PPI /
> > > > EFI_RSC_HANDLER_PROTOCOL. When another module reports a status
> > code
> > > > through EFI_PEI_PROGRESS_CODE_PPI /
> EFI_STATUS_CODE_PROTOCOL, it
> > reaches
> > > > the phase-matching ReportStatusCodeRouter module first, which in
> turn
> > > > passes the status code to the pre-registered, phase-matching
> > > > StatusCodeHandler module.
> > > >
> > > > The status code handling in the StatusCodeHandler modules is identical
> to
> > > > the one currently provided by the IntelFrameworkModulePkg modules.
> > Replace
> > > > the IntelFrameworkModulePkg modules with the MdeModulePkg ones,
> so
> > we can
> > > > decrease our dependency on IntelFrameworkModulePkg.
> > >
> > > I would like to have Ard's opinion on this (and he should be back
> > > Friday), and probably testing on the platforms. I say this because I
> > > intend to push the trivial patches today, but not this one.
> > >
> >
> >
> > I think this change is fine, but it should be tested on actual
> > hardware before it can be committed.
> 
> Hello Ard and Leif,
> 
> Do you know who might be able to help on testing this patch?

All,
We don't expect the no-one-own-testing blocks this patch series commit.
If we haven't received test result by start of next week, we would like
have an exception to push the patch series.

If we receive test results before that, we will continue working with
community to refine the patch to pass the test. (I think the possibility
of test failure is quite low. Similar changes have already been made
to OvmfPkg back to year 2016.)

Thanks,
Ray


> 
> Best Regards,
> Hao Wu
> 
> >
> > >
> > > > Cc: Ard Biesheuvel 
> > > > Cc: Leif Lindholm 
> > > > Cc: Michael D Kinney 
> > > > Signed-off-by: Hao A Wu 
> > > > ---
> > > >  Platform/Hisilicon/D03/D03.dsc | 6 --
> > > >  Platform/Hisilicon/D05/D05.dsc | 6 --
> > > >  Platform/Hisilicon/D06/D06.dsc | 6 --
> > > >  Platform/Hisilicon/D03/D03.fdf | 6 --
> > > >  Platform/Hisilicon/D05/D05.fdf | 6 --
> > > >  Platform/Hisilicon/D06/D06.fdf | 6 --
> > > >  6 files changed, 24 insertions(+), 12 deletions(-)
> > > >
> > > > diff --git a/Platform/Hisilicon/D03/D03.dsc
> > b/Platform/Hisilicon/D03/D03.dsc
> > > > index 7e8cb59641..a3c3ae5aa6 100644
> > > > --- a/Platform/Hisilicon/D03/D03.dsc
> > > > +++ b/Platform/Hisilicon/D03/D03.dsc
> > > > @@ -303,7 +303,8 @@
> > > >
> > > >Platform/Hisilicon/D03/MemoryInitPei/MemoryInitPeim.inf
> > > >ArmPkg/Drivers/CpuPei/CpuPei.inf
> > > > -
> IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> > > > +
> >
> MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCode
> Rout
> > erPei.inf
> > > > +
> >
> MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.in
> f
> > > >
> >
> 

[edk2-devel] [PATCH] UefiCpuPkg CpuCommFeaturesLib: Fix ASSERT if LMCE is supported

2019-05-21 Thread Zeng, Star
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1829

There will be ASSERT if LMCE is supported as below.
DXE_ASSERT!: [CpuFeaturesDxe]
  XXX\UefiCpuPkg\Library\CpuCommonFeaturesLib\MachineCheck.c (342):
ConfigData != ((void *) 0)

The code should get Config Data and FeatureControlGetConfigData
could be used.

BTW: A typo in LmceInitialize is also fixed.

Change-Id: I32b63ba649fc2977e155181a6263009e359742ed
Cc: Laszlo Ersek 
Cc: Eric Dong 
Cc: Ruiyu Ni 
Cc: Chandana Kumar 
Cc: Kevin Li 
Signed-off-by: Star Zeng 
---
 UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c | 2 +-
 UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c 
b/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c
index 738b57dc87f9..9ddc6ce9d476 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c
@@ -214,7 +214,7 @@ CpuCommonFeaturesLibConstructor (
   if (IsCpuFeatureSupported (CPU_FEATURE_LMCE)) {
 Status = RegisterCpuFeature (
"LMCE",
-   NULL,
+   FeatureControlGetConfigData,
LmceSupport,
LmceInitialize,
CPU_FEATURE_LMCE,
diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c 
b/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c
index 9ee559130080..2528e0044ecb 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/MachineCheck.c
@@ -322,7 +322,7 @@ LmceInitialize (
   MSR_IA32_FEATURE_CONTROL_REGISTER*MsrRegister;
 
   //
-  // The scope of FastStrings bit in the MSR_IA32_MISC_ENABLE is core for 
below processor type, only program
+  // The scope of LcmeOn bit in the MSR_IA32_MISC_ENABLE is core for below 
processor type, only program
   // MSR_IA32_MISC_ENABLE for thread 0 in each core.
   //
   if (IS_SILVERMONT_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo->DisplayModel) 
||
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41187): https://edk2.groups.io/g/devel/message/41187
Mute This Topic: https://groups.io/mt/31716359/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



FW: [edk2-devel] [Patch 2/2] EmulatorPkg: Add NetworkPkg/NetworkPkg.dec as the package dependency

2019-05-21 Thread Liming Gao
Forward to edk2 mail list

-Original Message-
From: Ni, Ray 
Sent: Tuesday, May 21, 2019 10:29 AM
To: Gao, Liming 
Subject: RE: [edk2-devel] [Patch 2/2] EmulatorPkg: Add 
NetworkPkg/NetworkPkg.dec as the package dependency

Reviewed-by: Ray Ni 
> 
> > -Original Message-
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> > Liming Gao
> > Sent: Monday, May 20, 2019 9:09 PM
> > To: devel@edk2.groups.io
> > Cc: Justen, Jordan L ; Andrew Fish
> > ; Ni, Ray 
> > Subject: [edk2-devel] [Patch 2/2] EmulatorPkg: Add
> > NetworkPkg/NetworkPkg.dec as the package dependency
> >
> > NetLib will be moved from MdeModulePkg and NetworkPkg.
> > So, the module that consumes NetLib need to depend on NetworkPkg.dec.
> >
> > Signed-off-by: Liming Gao 
> > Cc: Jordan Justen 
> > Cc: Andrew Fish 
> > Cc: Ray Ni 
> > ---
> >  EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
> > b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
> > index e570a4f79b..5b7d7fe60a 100644
> > --- a/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
> > +++ b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
> > @@ -1,7 +1,7 @@
> >  #/** @file
> >  # Component name for module EmuSnpDxe  # -#  Copyright (c) 2018,
> > Intel Corporation. All rights reserved.
> > +#  Copyright (c) 2018 - 2019, Intel Corporation. All rights
> > +reserved.
> >  # Copyright (c) 2010, Apple, Inc. All rights reserved.  #
> >  #SPDX-License-Identifier: BSD-2-Clause-Patent
> > @@ -33,6 +33,7 @@ [Packages]
> >MdePkg/MdePkg.dec
> >MdeModulePkg/MdeModulePkg.dec
> >EmulatorPkg/EmulatorPkg.dec
> > +  NetworkPkg/NetworkPkg.dec
> >
> >  [LibraryClasses]
> >DevicePathLib
> > --
> > 2.13.0.windows.1
> >
> >
> > 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41185): https://edk2.groups.io/g/devel/message/41185
Mute This Topic: https://groups.io/mt/31715658/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [PATCH] IntelFrameworkModulePkg/DebugLib: Fix string copy issue

2019-05-21 Thread Liming Gao
Reviewed-by: Liming Gao 

> -Original Message-
> From: Wu, Hao A
> Sent: Tuesday, May 21, 2019 4:03 PM
> To: devel@edk2.groups.io; Gao, Zhichao 
> Cc: Gao, Liming 
> Subject: RE: [edk2-devel] [PATCH] IntelFrameworkModulePkg/DebugLib: Fix 
> string copy issue
> 
> > -Original Message-
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> > Gao, Zhichao
> > Sent: Tuesday, May 21, 2019 3:50 PM
> > To: devel@edk2.groups.io
> > Cc: Gao, Liming; Wu, Hao A
> > Subject: [edk2-devel] [PATCH] IntelFrameworkModulePkg/DebugLib: Fix
> > string copy issue
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1826
> >
> > There is a bug to use AsciiStrCpyS to copy a truncated
> > string. If would cause an assert because the truncated
> > length is always less than the source string length. It
> > should use the AsciiStrnCpyS instead.
> >
> > Cc: Liming Gao 
> > Cc: Hao A Wu 
> > Signed-off-by: Zhichao Gao 
> > ---
> >  .../Library/PeiDxeDebugLibReportStatusCode/DebugLib.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git
> > a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> > bugLib.c
> > b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> > bugLib.c
> > index e92601f89e..1840b6d683 100644
> > ---
> > a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> > bugLib.c
> > +++
> > b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> > bugLib.c
> > @@ -150,7 +150,7 @@ DebugPrintMarker (
> >FormatString  = (CHAR8 *)((UINT64 *)(DebugInfo + 1) + 12);
> >
> >//
> > -  // Copy the Format string into the record
> > +  // Copy the Format string into the record. It will be truncated if it's 
> > too long.
> >//
> >// According to the content structure of Buffer shown above, the size of
> >// the FormatString buffer is the size of Buffer minus the Padding
> > @@ -158,7 +158,7 @@ DebugPrintMarker (
> >// variable arguments (12 * sizeof (UINT64)).
> >//
> >DestBufferSize = sizeof (Buffer) - 4 - sizeof (EFI_DEBUG_INFO) - 12 * 
> > sizeof
> > (UINT64);
> > -  AsciiStrCpyS (FormatString, DestBufferSize / sizeof (CHAR8), Format);
> > +  AsciiStrnCpyS (FormatString, DestBufferSize / sizeof (CHAR8), Format,
> > DestBufferSize / sizeof (CHAR8) - 1);
> 
> Reviewed-by: Hao A Wu 
> 
> Best Regards,
> Hao Wu
> 
> >
> >//
> >// The first 12 * sizeof (UINT64) bytes following EFI_DEBUG_INFO are for
> > variable arguments
> > --
> > 2.21.0.windows.1
> >
> >
> > 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41184): https://edk2.groups.io/g/devel/message/41184
Mute This Topic: https://groups.io/mt/31694427/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [Patch] MdeModulePkg: Update MdeModulePkg.dsc to remove Network related modules

2019-05-21 Thread Liming Gao
This is a bug. Because NetworkPkg dsc has included all network modules, the 
ones in MdeModule are duplicated. 
This change is to remove the duplicated one. 

Thanks
Liming
> -Original Message-
> From: Wu, Hao A
> Sent: Wednesday, May 22, 2019 9:44 AM
> To: devel@edk2.groups.io; Gao, Liming 
> Subject: RE: [edk2-devel] [Patch] MdeModulePkg: Update MdeModulePkg.dsc to 
> remove Network related modules
> 
> > -Original Message-
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> > Liming Gao
> > Sent: Tuesday, May 21, 2019 11:22 PM
> > To: devel@edk2.groups.io
> > Cc: Wu, Hao A
> > Subject: [edk2-devel] [Patch] MdeModulePkg: Update MdeModulePkg.dsc
> > to remove Network related modules
> >
> > Network related modules have been included in NetworkPkg.dsc.
> > They can be removed from MdeModulePkg.dsc.
> >
> > Signed-off-by: Liming Gao 
> > Cc: Hao A Wu 
> > ---
> >  MdeModulePkg/MdeModulePkg.dsc | 19 ---
> >  1 file changed, 19 deletions(-)
> >
> > diff --git a/MdeModulePkg/MdeModulePkg.dsc
> > b/MdeModulePkg/MdeModulePkg.dsc
> > index ac7111dea1..995fd805e1 100644
> > --- a/MdeModulePkg/MdeModulePkg.dsc
> > +++ b/MdeModulePkg/MdeModulePkg.dsc
> > @@ -63,11 +63,6 @@
> >#
> >UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> >UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> > -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> > -  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> > -  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> > -  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> > -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> >
> > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL
> > ib/DxeSecurityManagementLib.inf
> >
> > TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTem
> > plate.inf
> >
> > SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.in
> > f
> > @@ -263,12 +258,8 @@
> >
> > MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllo
> > cationProfileLib.inf
> >
> > MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.i
> > nf
> >
> > MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32Guided
> > SectionExtractLib.inf
> > -  MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> > -  MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> > -  MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> >MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
> >MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.inf
> > -  MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> >
> > MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protoco
> > l.inf
> >
> > MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedS
> > ectionExtractLib.inf
> >MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
> > @@ -357,16 +348,6 @@
> >MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
> >
> > MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurement
> > Dxe.inf
> >
> > -  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> > -  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> > -  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> > -  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> > -  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> > -  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> > -  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> > -  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> > -  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> > -
> 
> Reviewed-by: Hao A Wu 
> I will let the stewards to decide whether this can be pushed at this moment.
> 
> Best Regards,
> Hao Wu
> 
> >
> > MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmen
> > tPciCfg2Pei.inf
> >MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
> >MdeModulePkg/Universal/PCD/Pei/Pcd.inf
> > --
> > 2.13.0.windows.1
> >
> >
> > 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41183): https://edk2.groups.io/g/devel/message/41183
Mute This Topic: https://groups.io/mt/31697980/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [Patch] MdeModulePkg: Update MdeModulePkg.dsc to remove Network related modules

2019-05-21 Thread Wu, Hao A
> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Liming Gao
> Sent: Tuesday, May 21, 2019 11:22 PM
> To: devel@edk2.groups.io
> Cc: Wu, Hao A
> Subject: [edk2-devel] [Patch] MdeModulePkg: Update MdeModulePkg.dsc
> to remove Network related modules
> 
> Network related modules have been included in NetworkPkg.dsc.
> They can be removed from MdeModulePkg.dsc.
> 
> Signed-off-by: Liming Gao 
> Cc: Hao A Wu 
> ---
>  MdeModulePkg/MdeModulePkg.dsc | 19 ---
>  1 file changed, 19 deletions(-)
> 
> diff --git a/MdeModulePkg/MdeModulePkg.dsc
> b/MdeModulePkg/MdeModulePkg.dsc
> index ac7111dea1..995fd805e1 100644
> --- a/MdeModulePkg/MdeModulePkg.dsc
> +++ b/MdeModulePkg/MdeModulePkg.dsc
> @@ -63,11 +63,6 @@
>#
>UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
>UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> -  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> -  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> -  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> 
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL
> ib/DxeSecurityManagementLib.inf
> 
> TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTem
> plate.inf
> 
> SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.in
> f
> @@ -263,12 +258,8 @@
> 
> MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllo
> cationProfileLib.inf
> 
> MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.i
> nf
> 
> MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32Guided
> SectionExtractLib.inf
> -  MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> -  MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> -  MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
>MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
>MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.inf
> -  MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> 
> MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protoco
> l.inf
> 
> MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedS
> ectionExtractLib.inf
>MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
> @@ -357,16 +348,6 @@
>MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
> 
> MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurement
> Dxe.inf
> 
> -  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> -  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> -  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> -  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> -  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> -  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> -  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> -  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> -

Reviewed-by: Hao A Wu 
I will let the stewards to decide whether this can be pushed at this moment.

Best Regards,
Hao Wu

> 
> MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmen
> tPciCfg2Pei.inf
>MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
>MdeModulePkg/Universal/PCD/Pei/Pcd.inf
> --
> 2.13.0.windows.1
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41182): https://edk2.groups.io/g/devel/message/41182
Mute This Topic: https://groups.io/mt/31697980/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [Patch V5 edk2-platform 17/18] Platform/MinPlatformPkg: Update DSC to use NetworkPkg DSC.

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the DSC file to use the include fragment files provided
by NetworkPkg. And add network related definition in CoreCommonLib.dsc,
remove HttpLib from CoreDxeLib.dsc.

Cc: Michael A Kubacki 
Cc: Jiewen Yao 
Cc: Shifei A Lu 
Cc: Xiaohu Zhou 
Signed-off-by: Shenglei Zhang 
Reviewed-by: Michael Kubacki 
Reviewed-by: Liming Gao 
---
This change is updated to remove Http from 
MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc

 Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 11 ++-
 Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc|  2 --
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc 
b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
index efe02c99f3..23ab53dbfe 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
@@ -72,11 +72,12 @@
   #
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
+
+  #
+  # Network libraries
+  #
+!include NetworkPkg/NetworkLibs.dsc.inc
+
   
OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
 
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc 
b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
index 5b3679bb4e..0f0f15d3f6 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
@@ -40,8 +40,6 @@
 
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
 
-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
-
   
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
   
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
   
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41181): https://edk2.groups.io/g/devel/message/41181
Mute This Topic: https://groups.io/mt/31715430/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [Patch] BaseTools: Update Conf/target.template with the default EmulatorPkg.dsc

2019-05-21 Thread Bob Feng
Reviewed-by: Bob Feng 


-Original Message-
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Liming Gao
Sent: Tuesday, May 21, 2019 11:09 PM
To: devel@edk2.groups.io
Cc: Feng, Bob C 
Subject: [edk2-devel] [Patch] BaseTools: Update Conf/target.template with the 
default EmulatorPkg.dsc

Nt32Pkg has been removed. The default platform is changed to EmulatorPkg.dsc.

Signed-off-by: Liming Gao 
Cc: Bob Feng 
---
 BaseTools/Conf/target.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template 
index de8137a07e..d4a3b53b7f 100644
--- a/BaseTools/Conf/target.template
+++ b/BaseTools/Conf/target.template
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+#  Copyright (c) 2006 - 2019, Intel Corporation. All rights 
+reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent  # @@ -17,7 +17,7 @@
 #   build. This line is required 
if and only if the current
 #   working directory does not 
contain one or more description
 #   files.
-ACTIVE_PLATFORM   = Nt32Pkg/Nt32Pkg.dsc
+ACTIVE_PLATFORM   = EmulatorPkg/EmulatorPkg.dsc
 
 #  TARGETList   OptionalZero or more of the following: 
DEBUG, RELEASE, NOOPT
 #   UserDefined; separated by a 
space character.
--
2.13.0.windows.1





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41180): https://edk2.groups.io/g/devel/message/41180
Mute This Topic: https://groups.io/mt/31697760/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [Patch] BaseTools: Remove './SecMain' from 'run' target

2019-05-21 Thread Bob Feng
I entered a new BZ to create the EmulatorPkg postbuild script for "build run" 
support.
https://bugzilla.tianocore.org/show_bug.cgi?id=1828


Thanks,
Bob

-Original Message-
From: Kinney, Michael D 
Sent: Tuesday, May 21, 2019 11:45 PM
To: Gao, Liming ; Feng, Bob C ; 
devel@edk2.groups.io; Kinney, Michael D 
Subject: RE: [Patch] BaseTools: Remove './SecMain' from 'run' target

Reviewed-by: Michael D Kinney 

If we want the 'run' target to work for the EmulatorPkg, we can add a python 
post build script to support that.  Please enter a BZ feature request.

There is an example in the following edk2-staging branch that runs QEMU for an 
OvmfPkg build using a 'run' target.

https://github.com/tianocore/edk2-staging/tree/Bug_1525_FmpDevicePkg_MultipleControllers/OvmfPkg

The DSC file contains a POSTBUILD statement.  There are two python scripts in 
this example, but could be consolidated to a single python script for the 
EmulatorPkg.  Run.py finds the output directory where the EmulatorPkg 
executable for each supported host OS can be found.

https://github.com/tianocore/edk2-staging/blob/Bug_1525_FmpDevicePkg_MultipleControllers/OvmfPkg/OvmfPkgIa32X64.dsc

https://github.com/tianocore/edk2-staging/blob/Bug_1525_FmpDevicePkg_MultipleControllers/OvmfPkg/PostBuild.py

https://github.com/tianocore/edk2-staging/blob/Bug_1525_FmpDevicePkg_MultipleControllers/OvmfPkg/Run.py

Best regards,

Mike

> -Original Message-
> From: Gao, Liming
> Sent: Tuesday, May 21, 2019 8:06 AM
> To: Feng, Bob C ; devel@edk2.groups.io
> Cc: Kinney, Michael D 
> Subject: RE: [Patch] BaseTools: Remove './SecMain' from 'run' target
> 
> Bob:
>   Because NT32 has been removed, this change should be OK. 
> Reviewed-by: Liming Gao 
> 
> Thanks
> Liming
> > -Original Message-
> > From: Feng, Bob C
> > Sent: Friday, May 10, 2019 3:34 PM
> > To: Gao, Liming ;
> devel@edk2.groups.io
> > Cc: Kinney, Michael D 
> > Subject: RE: [Patch] BaseTools: Remove './SecMain'
> from 'run' target
> >
> > I think NT32Pkg need a POSTBUILD scripts to execute
> its run command.
> >
> >
> > -Original Message-
> > From: Gao, Liming
> > Sent: Friday, May 10, 2019 3:26 PM
> > To: Feng, Bob C ;
> devel@edk2.groups.io
> > Cc: Kinney, Michael D 
> > Subject: RE: [Patch] BaseTools: Remove './SecMain'
> from 'run' target
> >
> > Bob:
> >   Please make sure run command still works on NT32
> platform.
> >
> > >-Original Message-
> > >From: Feng, Bob C
> > >Sent: Friday, May 10, 2019 2:34 PM
> > >To: devel@edk2.groups.io
> > >Cc: Feng, Bob C ; Gao, Liming 
> > >; Kinney, Michael D
> 
> > >Subject: [Patch] BaseTools: Remove './SecMain' from
> 'run' target
> > >
> > >BZ:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1561
> > >
> > >When a target of 'run' is passed into build.py,
> BaseTools
> > >unconditionally attempts to execute the application
> called './SecMain'
> > >in the build output directory.
> > >
> > >This behavior applies to the Nt32Pkg which is being
> replaced with
> > >features in the EmulatorPkg.
> > >
> > >Signed-off-by: Bob Feng 
> > >Cc: Liming Gao 
> > >Cc: Michael D Kinney 
> > >---
> > > BaseTools/Source/Python/build/build.py | 4 
> > > 1 file changed, 4 deletions(-)
> > >
> > >diff --git a/BaseTools/Source/Python/build/build.py
> > >b/BaseTools/Source/Python/build/build.py
> > >index 7271570d29..04f266abf5 100644
> > >--- a/BaseTools/Source/Python/build/build.py
> > >+++ b/BaseTools/Source/Python/build/build.py
> > >@@ -1225,14 +1225,10 @@ class Build():
> > >
> > > makefile =
> >
> >GenMake.BuildFile(AutoGenObject)._FILE_NAME_[GenMake.g
> MakeType]
> > >
> > > # run
> > > if Target == 'run':
> > >-RunDir =
> os.path.normpath(os.path.join(AutoGenObject.BuildDir,
> > >GlobalData.gGlobalDefines['ARCH']))
> > >-Command = '.\SecMain'
> > >-os.chdir(RunDir)
> > >-LaunchCommand(Command, RunDir)
> > > return True
> > >
> > > # build modules
> > > if BuildModule:
> > > BuildCommand = BuildCommand + [Target]
> > >--
> > >2.20.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41179): https://edk2.groups.io/g/devel/message/41179
Mute This Topic: https://groups.io/mt/31574316/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [PATCH v2] KabylakeOpenBoardPkg: Fixed system hang caused by MemoryTest.

2019-05-21 Thread Kubacki, Michael A
Reviewed-by: Michael Kubacki 

> -Original Message-
> From: Chiu, Chasel
> Sent: Tuesday, May 21, 2019 5:03 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel ; Desimone, Nathaniel L
> ; Kubacki, Michael A
> 
> Subject: [PATCH v2] KabylakeOpenBoardPkg: Fixed system hang caused by
> MemoryTest.
> 
> From: "Chasel, Chiu" 
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1550
> 
> OS hang due to non-existing memory reported as usable memory.
> There are 2 different RVP3 boards and one with 4GB memory down
> implementation while another one with 8GB. Since rest of the
> configurations are exactly the same, board detection is added
> to the same RVP3 BoardInitLib and only SPD policy assigned
> differently.
> 
> This also fixed below 2 issues:
> 1. Fixed build failuire when PcdMultiBoardSupport == FALSE.
>(Wrong Pcd TokenSpace used in DxeBoardAcpiTableLib.inf)
> 2. Always failed to read SPD from DIMM because SpdAddressTable
>policy was not updated properly. Fixed by a notify callback
>when policy PPI installed.
> 
> Test: Verified both RVP3 boards can boot to Windows.
> 
> Cc: Nate DeSimone 
> Cc: Michael Kubacki 
> Signed-off-by: Chasel Chiu 
> ---
> 
> Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolic
> yNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c   | 103
> ++
> +
> 
> Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolic
> yUpdateLibFsp/PeiSaPolicyUpdatePreMem.c|  17 ++---
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeMultiBoardAcpiSupportLib.c  |   4 ++--
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmMultiBoardAcpiSupportLib.c  |   6 +++---
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3SpdTable.c | 117
> ++
> ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPreMemLib.c|   7 +--
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3Detect.c|  83
> ++
> +
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3InitPreMemLib.c | 127
> ++
> -
> 
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPostMemLib.c  |   4 ++--
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPreMemLib.c   |   4 ++--
>  Platform/Intel/KabylakeOpenBoardPkg/Library/BaseEcLib/BaseEcLib.c
> | 330
> ++
> ++
> ++
> ++
> ++
> 
> 
> Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolic
> yNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf |  43
> +++
> 
> Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolic
> yUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf |   9 -
>  Platform/Intel/KabylakeOpenBoardPkg/Include/EcCommands.h
> |  44 
>  Platform/Intel/KabylakeOpenBoardPkg/Include/Library/EcLib.h
> | 106
> ++
> 
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeBoardAcpiTableLib.inf   |   8 
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPreMemLib.inf  |   3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3InitLib.h   |   4 +++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPreMemLib.inf |   3 ++-
>  Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> |  12 ++--
>  Platform/Intel/KabylakeOpenBoardPkg/Library/BaseEcLib/BaseEcLib.inf
> |  29 +
>  21 files changed, 1013 insertions(+), 50 deletions(-)
> 
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPol
> icyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
> 

Re: [edk2-devel] [PATCH V1 1/1] ShellPkg/acpiview: GTDT updates for ACPI 6.3

2019-05-21 Thread Gao, Zhichao
The code change looks good for me. 
But when I try to apply your patch to my local edk2 code, I would encounter an 
error "error: corrupt patch at line 23".
Making sure the patch that can apply to the edk2 trunk is important. Otherwise, 
the testers and maintainers may take time to write the whole change to their 
own repo.
Most time, it is impossible for them to write the code again  because the 
patches are too many.

Thanks,
Zhichao

> -Original Message-
> From: PierreGondois [mailto:pierre.gond...@arm.com]
> Sent: Monday, May 20, 2019 9:33 PM
> To: devel@edk2.groups.io
> Cc: sami.muja...@arm.com; Carsey, Jaben ; Ni,
> Ray ; Gao, Zhichao ;
> matteo.carl...@arm.com; stephanie.hughes-f...@arm.com; n...@arm.com
> Subject: [PATCH V1 1/1] ShellPkg/acpiview: GTDT updates for ACPI 6.3
> 
> From: Pierre Gondois 
> 
> The ACPI 6.3 specification introduces support to describe the ARMv8.1 virtual
> EL2 timers. This patch updates the GTDT parser of acpiview to decode the EL2
> virtual timer fields.
> 
> Signed-off-by: Pierre Gondois 
> ---
> 
> The changes can be seen at:
> https://github.com/PierreARM/edk2/tree/382_acpiview_gtdt_acpi6_3_upd
> ate_v1
> 
> Notes:
> v1:
> - GTDT updates for ACPI 6.3 [Pierre]
> 
>  ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
> | 6 --
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git
> a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser
> .c
> b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser
> .c
> index
> 1b7e56486c8fb98a8fe063ae5fa25d86500a58a9..3b05ff3015d4a3af62dd9fab05
> 7c32369a456267 100644
> ---
> a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser
> .c
> +++
> b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtPars
> +++ er.c
> @@ -5,7 +5,7 @@
>SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>@par Reference(s):
> -- ACPI 6.2 Specification - Errata A, September 2017
> +- ACPI 6.3 Specification - January 2019
>**/
> 
>  #include 
> @@ -77,7 +77,9 @@ STATIC CONST ACPI_PARSER GtdtParser[] = {
>{L"Platform Timer Count", 4, 88, L"%d", NULL,
> (VOID**), NULL, NULL},
>{L"Platform Timer Offset", 4, 92, L"0x%x", NULL,
> -   (VOID**), NULL, NULL}
> +   (VOID**), NULL, NULL},  {L"Virtual EL2 Timer
> + GSIV", 4, 96, L"0x%x", NULL, NULL, NULL, NULL},  {L"Virtual EL2 Timer
> + Flags", 4, 100, L"0x%x", NULL, NULL, NULL, NULL}
>  };
> 
>  /**
> --
> 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41177): https://edk2.groups.io/g/devel/message/41177
Mute This Topic: https://groups.io/mt/31685310/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-21 Thread Michael D Kinney
Hi Laszlo,

Another option we can consider is delaying the
freeze windows and release date (if required) to
accommodate the OpenSSL 1.1.1b feature.

The following page shows that the current branch
being used by EDK II (1.1.0j) with EOL on 9/11/2019.

https://www.openssl.org/policies/releasestrat.html

Best regards,

Mike

> -Original Message-
> From: devel@edk2.groups.io
> [mailto:devel@edk2.groups.io] On Behalf Of Laszlo Ersek
> Sent: Tuesday, May 21, 2019 2:15 PM
> To: devel@edk2.groups.io; Lu, XiaoyuX
> 
> Cc: Wang, Jian J ; Ye, Ting
> 
> Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg:
> Upgrade OpenSSL to 1.1.1b
> 
> On 05/16/19 09:54, Xiaoyu lu wrote:
> > This series is also available at:
> >
> https://github.com/xiaoyuxlu/edk2/tree/bz_1089_upgrade_
> to_openssl_1_1_1b_v4
> >
> > Changes:
> >
> > (1) CryptoPkgOpensslLib: Modify process_files.pl for
> upgrading OpenSSL
> >
> > (2) CryptoPkg/OpensslLib: Exclude unnecessary files
> in process_files.pl
> > crypto/store/* are excluded.
> > crypto/rand/randfile.c is excluded.
> >
> > (3) CryptoPkg/IntrinsicLib: Fix possible unresolved
> external symbol issue
> >
> > (4) CryptoPkg/OpensslLib: Prepare for upgrading
> OpenSSL
> > Disable warnings for buiding OpenSSL_1_1_1b
> >
> > (5) CryptoPkg/OpensslLib: Fix cross-build problem for
> AARCH64
> >
> > (6) CryptoPkg: Upgrade OpenSSL to 1.1.1b
> > The biggest change is use TSC as entropy source
> > If TSC isn't avaiable, fallback to
> TimerLib(PerformanceCounter).
> >
> > (7) CryptoPkg/BaseCryptLib: Make HMAC_CTX size
> backward compatible
> >
> >
> > Verification done for this series:
> > * Https boot in OvmfPkg.
> > * BaseCrypt Library test. (Ovmf, EmulatorPkg)
> >
> > Important notice:
> > Nt32Pkg doesn't support TimerLib
> >>
> TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTi
> merLibNullTemplate.inf
> > So it will failed in Nt32Pkg.
> >
> > Cc: Jian J Wang 
> > Cc: Ting Ye 
> 
> This feature has missed edk2-stable201905.
> 
> Please postpone the following BZ reference:
> 
>   https://bugzilla.tianocore.org/show_bug.cgi?id=1089
> 
> from
> 
> 
> https://github.com/tianocore/tianocore.github.io/wiki/E
> DK-II-Release-Planning#edk2-stable201905-tag-planning
> 
> to
> 
> 
> https://github.com/tianocore/tianocore.github.io/wiki/E
> DK-II-Release-Planning#edk2-stable201908-tag-planning
> 
> Thanks,
> Laszlo
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41176): https://edk2.groups.io/g/devel/message/41176
Mute This Topic: https://groups.io/mt/31638503/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [PATCH v2] KabylakeOpenBoardPkg: Fixed system hang caused by MemoryTest.

2019-05-21 Thread Chiu, Chasel
From: "Chasel, Chiu" 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1550

OS hang due to non-existing memory reported as usable memory.
There are 2 different RVP3 boards and one with 4GB memory down
implementation while another one with 8GB. Since rest of the
configurations are exactly the same, board detection is added
to the same RVP3 BoardInitLib and only SPD policy assigned
differently.

This also fixed below 2 issues:
1. Fixed build failuire when PcdMultiBoardSupport == FALSE.
   (Wrong Pcd TokenSpace used in DxeBoardAcpiTableLib.inf)
2. Always failed to read SPD from DIMM because SpdAddressTable
   policy was not updated properly. Fixed by a notify callback
   when policy PPI installed.

Test: Verified both RVP3 boards can boot to Windows.

Cc: Nate DeSimone 
Cc: Michael Kubacki 
Signed-off-by: Chasel Chiu 
---
 
Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
   | 103 
+++
 
Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
|  17 ++---
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c
  |   4 ++--
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c
  |   6 +++---
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3SpdTable.c
 | 117 
-
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.c
|   7 +--
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3Detect.c
|  83 
+++
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitPreMemLib.c
 | 127 
++-
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c
  |   4 ++--
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c
   |   4 ++--
 Platform/Intel/KabylakeOpenBoardPkg/Library/BaseEcLib/BaseEcLib.c  
  | 330 
++
 
Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
 |  43 +++
 
Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
 |   9 -
 Platform/Intel/KabylakeOpenBoardPkg/Include/EcCommands.h   
  |  44 

 Platform/Intel/KabylakeOpenBoardPkg/Include/Library/EcLib.h
  | 106 
++
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
   |   8 
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
  |   3 ++-
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitLib.h
   |   4 +++-
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
 |   3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc  
  |  12 ++--
 Platform/Intel/KabylakeOpenBoardPkg/Library/BaseEcLib/BaseEcLib.inf
  |  29 +
 21 files changed, 1013 insertions(+), 50 deletions(-)

diff --git 
a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
 
b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
new file mode 100644
index 00..0fedd81cd0
--- /dev/null
+++ 

Re: [edk2-devel] [edk2-platforms][PATCH V1 1/1] Readme.md: Add Intel platforms

2019-05-21 Thread Chiu, Chasel


Reviewed-by: Chasel Chiu 


> -Original Message-
> From: Kubacki, Michael A
> Sent: Wednesday, May 22, 2019 12:49 AM
> To: devel@edk2.groups.io
> Cc: Kinney, Michael D ; Desimone, Nathaniel L
> ; Chiu, Chasel ; Gao,
> Liming ; Ni, Ray 
> Subject: [edk2-platforms][PATCH V1 1/1] Readme.md: Add Intel platforms
> 
> Adds information to Readme.md for Intel platforms recently moved to the
> edk2-platforms repository.
> 
> Cc: Michael D Kinney 
> Cc: Nate DeSimone 
> Cc: Chasel Chiu 
> Cc: Liming Gao 
> Cc: Ruiyu Ni 
> 
> Signed-off-by: Michael Kubacki 
> ---
>  Readme.md | 20 ++--
>  1 file changed, 14 insertions(+), 6 deletions(-)
> 
> diff --git a/Readme.md b/Readme.md
> index 59f739e861..e203795d47 100644
> --- a/Readme.md
> +++ b/Readme.md
> @@ -222,6 +222,20 @@ they will be documented with the platform.
>  * [D05](Platform/Hisilicon/D05)
>  * [HiKey](Platform/Hisilicon/HiKey)
> 
> +## [Intel](Platform/Intel/Readme.md)
> +### Minimum Platforms
> +* [Clevo](Platform/Intel/ClevoOpenBoardPkg)
> +* [Kaby Lake](Platform/Intel/KabylakeOpenBoardPkg)
> +* [Purley](Platform/Intel/PurleyOpenBoardPkg)
> +
> +For more information, see the
> +[EDK II Minimum Platform
> Specification](https://edk2-docs.gitbooks.io/edk-ii-minimum-platform-specific
> ation).
> +### Other Platforms
> +# Intel Quark SoC X1000 based platforms
> +* [Galileo](Platform/Intel/QuarkPlatformPkg)
> +# Minnowboard Max/Turbot based on Intel Valleyview2 SoC
> +* [Minnowboard Max](Platform/Intel/Vlv2TbltDevicePkg)
> +
>  ## Marvell
>  * [Armada 70x0](Platform/Marvell/Armada)
> 
> @@ -231,12 +245,6 @@ they will be documented with the platform.
>  ## Socionext
>  * [SynQuacer](Platform/Socionext/DeveloperBox)
> 
> -## Intel(R) Quark SoC X1000 based platforms
> -* [Galileo](Platform/Intel/QuarkPlatformPkg)
> -
> -## Minnowboard Max/Turbot based on Intel Valleyview2 SoC
> -* [Minnowboard Max](Platform/Intel/Vlv2TbltDevicePkg)
> -
>  # Maintainers
> 
>  See [Maintainers.txt](Maintainers.txt).
> --
> 2.16.2.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41174): https://edk2.groups.io/g/devel/message/41174
Mute This Topic: https://groups.io/mt/31698921/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [PATCH] KabylakeOpenBoardPkg: Fixed system hang caused by MemoryTest.

2019-05-21 Thread Kubacki, Michael A
Please promote BaseEcLib to the "GenericBoardPkg" or whatever name is decided 
when created.
We can extend command and vendor support there in the future.

In BaseEcLib.c, remove SLE_FLAG usage and positive logic blocks.

Thanks,
Michael

> -Original Message-
> From: Chiu, Chasel
> Sent: Tuesday, May 21, 2019 8:52 AM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel ; Desimone, Nathaniel L
> ; Kubacki, Michael A
> 
> Subject: [PATCH] KabylakeOpenBoardPkg: Fixed system hang caused by
> MemoryTest.
> 
> From: "Chasel, Chiu" 
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1550
> 
> OS hang due to non-existing memory reported as usable memory.
> There are 2 different RVP3 boards and one with 4GB memory down
> implementation while another one with 8GB. Since rest of the
> configurations are exactly the same, board detection is added
> to the same RVP3 BoardInitLib and only SPD policy assigned
> differently.
> 
> This also fixed below 2 issues:
> 1. Fixed build failuire when PcdMultiBoardSupport == FALSE.
>(Wrong Pcd TokenSpace used in DxeBoardAcpiTableLib.inf)
> 2. Always failed to read SPD from DIMM because SpdAddressTable
>policy was not updated properly. Fixed by a notify callback
>when policy PPI installed.
> 
> Test: Verified both RVP3 boards can boot to Windows.
> 
> Cc: Nate DeSimone 
> Cc: Michael Kubacki 
> Signed-off-by: Chasel Chiu 
> ---
> 
> Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> NotifyLib/PeiPreMemSiliconPolicyNotifyLib.c   | 103
> 
> +++
> 
> Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSaPolicyUpdatePreMem.c|  17 ++---
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/
> DxeMultiBoardAcpiSupportLib.c  |   4 ++--
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/
> SmmMultiBoardAcpiSupportLib.c  |   6 +++---
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/K
> abylakeRvp3SpdTable.c | 117
> 
> -
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/P
> eiBoardInitPreMemLib.c|   7 +--
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/P
> eiKabylakeRvp3Detect.c|  83
> 
> +++
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/P
> eiKabylakeRvp3InitPreMemLib.c | 127
> 
> ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/P
> eiMultiBoardInitPostMemLib.c  |   4 ++--
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/P
> eiMultiBoardInitPreMemLib.c   |   4 ++--
>  Platform/Intel/KabylakeOpenBoardPkg/Library/BaseEcLib/BaseEcLib.c
> | 339
> 
> 
> 
> 
> 
> +++
> 
> Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> NotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf |  43
> +++
> 
> Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf |   9 -
>  Platform/Intel/KabylakeOpenBoardPkg/Include/EcCommands.h
> |  44 
>  Platform/Intel/KabylakeOpenBoardPkg/Include/Library/EcLib.h
> | 106
> 
> ++
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/
> DxeBoardAcpiTableLib.inf   |   8 
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/P
> eiBoardInitPreMemLib.inf  |   3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/P
> eiKabylakeRvp3InitLib.h   |   4 +++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/P
> eiMultiBoardInitPreMemLib.inf |   3 ++-
>  Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> |  12 ++--
>  Platform/Intel/KabylakeOpenBoardPkg/Library/BaseEcLib/BaseEcLib.inf
> |  29 +

Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-21 Thread Laszlo Ersek
On 05/16/19 09:54, Xiaoyu lu wrote:
> This series is also available at:
> https://github.com/xiaoyuxlu/edk2/tree/bz_1089_upgrade_to_openssl_1_1_1b_v4
> 
> Changes:
> 
> (1) CryptoPkgOpensslLib: Modify process_files.pl for  upgrading OpenSSL
> 
> (2) CryptoPkg/OpensslLib: Exclude unnecessary files in process_files.pl
> crypto/store/* are excluded.
> crypto/rand/randfile.c is excluded.
> 
> (3) CryptoPkg/IntrinsicLib: Fix possible unresolved external symbol issue
> 
> (4) CryptoPkg/OpensslLib: Prepare for upgrading OpenSSL
> Disable warnings for buiding OpenSSL_1_1_1b
> 
> (5) CryptoPkg/OpensslLib: Fix cross-build problem for AARCH64
> 
> (6) CryptoPkg: Upgrade OpenSSL to 1.1.1b
> The biggest change is use TSC as entropy source
> If TSC isn't avaiable, fallback to TimerLib(PerformanceCounter).
> 
> (7) CryptoPkg/BaseCryptLib: Make HMAC_CTX size backward compatible
> 
> 
> Verification done for this series:
> * Https boot in OvmfPkg.
> * BaseCrypt Library test. (Ovmf, EmulatorPkg)
> 
> Important notice:
> Nt32Pkg doesn't support TimerLib
>> TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
> So it will failed in Nt32Pkg.
> 
> Cc: Jian J Wang 
> Cc: Ting Ye 

This feature has missed edk2-stable201905.

Please postpone the following BZ reference:

  https://bugzilla.tianocore.org/show_bug.cgi?id=1089

from

  
https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planning#edk2-stable201905-tag-planning

to

  
https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planning#edk2-stable201908-tag-planning

Thanks,
Laszlo

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41172): https://edk2.groups.io/g/devel/message/41172
Mute This Topic: https://groups.io/mt/31638503/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [Patch 0/7] Add new CLANG8ELF tool chain for new LLVM/CLANG8

2019-05-21 Thread Laszlo Ersek
On 04/26/19 16:42, Liming Gao wrote:
> BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1603
> LLVM/CLANG8 formal release http://releases.llvm.org/download.html#8.0.0
> It can be downloaded and installed in Windows/Linux/Mac OS.
> 
> CLANG8ELF tool chain is added to generate ELF image, and convert to PE/COFF.
> On Windows OS, set CLANG_HOST_BIN=n, set CLANG8_BIN=LLVM installed directory
> CLANG_HOST_BIN is used CLANG_HOST_PREFIX. Prefix n is for nmake.
> For example:
>   set CLANG_HOST_BIN=n
>   set CLANG8_BIN=C:\Program Files\LLVM\bin\
> On Linux/Mac, export CLANG8_BIN=LLVM installed directory, CLANG_HOST_BIN is 
> not required, because there is no prefix for make.
> For example:
>   export CLANG8_BIN=/home/clang8/bin/
> 
> This tool chain can be used to compile the firmware code. On windows OS,
> Visual Studio is still required to compile BaseTools C tools and 
> provide nmake.exe for makefile. On Linux/Mac OS, gcc is used to compile 
> BaseTools C tools. make is used for makefile.
> 
> This tool chain is verified on OVMF Ia32, X64 and Ia32X64 to boot Shell.
> This tool chain is verified in Windows/Linux and Mac OS.
> 
> Liming Gao (7):
>   BaseTools: Add ClangBase.lds for CLANG8 tool chain with max-page-size
>   BaseTools GenFw: Support CLANG8ELF with conversion ELF to PE/COFF
> image
>   BaseTools: Update build_rule.template for ASLC rule with full C flags
>   BaseTools: Update build_rule to skip CLANG resource section generation
>   BaseTools: Update tools_def.template to directly refer to AutoGen.h
>   BaseTools: Add new CLANG8ELF tool chain for new LLVM/CLANG8
>   OvmfPkg: Update DSC/FDF to support CLANG8ELF tool chain
> 
>  BaseTools/Source/C/GenFw/Elf32Convert.c |  12 +---
>  BaseTools/Source/C/GenFw/Elf64Convert.c |  11 +--
>  BaseTools/Conf/build_rule.template  |   8 +--
>  BaseTools/Conf/tools_def.template   | 121 
> +---
>  BaseTools/Scripts/ClangBase.lds |  79 +
>  OvmfPkg/OvmfPkgIa32.dsc |   4 +-
>  OvmfPkg/OvmfPkgIa32.fdf |   2 +-
>  OvmfPkg/OvmfPkgIa32X64.dsc  |   4 +-
>  OvmfPkg/OvmfPkgIa32X64.fdf  |   2 +-
>  OvmfPkg/OvmfPkgX64.dsc  |   4 +-
>  OvmfPkg/OvmfPkgX64.fdf  |   2 +-
>  11 files changed, 213 insertions(+), 36 deletions(-)
>  create mode 100644 BaseTools/Scripts/ClangBase.lds
> 

This feature has missed edk2-stable201905.

Please postpone the following BZ reference:

  https://bugzilla.tianocore.org/show_bug.cgi?id=1603

from

  
https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planning#edk2-stable201905-tag-planning

to

  
https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planning#edk2-stable201908-tag-planning

Thanks,
Laszlo

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41171): https://edk2.groups.io/g/devel/message/41171
Mute This Topic: https://groups.io/mt/31354044/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [Patch V3] OpensslLib: Missing local header files in [Sources] section of .INFs

2019-05-21 Thread Christian Rodriguez
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1821

In V2: Remove opensslconf.h because it is a script generated header.
Update OpenSSL autogeneration script for .INFs because some
OpenSSL local headers are missing from [Sources] section of
OpensslLib.inf and OpensslLibCrypto.inf. Update OpensslLib.inf and
OpensslLibCrypto.inf using the updated script. Enforce compilance
of Edk2 INF Spec 3.9, which states, All HII Unicode format files
must be listed in [Sources] section. Not functional issue, just compilance.

Signed-off-by: Christian Rodriguez 
Cc: Jian Wang 
Cc: Ting Ye 
Cc: Yonghong Zhu 
---
 CryptoPkg/Library/OpensslLib/OpensslLib.inf   | 173 
+
 CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 167 
+++
 CryptoPkg/Library/OpensslLib/process_files.pl |  50 
--
 3 files changed, 388 insertions(+), 2 deletions(-)

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf 
b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 530ac5f110..c24289d353 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -513,6 +513,179 @@
   $(OPENSSL_PATH)/ssl/t1_reneg.c
   $(OPENSSL_PATH)/ssl/t1_trce.c
   $(OPENSSL_PATH)/ssl/tls_srp.c
+  buildinf.h
+  $(OPENSSL_PATH)/include/internal/asn1t.h
+  $(OPENSSL_PATH)/include/internal/bio.h
+  $(OPENSSL_PATH)/include/internal/comp.h
+  $(OPENSSL_PATH)/include/internal/conf.h
+  $(OPENSSL_PATH)/include/internal/constant_time_locl.h
+  $(OPENSSL_PATH)/include/internal/dane.h
+  $(OPENSSL_PATH)/include/internal/dso.h
+  $(OPENSSL_PATH)/include/internal/err.h
+  $(OPENSSL_PATH)/include/internal/numbers.h
+  $(OPENSSL_PATH)/include/internal/o_dir.h
+  $(OPENSSL_PATH)/include/internal/o_str.h
+  $(OPENSSL_PATH)/include/internal/sslconf.h
+  $(OPENSSL_PATH)/include/internal/thread_once.h
+  $(OPENSSL_PATH)/include/openssl/aes.h
+  $(OPENSSL_PATH)/include/openssl/asn1.h
+  $(OPENSSL_PATH)/include/openssl/asn1t.h
+  $(OPENSSL_PATH)/include/openssl/asn1_mac.h
+  $(OPENSSL_PATH)/include/openssl/async.h
+  $(OPENSSL_PATH)/include/openssl/bio.h
+  $(OPENSSL_PATH)/include/openssl/blowfish.h
+  $(OPENSSL_PATH)/include/openssl/bn.h
+  $(OPENSSL_PATH)/include/openssl/buffer.h
+  $(OPENSSL_PATH)/include/openssl/camellia.h
+  $(OPENSSL_PATH)/include/openssl/cast.h
+  $(OPENSSL_PATH)/include/openssl/cmac.h
+  $(OPENSSL_PATH)/include/openssl/cms.h
+  $(OPENSSL_PATH)/include/openssl/comp.h
+  $(OPENSSL_PATH)/include/openssl/conf.h
+  $(OPENSSL_PATH)/include/openssl/conf_api.h
+  $(OPENSSL_PATH)/include/openssl/crypto.h
+  $(OPENSSL_PATH)/include/openssl/ct.h
+  $(OPENSSL_PATH)/include/openssl/des.h
+  $(OPENSSL_PATH)/include/openssl/dh.h
+  $(OPENSSL_PATH)/include/openssl/dsa.h
+  $(OPENSSL_PATH)/include/openssl/dtls1.h
+  $(OPENSSL_PATH)/include/openssl/ebcdic.h
+  $(OPENSSL_PATH)/include/openssl/ec.h
+  $(OPENSSL_PATH)/include/openssl/ecdh.h
+  $(OPENSSL_PATH)/include/openssl/ecdsa.h
+  $(OPENSSL_PATH)/include/openssl/engine.h
+  $(OPENSSL_PATH)/include/openssl/err.h
+  $(OPENSSL_PATH)/include/openssl/evp.h
+  $(OPENSSL_PATH)/include/openssl/e_os2.h
+  $(OPENSSL_PATH)/include/openssl/hmac.h
+  $(OPENSSL_PATH)/include/openssl/idea.h
+  $(OPENSSL_PATH)/include/openssl/kdf.h
+  $(OPENSSL_PATH)/include/openssl/lhash.h
+  $(OPENSSL_PATH)/include/openssl/md2.h
+  $(OPENSSL_PATH)/include/openssl/md4.h
+  $(OPENSSL_PATH)/include/openssl/md5.h
+  $(OPENSSL_PATH)/include/openssl/mdc2.h
+  $(OPENSSL_PATH)/include/openssl/modes.h
+  $(OPENSSL_PATH)/include/openssl/objects.h
+  $(OPENSSL_PATH)/include/openssl/obj_mac.h
+  $(OPENSSL_PATH)/include/openssl/ocsp.h
+  $(OPENSSL_PATH)/include/openssl/opensslv.h
+  $(OPENSSL_PATH)/include/openssl/ossl_typ.h
+  $(OPENSSL_PATH)/include/openssl/pem.h
+  $(OPENSSL_PATH)/include/openssl/pem2.h
+  $(OPENSSL_PATH)/include/openssl/pkcs12.h
+  $(OPENSSL_PATH)/include/openssl/pkcs7.h
+  $(OPENSSL_PATH)/include/openssl/rand.h
+  $(OPENSSL_PATH)/include/openssl/rc2.h
+  $(OPENSSL_PATH)/include/openssl/rc4.h
+  $(OPENSSL_PATH)/include/openssl/rc5.h
+  $(OPENSSL_PATH)/include/openssl/ripemd.h
+  $(OPENSSL_PATH)/include/openssl/rsa.h
+  $(OPENSSL_PATH)/include/openssl/safestack.h
+  $(OPENSSL_PATH)/include/openssl/seed.h
+  $(OPENSSL_PATH)/include/openssl/sha.h
+  $(OPENSSL_PATH)/include/openssl/srp.h
+  $(OPENSSL_PATH)/include/openssl/srtp.h
+  $(OPENSSL_PATH)/include/openssl/ssl.h
+  $(OPENSSL_PATH)/include/openssl/ssl2.h
+  $(OPENSSL_PATH)/include/openssl/ssl3.h
+  $(OPENSSL_PATH)/include/openssl/stack.h
+  $(OPENSSL_PATH)/include/openssl/symhacks.h
+  $(OPENSSL_PATH)/include/openssl/tls1.h
+  $(OPENSSL_PATH)/include/openssl/ts.h
+  

Re: [edk2-devel] [PATCH] BaseTools:Add the FeatureFlagExpression usage to the InfBuildData

2019-05-21 Thread Laszlo Ersek
On 05/17/19 02:57, Fan, ZhijuX wrote:
> BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1446
> 
> FeatureFlagExpression Support in LibraryClasses/Guids/Ppi/Protocols
> section of INF file. The Pcd value in the expression is from INF or DEC
> When a FeatureFlagExpression is present,if the expression evaluates
> to TRUE,then the entry is valid. If the expression evaluates to FALSE, 
> then the EDK II build tools must ignore the entry.
> 
> This patch is going to add this feature.
> 
> Cc: Bob Feng 
> Cc: Liming Gao 
> Signed-off-by: Zhiju.Fan 
> ---
>  BaseTools/Source/Python/Common/Expression.py   |  2 +-
>  BaseTools/Source/Python/Common/GlobalData.py   |  1 +
>  BaseTools/Source/Python/Workspace/InfBuildData.py  | 69 
> --
>  .../Source/Python/Workspace/WorkspaceCommon.py | 10 +++-
>  4 files changed, 73 insertions(+), 9 deletions(-)

This feature has missed edk2-stable201905.

Please postpone the following BZ reference:

  https://bugzilla.tianocore.org/show_bug.cgi?id=1446

from

  
https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planning#edk2-stable201905-tag-planning

to

  
https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planning#edk2-stable201908-tag-planning

Thanks,
Laszlo

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41169): https://edk2.groups.io/g/devel/message/41169
Mute This Topic: https://groups.io/mt/31650344/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [edk2] Soft Feature Freeze starts today for edk2-stable201905

2019-05-21 Thread Laszlo Ersek
On 05/21/19 23:01, Laszlo Ersek wrote:

>   
> https://github.com/lersek/edk2/wiki/SoftFeatureFreeze#what-is-the-soft-feature-freeze

Sorry, this link was wrong -- I got it from my browsers URL bar history,
and didn't notice it early enough. The right URL is:

https://github.com/tianocore/tianocore.github.io/wiki/SoftFeatureFreeze

and the content is identical:

>> The soft feature freeze is the beginning of the stabilization phase of
>> edk2's development process. By the date of the soft feature freeze,
>> developers must have sent their patches to the mailing list *and*
>> received positive maintainer reviews (Reviewed-by or Acked-by tags).
>> This means that features, and in particular non-trivial ones, must
>> have been accepted by maintainers before the soft freeze date.
>>
>> Between the soft feature freeze and the hard feature freeze,
>> previously reviewed and unit-tested features may be applied (or
>> merged) to the master branch, for integration testing. Feature
>> addition or enablement patches posted *or* reviewed after the soft
>> feature freeze will be delayed until after the upcoming stable tag.

Thanks
Laszlo

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41168): https://edk2.groups.io/g/devel/message/41168
Mute This Topic: https://groups.io/mt/31653140/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [edk2] Soft Feature Freeze starts today for edk2-stable201905

2019-05-21 Thread Laszlo Ersek
Hi,

On 05/17/19 10:56, Liming Gao wrote:
> Hi, all
>   
> https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planning
> lists edk2-stable201905 tag planning. Now, we enter into Soft Feature
> Freeze phase. In this phase, the feature without Reviewed-by or
> Acked-by tags will be delayed after the upcoming stable tag. The patch
> review can continue without break. Below is edk2-stable201905 tag
> planning.
>
> Date (00:00:00 UTC-8) Description
> 2018-03-08 (12PM) Beginning of development
> 2019-05-17 Soft Feature Freeze
> 2019-05-24 Hard Feature Freeze
> 2019-05-31 Release

We need to establish better enforcement for the soft feature freeze, or
else, we need to redefine what the soft feature freeze means.

According to the current definition, and schedule, a patch that is not a
bugfix may be committed after 2019-05-17 08:00 UTC only if it has
received sufficient Acked-by / Reviewed-by tags on the list before the
exact same timestamp (2019-05-17 08:00 UTC).

  
https://github.com/lersek/edk2/wiki/SoftFeatureFreeze#what-is-the-soft-feature-freeze

> The soft feature freeze is the beginning of the stabilization phase of
> edk2's development process. By the date of the soft feature freeze,
> developers must have sent their patches to the mailing list *and*
> received positive maintainer reviews (Reviewed-by or Acked-by tags).
> This means that features, and in particular non-trivial ones, must
> have been accepted by maintainers before the soft freeze date.
>
> Between the soft feature freeze and the hard feature freeze,
> previously reviewed and unit-tested features may be applied (or
> merged) to the master branch, for integration testing. Feature
> addition or enablement patches posted *or* reviewed after the soft
> feature freeze will be delayed until after the upcoming stable tag.

So let's check the recent commit history...

git log --oneline --reverse --since='2019-05-17T08:00:00+00:00'

> 8da8daafc905 ShellPkg: acpiview: Add GT Frame Number validation to GTDT parser

Reviewed on 2019-05-17, at 00:08 UTC:

  
3CE959C139B4C44DBEA1810E3AA6F9000B7D374D@SHSMSX101.ccr.corp.intel.com">http://mid.mail-archive.com/3CE959C139B4C44DBEA1810E3AA6F9000B7D374D@SHSMSX101.ccr.corp.intel.com

Valid commit.


> 1887b995a359 ShellPkg/UefiShellAcpiViewCommandLib: Fix PPTT cache attributes 
> validation

This patch received multiple R-b's, in time, including one from a
designated ShellPkg Reviewer:

  
DB6PR0802MB237582494362A29FEBE0DD3E84330@DB6PR0802MB2375.eurprd08.prod.outlook.com">http://mid.mail-archive.com/DB6PR0802MB237582494362A29FEBE0DD3E84330@DB6PR0802MB2375.eurprd08.prod.outlook.com
  
3C0D5C461C9E904E8F62152F6274C0BB40BD4110@SHSMSX104.ccr.corp.intel.com">http://mid.mail-archive.com/3C0D5C461C9E904E8F62152F6274C0BB40BD4110@SHSMSX104.ccr.corp.intel.com
  
3CE959C139B4C44DBEA1810E3AA6F9000B7D3832@SHSMSX101.ccr.corp.intel.com">http://mid.mail-archive.com/3CE959C139B4C44DBEA1810E3AA6F9000B7D3832@SHSMSX101.ccr.corp.intel.com

Valid commit. (This patch is a bugfix, even.)


> 41ac2076a7c6 UefiCpuPkg CpuCommonFeaturesLib: Remove CPU generation check

This is an invalid commit during the soft feature freeze. The change is
*not* a bugfix (it is a change that helps with the future use of a
function). And sufficient review was given only *after* the deadline, at
13:10 UTC:

  
734D49CCEBEEF84792F5B80ED585239D5C1476E8@SHSMSX104.ccr.corp.intel.com">http://mid.mail-archive.com/734D49CCEBEEF84792F5B80ED585239D5C1476E8@SHSMSX104.ccr.corp.intel.com


> 59f20e8d7100 ShellPkg: Update DSC to use NetworkPkg's include fragment file

Invalid commit. This is not a bugfix but a feature patch. (The commit
message should have referenced
.) The one R-b that
it received was posted *way* after the deadline, on 2019-05-20, at 00:28
UTC:

  
3CE959C139B4C44DBEA1810E3AA6F9000B7D3DB1@SHSMSX101.ccr.corp.intel.com">http://mid.mail-archive.com/3CE959C139B4C44DBEA1810E3AA6F9000B7D3DB1@SHSMSX101.ccr.corp.intel.com


> 48f43c2c56ee EmbeddedPkg: Update DSC to use NetworkPkg's include fragment file

Invalid commit. This is a feature patch (and it should have referenced
). The Reviewed-by
was posted after the deadline, at 09:00 UTC.

  20190517090006.ko36fbne4vprai3w@bivouac.eciton.net">http://mid.mail-archive.com/20190517090006.ko36fbne4vprai3w@bivouac.eciton.net


> 7b84de939489 ShellPkg: Display VENDOR_ID in ASCII when parsing PPTT

Valid commit; the sufficient R-b was given in time:

  
3CE959C139B4C44DBEA1810E3AA6F9000B7D21C2@SHSMSX101.ccr.corp.intel.com">http://mid.mail-archive.com/3CE959C139B4C44DBEA1810E3AA6F9000B7D21C2@SHSMSX101.ccr.corp.intel.com

(This patch could also be considered a bugfix, I believe.)


> 911efe279ec3 ShellPkg: Add NetworkPkg/NetworkPkg.dec as the package dependency

This is an invalid commit, during the soft feature freeze. Not only was
the reviewer feedback posted after the soft feature freeze, the 

Re: [edk2-devel] iSCSI and iBFT

2019-05-21 Thread Laszlo Ersek
On 05/21/19 16:54, Tomas Pilar (tpilar) wrote:
> I am going to commit the cardinal sin of online dev support.

heh :)

> 'Never mind, found the problem'

What was it?

I didn't ignore your original email -- I looked at iPXE briefly, but
couldn't blame anything at once, and then I quickly ran out of steam.
There wasn't anything I could have added to the thread.

Thanks,
Laszlo

> From: Tomas Pilar
> Sent: 20 May 2019 16:57
> To: 'devel@edk2.groups.io' 
> Subject: iSCSI and iBFT
> 
> Hi,
> 
> I have a bit of an esoteric problem. When I configure the software iscsi 
> intiator that is part of EDK2 platform network stack, the platform network 
> stack with install iBFT table into the ACPI tables so that the configuration 
> can be picked up by further boot loaders and the OS. So far so good.
> 
> Problem: When I PXE boot into iPXE using my adapter, exit back into boot 
> manager, the iBFT has disappeared. Alternatively, if I use iPXE to then boot 
> WDS, the software initiator in WinPE won't find the iBFT table and therefore 
> won't hook the network drive.
> 
> Observations:
> * When I boot into UEFI shell on disk and exit back into boot manager, the 
> iBFT is preserved.
> 
> * When I PXE boot into UEFI shell and exit, the iBFT is preserved.
> 
> * When I boot into iPXE on disk and exit, the iBFT is preserved.
> 
> * When I use a different adapter (Intel) to pxe boot into iBFT and exit back 
> to boot manager, the iBFT has moved from the penultimate position to the last 
> position in the ACPI tables. Almost as if something uninstalled the iBFT and 
> reinstalled it.
> 
> Any ideas?
> 
> Cheers
> Tom
> 
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41166): https://edk2.groups.io/g/devel/message/41166
Mute This Topic: https://groups.io/mt/31686860/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [PATCH] OpensslLib: Missing local header files in [Sources] section of .INFs

2019-05-21 Thread Christian Rodriguez
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1821

Update OpenSSL autogeneration script for .INFs because some
OpenSSL local headers are missing from [Sources] section of
OpensslLib.inf and OpensslLibCrypto.inf. Update OpensslLib.inf and
OpensslLibCrypto.inf using the updated script. Enforce compilance
of Edk2 INF Spec 3.9, which states, All HII Unicode format files
must be listed in [Sources] section. Not functional issue, just compilance.

Signed-off-by: Christian Rodriguez 
Cc: Jian Wang 
Cc: Ting Ye 
Cc: Yonghong Zhu 
---
 CryptoPkg/Library/OpensslLib/OpensslLib.inf   | 174 
++
 CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 168 

 CryptoPkg/Library/OpensslLib/process_files.pl |  49 
+++--
 3 files changed, 389 insertions(+), 2 deletions(-)

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf 
b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 530ac5f110..359c22a09f 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -513,6 +513,180 @@
   $(OPENSSL_PATH)/ssl/t1_reneg.c
   $(OPENSSL_PATH)/ssl/t1_trce.c
   $(OPENSSL_PATH)/ssl/tls_srp.c
+  buildinf.h
+  $(OPENSSL_PATH)/include/internal/asn1t.h
+  $(OPENSSL_PATH)/include/internal/bio.h
+  $(OPENSSL_PATH)/include/internal/comp.h
+  $(OPENSSL_PATH)/include/internal/conf.h
+  $(OPENSSL_PATH)/include/internal/constant_time_locl.h
+  $(OPENSSL_PATH)/include/internal/dane.h
+  $(OPENSSL_PATH)/include/internal/dso.h
+  $(OPENSSL_PATH)/include/internal/err.h
+  $(OPENSSL_PATH)/include/internal/numbers.h
+  $(OPENSSL_PATH)/include/internal/o_dir.h
+  $(OPENSSL_PATH)/include/internal/o_str.h
+  $(OPENSSL_PATH)/include/internal/sslconf.h
+  $(OPENSSL_PATH)/include/internal/thread_once.h
+  $(OPENSSL_PATH)/include/openssl/aes.h
+  $(OPENSSL_PATH)/include/openssl/asn1.h
+  $(OPENSSL_PATH)/include/openssl/asn1t.h
+  $(OPENSSL_PATH)/include/openssl/asn1_mac.h
+  $(OPENSSL_PATH)/include/openssl/async.h
+  $(OPENSSL_PATH)/include/openssl/bio.h
+  $(OPENSSL_PATH)/include/openssl/blowfish.h
+  $(OPENSSL_PATH)/include/openssl/bn.h
+  $(OPENSSL_PATH)/include/openssl/buffer.h
+  $(OPENSSL_PATH)/include/openssl/camellia.h
+  $(OPENSSL_PATH)/include/openssl/cast.h
+  $(OPENSSL_PATH)/include/openssl/cmac.h
+  $(OPENSSL_PATH)/include/openssl/cms.h
+  $(OPENSSL_PATH)/include/openssl/comp.h
+  $(OPENSSL_PATH)/include/openssl/conf.h
+  $(OPENSSL_PATH)/include/openssl/conf_api.h
+  $(OPENSSL_PATH)/include/openssl/crypto.h
+  $(OPENSSL_PATH)/include/openssl/ct.h
+  $(OPENSSL_PATH)/include/openssl/des.h
+  $(OPENSSL_PATH)/include/openssl/dh.h
+  $(OPENSSL_PATH)/include/openssl/dsa.h
+  $(OPENSSL_PATH)/include/openssl/dtls1.h
+  $(OPENSSL_PATH)/include/openssl/ebcdic.h
+  $(OPENSSL_PATH)/include/openssl/ec.h
+  $(OPENSSL_PATH)/include/openssl/ecdh.h
+  $(OPENSSL_PATH)/include/openssl/ecdsa.h
+  $(OPENSSL_PATH)/include/openssl/engine.h
+  $(OPENSSL_PATH)/include/openssl/err.h
+  $(OPENSSL_PATH)/include/openssl/evp.h
+  $(OPENSSL_PATH)/include/openssl/e_os2.h
+  $(OPENSSL_PATH)/include/openssl/hmac.h
+  $(OPENSSL_PATH)/include/openssl/idea.h
+  $(OPENSSL_PATH)/include/openssl/kdf.h
+  $(OPENSSL_PATH)/include/openssl/lhash.h
+  $(OPENSSL_PATH)/include/openssl/md2.h
+  $(OPENSSL_PATH)/include/openssl/md4.h
+  $(OPENSSL_PATH)/include/openssl/md5.h
+  $(OPENSSL_PATH)/include/openssl/mdc2.h
+  $(OPENSSL_PATH)/include/openssl/modes.h
+  $(OPENSSL_PATH)/include/openssl/objects.h
+  $(OPENSSL_PATH)/include/openssl/obj_mac.h
+  $(OPENSSL_PATH)/include/openssl/ocsp.h
+  $(OPENSSL_PATH)/include/openssl/opensslconf.h
+  $(OPENSSL_PATH)/include/openssl/opensslv.h
+  $(OPENSSL_PATH)/include/openssl/ossl_typ.h
+  $(OPENSSL_PATH)/include/openssl/pem.h
+  $(OPENSSL_PATH)/include/openssl/pem2.h
+  $(OPENSSL_PATH)/include/openssl/pkcs12.h
+  $(OPENSSL_PATH)/include/openssl/pkcs7.h
+  $(OPENSSL_PATH)/include/openssl/rand.h
+  $(OPENSSL_PATH)/include/openssl/rc2.h
+  $(OPENSSL_PATH)/include/openssl/rc4.h
+  $(OPENSSL_PATH)/include/openssl/rc5.h
+  $(OPENSSL_PATH)/include/openssl/ripemd.h
+  $(OPENSSL_PATH)/include/openssl/rsa.h
+  $(OPENSSL_PATH)/include/openssl/safestack.h
+  $(OPENSSL_PATH)/include/openssl/seed.h
+  $(OPENSSL_PATH)/include/openssl/sha.h
+  $(OPENSSL_PATH)/include/openssl/srp.h
+  $(OPENSSL_PATH)/include/openssl/srtp.h
+  $(OPENSSL_PATH)/include/openssl/ssl.h
+  $(OPENSSL_PATH)/include/openssl/ssl2.h
+  $(OPENSSL_PATH)/include/openssl/ssl3.h
+  $(OPENSSL_PATH)/include/openssl/stack.h
+  $(OPENSSL_PATH)/include/openssl/symhacks.h
+  $(OPENSSL_PATH)/include/openssl/tls1.h
+  $(OPENSSL_PATH)/include/openssl/ts.h
+  

Re: [edk2-devel] [edk2-platforms] [PATCH] Maintainers.txt: Add maintainers

2019-05-21 Thread Kubacki, Michael A
Reviewed-by: Michael Kubacki 

> -Original Message-
> From: Desimone, Nathaniel L
> Sent: Tuesday, May 21, 2019 11:17 AM
> To: devel@edk2.groups.io
> Cc: Kubacki, Michael A ; Chaganty, Rangasai
> V 
> Subject: [edk2-platforms] [PATCH] Maintainers.txt: Add maintainers
> 
> Add maintainers for MinPlatformPkg, ClevoOpenBoardPkg, and
> KabylakeSiliconPkg
> 
> Cc: Michael Kubacki 
> Cc: Sai Chaganty 
> Signed-off-by: Nate DeSimone 
> ---
>  Maintainers.txt | 4 
>  1 file changed, 4 insertions(+)
> 
> diff --git a/Maintainers.txt b/Maintainers.txt index 927cd5ed93..2fac4a4c30
> 100644
> --- a/Maintainers.txt
> +++ b/Maintainers.txt
> @@ -68,10 +68,12 @@ R: Nate DeSimone
>   Platform/Intel/KabylakeOpenBoardPkg
>  M: Chasel Chiu 
>  M: Michael Kubacki 
> +M: Nate DeSimone 
> 
>  Platform/Intel/MinPlatformPkg
>  M: Michael Kubacki 
>  M: Chasel Chiu 
> +M: Nate DeSimone 
>  R: Liming Gao 
> 
>  Platform/Intel/PurleyOpenBoardPkg
> @@ -95,6 +97,8 @@ M: Yi Qian 
> Silicon/Intel/KabylakeSiliconPkg
>  M: Chasel Chiu 
>  M: Michael A Kubacki 
> +M: Sai Chaganty 
> +R: Nate DeSimone 
> 
>  Silicon/Intel/LewisburgPkg
>  M: Piwko, Maciej 
> --
> 2.16.2.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41164): https://edk2.groups.io/g/devel/message/41164
Mute This Topic: https://groups.io/mt/31699825/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [edk2-platforms] [PATCH] Maintainers.txt: Add maintainers

2019-05-21 Thread Nate DeSimone
Add maintainers for MinPlatformPkg, ClevoOpenBoardPkg,
and KabylakeSiliconPkg

Cc: Michael Kubacki 
Cc: Sai Chaganty 
Signed-off-by: Nate DeSimone 
---
 Maintainers.txt | 4 
 1 file changed, 4 insertions(+)

diff --git a/Maintainers.txt b/Maintainers.txt
index 927cd5ed93..2fac4a4c30 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -68,10 +68,12 @@ R: Nate DeSimone 
 Platform/Intel/KabylakeOpenBoardPkg
 M: Chasel Chiu 
 M: Michael Kubacki 
+M: Nate DeSimone 
 
 Platform/Intel/MinPlatformPkg
 M: Michael Kubacki 
 M: Chasel Chiu 
+M: Nate DeSimone 
 R: Liming Gao 
 
 Platform/Intel/PurleyOpenBoardPkg
@@ -95,6 +97,8 @@ M: Yi Qian 
 Silicon/Intel/KabylakeSiliconPkg
 M: Chasel Chiu 
 M: Michael A Kubacki 
+M: Sai Chaganty 
+R: Nate DeSimone 
 
 Silicon/Intel/LewisburgPkg
 M: Piwko, Maciej 
-- 
2.16.2.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41163): https://edk2.groups.io/g/devel/message/41163
Mute This Topic: https://groups.io/mt/31699825/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [Enable measured boot with SM3 digest algorithm 0/4]

2019-05-21 Thread Yao, Jiewen
Cool Thanks

thank you!
Yao, Jiewen


> 在 2019年5月21日,上午9:58,Desai, Imran  写道:
> 
> Hello Jiewen,
> 
> I tested SM3 PCR extensions on the OvmfPkg using swTPM (and TPM2 simulator).
> The validation was done comparing PCR extensions from the TCG2 EventLog and 
> SM3 PCR Bank data from the simulator at every extension.
> Additionally each SM3 extension and resulting values were compared and 
> contrasted against OpenSSL_1_1_1b on a linux dev machine to ensure the 
> accuracy of the digest values being produced, extended and realized as a 
> final value in the PCR.
> 
> Thanks and Regards,
> 
> Imran Desai
> 
> From: Yao, Jiewen
> Sent: Monday, May 20, 2019 9:30 AM
> To: devel@edk2.groups.io; Desai, Imran
> Subject: Re: [edk2-devel] [Enable measured boot with SM3 digest algorithm 0/4]
> 
> hi
> thanks for this contribution
> Besides the comment from Laszlo, would you please also share your unit test 
> result?
> What test you have done for this patch?
> 
> thank you!
> Yao, Jiewen
> 
> 
>> 在 2019年5月17日,下午2:43,Imran Desai  写道:
>> 
>> https://github.com/idesai/edk2/tree/enable_sm3_measured_boot
>> 
>> Support for SM3 digest algorithm is needed for TPM with SM3 PCR banks. This 
>> digest algorithm is part of the China Crypto algorithm suite. Support for 
>> these algorithms is needed to enable platforms for the PRC market.
>> This integration has dependency on the openssl_1_1_1b integration into edk2.
>> 
>> Imran Desai (4):
>> sm3_enabling: Augment crypt interface with calls into openssl to
>>   calculate sm3 digest prior to exercising TPM2 calls for PCR extend
>> sm3-enabling: Add SM3 TCG algorithm registry value to the
>>   PcdTpm2HashMask
>> sm3-enabling: Add SM3 guid reference in the TPM2 hash mask  structure
>>   in HashLibBaseCryptoRouterCommon.c
>> sm3-enabling: Add SM3 hashinstance library information to all OvmfPkg
>>   and SecurityPkg
>> 
>> SecurityPkg/SecurityPkg.dec   |   5 +-
>> OvmfPkg/OvmfPkgIa32.dsc   |   2 +
>> OvmfPkg/OvmfPkgIa32X64.dsc|   2 +
>> OvmfPkg/OvmfPkgX64.dsc|   2 +
>> SecurityPkg/SecurityPkg.dsc   |   3 +
>> .../HashInstanceLibSm3/HashInstanceLibSm3.inf |  46 ++
>> MdePkg/Include/Protocol/Hash.h|   5 +
>> SecurityPkg/Include/Library/HashLib.h |   1 +
>> .../HashInstanceLibSm3/HashInstanceLibSm3.c   | 155 ++
>> .../HashLibBaseCryptoRouterCommon.c   |   1 +
>> .../HashInstanceLibSm3/HashInstanceLibSm3.uni |  21 +++
>> 11 files changed, 241 insertions(+), 2 deletions(-)
>> create mode 100644 
>> SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
>> create mode 100644 
>> SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.c
>> create mode 100644 
>> SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.uni
>> 
>> --
>> 2.17.0
>> 
>> 
>> 
>> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41161): https://edk2.groups.io/g/devel/message/41161
Mute This Topic: https://groups.io/mt/31659817/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] why does RAND_add() take "randomness" as a "double"?

2019-05-21 Thread Laszlo Ersek
Hi,

On 05/21/19 16:15, Laszlo Ersek wrote:
> (resending, with my subscription to  completed)
> 
> Hi OpenSSL Developers,
> 
> (cross-posting  and ,)

I've received comments on the openssl-user mailing list, but
regrettably, all of those responses stripped the 
email address. So, AFAICS, none of the followup has reached
. As a replacement, please see the thread at
.

Thanks
Laszlo

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41160): https://edk2.groups.io/g/devel/message/41160
Mute This Topic: https://groups.io/mt/31696120/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [edk2-platforms][PATCH V1 1/1] Readme.md: Add Intel platforms

2019-05-21 Thread Kubacki, Michael A
Adds information to Readme.md for Intel platforms recently
moved to the edk2-platforms repository.

Cc: Michael D Kinney 
Cc: Nate DeSimone 
Cc: Chasel Chiu 
Cc: Liming Gao 
Cc: Ruiyu Ni 

Signed-off-by: Michael Kubacki 
---
 Readme.md | 20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/Readme.md b/Readme.md
index 59f739e861..e203795d47 100644
--- a/Readme.md
+++ b/Readme.md
@@ -222,6 +222,20 @@ they will be documented with the platform.
 * [D05](Platform/Hisilicon/D05)
 * [HiKey](Platform/Hisilicon/HiKey)
 
+## [Intel](Platform/Intel/Readme.md)
+### Minimum Platforms
+* [Clevo](Platform/Intel/ClevoOpenBoardPkg)
+* [Kaby Lake](Platform/Intel/KabylakeOpenBoardPkg)
+* [Purley](Platform/Intel/PurleyOpenBoardPkg)
+
+For more information, see the
+[EDK II Minimum Platform 
Specification](https://edk2-docs.gitbooks.io/edk-ii-minimum-platform-specification).
+### Other Platforms
+# Intel Quark SoC X1000 based platforms
+* [Galileo](Platform/Intel/QuarkPlatformPkg)
+# Minnowboard Max/Turbot based on Intel Valleyview2 SoC
+* [Minnowboard Max](Platform/Intel/Vlv2TbltDevicePkg)
+
 ## Marvell
 * [Armada 70x0](Platform/Marvell/Armada)
 
@@ -231,12 +245,6 @@ they will be documented with the platform.
 ## Socionext
 * [SynQuacer](Platform/Socionext/DeveloperBox)
 
-## Intel(R) Quark SoC X1000 based platforms
-* [Galileo](Platform/Intel/QuarkPlatformPkg)
-
-## Minnowboard Max/Turbot based on Intel Valleyview2 SoC
-* [Minnowboard Max](Platform/Intel/Vlv2TbltDevicePkg)
-
 # Maintainers
 
 See [Maintainers.txt](Maintainers.txt).
-- 
2.16.2.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41159): https://edk2.groups.io/g/devel/message/41159
Mute This Topic: https://groups.io/mt/31698921/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [PATCH] KabylakeOpenBoardPkg: Fixed system hang caused by MemoryTest.

2019-05-21 Thread Chiu, Chasel
From: "Chasel, Chiu" 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1550

OS hang due to non-existing memory reported as usable memory.
There are 2 different RVP3 boards and one with 4GB memory down
implementation while another one with 8GB. Since rest of the
configurations are exactly the same, board detection is added
to the same RVP3 BoardInitLib and only SPD policy assigned
differently.

This also fixed below 2 issues:
1. Fixed build failuire when PcdMultiBoardSupport == FALSE.
   (Wrong Pcd TokenSpace used in DxeBoardAcpiTableLib.inf)
2. Always failed to read SPD from DIMM because SpdAddressTable
   policy was not updated properly. Fixed by a notify callback
   when policy PPI installed.

Test: Verified both RVP3 boards can boot to Windows.

Cc: Nate DeSimone 
Cc: Michael Kubacki 
Signed-off-by: Chasel Chiu 
---
 
Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
   | 103 
+++
 
Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
|  17 ++---
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c
  |   4 ++--
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c
  |   6 +++---
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3SpdTable.c
 | 117 
-
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.c
|   7 +--
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3Detect.c
|  83 
+++
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitPreMemLib.c
 | 127 
++-
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c
  |   4 ++--
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c
   |   4 ++--
 Platform/Intel/KabylakeOpenBoardPkg/Library/BaseEcLib/BaseEcLib.c  
  | 339 
+++
 
Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
 |  43 +++
 
Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
 |   9 -
 Platform/Intel/KabylakeOpenBoardPkg/Include/EcCommands.h   
  |  44 

 Platform/Intel/KabylakeOpenBoardPkg/Include/Library/EcLib.h
  | 106 
++
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
   |   8 
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
  |   3 ++-
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitLib.h
   |   4 +++-
 
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
 |   3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc  
  |  12 ++--
 Platform/Intel/KabylakeOpenBoardPkg/Library/BaseEcLib/BaseEcLib.inf
  |  29 +
 21 files changed, 1022 insertions(+), 50 deletions(-)

diff --git 
a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
 
b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
new file mode 100644
index 00..0fedd81cd0
--- /dev/null
+++ 

Re: [edk2-devel] [Patch] BaseTools: Remove './SecMain' from 'run' target

2019-05-21 Thread Michael D Kinney
Reviewed-by: Michael D Kinney 

If we want the 'run' target to work for the EmulatorPkg, we
can add a python post build script to support that.  Please
enter a BZ feature request.

There is an example in the following edk2-staging branch that
runs QEMU for an OvmfPkg build using a 'run' target.

https://github.com/tianocore/edk2-staging/tree/Bug_1525_FmpDevicePkg_MultipleControllers/OvmfPkg

The DSC file contains a POSTBUILD statement.  There are two
python scripts in this example, but could be consolidated to
a single python script for the EmulatorPkg.  Run.py finds the
output directory where the EmulatorPkg executable for each 
supported host OS can be found.

https://github.com/tianocore/edk2-staging/blob/Bug_1525_FmpDevicePkg_MultipleControllers/OvmfPkg/OvmfPkgIa32X64.dsc

https://github.com/tianocore/edk2-staging/blob/Bug_1525_FmpDevicePkg_MultipleControllers/OvmfPkg/PostBuild.py

https://github.com/tianocore/edk2-staging/blob/Bug_1525_FmpDevicePkg_MultipleControllers/OvmfPkg/Run.py

Best regards,

Mike

> -Original Message-
> From: Gao, Liming
> Sent: Tuesday, May 21, 2019 8:06 AM
> To: Feng, Bob C ;
> devel@edk2.groups.io
> Cc: Kinney, Michael D 
> Subject: RE: [Patch] BaseTools: Remove './SecMain' from
> 'run' target
> 
> Bob:
>   Because NT32 has been removed, this change should be
> OK. Reviewed-by: Liming Gao 
> 
> Thanks
> Liming
> > -Original Message-
> > From: Feng, Bob C
> > Sent: Friday, May 10, 2019 3:34 PM
> > To: Gao, Liming ;
> devel@edk2.groups.io
> > Cc: Kinney, Michael D 
> > Subject: RE: [Patch] BaseTools: Remove './SecMain'
> from 'run' target
> >
> > I think NT32Pkg need a POSTBUILD scripts to execute
> its run command.
> >
> >
> > -Original Message-
> > From: Gao, Liming
> > Sent: Friday, May 10, 2019 3:26 PM
> > To: Feng, Bob C ;
> devel@edk2.groups.io
> > Cc: Kinney, Michael D 
> > Subject: RE: [Patch] BaseTools: Remove './SecMain'
> from 'run' target
> >
> > Bob:
> >   Please make sure run command still works on NT32
> platform.
> >
> > >-Original Message-
> > >From: Feng, Bob C
> > >Sent: Friday, May 10, 2019 2:34 PM
> > >To: devel@edk2.groups.io
> > >Cc: Feng, Bob C ; Gao, Liming
> > >; Kinney, Michael D
> 
> > >Subject: [Patch] BaseTools: Remove './SecMain' from
> 'run' target
> > >
> > >BZ:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1561
> > >
> > >When a target of 'run' is passed into build.py,
> BaseTools
> > >unconditionally attempts to execute the application
> called './SecMain'
> > >in the build output directory.
> > >
> > >This behavior applies to the Nt32Pkg which is being
> replaced with
> > >features in the EmulatorPkg.
> > >
> > >Signed-off-by: Bob Feng 
> > >Cc: Liming Gao 
> > >Cc: Michael D Kinney 
> > >---
> > > BaseTools/Source/Python/build/build.py | 4 
> > > 1 file changed, 4 deletions(-)
> > >
> > >diff --git a/BaseTools/Source/Python/build/build.py
> > >b/BaseTools/Source/Python/build/build.py
> > >index 7271570d29..04f266abf5 100644
> > >--- a/BaseTools/Source/Python/build/build.py
> > >+++ b/BaseTools/Source/Python/build/build.py
> > >@@ -1225,14 +1225,10 @@ class Build():
> > >
> > > makefile =
> >
> >GenMake.BuildFile(AutoGenObject)._FILE_NAME_[GenMake.g
> MakeType]
> > >
> > > # run
> > > if Target == 'run':
> > >-RunDir =
> os.path.normpath(os.path.join(AutoGenObject.BuildDir,
> > >GlobalData.gGlobalDefines['ARCH']))
> > >-Command = '.\SecMain'
> > >-os.chdir(RunDir)
> > >-LaunchCommand(Command, RunDir)
> > > return True
> > >
> > > # build modules
> > > if BuildModule:
> > > BuildCommand = BuildCommand + [Target]
> > >--
> > >2.20.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41157): https://edk2.groups.io/g/devel/message/41157
Mute This Topic: https://groups.io/mt/31574316/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [Patch] MdeModulePkg: Update MdeModulePkg.dsc to remove Network related modules

2019-05-21 Thread Liming Gao
Network related modules have been included in NetworkPkg.dsc.
They can be removed from MdeModulePkg.dsc.

Signed-off-by: Liming Gao 
Cc: Hao A Wu 
---
 MdeModulePkg/MdeModulePkg.dsc | 19 ---
 1 file changed, 19 deletions(-)

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index ac7111dea1..995fd805e1 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -63,11 +63,6 @@
   #
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
   
SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
   TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
@@ -263,12 +258,8 @@
   
MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationProfileLib.inf
   MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
   
MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
-  MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
   MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
   MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.inf
-  MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
   MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.inf
   
MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf
   MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
@@ -357,16 +348,6 @@
   MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
   MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf
 
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-
   
MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
   MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
   MdeModulePkg/Universal/PCD/Pei/Pcd.inf
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41156): https://edk2.groups.io/g/devel/message/41156
Mute This Topic: https://groups.io/mt/31697980/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [Patch] BaseTools: Update Conf/target.template with the default EmulatorPkg.dsc

2019-05-21 Thread Liming Gao
Nt32Pkg has been removed. The default platform is changed to EmulatorPkg.dsc.

Signed-off-by: Liming Gao 
Cc: Bob Feng 
---
 BaseTools/Conf/target.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template
index de8137a07e..d4a3b53b7f 100644
--- a/BaseTools/Conf/target.template
+++ b/BaseTools/Conf/target.template
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+#  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -17,7 +17,7 @@
 #   build. This line is required 
if and only if the current
 #   working directory does not 
contain one or more description
 #   files.
-ACTIVE_PLATFORM   = Nt32Pkg/Nt32Pkg.dsc
+ACTIVE_PLATFORM   = EmulatorPkg/EmulatorPkg.dsc
 
 #  TARGETList   OptionalZero or more of the following: 
DEBUG, RELEASE, NOOPT
 #   UserDefined; separated by a 
space character.
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41155): https://edk2.groups.io/g/devel/message/41155
Mute This Topic: https://groups.io/mt/31697760/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [Patch] BaseTools: Remove './SecMain' from 'run' target

2019-05-21 Thread Liming Gao
Bob:
  Because NT32 has been removed, this change should be OK. Reviewed-by: Liming 
Gao 

Thanks
Liming
> -Original Message-
> From: Feng, Bob C
> Sent: Friday, May 10, 2019 3:34 PM
> To: Gao, Liming ; devel@edk2.groups.io
> Cc: Kinney, Michael D 
> Subject: RE: [Patch] BaseTools: Remove './SecMain' from 'run' target
> 
> I think NT32Pkg need a POSTBUILD scripts to execute its run command.
> 
> 
> -Original Message-
> From: Gao, Liming
> Sent: Friday, May 10, 2019 3:26 PM
> To: Feng, Bob C ; devel@edk2.groups.io
> Cc: Kinney, Michael D 
> Subject: RE: [Patch] BaseTools: Remove './SecMain' from 'run' target
> 
> Bob:
>   Please make sure run command still works on NT32 platform.
> 
> >-Original Message-
> >From: Feng, Bob C
> >Sent: Friday, May 10, 2019 2:34 PM
> >To: devel@edk2.groups.io
> >Cc: Feng, Bob C ; Gao, Liming
> >; Kinney, Michael D 
> >Subject: [Patch] BaseTools: Remove './SecMain' from 'run' target
> >
> >BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1561
> >
> >When a target of 'run' is passed into build.py, BaseTools
> >unconditionally attempts to execute the application called './SecMain'
> >in the build output directory.
> >
> >This behavior applies to the Nt32Pkg which is being replaced with
> >features in the EmulatorPkg.
> >
> >Signed-off-by: Bob Feng 
> >Cc: Liming Gao 
> >Cc: Michael D Kinney 
> >---
> > BaseTools/Source/Python/build/build.py | 4 
> > 1 file changed, 4 deletions(-)
> >
> >diff --git a/BaseTools/Source/Python/build/build.py
> >b/BaseTools/Source/Python/build/build.py
> >index 7271570d29..04f266abf5 100644
> >--- a/BaseTools/Source/Python/build/build.py
> >+++ b/BaseTools/Source/Python/build/build.py
> >@@ -1225,14 +1225,10 @@ class Build():
> >
> > makefile =
> >GenMake.BuildFile(AutoGenObject)._FILE_NAME_[GenMake.gMakeType]
> >
> > # run
> > if Target == 'run':
> >-RunDir = os.path.normpath(os.path.join(AutoGenObject.BuildDir,
> >GlobalData.gGlobalDefines['ARCH']))
> >-Command = '.\SecMain'
> >-os.chdir(RunDir)
> >-LaunchCommand(Command, RunDir)
> > return True
> >
> > # build modules
> > if BuildModule:
> > BuildCommand = BuildCommand + [Target]
> >--
> >2.20.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41154): https://edk2.groups.io/g/devel/message/41154
Mute This Topic: https://groups.io/mt/31574316/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] iSCSI and iBFT

2019-05-21 Thread Tomas Pilar (tpilar)
I am going to commit the cardinal sin of online dev support.

'Never mind, found the problem'

From: Tomas Pilar
Sent: 20 May 2019 16:57
To: 'devel@edk2.groups.io' 
Subject: iSCSI and iBFT

Hi,

I have a bit of an esoteric problem. When I configure the software iscsi 
intiator that is part of EDK2 platform network stack, the platform network 
stack with install iBFT table into the ACPI tables so that the configuration 
can be picked up by further boot loaders and the OS. So far so good.

Problem: When I PXE boot into iPXE using my adapter, exit back into boot 
manager, the iBFT has disappeared. Alternatively, if I use iPXE to then boot 
WDS, the software initiator in WinPE won't find the iBFT table and therefore 
won't hook the network drive.

Observations:
* When I boot into UEFI shell on disk and exit back into boot manager, the iBFT 
is preserved.

* When I PXE boot into UEFI shell and exit, the iBFT is preserved.

* When I boot into iPXE on disk and exit, the iBFT is preserved.

* When I use a different adapter (Intel) to pxe boot into iBFT and exit back to 
boot manager, the iBFT has moved from the penultimate position to the last 
position in the ACPI tables. Almost as if something uninstalled the iBFT and 
reinstalled it.

Any ideas?

Cheers
Tom

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41153): https://edk2.groups.io/g/devel/message/41153
Mute This Topic: https://groups.io/mt/31686860/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [Patch V5 edk2-platform 16/18] Platform/PurleyOpenBoardPkg: Update DSC to use NetworkPkg DSC

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the platform DSC files to use the include fragment
files provided by NetworkPkg. And add network related definition in
Purley PlatformPkg.dsc.

Cc: Michael A Kubacki 
Cc: Jiewen Yao 
Cc: Shifei A Lu 
Cc: Xiaohu Zhou 
Signed-off-by: Shenglei Zhang 
Reviewed-by: Michael Kubacki 
---
In V5:
Only update this patch to move those definitions after Include PCD setting

 Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc | 9 +
 1 file changed, 9 insertions(+)

diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc 
b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
index de1a3965d7..595ffd4144 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
@@ -77,6 +77,15 @@
 !include $(SKT_PKG)/SktCommonLib.dsc
 !include $(PCH_PKG)/PchCommonLib.dsc
 
+[Defines]
+  !if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
+DEFINE NETWORK_TLS_ENABLE = FALSE
+DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
+  !else
+DEFINE NETWORK_ENABLE = FALSE
+  !endif
+!include NetworkPkg/NetworkDefines.dsc.inc
+
 [LibraryClasses.common]
 !if gPlatformTokenSpaceGuid.PcdFastBoot == FALSE
   
PlatformBootManagerLib|MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41152): https://edk2.groups.io/g/devel/message/41152
Mute This Topic: https://groups.io/mt/31697263/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] why does RAND_add() take "randomness" as a "double"?

2019-05-21 Thread Laszlo Ersek
(resending, with my subscription to  completed)

Hi OpenSSL Developers,

(cross-posting  and ,)

OpenSSL commit [1] changed the representation of the "entropy amount" --
later renamed to "randomess" in [2] -- from "int" to "double". I've read
the commit message:

commit 853f757ecea74a271a7c5cdee3f3b5fe0d3ae863
Author: Bodo Möller 
Date:   Sat Feb 19 15:22:53 2000 +

Allow for higher granularity of entropy estimates by using 'double'
instead of 'unsigned' counters.
Seed PRNG in MacOS/GetHTTPS.src/GetHTTPS.cpp.

Partially submitted by Yoram Meroz .

and also checked "MacOS/GetHTTPS.src/GetHTTPS.cpp" at the same commit.
But, I'm none the wiser.

Can someone please explain what is gained by using a floating point type
here?

Is it really a relevant use case that entropy is fed from an external
source to OpenSSL such that truncating the amount to a whole number of
bits would cause significant lossage? (Admittedly, it could be relevant
if the individual randomness bit counts were in the (0, 1) interval,
both boundaries exclusive.)

Using floating point for randomness representation is a problem for
environments that prefer to avoid floating point altogether, such as
edk2 ("UEFI") firmware

Thanks,
Laszlo

[1] https://github.com/openssl/openssl/commit/853f757ecea7
[2] https://github.com/openssl/openssl/commit/f367ac2b2664

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41151): https://edk2.groups.io/g/devel/message/41151
Mute This Topic: https://groups.io/mt/31696120/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [PATCH] BaseTools: Add a checking for Sources section in INF file

2019-05-21 Thread Christian Rodriguez
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1804

In the Edk2 INF spec 3.9, it states, All HII Unicode format files
must be listed in [Sources] section. Add a check to see if [Sources]
section lists all the "source" type files of a module. Performance
impact should be minimal with this patch since information is already
being fetched for Makefile purposes. All other information is already
cached in memory. No extra IO time is needed.

Signed-off-by: Christian Rodriguez 
Cc: Bob Feng 
Cc: Liming Gao 
Cc: Yonghong Zhu 
---
 BaseTools/Source/Python/AutoGen/AutoGen.py   |  6 --
 BaseTools/Source/Python/AutoGen/GenMake.py   | 45 
+
 BaseTools/Source/Python/Common/GlobalData.py |  3 ++-
 BaseTools/Source/Python/build/build.py   | 66 
--
 4 files changed, 91 insertions(+), 29 deletions(-)

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py 
b/BaseTools/Source/Python/AutoGen/AutoGen.py
index a843f294b9..0bc27fb2b3 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -3989,7 +3989,8 @@ class ModuleAutoGen(AutoGen):
 for LibraryAutoGen in self.LibraryAutoGenList:
 LibraryAutoGen.CreateMakeFile()
 
-if self.CanSkip():
+# Don't enable if hash feature enabled, CanSkip uses timestamps to 
determine build skipping
+if not GlobalData.gUseHashCache and self.CanSkip():
 return
 
 if len(self.CustomMakefile) == 0:
@@ -4032,7 +4033,8 @@ class ModuleAutoGen(AutoGen):
 for LibraryAutoGen in self.LibraryAutoGenList:
 LibraryAutoGen.CreateCodeFile()
 
-if self.CanSkip():
+# Don't enable if hash feature enabled, CanSkip uses timestamps to 
determine build skipping
+if not GlobalData.gUseHashCache and self.CanSkip():
 return
 
 AutoGenList = []
diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py 
b/BaseTools/Source/Python/AutoGen/GenMake.py
index 0e0f9fd9b0..8765ffa188 100644
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -905,6 +905,51 @@ cleanlib:
 ForceIncludedFile,
 self._AutoGenObject.IncludePathList + 
self._AutoGenObject.BuildOptionIncPathList
 )
+
+# Only do it during hashing feature for now to save time on clean build
+# Conditional can be removed to happen on all builds for MetaFile 
compliance
+if GlobalData.gUseHashCache:
+# Check if header files are listed in metafile
+# Get a list of unique module header source files from MetaFile
+headerFilesInMetaFileSet = set()
+for aFile in self._AutoGenObject.SourceFileList:
+aFileName = str(aFile)
+if not aFileName.endswith('.h'):
+continue
+headerFilesInMetaFileSet.add(aFileName.lower())
+
+# Get a list of unique module autogen files
+localAutoGenFileSet = set()
+for aFile in self._AutoGenObject.AutoGenFileList:
+localAutoGenFileSet.add(str(aFile).lower())
+
+# Get a list of unique module dependency header files
+# Exclude autogen files and files not in the source directory
+headerFileDependencySet = set()
+localSourceDir = str(self._AutoGenObject.SourceDir).lower()
+for Dependency in FileDependencyDict.values():
+for aFile in Dependency:
+aFileName = str(aFile).lower()
+if not aFileName.endswith('.h'):
+continue
+if aFileName in localAutoGenFileSet:
+continue
+if localSourceDir not in aFileName:
+continue
+headerFileDependencySet.add(aFileName)
+
+# Ensure that gModuleBuildTracking has been initialized per 
architecture
+if self._AutoGenObject.Arch not in GlobalData.gModuleBuildTracking:
+GlobalData.gModuleBuildTracking[self._AutoGenObject.Arch] = 
dict()
+
+# Check if a module dependency header file is missing from the 
module's MetaFile
+for aFile in headerFileDependencySet:
+if aFile not in headerFilesInMetaFileSet:
+
GlobalData.gModuleBuildTracking[self._AutoGenObject.Arch][self._AutoGenObject] 
= 'FAIL_METAFILE'
+EdkLogger.warn("build","Module MetaFile [Sources] is 
missing local header!",
+ExtraData = "Local Header: " + aFile + " not 
found in " + self._AutoGenObject.MetaFile.Path
+)
+
 DepSet = None
 for File,Dependency in FileDependencyDict.items():

Re: [edk2-devel] [PATCH edk2-platforms V3 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Liming Gao
Leif:
  The unnecessary change is caused by the line ending. I send the new version 
patch. Please help review it. 

  On version info, I agree not to add them in the commit message. We can 
describe them in the cover letter so that people know what changes in this 
version. 

Thanks
Liming
> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Leif 
> Lindholm
> Sent: Tuesday, May 21, 2019 7:58 PM
> To: Zhang, Shenglei 
> Cc: devel@edk2.groups.io
> Subject: Re: [edk2-devel] [PATCH edk2-platforms V3 04/18] Hisilicon/D05: 
> Update DSC/FDF to use NetworkPkg DSC/FDF
> 
> On Mon, May 20, 2019 at 03:07:15PM +0800, Shenglei Zhang wrote:
> > This patch updates the platform DSC/FDF files to use the include fragment
> > files provided by NetworkPkg.
> >
> > v2: Withdraw unrelated changes.
> 
> Any comments on changes since previous patch go underneath the "---"
> line below - they do not belong in the commit message.
> 
> > Cc: Leif Lindholm 
> > Signed-off-by: Shenglei Zhang 
> > ---
> >  Platform/Hisilicon/D05/D05.dsc | 59 ++
> >  Platform/Hisilicon/D05/D05.fdf | 23 +
> >  2 files changed, 18 insertions(+), 64 deletions(-)
> >
> > diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
> > index dc9e1407ba..239bc776f9 100644
> > --- a/Platform/Hisilicon/D05/D05.dsc
> > +++ b/Platform/Hisilicon/D05/D05.dsc
> > @@ -23,8 +23,15 @@
> >SKUID_IDENTIFIER   = DEFAULT
> >FLASH_DEFINITION   = 
> > Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf
> >DEFINE EDK2_SKIP_PEICORE=0
> > -  DEFINE NETWORK_IP6_ENABLE  = FALSE
> > -  DEFINE HTTP_BOOT_ENABLE= FALSE
> > +
> > +  #
> > +  # Network definition
> > +  #
> > +  DEFINE NETWORK_SNP_ENABLE = FALSE
> > +  DEFINE NETWORK_TLS_ENABLE = FALSE
> > +  DEFINE NETWORK_VLAN_ENABLE= FALSE
> > +  DEFINE NETWORK_IP6_ENABLE = FALSE
> > +  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
> >
> >  !include Silicon/Hisilicon/Hisilicon.dsc.inc
> >
> > @@ -37,12 +44,8 @@
> >
> >IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf
> >
> > -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> > -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> >HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
> >
> > UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
> > -  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> > -  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> >
> > OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
> >
> > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
> > @@ -50,11 +53,6 @@
> >BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
> >SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
> >
> > -  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> > -
> > -!if $(HTTP_BOOT_ENABLE) == TRUE
> > -  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> > -!endif
> >
> >  !ifdef $(FDT_ENABLE)
> >#FDTUpdateLib
> > @@ -89,10 +87,10 @@
> >
> >LpcLib|Silicon/Hisilicon/Hi1610/Library/LpcLib/LpcLib.inf
> >
> > SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
> > -  
> > PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> > +  
> > PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> 
> This no-op change needs to go.
> Please verify the patches manually before resubmitting.
> 
> >
> > PciHostBridgeLib|Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> >
> > PciSegmentLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/Hi161xPciSegmentLib.inf
> > -  
> > PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf
> > +  
> > PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf
> 
> This no-op change needs to go.
> Please verify the patches manually before resubmitting.
> 
> >
> >  [LibraryClasses.common.SEC]
> >
> > ArmPlatformLib|Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> > @@ -130,7 +128,7 @@
> >
> >  [PcdsFixedAtBuild.common]
> >gArmPlatformTokenSpaceGuid.PcdCoreCount|8
> > -  gArmTokenSpaceGuid.PcdPciIoTranslation|0
> > +  gArmTokenSpaceGuid.PcdPciIoTranslation|0
> 
> This no-op change needs to go.
> Please verify the patches manually before resubmitting.
> 
> >
> >gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000
> >
> > @@ -466,7 +464,7 @@
> >ArmPkg/Drivers/CpuDxe/CpuDxe.inf
> >MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
> >
> > -  ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
> > +  

Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-21 Thread Ard Biesheuvel
On Tue, 21 May 2019 at 13:23, Laszlo Ersek  wrote:
>
> Hi,
>
> On 05/21/19 11:09, Wang, Jian J wrote:
> > Ard,
> >
> >> -Original Message-
> >> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Ard
> >> Biesheuvel
> >> Sent: Tuesday, May 21, 2019 5:02 PM
> >> To: Wang, Jian J 
> >> Cc: devel@edk2.groups.io; Laszlo Ersek ; Lu, XiaoyuX
> >> ; Ye, Ting ; Leif Lindholm
> >> ; Gao, Liming 
> >> Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 
> >> 1.1.1b
> >>
> >> On Tue, 21 May 2019 at 09:43, Wang, Jian J  wrote:
> >>>
> >>> Hi Ard,
> >>>
> >>> Any comments?
> >>>
> >>> Regards,
> >>> Jian
> >>>
>  -Original Message-
>  From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> >> Wang,
>  Jian J
>  Sent: Monday, May 20, 2019 9:41 AM
>  To: devel@edk2.groups.io; ard.biesheu...@linaro.org; Laszlo Ersek
>  
>  Cc: Lu, XiaoyuX ; Ye, Ting ; 
>  Leif
>  Lindholm ; Gao, Liming 
>  Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to
> >> 1.1.1b
> 
>  Ard,
> 
> 
> > -Original Message-
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> >> Ard
> > Biesheuvel
> > Sent: Friday, May 17, 2019 11:06 PM
> > To: Laszlo Ersek 
> > Cc: Wang, Jian J ; devel@edk2.groups.io; Lu,
> >> XiaoyuX
> > ; Ye, Ting ; Leif Lindholm
> > ; Gao, Liming 
> > Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to
>  1.1.1b
> >
> > On Fri, 17 May 2019 at 15:17, Laszlo Ersek  wrote:
> >>
> >> On 05/17/19 15:04, Laszlo Ersek wrote:
> >>> On 05/17/19 07:11, Wang, Jian J wrote:
>  Hi Laszlo,
> 
>  There's already a float library used in OpensslLib.inf.
> 
>  [LibraryClasses.ARM]
>    ArmSoftFloatLib
> 
>  The problem is that the below instance doesn't implement
> >> __aeabi_ui2d
>  and __aeabi_d2uiz (I encountered this one as well)
> 
>    ArmPkg\Library\ArmSoftFloatLib\ArmSoftFloatLib.inf
> 
>  I think we can update this library support those two APIs. So what
> >> about
>  we still push the patch and file a BZ to fix this issue?
> >>>
> >>> I'm OK with that, but it will break ARM and AARCH64 platforms that
> >>> consume OpensslLib (directly or through BaseCryptLib), so this 
> >>> question
> >>> is up to Leif and Ard to decide.
> >>
> >> Correction: break ARM platforms only, not AARCH64.
> >>
> >
> > We obviously need to fix this before we can upgrade to a new OpenSSL
> >> version.
> >
> > Do we really have a need for the random functions? These seem the only
> > ones that use floating point, which the UEFI spec does not permit, so
> > it would be better if we could fix this by removing the dependency on
> > FP in the first place (and get rid of ArmSoftFloatLib entirely)
> >
> 
>  BaseCryptLib provides RandSeed/RandBytes interface which wrap openssl
> >> rand
>  functionalities. These interfaces are used by following components in 
>  edk2
> 
>    - CryptoPkg\Library\TlsLib\TlsInit.c
>    - SecurityPkg\HddPassword\HddPasswordDxe.c
> 
>  Openssl components, like asn1, bn, evp, ocsp, pem, pkcs7, pkcs12, rsa, 
>  ssl (in
>  addition
>  to cms, dsa, srp, which are disabled in edk2) will call rand_* interface 
>  as well.
> 
> >>
> >> If we have both internal (to Openssl) and external users of the RNG
> >> api, then I guess there is no way to work around this. It is
> >> unfortunate, since the RNG code in OpenSSL doesn't actually use double
> >> types except for keeping an entropy count, which could just as easily
> >> be kept in an integer variable.
>
> (1) I think I agree... However, it seems that the first function (or one
> of the first functions) in OpenSSL to take an "entropy" parameter, of
> type "double", was RAND_add(). And the RAND_add() manual states,
>
>RAND_add() mixes the num bytes at buf into the PRNG state.
>Thus, if the data at buf are unpredictable to an adversary,
>this increases the uncertainty about the state and makes the
>PRNG output less predictable. Suitable input comes from user
>interaction (random key presses, mouse movements) and certain
>hardware events. The entropy argument is (the lower bound of)
>an estimate of how much randomness is contained in buf,
>measured in bytes. Details about sources of randomness and how
>to estimate their entropy can be found in the literature, e.g.
>RFC 1750.
>
> I've now looked up RFC 1750, and it contains copious amounts of math on
> irrational numbers. Hence the use of floating point in OpenSSL, I'd guess.
>
>   https://www.ietf.org/rfc/rfc1750.txt
>
> ... After digging a bit in the OpenSSL git history, I've found the
> following 

[edk2-devel] [Patch edk2-platform V4 16/18] Platform/PurleyOpenBoardPkg: Update DSC to use NetworkPkg DSC

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the platform DSC files to use the include fragment
files provided by NetworkPkg. And add network related definition in
Purley PlatformPkg.dsc.

Cc: Michael A Kubacki 
Cc: Jiewen Yao 
Cc: Shifei A Lu 
Cc: Xiaohu Zhou 
Signed-off-by: Shenglei Zhang 
Reviewed-by: Michael Kubacki 
---
 Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc 
b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
index de1a3965d7..a82d18a028 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
@@ -30,6 +30,13 @@
   BUILD_TARGETS   = DEBUG|RELEASE
   SKUID_IDENTIFIER= DEFAULT
 
+  !if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
+DEFINE NETWORK_TLS_ENABLE = FALSE
+  !else
+DEFINE NETWORK_ENABLE = FALSE
+  !endif
+!include NetworkPkg/NetworkDefines.dsc.inc
+
   #
   # Set the global variables
   #
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41145): https://edk2.groups.io/g/devel/message/41145
Mute This Topic: https://groups.io/mt/31696695/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [Patch edk2-platform V4 12/18] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Cc: Leif Lindholm 
Signed-off-by: Shenglei Zhang 
---
 Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc|  8 
 Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc|  8 
 Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc |  8 
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 18 +-
 Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 12 +---
 5 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc 
b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
index 01532b4a00..8ee84902ef 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
@@ -46,6 +46,14 @@
   FLASH_DEFINITION   = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
   BOARD_DXE_FV_COMPONENTS= 
Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
+
 !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
 
 [LibraryClasses.common]
diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc 
b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
index c6510d..5418ddcaa7 100644
--- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
+++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
@@ -46,6 +46,14 @@
   FLASH_DEFINITION   = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
   BOARD_DXE_FV_COMPONENTS= 
Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
+
 !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
 
 [LibraryClasses.common]
diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc 
b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
index d08013612f..ff9bd5dc8c 100644
--- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
+++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
@@ -47,6 +47,14 @@
   BOARD_DXE_FV_COMPONENTS= 
Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
   CAPSULE_ENABLE = TRUE
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
+
 !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
 
 [LibraryClasses.common]
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc 
b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 0cf5d8447a..cfbc172b4f 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -115,12 +115,6 @@
   
RealTimeClockLib|Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
   
ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
 
-  # Network support
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-
   # These libraries are used by the dynamic EFI Shell commands
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
@@ -471,17 +465,7 @@
   Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
 
   # Network support
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
+!include NetworkPkg/Network.dsc.inc
   Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
   Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf
   Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf 
b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
index d2bbdedcfa..6face86577 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
@@ -129,17 +129,7 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
   INF 

[edk2-devel] [Patch edk2-platform V4 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Cc: Leif Lindholm 
Signed-off-by: Shenglei Zhang 
---
 Platform/Hisilicon/D05/D05.dsc | 45 
++---
 Platform/Hisilicon/D05/D05.fdf | 23 +--
 2 files changed, 11 insertions(+), 57 deletions(-)

diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
index dc9e1407ba..3c04b7ee24 100644
--- a/Platform/Hisilicon/D05/D05.dsc
+++ b/Platform/Hisilicon/D05/D05.dsc
@@ -23,8 +23,15 @@
   SKUID_IDENTIFIER   = DEFAULT
   FLASH_DEFINITION   = 
Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf
   DEFINE EDK2_SKIP_PEICORE=0
-  DEFINE NETWORK_IP6_ENABLE  = FALSE
-  DEFINE HTTP_BOOT_ENABLE= FALSE
+
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_SNP_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_VLAN_ENABLE= FALSE
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
 
 !include Silicon/Hisilicon/Hisilicon.dsc.inc
 
@@ -37,12 +44,8 @@
 
   IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf
 
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   
UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
   
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
   
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
@@ -50,11 +53,6 @@
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
 
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-
-!if $(HTTP_BOOT_ENABLE) == TRUE
-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
-!endif
 
 !ifdef $(FDT_ENABLE)
   #FDTUpdateLib
@@ -532,30 +530,7 @@
 
   Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf
 
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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
-!if $(NETWORK_IP6_ENABLE) == TRUE
-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-!endif
-!if $(HTTP_BOOT_ENABLE) == TRUE
-  NetworkPkg/DnsDxe/DnsDxe.inf
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  NetworkPkg/HttpDxe/HttpDxe.inf
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-!endif
-
-
+!include NetworkPkg/Network.dsc.inc
   Platform/Hisilicon/D05/Drivers/Sas/SasDxeDriver.inf
 
   SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
index 812f7f2690..c18f23482f 100644
--- a/Platform/Hisilicon/D05/D05.fdf
+++ b/Platform/Hisilicon/D05/D05.fdf
@@ -246,28 +246,7 @@ READ_LOCK_STATUS   = TRUE
   INF Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf
   INF Platform/Hisilicon/D05/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.inf
 
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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/Udp6Dxe/Udp6Dxe.inf
-  INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-!endif
-!if $(HTTP_BOOT_ENABLE) == TRUE
-  INF NetworkPkg/DnsDxe/DnsDxe.inf
-  INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  INF NetworkPkg/HttpDxe/HttpDxe.inf
-  INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-!endif
+!include NetworkPkg/Network.fdf.inc
 
 !ifdef $(FDT_ENABLE)
   INF Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.inf
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41133): 

[edk2-devel] [Patch edk2-platform V4 15/18] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg DSC/FDF.

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Cc: Zailiang Sun 
Cc: Yi Qian 
Signed-off-by: Shenglei Zhang 
Reviewed-by: Zailiang Sun 
---
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf   | 24 
++--
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc |  6 ++
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf| 24 
++--
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 43 
+++
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc   | 39 
+--
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 42 
++
 6 files changed, 28 insertions(+), 150 deletions(-)

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf 
b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 098602b9d8..5827386977 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -714,33 +714,13 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
 #
 # Network Modules
 #
+!include NetworkPkg/Network.fdf.inc
+
 !if $(NETWORK_ENABLE) == TRUE
   FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {
 SECTION PE32 = 
Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
 SECTION UI = "UNDI"
   }
-  INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  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
-  !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
-  !endif
-  !if $(NETWORK_VLAN_ENABLE) == TRUE
-  INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  !endif
-  !if $(NETWORK_ISCSI_ENABLE) == TRUE
-INF  NetworkPkg/IScsiDxe/IScsiDxe.inf
-  !endif
 !endif
 
 !if $(CAPSULE_ENABLE)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc 
b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
index 6d556c1be2..61eca30be1 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
@@ -76,10 +76,16 @@ DEFINE ENBDT_S3_SUPPORT = TRUE
 
 DEFINE LZMA_ENABLE = TRUE
 DEFINE S4_ENABLE = TRUE
+
+#
+# Network definition
+#
 DEFINE NETWORK_ENABLE = TRUE
 DEFINE NETWORK_IP6_ENABLE = TRUE
 DEFINE NETWORK_ISCSI_ENABLE = FALSE
 DEFINE NETWORK_VLAN_ENABLE = FALSE
+DEFINE NETWORK_TLS_ENABLE = FALSE
+DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
 
 DEFINE SATA_ENABLE   = TRUE
 DEFINE PCIESC_ENABLE = TRUE
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf 
b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 1ba6124a69..a6859d3b6d 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -670,33 +670,13 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
 #
 # Network Modules
 #
+!include NetworkPkg/Network.fdf.inc
+
 !if $(NETWORK_ENABLE) == TRUE
   FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {
 SECTION PE32 = 
Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
 SECTION UI = "UNDI"
   }
-  INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  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
-  !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
-  !endif
-  !if $(NETWORK_VLAN_ENABLE) == TRUE
-  INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  !endif
-  !if $(NETWORK_ISCSI_ENABLE) == TRUE
-INF  NetworkPkg/IScsiDxe/IScsiDxe.inf
-  !endif
 !endif
 
 !if $(CAPSULE_ENABLE)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc 
b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 3a3d3e29e7..b9c4739e09 100644
--- 

[edk2-devel] [Patch edk2-platform V4 08/18] Platform/CelloBoard: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/LeMaker/CelloBoard/CelloBoard.dsc | 28 
 Platform/LeMaker/CelloBoard/CelloBoard.fdf | 15 +--
 2 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc 
b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
index 525276a2b0..67830506ab 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -23,6 +23,13 @@ DEFINE NUM_CORES= 4
   SKUID_IDENTIFIER   = DEFAULT
   FLASH_DEFINITION   = Platform/LeMaker/CelloBoard/CelloBoard.fdf
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+
 

 #
 # Library Class section - list of all Library Classes needed by this Platform.
@@ -69,13 +76,6 @@ DEFINE NUM_CORES= 4
 
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
 
-  # Networking Requirements
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-
   # ARM Architectural Libraries
   
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
   
DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
@@ -574,19 +574,7 @@ DEFINE NUM_CORES= 4
   #
   # Networking stack
   #
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-# MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  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
+!include NetworkPkg/Network.dsc.inc
 
   #
   # Core Info
diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.fdf 
b/Platform/LeMaker/CelloBoard/CelloBoard.fdf
index a2098989a0..80c760464f 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.fdf
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.fdf
@@ -172,20 +172,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-# INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  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/Udp4Dxe/Udp4Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
-  INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-
+!include NetworkPkg/Network.fdf.inc
   #
   # Core Info
   #
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41137): https://edk2.groups.io/g/devel/message/41137
Mute This Topic: https://groups.io/mt/31696686/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [Patch edk2-platform V4 02/18] Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc | 12 +---
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc| 26 
+-
 2 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc 
b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
index 6d060303b9..1ee2eeab01 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
@@ -7,17 +7,7 @@
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
-  INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+!include NetworkPkg/Network.fdf.inc
 
 !if $(INCLUDE_TFTP_COMMAND) == TRUE
   #
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc 
b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index 7b5dc93a70..13f5c6c1e7 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -9,6 +9,14 @@
   SECURE_BOOT_ENABLE= FALSE
   INCLUDE_TFTP_COMMAND  = TRUE
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_SNP_ENABLE = FALSE
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+
 
[BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
 
@@ -54,12 +62,6 @@
 
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
 
-  # Networking Requirements
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
 
   # ARM Architectural Libraries
   
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
@@ -409,17 +411,7 @@
   #
   # Networking stack
   #
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  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
+!include NetworkPkg/Network.dsc.inc
 !ifdef EDK2_ENABLE_SMSC_91X
   # SMSC LAN 91C111
   EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41131): https://edk2.groups.io/g/devel/message/41131
Mute This Topic: https://groups.io/mt/31696679/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [Patch edk2-platform V4 00/18] Add Network's include segment files in DSC/FDF

2019-05-21 Thread Liming Gao
We have plan to move all network related modules/libraries to
NetworkPkg. So in order to make these changes happen smoothly,
We update platforms' DSC/FDF to use Network's include segment files.

v2:1.Add Contributed-under tag in all patches,based on current edk2/master.
   2.Modify changes in part of patch series.

v3:1.Remove Contributed-under tag in all patches.
   2.Split 16/16 to 16/18, 17/18 and 18/18.

v4:1.Remove version info the commit message.
   2.Correct patch 4 on line ending issue. 
   3.Generate the patch with full file path.

Shenglei Zhang (18):
  Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg DSC/FDF
  Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg DSC/FDF
  Hisilicon/D03: Update DSC/FDF to use NetworkPkg DSC/FDF
  Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF
  Hisilicon/D06: Update DSC/FDF to use NetworkPkg DSC/FDF
  Hisilicon/HiKey: Update DSC/FDF to use NetworkPkg DSC/FDF
  Hisilicon/HiKey960: Update DSC/FDF to use NetworkPkg DSC/FDF
  Platform/CelloBoard: Update DSC/FDF to use NetworkPkg DSC/FDF
  Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg DSC/FDF
  Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg DSC/FDF
  Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg DSC/FDF
  Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF
  Platform/SgiPkg: Update FDF to use NetworkPkg FDF
  Platform/RDKQemu: Update DSC to use NetworkPkg DSC.
  Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg DSC/FDF.
  Platform/PurleyOpenBoardPkg: Update DSC to use NetworkPkg DSC
  Platform/MinPlatformPkg: Update DSC to use NetworkPkg DSC.
  Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF

 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc| 31 
+--
 Platform/AMD/OverdriveBoard/OverdriveBoard.fdf| 23 
+--
 Platform/ARM/SgiPkg/SgiPlatform.fdf   | 12 
+---
 Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc   | 12 
+---
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc  | 26 
+-
 Platform/Comcast/RDKQemu/RDKQemu.dsc  | 34 
++
 Platform/Hisilicon/D03/D03.dsc| 26 
+++---
 Platform/Hisilicon/D03/D03.fdf| 10 
+-
 Platform/Hisilicon/D05/D05.dsc| 45 
++---
 Platform/Hisilicon/D05/D05.fdf| 23 
+--
 Platform/Hisilicon/D06/D06.dsc| 42 
++
 Platform/Hisilicon/D06/D06.fdf| 27 
+--
 Platform/Hisilicon/HiKey/HiKey.dsc| 26 
++
 Platform/Hisilicon/HiKey/HiKey.fdf| 10 
+-
 Platform/Hisilicon/HiKey960/HiKey960.dsc  | 25 
++---
 Platform/Hisilicon/HiKey960/HiKey960.fdf  | 11 
+--
 Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc  | 26 
+-
 Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf | 26 
+-
 Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc   | 11 
++-
 Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc  |  7 
+++
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf  | 24 
++--
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc|  6 
++
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf   | 24 
++--
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc| 43 
+++
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc  | 39 
+--
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc   | 42 
++
 Platform/LeMaker/CelloBoard/CelloBoard.dsc| 28 

 Platform/LeMaker/CelloBoard/CelloBoard.fdf| 15 
+--
 Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc|  8 

 Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc|  8 

 Platform/Socionext/DeveloperBox/DeveloperBox.dsc  | 29 
+++--
 

[edk2-devel] [Patch edk2-platform V4 13/18] Platform/SgiPkg: Update FDF to use NetworkPkg FDF

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the platform FDF files to use the include fragment
files provided by NetworkPkg.

Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/ARM/SgiPkg/SgiPlatform.fdf | 12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf 
b/Platform/ARM/SgiPkg/SgiPlatform.fdf
index 527bbd825d..44e571a184 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
+++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
@@ -183,17 +183,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  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/Udp4Dxe/Udp4Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
-  INF NetworkPkg/IScsiDxe/IScsiDxe.inf
+!include NetworkPkg/Network.fdf.inc
 
 !ifdef EDK2_ENABLE_SMSC_91X
   INF EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41142): https://edk2.groups.io/g/devel/message/41142
Mute This Topic: https://groups.io/mt/31696691/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [Patch edk2-platform V4 11/18] Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 27 
+--
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf | 16 
+---
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc 
b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index d74ad479af..f9b73edeb3 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -23,6 +23,14 @@ DEFINE NUM_CORES= 4
   SKUID_IDENTIFIER   = DEFAULT
   FLASH_DEFINITION   = 
Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
+
 

 #
 # Library Class section - list of all Library Classes needed by this Platform.
@@ -69,11 +77,6 @@ DEFINE NUM_CORES= 4
 
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
 
-  # Networking Requirements
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
 
   # ARM Architectural Libraries
   
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
@@ -566,23 +569,11 @@ DEFINE NUM_CORES= 4
   #
   # Networking stack
   #
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-# MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+!include NetworkPkg/Network.dsc.inc
   MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf {
 
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x21
   }
-  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
-## Bug https://bugs.linaro.org/show_bug.cgi?id=2239
-# NetworkPkg/IScsiDxe/IScsiDxe.inf
 
   #
   # Core Info
diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf 
b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
index 6581138a6c..6a9226476b 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
@@ -179,21 +179,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-# INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  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/Udp4Dxe/Udp4Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
-## Bug https://bugs.linaro.org/show_bug.cgi?id=2239
-# INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-
+!include NetworkPkg/Network.fdf.inc
   #
   # Core Info
   #
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41140): https://edk2.groups.io/g/devel/message/41140
Mute This Topic: https://groups.io/mt/31696689/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [Patch edk2-platform V4 07/18] Hisilicon/HiKey960: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/Hisilicon/HiKey960/HiKey960.dsc | 25 ++---
 Platform/Hisilicon/HiKey960/HiKey960.fdf | 11 +--
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc 
b/Platform/Hisilicon/HiKey960/HiKey960.dsc
index db6e5b918d..151c6312f8 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
+++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
@@ -22,6 +22,15 @@
 
   DEFINE CONFIG_NO_DEBUGLIB  = TRUE
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_SNP_ENABLE = FALSE
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
+  DEFINE NETWORK_VLAN_ENABLE= FALSE
 !include Silicon/Hisilicon/Hisilicon.dsc.inc
 
 [LibraryClasses.common]
@@ -48,11 +57,6 @@
 
   # Network Libraries
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-
   # VariableRuntimeDxe Requirements
   
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
@@ -223,16 +227,7 @@
   #
   # UEFI Network Stack
   #
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-
+!include NetworkPkg/Network.dsc.inc
   #
   # FAT filesystem + GPT/MBR partitioning
   #
diff --git a/Platform/Hisilicon/HiKey960/HiKey960.fdf 
b/Platform/Hisilicon/HiKey960/HiKey960.fdf
index 01ae18499f..dcb3105d6e 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.fdf
+++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf
@@ -147,16 +147,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # UEFI Network Stack
   #
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  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
-
+!include NetworkPkg/Network.fdf.inc
   #
   # FAT filesystem + GPT/MBR partitioning
   #
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41136): https://edk2.groups.io/g/devel/message/41136
Mute This Topic: https://groups.io/mt/31696685/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [Patch edk2-platform V4 09/18] Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 29 
+++--
 Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 24 ++--
 2 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc 
b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
index 428e5d6459..e100700f6e 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
@@ -22,6 +22,11 @@
   FLASH_DEFINITION   = 
Platform/Socionext/DeveloperBox/DeveloperBox.fdf
   BUILD_NUMBER   = 1
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_TLS_ENABLE  = FALSE
+
   DEFINE DEBUG_ON_UART1  = FALSE
   DEFINE SECURE_BOOT_ENABLE  = FALSE
   DEFINE X64EMU_ENABLE   = FALSE
@@ -404,28 +409,8 @@
   #
   # Networking stack
   #
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  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
-  NetworkPkg/DnsDxe/DnsDxe.inf
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  NetworkPkg/HttpDxe/HttpDxe.inf
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-  NetworkPkg/TlsDxe/TlsDxe.inf
-  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
+!include NetworkPkg/Network.dsc.inc
+
   Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf {
 
   DmaLib|EmbeddedPkg/Library/CoherentDmaLib/CoherentDmaLib.inf
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf 
b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
index b322fead62..da9290fd92 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
@@ -209,28 +209,8 @@ READ_LOCK_STATUS   = TRUE
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  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
-  INF NetworkPkg/DnsDxe/DnsDxe.inf
-  INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  INF NetworkPkg/HttpDxe/HttpDxe.inf
-  INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-  INF NetworkPkg/TlsDxe/TlsDxe.inf
-  INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
+!include NetworkPkg/Network.fdf.inc
+
   INF Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf
 
   #
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41138): https://edk2.groups.io/g/devel/message/41138
Mute This Topic: https://groups.io/mt/31696687/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [Patch edk2-platform V4 03/18] Hisilicon/D03: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/Hisilicon/D03/D03.dsc | 26 +++---
 Platform/Hisilicon/D03/D03.fdf | 10 +-
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
index 60b0d6393e..7f4f3b002a 100644
--- a/Platform/Hisilicon/D03/D03.dsc
+++ b/Platform/Hisilicon/D03/D03.dsc
@@ -23,6 +23,16 @@
   SKUID_IDENTIFIER   = DEFAULT
   FLASH_DEFINITION   = 
Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_SNP_ENABLE = FALSE
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
+  DEFINE NETWORK_VLAN_ENABLE= FALSE
+
 !include Silicon/Hisilicon/Hisilicon.dsc.inc
 
 [LibraryClasses.common]
@@ -34,13 +44,8 @@
 
   IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf
 
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   
UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-
 
 
 !ifdef $(FDT_ENABLE)
@@ -398,16 +403,7 @@
 
   Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf
 
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-
+!include NetworkPkg/Network.dsc.inc
   Platform/Hisilicon/D03/Drivers/Sas/SasDxeDriver.inf
 
   SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
index f5d0c66f63..e44cb86282 100644
--- a/Platform/Hisilicon/D03/D03.fdf
+++ b/Platform/Hisilicon/D03/D03.fdf
@@ -240,15 +240,7 @@ READ_LOCK_STATUS   = TRUE
   INF Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf
   INF Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.inf
 
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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
+!include NetworkPkg/Network.fdf.inc
 
 !ifdef $(FDT_ENABLE)
   INF Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.inf
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41132): https://edk2.groups.io/g/devel/message/41132
Mute This Topic: https://groups.io/mt/31696680/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [Patch edk2-platform V4 05/18] Hisilicon/D06: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/Hisilicon/D06/D06.dsc | 42 ++
 Platform/Hisilicon/D06/D06.fdf | 27 +--
 2 files changed, 11 insertions(+), 58 deletions(-)

diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
index 5387daf553..269515c7a5 100644
--- a/Platform/Hisilicon/D06/D06.dsc
+++ b/Platform/Hisilicon/D06/D06.dsc
@@ -22,8 +22,14 @@
   BUILD_TARGETS  = DEBUG|NOOPT|RELEASE
   SKUID_IDENTIFIER   = DEFAULT
   FLASH_DEFINITION   = 
Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf
-  DEFINE NETWORK_IP6_ENABLE  = FALSE
-  DEFINE HTTP_BOOT_ENABLE= FALSE
+
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_TLS_ENABLE  = FALSE
+  DEFINE NETWORK_VLAN_ENABLE = FALSE
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
 
 !include Silicon/Hisilicon/Hisilicon.dsc.inc
 
@@ -36,12 +42,8 @@
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
   IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf
 
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   
UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
   
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
   
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
@@ -49,9 +51,8 @@
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
 
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
 
-!if $(HTTP_BOOT_ENABLE) == TRUE
+!if $(NETWORK_HTTP_BOOT_ENABLE) == TRUE
   HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
 !endif
 
@@ -340,30 +341,7 @@
   #
   #network
   #
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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
-!if $(NETWORK_IP6_ENABLE) == TRUE
-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-!endif
-!if $(HTTP_BOOT_ENABLE) == TRUE
-  NetworkPkg/DnsDxe/DnsDxe.inf
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  NetworkPkg/HttpDxe/HttpDxe.inf
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-!endif
+!include NetworkPkg/Network.dsc.inc
 
   MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
index 976b597647..f6cb3f6876 100644
--- a/Platform/Hisilicon/D06/D06.fdf
+++ b/Platform/Hisilicon/D06/D06.fdf
@@ -239,32 +239,7 @@ READ_LOCK_STATUS   = TRUE
   #
   #Network
   #
-  INF Platform/Hisilicon/D06/Drivers/Net/SnpHi1620NewDxe/SnpDxe.inf
-
-  INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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/Udp6Dxe/Udp6Dxe.inf
-  INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-!endif
-!if $(HTTP_BOOT_ENABLE) == TRUE
-  INF NetworkPkg/DnsDxe/DnsDxe.inf
-  INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  INF NetworkPkg/HttpDxe/HttpDxe.inf
-  INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-!endif
-
+!include NetworkPkg/Network.fdf.inc
 
   #
   # PCI Support
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41134): https://edk2.groups.io/g/devel/message/41134

[edk2-devel] [Patch edk2-platform V4 01/18] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Liming Gao
From: Shenglei Zhang 

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 31 
+--
 Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 23 +--
 2 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc 
b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 5ba8e16a5a..6629009132 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -72,12 +72,6 @@ DEFINE X64EMU_ENABLE  = FALSE
 
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
 
-  # Networking Requirements
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-
   # ARM Architectural Libraries
   
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
   
DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
@@ -124,9 +118,7 @@ DEFINE X64EMU_ENABLE  = FALSE
   IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf
   
PlatformFlashAccessLib|Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf
 
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
 
   
UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
@@ -635,28 +627,7 @@ DEFINE X64EMU_ENABLE  = FALSE
   #
   # Networking stack
   #
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  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
-  NetworkPkg/DnsDxe/DnsDxe.inf
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  NetworkPkg/HttpDxe/HttpDxe.inf
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-  NetworkPkg/TlsDxe/TlsDxe.inf
-  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
+!include NetworkPkg/Network.dsc.inc
   MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
 
   #
diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf 
b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
index b823cb1b46..851ae65b5b 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
@@ -187,28 +187,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  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
-  INF NetworkPkg/DnsDxe/DnsDxe.inf
-  INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  INF NetworkPkg/HttpDxe/HttpDxe.inf
-  INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-  INF NetworkPkg/TlsDxe/TlsDxe.inf
-  INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
+!include NetworkPkg/Network.fdf.inc
   INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
 
   #
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41130): https://edk2.groups.io/g/devel/message/41130
Mute This Topic: https://groups.io/mt/31696678/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-21 Thread Laszlo Ersek
On 05/21/19 15:02, Wang, Jian J wrote:
>> -Original Message-
>> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
>> Laszlo Ersek
>> Sent: Tuesday, May 21, 2019 8:24 PM
>> To: Wang, Jian J ; devel@edk2.groups.io;
>> ard.biesheu...@linaro.org
>> Cc: Lu, XiaoyuX ; Ye, Ting ; Leif
>> Lindholm ; Gao, Liming 
>> Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

>> (2) NB, I think we can no longer merge this feature for
>> edk2-stable201905. The soft feature freeze criterion is that all patches
>> be reviewed (approved) on-list before the SFF date / announcement, and
>> that was not fulfilled in this case.
>>
> 
> You're right. But we still need to complete the upgrade ASAP after stable tag.
> There're several other features pending on it.

True!

>> (3) I can only report the failure that trips up the build for me. I did
>> that here:
>>
>> http://mid.mail-archive.com/049e489c-b58f-0fc5-1c66-
>> 8ad920d93...@redhat.com
>> https://edk2.groups.io/g/devel/message/40823
>>
>>
>> Thus, for me, the missing symbol was "__aeabi_ui2d".
>>
>> It's possible that the 32-bit ARM build will fail at a different (later)
>> stage as well, but I can't tell until I get past this one. (And I don't
>> think I can implement a "shim" function for the missing symbol, just to
>> let the build progress.)
>>
> 
> I got __aeabi_d2uiz reported missing, in addition to __aeabi_ui2d, if
> I build with cross-compiler arm-linux-gnueabi-gcc-5. Using dummy
> implementations of both them can make build pass. Any chances the
> real implementation of these functions cause other missing symbol?

(I'll let Ard answer this.)

Thanks
Laszlo

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41128): https://edk2.groups.io/g/devel/message/41128
Mute This Topic: https://groups.io/mt/31638503/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [PATCH edk2-platforms V3 10/18] Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Liming Gao
Leif:

> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Leif 
> Lindholm
> Sent: Tuesday, May 21, 2019 7:59 PM
> To: Zhang, Shenglei 
> Cc: devel@edk2.groups.io
> Subject: Re: [edk2-devel] [PATCH edk2-platforms V3 10/18] 
> Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg DSC/FDF
> 
> On Mon, May 20, 2019 at 03:07:21PM +0800, Shenglei Zhang wrote:
> > This patch updates the platform DSC/FDF files to use the include fragment
> > files provided by NetworkPkg.
> >
> > v2: Change Network.dsc.inc to Network.fdf.inc in SynQuacerEvalBoard.fdf.
> 
> Any notes on changes go under the "---" line below.
> If you delete this revision comment before committing:
> Reviewed-by: Leif Lindholm 
> 
I will remove the version in the commit message. 
Thanks for your review.

> > Cc: Leif Lindholm 
> > Signed-off-by: Shenglei Zhang 
> > ---
> >  .../SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 35 +--
> >  .../SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 21 ++-
> >  2 files changed, 10 insertions(+), 46 deletions(-)
> >
> > diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> > index 189baa8659..ab1ab6f2de 100644
> > --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> > +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> > @@ -22,6 +22,12 @@
> >FLASH_DEFINITION   = 
> > Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> >BUILD_NUMBER   = 1
> >
> > +  #
> > +  # Network definition
> > +  #
> > +  DEFINE NETWORK_SNP_ENABLE = FALSE
> > +  DEFINE NETWORK_TLS_ENABLE = FALSE
> > +
> >  [BuildOptions]
> >RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG -U_FORTIFY_SOURCE 
> > -D_FORTIFY_SOURCE=0
> >
> > @@ -49,11 +55,6 @@
> >
> >BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
> >
> > -  # Networking Requirements
> > -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> > -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> > -  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> > -  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> >
> ># ARM Architectural Libraries
> >
> > CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
> > @@ -113,9 +114,6 @@
> >
> > SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
> >PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf
> >
> > -  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> > -  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> > -
> >NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
> >NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
> >
> > @@ -594,25 +592,8 @@
> >#
> ># Networking stack
> >#
> > -  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> > -  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> > -  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> > -  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> > -  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> > -  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> > -  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> > -  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> > -  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
> > -  NetworkPkg/DnsDxe/DnsDxe.inf
> > -  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> > -  NetworkPkg/HttpDxe/HttpDxe.inf
> > -  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> > +!include NetworkPkg/Network.dsc.inc
> > +
> >Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf {
> >  
> >DmaLib|EmbeddedPkg/Library/CoherentDmaLib/CoherentDmaLib.inf
> > diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> > index 1c9795df3b..b1e0a53e61 100644
> > --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> > +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> > @@ -186,25 +186,8 @@ READ_LOCK_STATUS   = TRUE
> >#
> ># Networking stack
> >#
> > -  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> > -  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> > -  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> > -  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> > -  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/Udp4Dxe/Udp4Dxe.inf
> 

Re: [edk2-devel] [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Liming Gao
Leif:

> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Leif 
> Lindholm
> Sent: Tuesday, May 21, 2019 8:04 PM
> To: Zhang, Shenglei 
> Cc: devel@edk2.groups.io
> Subject: Re: [edk2-devel] [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: 
> Update DSC/FDF to use NetworkPkg DSC/FDF
> 
> On Mon, May 20, 2019 at 03:07:23PM +0800, Shenglei Zhang wrote:
> > This patch updates the platform DSC/FDF files to use the include fragment
> > files provided by NetworkPkg.
> >
> > v2:Remove the definitions from Armada7k8k.dsc.inc to Armada70x0Db.dsc,
> >Armada80x0Db.dsc and Armada80x0McBin.dsc.
> 
> Version comments go below "---" line.
> 
I will remove the version info in the commit message. Can I add your RB for 
this patch?

> > Cc: Leif Lindholm 
> > Signed-off-by: Shenglei Zhang 
> > ---
> >  Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc |  8 
> >  Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc |  8 
> >  .../Armada80x0McBin/Armada80x0McBin.dsc|  8 
> 
> Please follow
> https://github.com/tianocore/tianocore.github.io/wiki/Laszlo%27s-unkempt-git-guide-for-edk2-contributors-and-maintainers
> when generating and submitting patches. That way we get to see the
> whole path of the files being modified.
> 
Yes. I will follow this rule to generate the patch with the full file path.

> /
> Leif
> 
> >  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc  | 18 +-
> >  Silicon/Marvell/Armada7k8k/Armada7k8k.fdf  | 12 +---
> >  5 files changed, 26 insertions(+), 28 deletions(-)
> >
> > diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc 
> > b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> > index 01532b4a00..8ee84902ef 100644
> > --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> > +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> > @@ -46,6 +46,14 @@
> >FLASH_DEFINITION   = 
> > Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> >BOARD_DXE_FV_COMPONENTS= 
> > Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
> >
> > +  #
> > +  # Network definition
> > +  #
> > +  DEFINE NETWORK_IP6_ENABLE = FALSE
> > +  DEFINE NETWORK_TLS_ENABLE = FALSE
> > +  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
> > +  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
> > +
> >  !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> >
> >  [LibraryClasses.common]
> > diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc 
> > b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > index c6510d..5418ddcaa7 100644
> > --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > @@ -46,6 +46,14 @@
> >FLASH_DEFINITION   = 
> > Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> >BOARD_DXE_FV_COMPONENTS= 
> > Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
> >
> > +  #
> > +  # Network definition
> > +  #
> > +  DEFINE NETWORK_IP6_ENABLE = FALSE
> > +  DEFINE NETWORK_TLS_ENABLE = FALSE
> > +  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
> > +  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
> > +
> >  !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> >
> >  [LibraryClasses.common]
> > diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> > index d08013612f..ff9bd5dc8c 100644
> > --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> > +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> > @@ -47,6 +47,14 @@
> >BOARD_DXE_FV_COMPONENTS= 
> > Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
> >CAPSULE_ENABLE = TRUE
> >
> > +  #
> > +  # Network definition
> > +  #
> > +  DEFINE NETWORK_IP6_ENABLE = FALSE
> > +  DEFINE NETWORK_TLS_ENABLE = FALSE
> > +  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
> > +  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
> > +
> >  !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> >
> >  [LibraryClasses.common]
> > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc 
> > b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> > index 0cf5d8447a..cfbc172b4f 100644
> > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> > @@ -115,12 +115,6 @@
> >
> > RealTimeClockLib|Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
> >
> > ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> >
> > -  # Network support
> > -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> > -  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> > -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> > -  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> > -
> ># These libraries are used by the dynamic EFI Shell commands
> >

Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-21 Thread Wang, Jian J
Laszlo,


> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Laszlo Ersek
> Sent: Tuesday, May 21, 2019 8:24 PM
> To: Wang, Jian J ; devel@edk2.groups.io;
> ard.biesheu...@linaro.org
> Cc: Lu, XiaoyuX ; Ye, Ting ; Leif
> Lindholm ; Gao, Liming 
> Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b
> 
> Hi,
> 
> On 05/21/19 11:09, Wang, Jian J wrote:
> > Ard,
> >
> >> -Original Message-
> >> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Ard
> >> Biesheuvel
> >> Sent: Tuesday, May 21, 2019 5:02 PM
> >> To: Wang, Jian J 
> >> Cc: devel@edk2.groups.io; Laszlo Ersek ; Lu, XiaoyuX
> >> ; Ye, Ting ; Leif Lindholm
> >> ; Gao, Liming 
> >> Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to
> 1.1.1b
> >>
> >> On Tue, 21 May 2019 at 09:43, Wang, Jian J  wrote:
> >>>
> >>> Hi Ard,
> >>>
> >>> Any comments?
> >>>
> >>> Regards,
> >>> Jian
> >>>
>  -Original Message-
>  From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> >> Wang,
>  Jian J
>  Sent: Monday, May 20, 2019 9:41 AM
>  To: devel@edk2.groups.io; ard.biesheu...@linaro.org; Laszlo Ersek
>  
>  Cc: Lu, XiaoyuX ; Ye, Ting ;
> Leif
>  Lindholm ; Gao, Liming 
>  Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to
> >> 1.1.1b
> 
>  Ard,
> 
> 
> > -Original Message-
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf
> Of
> >> Ard
> > Biesheuvel
> > Sent: Friday, May 17, 2019 11:06 PM
> > To: Laszlo Ersek 
> > Cc: Wang, Jian J ; devel@edk2.groups.io; Lu,
> >> XiaoyuX
> > ; Ye, Ting ; Leif Lindholm
> > ; Gao, Liming 
> > Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to
>  1.1.1b
> >
> > On Fri, 17 May 2019 at 15:17, Laszlo Ersek  wrote:
> >>
> >> On 05/17/19 15:04, Laszlo Ersek wrote:
> >>> On 05/17/19 07:11, Wang, Jian J wrote:
>  Hi Laszlo,
> 
>  There's already a float library used in OpensslLib.inf.
> 
>  [LibraryClasses.ARM]
>    ArmSoftFloatLib
> 
>  The problem is that the below instance doesn't implement
> >> __aeabi_ui2d
>  and __aeabi_d2uiz (I encountered this one as well)
> 
>    ArmPkg\Library\ArmSoftFloatLib\ArmSoftFloatLib.inf
> 
>  I think we can update this library support those two APIs. So what
> >> about
>  we still push the patch and file a BZ to fix this issue?
> >>>
> >>> I'm OK with that, but it will break ARM and AARCH64 platforms that
> >>> consume OpensslLib (directly or through BaseCryptLib), so this 
> >>> question
> >>> is up to Leif and Ard to decide.
> >>
> >> Correction: break ARM platforms only, not AARCH64.
> >>
> >
> > We obviously need to fix this before we can upgrade to a new OpenSSL
> >> version.
> >
> > Do we really have a need for the random functions? These seem the only
> > ones that use floating point, which the UEFI spec does not permit, so
> > it would be better if we could fix this by removing the dependency on
> > FP in the first place (and get rid of ArmSoftFloatLib entirely)
> >
> 
>  BaseCryptLib provides RandSeed/RandBytes interface which wrap openssl
> >> rand
>  functionalities. These interfaces are used by following components in 
>  edk2
> 
>    - CryptoPkg\Library\TlsLib\TlsInit.c
>    - SecurityPkg\HddPassword\HddPasswordDxe.c
> 
>  Openssl components, like asn1, bn, evp, ocsp, pem, pkcs7, pkcs12, rsa, 
>  ssl
> (in
>  addition
>  to cms, dsa, srp, which are disabled in edk2) will call rand_* interface 
>  as
> well.
> 
> >>
> >> If we have both internal (to Openssl) and external users of the RNG
> >> api, then I guess there is no way to work around this. It is
> >> unfortunate, since the RNG code in OpenSSL doesn't actually use double
> >> types except for keeping an entropy count, which could just as easily
> >> be kept in an integer variable.
> 
> (1) I think I agree... However, it seems that the first function (or one
> of the first functions) in OpenSSL to take an "entropy" parameter, of
> type "double", was RAND_add(). And the RAND_add() manual states,
> 
>RAND_add() mixes the num bytes at buf into the PRNG state.
>Thus, if the data at buf are unpredictable to an adversary,
>this increases the uncertainty about the state and makes the
>PRNG output less predictable. Suitable input comes from user
>interaction (random key presses, mouse movements) and certain
>hardware events. The entropy argument is (the lower bound of)
>an estimate of how much randomness is contained in buf,
>measured in bytes. Details about sources of randomness and how
>to estimate their entropy can be 

[edk2-devel] why does RAND_add() take "randomness" as a "double"?

2019-05-21 Thread Laszlo Ersek
Hi OpenSSL Developers,

(cross-posting  and ,)

OpenSSL commit [1] changed the representation of the "entropy amount" --
later renamed to "randomess" in [2] -- from "int" to "double". I've read
the commit message:

commit 853f757ecea74a271a7c5cdee3f3b5fe0d3ae863
Author: Bodo Möller 
Date:   Sat Feb 19 15:22:53 2000 +

Allow for higher granularity of entropy estimates by using 'double'
instead of 'unsigned' counters.
Seed PRNG in MacOS/GetHTTPS.src/GetHTTPS.cpp.

Partially submitted by Yoram Meroz .

and also checked "MacOS/GetHTTPS.src/GetHTTPS.cpp" at the same commit.
But, I'm none the wiser.

Can someone please explain what is gained by using a floating point type
here?

Is it really a relevant use case that entropy is fed from an external
source to OpenSSL such that truncating the amount to a whole number of
bits would cause significant lossage? (Admittedly, it could be relevant
if the individual randomness bit counts were in the (0, 1) interval,
both boundaries exclusive.)

Using floating point for randomness representation is a problem for
environments that prefer to avoid floating point altogether, such as
edk2 ("UEFI") firmware

Thanks,
Laszlo

[1] https://github.com/openssl/openssl/commit/853f757ecea7
[2] https://github.com/openssl/openssl/commit/f367ac2b2664

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41124): https://edk2.groups.io/g/devel/message/41124
Mute This Topic: https://groups.io/mt/31696120/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-21 Thread Laszlo Ersek
Hi,

On 05/21/19 11:09, Wang, Jian J wrote:
> Ard,
> 
>> -Original Message-
>> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Ard
>> Biesheuvel
>> Sent: Tuesday, May 21, 2019 5:02 PM
>> To: Wang, Jian J 
>> Cc: devel@edk2.groups.io; Laszlo Ersek ; Lu, XiaoyuX
>> ; Ye, Ting ; Leif Lindholm
>> ; Gao, Liming 
>> Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b
>>
>> On Tue, 21 May 2019 at 09:43, Wang, Jian J  wrote:
>>>
>>> Hi Ard,
>>>
>>> Any comments?
>>>
>>> Regards,
>>> Jian
>>>
 -Original Message-
 From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
>> Wang,
 Jian J
 Sent: Monday, May 20, 2019 9:41 AM
 To: devel@edk2.groups.io; ard.biesheu...@linaro.org; Laszlo Ersek
 
 Cc: Lu, XiaoyuX ; Ye, Ting ; Leif
 Lindholm ; Gao, Liming 
 Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to
>> 1.1.1b

 Ard,


> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
>> Ard
> Biesheuvel
> Sent: Friday, May 17, 2019 11:06 PM
> To: Laszlo Ersek 
> Cc: Wang, Jian J ; devel@edk2.groups.io; Lu,
>> XiaoyuX
> ; Ye, Ting ; Leif Lindholm
> ; Gao, Liming 
> Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to
 1.1.1b
>
> On Fri, 17 May 2019 at 15:17, Laszlo Ersek  wrote:
>>
>> On 05/17/19 15:04, Laszlo Ersek wrote:
>>> On 05/17/19 07:11, Wang, Jian J wrote:
 Hi Laszlo,

 There's already a float library used in OpensslLib.inf.

 [LibraryClasses.ARM]
   ArmSoftFloatLib

 The problem is that the below instance doesn't implement
>> __aeabi_ui2d
 and __aeabi_d2uiz (I encountered this one as well)

   ArmPkg\Library\ArmSoftFloatLib\ArmSoftFloatLib.inf

 I think we can update this library support those two APIs. So what
>> about
 we still push the patch and file a BZ to fix this issue?
>>>
>>> I'm OK with that, but it will break ARM and AARCH64 platforms that
>>> consume OpensslLib (directly or through BaseCryptLib), so this question
>>> is up to Leif and Ard to decide.
>>
>> Correction: break ARM platforms only, not AARCH64.
>>
>
> We obviously need to fix this before we can upgrade to a new OpenSSL
>> version.
>
> Do we really have a need for the random functions? These seem the only
> ones that use floating point, which the UEFI spec does not permit, so
> it would be better if we could fix this by removing the dependency on
> FP in the first place (and get rid of ArmSoftFloatLib entirely)
>

 BaseCryptLib provides RandSeed/RandBytes interface which wrap openssl
>> rand
 functionalities. These interfaces are used by following components in edk2

   - CryptoPkg\Library\TlsLib\TlsInit.c
   - SecurityPkg\HddPassword\HddPasswordDxe.c

 Openssl components, like asn1, bn, evp, ocsp, pem, pkcs7, pkcs12, rsa, ssl 
 (in
 addition
 to cms, dsa, srp, which are disabled in edk2) will call rand_* interface 
 as well.

>>
>> If we have both internal (to Openssl) and external users of the RNG
>> api, then I guess there is no way to work around this. It is
>> unfortunate, since the RNG code in OpenSSL doesn't actually use double
>> types except for keeping an entropy count, which could just as easily
>> be kept in an integer variable.

(1) I think I agree... However, it seems that the first function (or one
of the first functions) in OpenSSL to take an "entropy" parameter, of
type "double", was RAND_add(). And the RAND_add() manual states,

   RAND_add() mixes the num bytes at buf into the PRNG state.
   Thus, if the data at buf are unpredictable to an adversary,
   this increases the uncertainty about the state and makes the
   PRNG output less predictable. Suitable input comes from user
   interaction (random key presses, mouse movements) and certain
   hardware events. The entropy argument is (the lower bound of)
   an estimate of how much randomness is contained in buf,
   measured in bytes. Details about sources of randomness and how
   to estimate their entropy can be found in the literature, e.g.
   RFC 1750.

I've now looked up RFC 1750, and it contains copious amounts of math on
irrational numbers. Hence the use of floating point in OpenSSL, I'd guess.

  https://www.ietf.org/rfc/rfc1750.txt

... After digging a bit in the OpenSSL git history, I've found the
following commit (from 19 years ago):

commit 853f757ecea74a271a7c5cdee3f3b5fe0d3ae863
Author: Bodo Möller 
Date:   Sat Feb 19 15:22:53 2000 +

Allow for higher granularity of entropy estimates by using 'double'
instead of 'unsigned' counters.
Seed PRNG in MacOS/GetHTTPS.src/GetHTTPS.cpp.

Partially submitted by Yoram Meroz .

It 

Re: [edk2-devel] [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Leif Lindholm
On Mon, May 20, 2019 at 03:07:23PM +0800, Shenglei Zhang wrote:
> This patch updates the platform DSC/FDF files to use the include fragment
> files provided by NetworkPkg.
> 
> v2:Remove the definitions from Armada7k8k.dsc.inc to Armada70x0Db.dsc,
>Armada80x0Db.dsc and Armada80x0McBin.dsc.

Version comments go below "---" line.

> Cc: Leif Lindholm 
> Signed-off-by: Shenglei Zhang 
> ---
>  Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc |  8 
>  Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc |  8 
>  .../Armada80x0McBin/Armada80x0McBin.dsc|  8 

Please follow
https://github.com/tianocore/tianocore.github.io/wiki/Laszlo%27s-unkempt-git-guide-for-edk2-contributors-and-maintainers
when generating and submitting patches. That way we get to see the
whole path of the files being modified.

/
Leif

>  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc  | 18 +-
>  Silicon/Marvell/Armada7k8k/Armada7k8k.fdf  | 12 +---
>  5 files changed, 26 insertions(+), 28 deletions(-)
> 
> diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc 
> b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> index 01532b4a00..8ee84902ef 100644
> --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> @@ -46,6 +46,14 @@
>FLASH_DEFINITION   = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
>BOARD_DXE_FV_COMPONENTS= 
> Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
>  
> +  #
> +  # Network definition
> +  #
> +  DEFINE NETWORK_IP6_ENABLE = FALSE
> +  DEFINE NETWORK_TLS_ENABLE = FALSE
> +  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
> +  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
> +
>  !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>  
>  [LibraryClasses.common]
> diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc 
> b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> index c6510d..5418ddcaa7 100644
> --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> @@ -46,6 +46,14 @@
>FLASH_DEFINITION   = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
>BOARD_DXE_FV_COMPONENTS= 
> Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
>  
> +  #
> +  # Network definition
> +  #
> +  DEFINE NETWORK_IP6_ENABLE = FALSE
> +  DEFINE NETWORK_TLS_ENABLE = FALSE
> +  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
> +  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
> +
>  !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>  
>  [LibraryClasses.common]
> diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc 
> b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> index d08013612f..ff9bd5dc8c 100644
> --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> @@ -47,6 +47,14 @@
>BOARD_DXE_FV_COMPONENTS= 
> Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
>CAPSULE_ENABLE = TRUE
>  
> +  #
> +  # Network definition
> +  #
> +  DEFINE NETWORK_IP6_ENABLE = FALSE
> +  DEFINE NETWORK_TLS_ENABLE = FALSE
> +  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
> +  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
> +
>  !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>  
>  [LibraryClasses.common]
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc 
> b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> index 0cf5d8447a..cfbc172b4f 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> @@ -115,12 +115,6 @@
>
> RealTimeClockLib|Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
>
> ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
>  
> -  # Network support
> -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> -  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> -  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> -
># These libraries are used by the dynamic EFI Shell commands
>ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
>FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> @@ -471,17 +465,7 @@
>Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
>  
># Network support
> -  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> -  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> -  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> -  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> -  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> -  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> -  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> -  

Re: [edk2-devel] [PATCH edk2-platforms V3 10/18] Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Leif Lindholm
On Mon, May 20, 2019 at 03:07:21PM +0800, Shenglei Zhang wrote:
> This patch updates the platform DSC/FDF files to use the include fragment
> files provided by NetworkPkg.
> 
> v2: Change Network.dsc.inc to Network.fdf.inc in SynQuacerEvalBoard.fdf.

Any notes on changes go under the "---" line below.
If you delete this revision comment before committing:
Reviewed-by: Leif Lindholm 

> Cc: Leif Lindholm 
> Signed-off-by: Shenglei Zhang 
> ---
>  .../SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 35 +--
>  .../SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 21 ++-
>  2 files changed, 10 insertions(+), 46 deletions(-)
> 
> diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc 
> b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> index 189baa8659..ab1ab6f2de 100644
> --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> @@ -22,6 +22,12 @@
>FLASH_DEFINITION   = 
> Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
>BUILD_NUMBER   = 1
>  
> +  #
> +  # Network definition
> +  #
> +  DEFINE NETWORK_SNP_ENABLE = FALSE
> +  DEFINE NETWORK_TLS_ENABLE = FALSE
> +
>  [BuildOptions]
>RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG -U_FORTIFY_SOURCE 
> -D_FORTIFY_SOURCE=0
>  
> @@ -49,11 +55,6 @@
>  
>BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
>  
> -  # Networking Requirements
> -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> -  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> -  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
>  
># ARM Architectural Libraries
>
> CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
> @@ -113,9 +114,6 @@
>
> SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
>PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf
>  
> -  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> -  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> -
>NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
>NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
>  
> @@ -594,25 +592,8 @@
>#
># Networking stack
>#
> -  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> -  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> -  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> -  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> -  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> -  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> -  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> -  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
> -  NetworkPkg/DnsDxe/DnsDxe.inf
> -  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> -  NetworkPkg/HttpDxe/HttpDxe.inf
> -  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> +!include NetworkPkg/Network.dsc.inc
> +
>Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf {
>  
>DmaLib|EmbeddedPkg/Library/CoherentDmaLib/CoherentDmaLib.inf
> diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf 
> b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> index 1c9795df3b..b1e0a53e61 100644
> --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> @@ -186,25 +186,8 @@ READ_LOCK_STATUS   = TRUE
>#
># Networking stack
>#
> -  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> -  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> -  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> -  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/Udp4Dxe/Udp4Dxe.inf
> -  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
> -  INF NetworkPkg/DnsDxe/DnsDxe.inf
> -  INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> -  INF NetworkPkg/HttpDxe/HttpDxe.inf
> -  INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> +!include NetworkPkg/Network.fdf.inc
> +
>INF Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf
>  
>#
> -- 
> 

Re: [edk2-devel] [PATCH edk2-platforms V3 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF

2019-05-21 Thread Leif Lindholm
On Mon, May 20, 2019 at 03:07:15PM +0800, Shenglei Zhang wrote:
> This patch updates the platform DSC/FDF files to use the include fragment
> files provided by NetworkPkg.
> 
> v2: Withdraw unrelated changes.

Any comments on changes since previous patch go underneath the "---"
line below - they do not belong in the commit message.

> Cc: Leif Lindholm 
> Signed-off-by: Shenglei Zhang 
> ---
>  Platform/Hisilicon/D05/D05.dsc | 59 ++
>  Platform/Hisilicon/D05/D05.fdf | 23 +
>  2 files changed, 18 insertions(+), 64 deletions(-)
> 
> diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
> index dc9e1407ba..239bc776f9 100644
> --- a/Platform/Hisilicon/D05/D05.dsc
> +++ b/Platform/Hisilicon/D05/D05.dsc
> @@ -23,8 +23,15 @@
>SKUID_IDENTIFIER   = DEFAULT
>FLASH_DEFINITION   = 
> Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf
>DEFINE EDK2_SKIP_PEICORE=0
> -  DEFINE NETWORK_IP6_ENABLE  = FALSE
> -  DEFINE HTTP_BOOT_ENABLE= FALSE
> +
> +  #
> +  # Network definition
> +  #
> +  DEFINE NETWORK_SNP_ENABLE = FALSE
> +  DEFINE NETWORK_TLS_ENABLE = FALSE
> +  DEFINE NETWORK_VLAN_ENABLE= FALSE
> +  DEFINE NETWORK_IP6_ENABLE = FALSE
> +  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
>  
>  !include Silicon/Hisilicon/Hisilicon.dsc.inc
>  
> @@ -37,12 +44,8 @@
>  
>IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf
>  
> -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
>HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
>
> UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
> -  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> -  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
>
> OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
>
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
> @@ -50,11 +53,6 @@
>BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
>SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
>  
> -  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> -
> -!if $(HTTP_BOOT_ENABLE) == TRUE
> -  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> -!endif
>  
>  !ifdef $(FDT_ENABLE)
>#FDTUpdateLib
> @@ -89,10 +87,10 @@
>  
>LpcLib|Silicon/Hisilicon/Hi1610/Library/LpcLib/LpcLib.inf
>
> SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
> -  
> PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> +  
> PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf

This no-op change needs to go.
Please verify the patches manually before resubmitting.

>
> PciHostBridgeLib|Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
>
> PciSegmentLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/Hi161xPciSegmentLib.inf
> -  
> PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf
> +  
> PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf

This no-op change needs to go.
Please verify the patches manually before resubmitting.

>  
>  [LibraryClasses.common.SEC]
>
> ArmPlatformLib|Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> @@ -130,7 +128,7 @@
>  
>  [PcdsFixedAtBuild.common]
>gArmPlatformTokenSpaceGuid.PcdCoreCount|8
> -  gArmTokenSpaceGuid.PcdPciIoTranslation|0
> +  gArmTokenSpaceGuid.PcdPciIoTranslation|0

This no-op change needs to go.
Please verify the patches manually before resubmitting.

>  
>gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000
>  
> @@ -466,7 +464,7 @@
>ArmPkg/Drivers/CpuDxe/CpuDxe.inf
>MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
>  
> -  ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
> +  ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf

This no-op change needs to go.
Please verify the patches manually before resubmitting.

>Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
>  
>Platform/Hisilicon/D05/Drivers/SFC/SfcDxeDriver.inf
> @@ -532,30 +530,7 @@
>  
>Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf
>  
> -  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> -  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> -  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> -  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> -  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> -  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> -  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> -  NetworkPkg/TcpDxe/TcpDxe.inf
> -  

[edk2-devel] [PATCH V2] UefiCpuPkg CpuCommFeaturesLib: Reduce to set MSR_IA32_CLOCK_MODULATION

2019-05-21 Thread Zeng, Star
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1810

This patch covers two problems.

1. Current code gets CPUID_THERMAL_POWER_MANAGEMENT in
ClockModulationInitialize() and uses its ECMD bit for all processors.
But ClockModulationInitialize() is only executed by BSP, that means
the bit is just for BSP.
It may have no functionality issue as all processors may have same
bit value in a great possibility. But for good practice, the code
should get CPUID_THERMAL_POWER_MANAGEMENT in ClockModulationSupport
(executed by all processors), and then use them in
ClockModulationInitialize() for all processors.
We can see that Aesni.c (and others) have used this good practice.

2. Current code uses 3 CPU_REGISTER_TABLE_WRITE_FIELD for
MSR_IA32_CLOCK_MODULATION in ClockModulationInitialize(), they can
be reduced to 1 CPU_REGISTER_TABLE_WRITE64 by getting
MSR_IA32_CLOCK_MODULATION for all processors in
ClockModulationSupport() and then update fields for register table
write in ClockModulationInitialize().

We may argue that there may be more times of MSR_IA32_CLOCK_MODULATION
getting. But actually the times of MSR_IA32_CLOCK_MODULATION getting
could be also reduced.

The reason is in ProgramProcessorRegister() of CpuFeaturesInitialize.c,
AsmMsrBitFieldWrite64 (AsmReadMsr64 + AsmWriteMsr64) will be used for
CPU_REGISTER_TABLE_WRITE_FIELD, and AsmWriteMsr64 will be used for
CPU_REGISTER_TABLE_WRITE64.

The times of MSR accessing could be reduced with this patch.
Without the patch:
3 CPU_REGISTER_TABLE_WRITE_FIELD (in ClockModulationInitialize)
  ==> 3 AsmMsrBitFieldWrite64
==> 3 AsmReadMsr64 + 3 AsmWriteMsr64

With the patch:
1 AsmReadMsr64 (in ClockModulationSupport) +
1 CPU_REGISTER_TABLE_WRITE64 (in ClockModulationInitialize)
  ==> 1 AsmWriteMsr64

Cc: Laszlo Ersek 
Cc: Eric Dong 
Cc: Ruiyu Ni 
Cc: Chandana Kumar 
Cc: Kevin Li 
Signed-off-by: Star Zeng 
---
 .../CpuCommonFeaturesLib/ClockModulation.c| 87 +--
 .../CpuCommonFeaturesLib/CpuCommonFeatures.h  | 15 
 .../CpuCommonFeaturesLib.c|  2 +-
 3 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/ClockModulation.c 
b/UefiCpuPkg/Library/CpuCommonFeaturesLib/ClockModulation.c
index 614768587501..b1c6bf6148f3 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/ClockModulation.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/ClockModulation.c
@@ -1,13 +1,40 @@
 /** @file
   Clock Modulation feature.
 
-  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.
+  Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
 #include "CpuCommonFeatures.h"
 
+typedef struct  {
+  CPUID_THERMAL_POWER_MANAGEMENT_EAX  ThermalPowerManagementEax;
+  MSR_IA32_CLOCK_MODULATION_REGISTER  ClockModulation;
+} CLOCK_MODULATION_CONFIG_DATA;
+
+/**
+  Prepares for the data used by CPU feature detection and initialization.
+
+  @param[in]  NumberOfProcessors  The number of CPUs in the platform.
+
+  @return  Pointer to a buffer of CPU related configuration data.
+
+  @note This service could be called by BSP only.
+**/
+VOID *
+EFIAPI
+ClockModulationGetConfigData (
+  IN UINTN  NumberOfProcessors
+  )
+{
+  UINT32*ConfigData;
+
+  ConfigData = AllocateZeroPool (sizeof (CLOCK_MODULATION_CONFIG_DATA) * 
NumberOfProcessors);
+  ASSERT (ConfigData != NULL);
+  return ConfigData;
+}
+
 /**
   Detects if Clock Modulation feature supported on current processor.
 
@@ -32,7 +59,22 @@ ClockModulationSupport (
   IN VOID  *ConfigData  OPTIONAL
   )
 {
-  return (CpuInfo->CpuIdVersionInfoEdx.Bits.ACPI == 1);
+  CLOCK_MODULATION_CONFIG_DATA *CmConfigData;
+
+  if (CpuInfo->CpuIdVersionInfoEdx.Bits.ACPI == 1) {
+CmConfigData = (CLOCK_MODULATION_CONFIG_DATA *) ConfigData;
+ASSERT (CmConfigData != NULL);
+AsmCpuid (
+  CPUID_THERMAL_POWER_MANAGEMENT,
+  [ProcessorNumber].ThermalPowerManagementEax.Uint32,
+  NULL,
+  NULL,
+  NULL
+  );
+CmConfigData[ProcessorNumber].ClockModulation.Uint64 = AsmReadMsr64 
(MSR_IA32_CLOCK_MODULATION);
+return TRUE;
+  }
+  return FALSE;
 }
 
 /**
@@ -61,34 +103,29 @@ ClockModulationInitialize (
   IN BOOLEAN   State
   )
 {
-  CPUID_THERMAL_POWER_MANAGEMENT_EAX   ThermalPowerManagementEax;
-  AsmCpuid (CPUID_THERMAL_POWER_MANAGEMENT, , 
NULL, NULL, NULL);
+  CLOCK_MODULATION_CONFIG_DATA *CmConfigData;
+  MSR_IA32_CLOCK_MODULATION_REGISTER   *ClockModulation;
 
-  CPU_REGISTER_TABLE_WRITE_FIELD (
-ProcessorNumber,
-Msr,
-MSR_IA32_CLOCK_MODULATION,
-MSR_IA32_CLOCK_MODULATION_REGISTER,
-Bits.OnDemandClockModulationDutyCycle,
-PcdGet8 (PcdCpuClockModulationDutyCycle) >> 1
-);
-  if (ThermalPowerManagementEax.Bits.ECMD == 1) {
-CPU_REGISTER_TABLE_WRITE_FIELD (
-  ProcessorNumber,
-  Msr,
-  MSR_IA32_CLOCK_MODULATION,
-  

Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-21 Thread Wang, Jian J
Ard,

> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Ard
> Biesheuvel
> Sent: Tuesday, May 21, 2019 5:02 PM
> To: Wang, Jian J 
> Cc: devel@edk2.groups.io; Laszlo Ersek ; Lu, XiaoyuX
> ; Ye, Ting ; Leif Lindholm
> ; Gao, Liming 
> Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b
> 
> On Tue, 21 May 2019 at 09:43, Wang, Jian J  wrote:
> >
> > Hi Ard,
> >
> > Any comments?
> >
> > Regards,
> > Jian
> >
> > > -Original Message-
> > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Wang,
> > > Jian J
> > > Sent: Monday, May 20, 2019 9:41 AM
> > > To: devel@edk2.groups.io; ard.biesheu...@linaro.org; Laszlo Ersek
> > > 
> > > Cc: Lu, XiaoyuX ; Ye, Ting ; Leif
> > > Lindholm ; Gao, Liming 
> > > Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to
> 1.1.1b
> > >
> > > Ard,
> > >
> > >
> > > > -Original Message-
> > > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Ard
> > > > Biesheuvel
> > > > Sent: Friday, May 17, 2019 11:06 PM
> > > > To: Laszlo Ersek 
> > > > Cc: Wang, Jian J ; devel@edk2.groups.io; Lu,
> XiaoyuX
> > > > ; Ye, Ting ; Leif Lindholm
> > > > ; Gao, Liming 
> > > > Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to
> > > 1.1.1b
> > > >
> > > > On Fri, 17 May 2019 at 15:17, Laszlo Ersek  wrote:
> > > > >
> > > > > On 05/17/19 15:04, Laszlo Ersek wrote:
> > > > > > On 05/17/19 07:11, Wang, Jian J wrote:
> > > > > >> Hi Laszlo,
> > > > > >>
> > > > > >> There's already a float library used in OpensslLib.inf.
> > > > > >>
> > > > > >> [LibraryClasses.ARM]
> > > > > >>   ArmSoftFloatLib
> > > > > >>
> > > > > >> The problem is that the below instance doesn't implement
> __aeabi_ui2d
> > > > > >> and __aeabi_d2uiz (I encountered this one as well)
> > > > > >>
> > > > > >>   ArmPkg\Library\ArmSoftFloatLib\ArmSoftFloatLib.inf
> > > > > >>
> > > > > >> I think we can update this library support those two APIs. So what
> about
> > > > > >> we still push the patch and file a BZ to fix this issue?
> > > > > >
> > > > > > I'm OK with that, but it will break ARM and AARCH64 platforms that
> > > > > > consume OpensslLib (directly or through BaseCryptLib), so this 
> > > > > > question
> > > > > > is up to Leif and Ard to decide.
> > > > >
> > > > > Correction: break ARM platforms only, not AARCH64.
> > > > >
> > > >
> > > > We obviously need to fix this before we can upgrade to a new OpenSSL
> version.
> > > >
> > > > Do we really have a need for the random functions? These seem the only
> > > > ones that use floating point, which the UEFI spec does not permit, so
> > > > it would be better if we could fix this by removing the dependency on
> > > > FP in the first place (and get rid of ArmSoftFloatLib entirely)
> > > >
> > >
> > > BaseCryptLib provides RandSeed/RandBytes interface which wrap openssl
> rand
> > > functionalities. These interfaces are used by following components in edk2
> > >
> > >   - CryptoPkg\Library\TlsLib\TlsInit.c
> > >   - SecurityPkg\HddPassword\HddPasswordDxe.c
> > >
> > > Openssl components, like asn1, bn, evp, ocsp, pem, pkcs7, pkcs12, rsa, 
> > > ssl (in
> > > addition
> > > to cms, dsa, srp, which are disabled in edk2) will call rand_* interface 
> > > as well.
> > >
> 
> If we have both internal (to Openssl) and external users of the RNG
> api, then I guess there is no way to work around this. It is
> unfortunate, since the RNG code in OpenSSL doesn't actually use double
> types except for keeping an entropy count, which could just as easily
> be kept in an integer variable.
> 
> So we will need to fix ArmSoftFloatLib before we can merge this
> OpenSSL update. I'm happy to help doing that, could you please
> summarize what we are missing today?
> 

Great. I think there're two intrinsic functions missing here

  __aeabi_ui2d
  __aeabi_d2uiz

Laszlo, please double check if these two are enough.

Thanks for doing this.

Regards,
Jian

> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41118): https://edk2.groups.io/g/devel/message/41118
Mute This Topic: https://groups.io/mt/31638503/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [PATCH] IntelFrameworkModulePkg/DebugLib: Fix string copy issue

2019-05-21 Thread Wu, Hao A
> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Gao, Zhichao
> Sent: Tuesday, May 21, 2019 3:50 PM
> To: devel@edk2.groups.io
> Cc: Gao, Liming; Wu, Hao A
> Subject: [edk2-devel] [PATCH] IntelFrameworkModulePkg/DebugLib: Fix
> string copy issue
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1826
> 
> There is a bug to use AsciiStrCpyS to copy a truncated
> string. If would cause an assert because the truncated
> length is always less than the source string length. It
> should use the AsciiStrnCpyS instead.
> 
> Cc: Liming Gao 
> Cc: Hao A Wu 
> Signed-off-by: Zhichao Gao 
> ---
>  .../Library/PeiDxeDebugLibReportStatusCode/DebugLib.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git
> a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> bugLib.c
> b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> bugLib.c
> index e92601f89e..1840b6d683 100644
> ---
> a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> bugLib.c
> +++
> b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/De
> bugLib.c
> @@ -150,7 +150,7 @@ DebugPrintMarker (
>FormatString  = (CHAR8 *)((UINT64 *)(DebugInfo + 1) + 12);
> 
>//
> -  // Copy the Format string into the record
> +  // Copy the Format string into the record. It will be truncated if it's 
> too long.
>//
>// According to the content structure of Buffer shown above, the size of
>// the FormatString buffer is the size of Buffer minus the Padding
> @@ -158,7 +158,7 @@ DebugPrintMarker (
>// variable arguments (12 * sizeof (UINT64)).
>//
>DestBufferSize = sizeof (Buffer) - 4 - sizeof (EFI_DEBUG_INFO) - 12 * 
> sizeof
> (UINT64);
> -  AsciiStrCpyS (FormatString, DestBufferSize / sizeof (CHAR8), Format);
> +  AsciiStrnCpyS (FormatString, DestBufferSize / sizeof (CHAR8), Format,
> DestBufferSize / sizeof (CHAR8) - 1);

Reviewed-by: Hao A Wu 

Best Regards,
Hao Wu

> 
>//
>// The first 12 * sizeof (UINT64) bytes following EFI_DEBUG_INFO are for
> variable arguments
> --
> 2.21.0.windows.1
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41116): https://edk2.groups.io/g/devel/message/41116
Mute This Topic: https://groups.io/mt/31694427/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [PATCH] IntelFrameworkModulePkg/DebugLib: Fix string copy issue

2019-05-21 Thread Gao, Zhichao
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1826

There is a bug to use AsciiStrCpyS to copy a truncated
string. If would cause an assert because the truncated
length is always less than the source string length. It
should use the AsciiStrnCpyS instead.

Cc: Liming Gao 
Cc: Hao A Wu 
Signed-off-by: Zhichao Gao 
---
 .../Library/PeiDxeDebugLibReportStatusCode/DebugLib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c 
b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
index e92601f89e..1840b6d683 100644
--- a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
@@ -150,7 +150,7 @@ DebugPrintMarker (
   FormatString  = (CHAR8 *)((UINT64 *)(DebugInfo + 1) + 12);
 
   //
-  // Copy the Format string into the record
+  // Copy the Format string into the record. It will be truncated if it's too 
long.
   //
   // According to the content structure of Buffer shown above, the size of
   // the FormatString buffer is the size of Buffer minus the Padding
@@ -158,7 +158,7 @@ DebugPrintMarker (
   // variable arguments (12 * sizeof (UINT64)).
   //
   DestBufferSize = sizeof (Buffer) - 4 - sizeof (EFI_DEBUG_INFO) - 12 * sizeof 
(UINT64);
-  AsciiStrCpyS (FormatString, DestBufferSize / sizeof (CHAR8), Format);
+  AsciiStrnCpyS (FormatString, DestBufferSize / sizeof (CHAR8), Format, 
DestBufferSize / sizeof (CHAR8) - 1);
 
   //
   // The first 12 * sizeof (UINT64) bytes following EFI_DEBUG_INFO are for 
variable arguments
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41115): https://edk2.groups.io/g/devel/message/41115
Mute This Topic: https://groups.io/mt/31694427/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-21 Thread Wang, Jian J
Hi Ard,

Any comments?

Regards,
Jian

> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Wang,
> Jian J
> Sent: Monday, May 20, 2019 9:41 AM
> To: devel@edk2.groups.io; ard.biesheu...@linaro.org; Laszlo Ersek
> 
> Cc: Lu, XiaoyuX ; Ye, Ting ; Leif
> Lindholm ; Gao, Liming 
> Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b
> 
> Ard,
> 
> 
> > -Original Message-
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Ard
> > Biesheuvel
> > Sent: Friday, May 17, 2019 11:06 PM
> > To: Laszlo Ersek 
> > Cc: Wang, Jian J ; devel@edk2.groups.io; Lu, XiaoyuX
> > ; Ye, Ting ; Leif Lindholm
> > ; Gao, Liming 
> > Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to
> 1.1.1b
> >
> > On Fri, 17 May 2019 at 15:17, Laszlo Ersek  wrote:
> > >
> > > On 05/17/19 15:04, Laszlo Ersek wrote:
> > > > On 05/17/19 07:11, Wang, Jian J wrote:
> > > >> Hi Laszlo,
> > > >>
> > > >> There's already a float library used in OpensslLib.inf.
> > > >>
> > > >> [LibraryClasses.ARM]
> > > >>   ArmSoftFloatLib
> > > >>
> > > >> The problem is that the below instance doesn't implement __aeabi_ui2d
> > > >> and __aeabi_d2uiz (I encountered this one as well)
> > > >>
> > > >>   ArmPkg\Library\ArmSoftFloatLib\ArmSoftFloatLib.inf
> > > >>
> > > >> I think we can update this library support those two APIs. So what 
> > > >> about
> > > >> we still push the patch and file a BZ to fix this issue?
> > > >
> > > > I'm OK with that, but it will break ARM and AARCH64 platforms that
> > > > consume OpensslLib (directly or through BaseCryptLib), so this question
> > > > is up to Leif and Ard to decide.
> > >
> > > Correction: break ARM platforms only, not AARCH64.
> > >
> >
> > We obviously need to fix this before we can upgrade to a new OpenSSL 
> > version.
> >
> > Do we really have a need for the random functions? These seem the only
> > ones that use floating point, which the UEFI spec does not permit, so
> > it would be better if we could fix this by removing the dependency on
> > FP in the first place (and get rid of ArmSoftFloatLib entirely)
> >
> 
> BaseCryptLib provides RandSeed/RandBytes interface which wrap openssl rand
> functionalities. These interfaces are used by following components in edk2
> 
>   - CryptoPkg\Library\TlsLib\TlsInit.c
>   - SecurityPkg\HddPassword\HddPasswordDxe.c
> 
> Openssl components, like asn1, bn, evp, ocsp, pem, pkcs7, pkcs12, rsa, ssl (in
> addition
> to cms, dsa, srp, which are disabled in edk2) will call rand_* interface as 
> well.
> 
> Regards,
> Jian
> 
> >
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41113): https://edk2.groups.io/g/devel/message/41113
Mute This Topic: https://groups.io/mt/31638503/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-