Re: [edk2-devel] [PATCH v1 1/1] BoardModulePkg: Added Mock library for BiosIdLib
Hi Vivian,
Please see feedback below inline. The # MU_CHANGE comment seems unnecessary.
Thanks,
Nate
> -Original Message-
> From: devel@edk2.groups.io On Behalf Of VivianNK
> Sent: Wednesday, May 8, 2024 1:32 PM
> To: devel@edk2.groups.io
> Cc: Dong, Eric ; Liming Gao
>
> Subject: [edk2-devel] [PATCH v1 1/1] BoardModulePkg: Added Mock library
> for BiosIdLib
>
> From: Bhavani Subramanian
>
> Added a gmock for GoogleTests that pull in BiosIdLib.
>
> Cc: Eric Dong
> Cc: Liming Gao
>
> Signed-off-by: Vivian Nowka-Keane
> ---
> Platform/Intel/BoardModulePkg/BoardModulePkg.dec
> | 1 +
> Platform/Intel/BoardModulePkg/Test/BoardModulePkgHostTest.dsc
> | 32 +++
>
> Platform/Intel/BoardModulePkg/Test/Mock/Include/GoogleTest/Library/MockBiosIdLib.h
> | 31 ++
>
> Platform/Intel/BoardModulePkg/Test/Mock/Library/GoogleTest/MockBiosIdLib/MockBiosIdLib.cpp
> | 11 +++
>
> Platform/Intel/BoardModulePkg/Test/Mock/Library/GoogleTest/MockBiosIdLib/MockBiosIdLib.inf
> | 33
> 5 files changed, 108 insertions(+)
>
> diff --git a/Platform/Intel/BoardModulePkg/BoardModulePkg.dec
> b/Platform/Intel/BoardModulePkg/BoardModulePkg.dec
> index 26e662f711d1..5efb1a0348ff 100644
> --- a/Platform/Intel/BoardModulePkg/BoardModulePkg.dec
> +++ b/Platform/Intel/BoardModulePkg/BoardModulePkg.dec
> @@ -22,6 +22,7 @@
>
> [Includes]
>Include
> + Test/Mock/Include # MU_CHANGE
Please remove the # MU_CHANGE comment
>
> [LibraryClasses]
>## @libraryclassProvide services to access CMOS area.
> diff --git a/Platform/Intel/BoardModulePkg/Test/BoardModulePkgHostTest.dsc
> b/Platform/Intel/BoardModulePkg/Test/BoardModulePkgHostTest.dsc
> new file mode 100644
> index ..846a1e9f8b33
> --- /dev/null
> +++ b/Platform/Intel/BoardModulePkg/Test/BoardModulePkgHostTest.dsc
> @@ -0,0 +1,32 @@
> +## @fileBoardModulePkgHostTest.dsc
> +#
> +# Copyright (c) Microsoft Corporation.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> +#
> +# Description
> +#
> +##
> +
> +[Defines]
> +PLATFORM_NAME = BoardModulePkgHostTest
> +PLATFORM_GUID = 67275336-A324-4F69-BD38-70A4C7898F06
> +PLATFORM_VERSION= 0.1
> +DSC_SPECIFICATION = 0x00010005
> +OUTPUT_DIRECTORY= Build/BoardModulePkg/HostTest
> +SUPPORTED_ARCHITECTURES = IA32|X64|AARCH64
> +BUILD_TARGETS = NOOPT
> +SKUID_IDENTIFIER= DEFAULT
> +
> +!include UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc
> +
> +[LibraryClasses]
> +
> +[Components]
> + #
> + # List of Unit test packages
> + #
> +
> + #
> + # Build HOST_APPLICATION Libraries With GoogleTest
> + #
> + BoardModulePkg/Test/Mock/Library/GoogleTest/MockBiosIdLib/MockBiosIdLib.inf
> diff --git
> a/Platform/Intel/BoardModulePkg/Test/Mock/Include/GoogleTest/Library/MockBiosIdLib.h
>
> b/Platform/Intel/BoardModulePkg/Test/Mock/Include/GoogleTest/Library/MockBiosIdLib.h
> new file mode 100644
> index ..8f8a82da2807
> --- /dev/null
> +++
> b/Platform/Intel/BoardModulePkg/Test/Mock/Include/GoogleTest/Library/MockBiosIdLib.h
> @@ -0,0 +1,31 @@
> +/** @file MockBiosIdLib.h
> + Google Test mocks for BiosIdLib
> +
> + Copyright (c) Microsoft Corporation.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
> +**/
> +
> +#ifndef MOCK_BIOS_ID_LIB_H_
> +#define MOCK_BIOS_ID_LIB_H_
> +
> +#include
> +#include
> +extern "C" {
> + #include
> + #include
> + #include
> +}
> +
> +struct MockBiosIdLib {
> + MOCK_INTERFACE_DECLARATION (MockBiosIdLib);
> +
> + MOCK_FUNCTION_DECLARATION (
> +EFI_STATUS,
> +GetBiosId,
> +(
> + OUT BIOS_ID_IMAGE *BiosIdImage OPTIONAL
> +)
> +);
> +};
> +
> +#endif
> diff --git
> a/Platform/Intel/BoardModulePkg/Test/Mock/Library/GoogleTest/MockBiosIdLib/MockBiosIdLib.cpp
>
> b/Platform/Intel/BoardModulePkg/Test/Mock/Library/GoogleTest/MockBiosIdLib/MockBiosIdLib.cpp
> new file mode 100644
> index ..8b64e8a66acd
> --- /dev/null
> +++
> b/Platform/Intel/BoardModulePkg/Test/Mock/Library/GoogleTest/MockBiosIdLib/MockBiosIdLib.cpp
> @@ -0,0 +1,11 @@
> +/** @file MockBiosIdLib.cpp
> + Google Test mocks for BiosIdLib
> +
> + Copyright (c) Microsoft Corporation.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
> +**/
> +
> +#include
> +
> +MOCK_INTERFACE_DEFINITION (MockBiosIdLib);
> +MOCK_FUNCTION_DEFINITION (MockBiosIdLib, GetBiosId, 1, EFIAPI);
> diff --git
> a/Platform/Intel/BoardModulePkg/Test/Mock/Library/GoogleTest/MockBiosIdLib/MockBiosIdLib.inf
>
> b/Platform/Intel/BoardModulePkg/Test/Mock/Library/GoogleTest/MockBiosIdLib/MockBiosIdLib.inf
> new file mode 100644
> index ..f60bc3724f6a
> --- /dev/null
> +++
> b/Platform/Intel/BoardModulePkg/Test/Mock/Library/GoogleTest/MockBiosIdLib/MockBiosIdLib.inf
> @@ -0,0 +1,33 @@
> +## @file MockBiosIdLib.inf
> +# Google Test mocks for BiosIdLib
> +#
Re: [edk2-devel] [PATCH v8] MinPlatformPkg: Update HWSignature filed in FACS
Hi Vincent,
This patch has merge conflicts with the newest edk2-platforms. Is this change
still needed? If yes, please rebase it to latest and re-send the patch.
Thank You,
Nate
> -Original Message-
> From: Ke, VincentX
> Sent: Friday, May 19, 2023 3:29 AM
> To: devel@edk2.groups.io
> Cc: Ke, VincentX ; Chiu, Chasel
> ; Desimone, Nathaniel L
> ; Oram, Isaac W
> ; Gao, Liming ; Dong,
> Eric ; Sinha, Ankit
> Subject: [PATCH v8] MinPlatformPkg: Update HWSignature filed in FACS
>
> From: VincentX Ke
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4428
>
> Calculating CRC based on each ACPI table.
> Update HWSignature filed in FACS based on CRC while ACPI table changed.
>
> Change-Id: Ic0ca66ff10cda0fbcd0683020fab1bc9aea9b78c
> Signed-off-by: VincentX Ke
> Cc: Chasel Chiu
> Cc: Nate DeSimone
> Cc: Isaac Oram
> Cc: Liming Gao
> Cc: Eric Dong
> Cc: Ankit Sinha
> Signed-off-by: VincentX Ke
> ---
> Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 299
> +++-
> Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf | 1 +
> 2 files changed, 233 insertions(+), 67 deletions(-)
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> index 2f2c96f907..5005d1a524 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> @@ -1191,98 +1191,263 @@ PlatformUpdateTables (
> }
>
>
>
> /**
>
> - This function calculates RCR based on PCI Device ID and Vendor ID from the
> devices
>
> - available on the platform.
>
> - It also includes other instances of BIOS change to calculate CRC and
> provides
> as
>
> - HWSignature filed in FADT table.
>
> + This function calculates CRC based on each offset in the ACPI table.
>
> +
>
> + @param[in] Table The ACPI table required to calculate CRC.
>
> +
>
> + @retval CRC A pointer to allocate UINT32 that
>
> +contains the CRC32 data.
>
> +**/
>
> +UINT32
>
> +AcpiTableCrcCalculator (
>
> + IN EFI_ACPI_COMMON_HEADER *Table
>
> + )
>
> +{
>
> + EFI_STATUS Status;
>
> + UINT32 CRC;
>
> +
>
> + Status = EFI_SUCCESS;
>
> + CRC= 0;
>
> +
>
> + //
>
> + // Calculate CRC value.
>
> + //
>
> + if (Table->Signature ==
> EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) {
>
> +//
>
> +// Zero HardwareSignature field before Calculating FACS CRC
>
> +//
>
> +((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)Table)-
> >HardwareSignature = 0;
>
> + }
>
> +
>
> + Status = gBS->CalculateCrc32 ((UINT8 *)Table, (UINTN)Table->Length,
> );
>
> + return CRC;
>
> +}
>
> +
>
> +/**
>
> + This function count ACPI tables in RSDT/XSDT and return the result.
>
> +
>
> + @param[in] SdtACPI XSDT/RSDT.
>
> + @param[in] TablePointerSize Size of table pointer:
>
> +4(RSDT) or 8(XSDT).
>
> +
>
> + @retval TableCountThe total number of ACPI tables in
>
> +RSDT or XSDT.
>
> +**/
>
> +UINTN
>
> +CountTableInSDT (
>
> + IN EFI_ACPI_DESCRIPTION_HEADER *Sdt,
>
> + IN UINTNTablePointerSize
>
> + )
>
> +{
>
> + UINTN Index;
>
> + UINTN TableCount;
>
> + UINTN EntryCount;
>
> + UINT64 EntryPtr;
>
> + UINTN BasePtr;
>
> + EFI_ACPI_COMMON_HEADER *Table;
>
> + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *FadtPtr;
>
> +
>
> + EntryCount = (Sdt->Length - sizeof (EFI_ACPI_DESCRIPTION_HEADER)) /
> TablePointerSize;
>
> + BasePtr= (UINTN)(Sdt + 1);
>
> + FadtPtr= NULL;
>
> +
>
> + for (Index = 0, TableCount = 0; Index < EntryCount; Index++) {
>
> +EntryPtr = 0;
>
> +Table= NULL;
>
> +CopyMem (, (VOID *)(BasePtr + Index * TablePointerSize),
> TablePointerSize);
>
> +Table = (EFI_ACPI_COMMON_HEADER *)((UINTN)(EntryPtr));
>
> +if (Table != NULL) {
>
> + TableCount++;
>
> +}
>
> +
>
> +if (Table->Signature ==
> EFI_ACPI_6_5_FIX
Re: [edk2-devel] [PATCH v1 1/1] MinPlatformPkg: Fix DxePhatAcpiLib.inf path in dsc
Pushed as 59c6866 > -Original Message- > From: Vivian Nowka-Keane > Sent: Thursday, May 9, 2024 7:09 PM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L > > Subject: [PATCH v1 1/1] MinPlatformPkg: Fix DxePhatAcpiLib.inf path in dsc > > When building MinPlatformPkg, a build error occured because the inf was not > found. The path was incorrect -- DxePhatAcpiLib folder doesn't exist, > PhatAcpiLib does. > > Cc: Chasel Chiu > Cc: Nate DeSimone > Signed-off-by: Vivian Nowka-Keane > --- > Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc > b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc > index ecb4d8f65efa..f81ad3cabf56 100644 > --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc > +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc > @@ -64,7 +64,7 @@ > > PciSegmentInfoLib|MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.inf > > PlatformBootManagerLib|MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf > > AslUpdateLib|MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf > - PhatAcpiLib|MinPlatformPkg/Acpi/Library/DxePhatAcpiLib/DxePhatAcpiLib.inf > + PhatAcpiLib|MinPlatformPkg/Acpi/Library/PhatAcpiLib/DxePhatAcpiLib.inf > ># ># Misc > @@ -209,7 +209,7 @@ >MinPlatformPkg/Library/BaseLargeVariableLib/BaseLargeVariableReadLib.inf >MinPlatformPkg/Library/BaseLargeVariableLib/BaseLargeVariableWriteLib.inf > > - MinPlatformPkg/Acpi/Library/DxePhatAcpiLib/DxePhatAcpiLib.inf > + MinPlatformPkg/Acpi/Library/PhatAcpiLib/DxePhatAcpiLib.inf > > [BuildOptions] >*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES > -- > 2.43.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118876): https://edk2.groups.io/g/devel/message/118876 Mute This Topic: https://groups.io/mt/106014298/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v1 1/1] MinPlatformPkg: Fix DxePhatAcpiLib.inf path in dsc
Reviewed-by: Nate DeSimone > -Original Message- > From: Vivian Nowka-Keane > Sent: Thursday, May 9, 2024 7:09 PM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L > > Subject: [PATCH v1 1/1] MinPlatformPkg: Fix DxePhatAcpiLib.inf path in dsc > > When building MinPlatformPkg, a build error occured because the inf was not > found. The path was incorrect -- DxePhatAcpiLib folder doesn't exist, > PhatAcpiLib does. > > Cc: Chasel Chiu > Cc: Nate DeSimone > Signed-off-by: Vivian Nowka-Keane > --- > Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc > b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc > index ecb4d8f65efa..f81ad3cabf56 100644 > --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc > +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc > @@ -64,7 +64,7 @@ > > PciSegmentInfoLib|MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.inf > > PlatformBootManagerLib|MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf > > AslUpdateLib|MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf > - PhatAcpiLib|MinPlatformPkg/Acpi/Library/DxePhatAcpiLib/DxePhatAcpiLib.inf > + PhatAcpiLib|MinPlatformPkg/Acpi/Library/PhatAcpiLib/DxePhatAcpiLib.inf > ># ># Misc > @@ -209,7 +209,7 @@ >MinPlatformPkg/Library/BaseLargeVariableLib/BaseLargeVariableReadLib.inf >MinPlatformPkg/Library/BaseLargeVariableLib/BaseLargeVariableWriteLib.inf > > - MinPlatformPkg/Acpi/Library/DxePhatAcpiLib/DxePhatAcpiLib.inf > + MinPlatformPkg/Acpi/Library/PhatAcpiLib/DxePhatAcpiLib.inf > > [BuildOptions] >*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES > -- > 2.43.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118875): https://edk2.groups.io/g/devel/message/118875 Mute This Topic: https://groups.io/mt/106014298/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 1/2] MinPlatform: Add MpInfo2HobPei
Thanks for the feedback Chasel and Sai! I have incorporated all your
suggestions.
> -Original Message-
> From: Chaganty, Rangasai V
> Sent: Thursday, May 9, 2024 6:15 PM
> To: Desimone, Nathaniel L ;
> devel@edk2.groups.io
> Cc: Chiu, Chasel ; Liming Gao
> ; Dong, Eric ; Chuang,
> Rosen ; Kasbekar, Saloni
>
> Subject: RE: [edk2-platforms] [PATCH v1 1/2] MinPlatform: Add
> MpInfo2HobPei
>
> Hi Nate,
> Looks good.
> In addition to optimization suggested by Chasel to save unnecessary call to
> locate PPI, you might also want to consider checking for checking "no error"
> status for locate PPI and perhaps avoid a "goto" label.
> With that, Reviewed-by: Sai Chaganty for
> the whole patch series.
>
> Thanks,
> Sai
>
>
> -Original Message-
> From: Desimone, Nathaniel L
> Sent: Wednesday, May 8, 2024 5:09 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel ; Liming Gao
> ; Dong, Eric ; Chaganty,
> Rangasai V ; Chuang, Rosen
> ; Kasbekar, Saloni
> Subject: [edk2-platforms] [PATCH v1 1/2] MinPlatform: Add MpInfo2HobPei
>
> MpInfo2HobPei provides backwards compatibility between FSP binaries built
> with older versions of EDK II and the latest EDK II.
>
> Newer versions of CpuMpPei produce the gMpInformation2HobGuid. This
> HOB is required by newer implementations of the CPU DXE driver, however
> older versions of CpuMpPei do not produce it. This PEIM will check if
> CpuMpPei creates gMpInformation2HobGuid and if it does not it creates it.
>
> Cc: Chasel Chiu
> Cc: Liming Gao
> Cc: Eric Dong
> Cc: Sai Chaganty
> Cc: Rosen Chuang
> Cc: Saloni Kasbekar
> Signed-off-by: Nate DeSimone
> ---
> .../FspWrapper/MpInfo2HobPei/MpInfo2HobPei.c | 236
> ++
> .../MpInfo2HobPei/MpInfo2HobPei.inf | 47
> .../Intel/MinPlatformPkg/MinPlatformPkg.dsc | 3 +-
> 3 files changed, 285 insertions(+), 1 deletion(-) create mode 100644
> Platform/Intel/MinPlatformPkg/FspWrapper/MpInfo2HobPei/MpInfo2HobPe
> i.c
> create mode 100644
> Platform/Intel/MinPlatformPkg/FspWrapper/MpInfo2HobPei/MpInfo2HobPe
> i.inf
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/MpInfo2HobPei/MpInfo2Hob
> Pei.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/MpInfo2HobPei/MpInfo2Hob
> Pei.c
> new file mode 100644
> index 00..4cbc4cf7e6
> --- /dev/null
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/MpInfo2HobPei/MpInfo2Hob
> P
> +++ ei.c
> @@ -0,0 +1,236 @@
> +/** @file
> + Multi-processor Info 2 HOB PEIM.
> +
> + The purpose of this PEIM is to provide backwards compatibility
> + between FSP binaries built with older versions of EDK II and the latest
> EDK II.
> +
> + Newer versions of CpuMpPei produce the gMpInformation2HobGuid. This
> + HOB is required by newer implementations of the CPU DXE driver,
> + however older versions of CpuMpPei do not produce it. This PEIM will
> + check if CpuMpPei creates gMpInformation2HobGuid and if it does not it
> creates it.
> +
> +Copyright (c) 2024, Intel Corporation. All rights reserved.
> +
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> +
> +**/
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include #include
> +
> +
> +#include
> +#include
> +#include
> +
> +typedef struct {
> + EDKII_PEI_MP_SERVICES2_PPI*CpuMpPpi2;
> + UINT8 *CoreTypes;
> +} GET_PROCESSOR_CORE_TYPE_BUFFER;
> +
> +/**
> + Get CPU core type.
> +
> + @param[in, out] Buffer Argument of the procedure.
> +**/
> +VOID
> +EFIAPI
> +GetProcessorCoreType (
> + IN OUT VOID *Buffer
> + )
> +{
> + EFI_STATUS Status;
> + UINT8*CoreTypes;
> + CPUID_NATIVE_MODEL_ID_AND_CORE_TYPE_EAX
> NativeModelIdAndCoreTypeEax;
> + UINTNProcessorIndex;
> + GET_PROCESSOR_CORE_TYPE_BUFFER *Params;
> +
> + Params = (GET_PROCESSOR_CORE_TYPE_BUFFER *)Buffer; Status =
> + Params->CpuMpPpi2->WhoAmI (Params->CpuMpPpi2, );
> + ASSERT_EFI_ERROR (Status);
> +
> + CoreTypes = Params->CoreTypes;
> + AsmCpuidEx (CPUID_HYBRID_INFORMATION,
> +CPUID_HYBRID_INFORMATION_MAIN_LEAF,
> +, NULL, NULL, NULL);
> + CoreTypes[ProcessorIndex] =
> +(UINT8)NativeModelIdAndCoreTypeEax.Bits.CoreType;
> +}
> +
> +/**
> + Create gMpInformation2HobGuid.
> +**/
> +VOID
> +BuildMpInformationHob (
> + IN EDKII_PEI_MP_SERVICES2_PPI *CpuMpPpi2
> + )
> +{
> + GET_PROCESSOR_CORE_TYPE_BUFFER Buffer;
> + EFI_STATUS
Re: [edk2-devel] [edk2-platforms] [PATCH v1 0/2] Intel/MinPlatform: Add MpInfo2HobPei
The series has been pushed as c31962b~..0ba43d4 > -Original Message- > From: devel@edk2.groups.io On Behalf Of Nate > DeSimone > Sent: Wednesday, May 8, 2024 5:09 PM > To: devel@edk2.groups.io > Cc: Chaganty, Rangasai V ; Chuang, Rosen > ; Kasbekar, Saloni ; > Chiu, Chasel ; Liming Gao > ; Dong, Eric > Subject: [edk2-devel] [edk2-platforms] [PATCH v1 0/2] Intel/MinPlatform: > Add MpInfo2HobPei > > Newer versions of CpuMpPei produce the gMpInformation2HobGuid. This > HOB is required by newer implementations of the CPU DXE driver, however > older versions of CpuMpPei do not produce it. This can cause backwards > compatibiliity issues if the FSP binary was built with an older version of > EDK II > and the OpenBoard code is built with the latest version of EDK II. > > To solve this problem, this patch series introduces a new PEIM called > MpInfo2HobPei. This PEIM will check if CpuMpPei creates > gMpInformation2HobGuid and if it does not then MpInfo2HobPei will create > it. > > Cc: Sai Chaganty > Cc: Rosen Chuang > Cc: Saloni Kasbekar > Cc: Chasel Chiu > Cc: Liming Gao > Cc: Eric Dong > Signed-off-by: Nate DeSimone > > Nate DeSimone (2): > MinPlatform: Add MpInfo2HobPei > AlderlakeOpenBoardPkg: Include MpInfo2HobPei > > .../AlderlakePRvp/OpenBoardPkg.dsc| 10 +- > .../AlderlakePRvp/OpenBoardPkg.fdf| 10 +- > .../FspWrapper/MpInfo2HobPei/MpInfo2HobPei.c | 236 > ++ > .../MpInfo2HobPei/MpInfo2HobPei.inf | 47 > .../Intel/MinPlatformPkg/MinPlatformPkg.dsc | 3 +- > 5 files changed, 303 insertions(+), 3 deletions(-) create mode 100644 > Platform/Intel/MinPlatformPkg/FspWrapper/MpInfo2HobPei/MpInfo2HobPe > i.c > create mode 100644 > Platform/Intel/MinPlatformPkg/FspWrapper/MpInfo2HobPei/MpInfo2HobPe > i.inf > > -- > 2.44.0.windows.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118873): https://edk2.groups.io/g/devel/message/118873 Mute This Topic: https://groups.io/mt/105992896/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v1] MinPlatformPkg/Test: Fix DumpAcpiMadt infinite loop
Pushed as 3f89df4 > -Original Message- > From: Abdul Lateef Attar > Sent: Monday, April 22, 2024 7:04 AM > To: devel@edk2.groups.io > Cc: Abdul Lateef Attar ; Chiu, Chasel > ; Desimone, Nathaniel L > ; Liming Gao ; > Dong, Eric > Subject: [PATCH v1] MinPlatformPkg/Test: Fix DumpAcpiMadt infinite loop > > Update the MadtLen varaible before the next record is read, to void infinite > loop. > > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Liming Gao > Cc: Eric Dong > Signed-off-by: Abdul Lateef Attar > --- > .../Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c | 7 +-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c > > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c > index 7e29b47a0b..04cc6f963a 100644 > --- > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c > +++ > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c > @@ -1,6 +1,7 @@ > /** @file > > Copyright (c) 2017, Intel Corporation. All rights reserved. > +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved. > SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > @@ -235,8 +236,9 @@ DumpAcpiMadt ( >DEBUG ((DEBUG_INFO, "\n")); >break; > } > -ApicStructHeader = (APIC_STRUCT_HEADER *)((UINT8 *)ApicStructHeader + > ApicStructHeader->Length); > +// Update MadtLen first to avoid the dead loop and system hang > MadtLen -= ApicStructHeader->Length; > +ApicStructHeader = (APIC_STRUCT_HEADER *)((UINT8 *)ApicStructHeader + > ApicStructHeader->Length); >} > } > > @@ -324,8 +326,9 @@ CheckAcpiMadt ( > default: >break; > } > -ApicStructHeader = (APIC_STRUCT_HEADER *)((UINT8 *)ApicStructHeader + > ApicStructHeader->Length); > +// Update MadtLen first to avoid the dead loop and system hang > MadtLen -= ApicStructHeader->Length; > +ApicStructHeader = (APIC_STRUCT_HEADER *)((UINT8 *)ApicStructHeader + > ApicStructHeader->Length); >} >return EFI_SUCCESS; > } > \ No newline at end of file > -- > 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118770): https://edk2.groups.io/g/devel/message/118770 Mute This Topic: https://groups.io/mt/105669987/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v1] MinPlatformPkg/Test: Fix DumpAcpiMadt infinite loop
Reviewed-by: Nate DeSimone > -Original Message- > From: Abdul Lateef Attar > Sent: Monday, April 22, 2024 7:04 AM > To: devel@edk2.groups.io > Cc: Abdul Lateef Attar ; Chiu, Chasel > ; Desimone, Nathaniel L > ; Liming Gao ; > Dong, Eric > Subject: [PATCH v1] MinPlatformPkg/Test: Fix DumpAcpiMadt infinite loop > > Update the MadtLen varaible before the next record is read, to void infinite > loop. > > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Liming Gao > Cc: Eric Dong > Signed-off-by: Abdul Lateef Attar > --- > .../Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c | 7 +-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c > > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c > index 7e29b47a0b..04cc6f963a 100644 > --- > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c > +++ > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c > @@ -1,6 +1,7 @@ > /** @file > > Copyright (c) 2017, Intel Corporation. All rights reserved. > +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved. > SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > @@ -235,8 +236,9 @@ DumpAcpiMadt ( >DEBUG ((DEBUG_INFO, "\n")); >break; > } > -ApicStructHeader = (APIC_STRUCT_HEADER *)((UINT8 *)ApicStructHeader + > ApicStructHeader->Length); > +// Update MadtLen first to avoid the dead loop and system hang > MadtLen -= ApicStructHeader->Length; > +ApicStructHeader = (APIC_STRUCT_HEADER *)((UINT8 *)ApicStructHeader + > ApicStructHeader->Length); >} > } > > @@ -324,8 +326,9 @@ CheckAcpiMadt ( > default: >break; > } > -ApicStructHeader = (APIC_STRUCT_HEADER *)((UINT8 *)ApicStructHeader + > ApicStructHeader->Length); > +// Update MadtLen first to avoid the dead loop and system hang > MadtLen -= ApicStructHeader->Length; > +ApicStructHeader = (APIC_STRUCT_HEADER *)((UINT8 *)ApicStructHeader + > ApicStructHeader->Length); >} >return EFI_SUCCESS; > } > \ No newline at end of file > -- > 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118769): https://edk2.groups.io/g/devel/message/118769 Mute This Topic: https://groups.io/mt/105669987/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/2] MinPlatform: Add MpInfo2HobPei
MpInfo2HobPei provides backwards compatibility between FSP binaries built with
older versions of EDK II and the latest EDK II.
Newer versions of CpuMpPei produce the gMpInformation2HobGuid. This HOB is
required by newer implementations of the CPU DXE driver, however older
versions of CpuMpPei do not produce it. This PEIM will check if CpuMpPei
creates gMpInformation2HobGuid and if it does not it creates it.
Cc: Chasel Chiu
Cc: Liming Gao
Cc: Eric Dong
Cc: Sai Chaganty
Cc: Rosen Chuang
Cc: Saloni Kasbekar
Signed-off-by: Nate DeSimone
---
.../FspWrapper/MpInfo2HobPei/MpInfo2HobPei.c | 236 ++
.../MpInfo2HobPei/MpInfo2HobPei.inf | 47
.../Intel/MinPlatformPkg/MinPlatformPkg.dsc | 3 +-
3 files changed, 285 insertions(+), 1 deletion(-)
create mode 100644
Platform/Intel/MinPlatformPkg/FspWrapper/MpInfo2HobPei/MpInfo2HobPei.c
create mode 100644
Platform/Intel/MinPlatformPkg/FspWrapper/MpInfo2HobPei/MpInfo2HobPei.inf
diff --git
a/Platform/Intel/MinPlatformPkg/FspWrapper/MpInfo2HobPei/MpInfo2HobPei.c
b/Platform/Intel/MinPlatformPkg/FspWrapper/MpInfo2HobPei/MpInfo2HobPei.c
new file mode 100644
index 00..4cbc4cf7e6
--- /dev/null
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/MpInfo2HobPei/MpInfo2HobPei.c
@@ -0,0 +1,236 @@
+/** @file
+ Multi-processor Info 2 HOB PEIM.
+
+ The purpose of this PEIM is to provide backwards compatibility between FSP
+ binaries built with older versions of EDK II and the latest EDK II.
+
+ Newer versions of CpuMpPei produce the gMpInformation2HobGuid. This HOB is
+ required by newer implementations of the CPU DXE driver, however older
+ versions of CpuMpPei do not produce it. This PEIM will check if CpuMpPei
+ creates gMpInformation2HobGuid and if it does not it creates it.
+
+Copyright (c) 2024, Intel Corporation. All rights reserved.
+
+SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+typedef struct {
+ EDKII_PEI_MP_SERVICES2_PPI*CpuMpPpi2;
+ UINT8 *CoreTypes;
+} GET_PROCESSOR_CORE_TYPE_BUFFER;
+
+/**
+ Get CPU core type.
+
+ @param[in, out] Buffer Argument of the procedure.
+**/
+VOID
+EFIAPI
+GetProcessorCoreType (
+ IN OUT VOID *Buffer
+ )
+{
+ EFI_STATUS Status;
+ UINT8*CoreTypes;
+ CPUID_NATIVE_MODEL_ID_AND_CORE_TYPE_EAX NativeModelIdAndCoreTypeEax;
+ UINTNProcessorIndex;
+ GET_PROCESSOR_CORE_TYPE_BUFFER *Params;
+
+ Params = (GET_PROCESSOR_CORE_TYPE_BUFFER *)Buffer;
+ Status = Params->CpuMpPpi2->WhoAmI (Params->CpuMpPpi2, );
+ ASSERT_EFI_ERROR (Status);
+
+ CoreTypes = Params->CoreTypes;
+ AsmCpuidEx (CPUID_HYBRID_INFORMATION, CPUID_HYBRID_INFORMATION_MAIN_LEAF,
, NULL, NULL, NULL);
+ CoreTypes[ProcessorIndex] = (UINT8)NativeModelIdAndCoreTypeEax.Bits.CoreType;
+}
+
+/**
+ Create gMpInformation2HobGuid.
+**/
+VOID
+BuildMpInformationHob (
+ IN EDKII_PEI_MP_SERVICES2_PPI *CpuMpPpi2
+ )
+{
+ GET_PROCESSOR_CORE_TYPE_BUFFER Buffer;
+ EFI_STATUS Status;
+ UINTN ProcessorIndex;
+ UINTN NumberOfProcessors;
+ UINTN NumberOfEnabledProcessors;
+ UINTN NumberOfProcessorsInHob;
+ UINTN MaxProcessorsPerHob;
+ MP_INFORMATION2_HOB_DATA*MpInformation2HobData;
+ MP_INFORMATION2_ENTRY *MpInformation2Entry;
+ UINTN Index;
+ UINT8 *CoreTypes;
+ UINT32 CpuidMaxInput;
+ UINTN CoreTypePages;
+
+ ProcessorIndex= 0;
+ MpInformation2HobData = NULL;
+ MpInformation2Entry = NULL;
+ CoreTypes = NULL;
+ CoreTypePages = 0;
+
+ Status = CpuMpPpi2->GetNumberOfProcessors (
+CpuMpPpi2,
+,
+
+);
+ ASSERT_EFI_ERROR (Status);
+ if (EFI_ERROR (Status)) {
+goto Done;
+ }
+
+ //
+ // Get Processors CoreType
+ //
+ AsmCpuid (CPUID_SIGNATURE, , NULL, NULL, NULL);
+ if (CpuidMaxInput >= CPUID_HYBRID_INFORMATION) {
+CoreTypePages = EFI_SIZE_TO_PAGES (sizeof (UINT8) * NumberOfProcessors);
+CoreTypes = AllocatePages (CoreTypePages);
+ASSERT (CoreTypes != NULL);
+if (CoreTypes == NULL) {
+ goto Done;
+}
+
+Buffer.CoreTypes = CoreTypes;
+Buffer.CpuMpPpi2 = CpuMpPpi2;
+Status = CpuMpPpi2->StartupAllCPUs (
+CpuMpPpi2,
+GetProcessorCoreType,
+0,
+(VOID *)
+);
+ASSERT_EFI_ERROR (Status);
+ }
+
+
[edk2-devel] [edk2-platforms] [PATCH v1 0/2] Intel/MinPlatform: Add MpInfo2HobPei
Newer versions of CpuMpPei produce the gMpInformation2HobGuid. This HOB is required by newer implementations of the CPU DXE driver, however older versions of CpuMpPei do not produce it. This can cause backwards compatibiliity issues if the FSP binary was built with an older version of EDK II and the OpenBoard code is built with the latest version of EDK II. To solve this problem, this patch series introduces a new PEIM called MpInfo2HobPei. This PEIM will check if CpuMpPei creates gMpInformation2HobGuid and if it does not then MpInfo2HobPei will create it. Cc: Sai Chaganty Cc: Rosen Chuang Cc: Saloni Kasbekar Cc: Chasel Chiu Cc: Liming Gao Cc: Eric Dong Signed-off-by: Nate DeSimone Nate DeSimone (2): MinPlatform: Add MpInfo2HobPei AlderlakeOpenBoardPkg: Include MpInfo2HobPei .../AlderlakePRvp/OpenBoardPkg.dsc| 10 +- .../AlderlakePRvp/OpenBoardPkg.fdf| 10 +- .../FspWrapper/MpInfo2HobPei/MpInfo2HobPei.c | 236 ++ .../MpInfo2HobPei/MpInfo2HobPei.inf | 47 .../Intel/MinPlatformPkg/MinPlatformPkg.dsc | 3 +- 5 files changed, 303 insertions(+), 3 deletions(-) create mode 100644 Platform/Intel/MinPlatformPkg/FspWrapper/MpInfo2HobPei/MpInfo2HobPei.c create mode 100644 Platform/Intel/MinPlatformPkg/FspWrapper/MpInfo2HobPei/MpInfo2HobPei.inf -- 2.44.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118706): https://edk2.groups.io/g/devel/message/118706 Mute This Topic: https://groups.io/mt/105992896/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 2/2] AlderlakeOpenBoardPkg: Include MpInfo2HobPei
Because Alder Lake FSP includes an older version of CpuMpPei MpInfo2HobPei is needed to boot with newer versions of EDK II. Accordingly, this change adds MpInfo2HobPei to FvPostMemory. Cc: Sai Chaganty Cc: Rosen Chuang Cc: Saloni Kasbekar Cc: Chasel Chiu Cc: Liming Gao Cc: Eric Dong Signed-off-by: Nate DeSimone --- .../AlderlakePRvp/OpenBoardPkg.dsc | 10 +- .../AlderlakePRvp/OpenBoardPkg.fdf | 10 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc index edd03cba68..092cb34831 100644 --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc @@ -1,7 +1,7 @@ ## @file # The main build description file for the AlderlakePRvp board. # -# Copyright (c) 2022, Intel Corporation. All rights reserved. +# Copyright (c) 2022 - 2024, Intel Corporation. All rights reserved. # SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -342,6 +342,14 @@ ResetSystemLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/BaseResetSystemLib/BaseResetSy } + # + # ADL FSP includes an older version of CpuMpPei, so the compatibility PEIM + # is needed when using FSP Dispatch mode. + # +!if gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection == 0 + $(PLATFORM_PACKAGE)/FspWrapper/MpInfo2HobPei/MpInfo2HobPei.inf +!endif + # # Security # diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf index ae7896e5e0..c8ceb8684c 100644 --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf @@ -1,7 +1,7 @@ ## @file # FDF file of Platform. # -# Copyright (c) 2022, Intel Corporation. All rights reserved. +# Copyright (c) 2022 - 2024, Intel Corporation. All rights reserved. # SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -344,6 +344,14 @@ INF $(PLATFORM_BOARD_PACKAGE)/OpenBoardPlatformInit/OpenBoardPlatformInitPei/Ope INF $(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.inf INF IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf +# +# ADL FSP includes an older version of CpuMpPei, so the compatibility PEIM +# is needed when using FSP Dispatch mode. +# +!if gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection == 0 + INF $(PLATFORM_PACKAGE)/FspWrapper/MpInfo2HobPei/MpInfo2HobPei.inf +!endif + [FV.FvPostMemory] BlockSize = $(FLASH_BLOCK_SIZE) -- 2.44.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118708): https://edk2.groups.io/g/devel/message/118708 Mute This Topic: https://groups.io/mt/105992898/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v1] MinPlatformPkg: Add MM_STANDALONE LibraryClasses
Pushed as d335e04 > -Original Message- > From: devel@edk2.groups.io On Behalf Of Nate > DeSimone > Sent: Friday, February 9, 2024 2:48 PM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Liming Gao > ; Dong, Eric > Subject: [edk2-devel] [PATCH v1] MinPlatformPkg: Add MM_STANDALONE > LibraryClasses > > Adds MM_STANDALONE instances for core LibraryClasses to facilitate using > Standalone MM in platform code. > > Cc: Chasel Chiu > Cc: Liming Gao > Cc: Eric Dong > Signed-off-by: Nate DeSimone > --- > .../Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 11 +++ > Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc | 9 - > 2 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc > b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc > index b469938823..1e86de282f 100644 > --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc > +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc > @@ -97,6 +97,17 @@ > > ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/Sm > mReportStatusCodeLib.inf >SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf > > +[LibraryClasses.common.MM_STANDALONE] > + > +MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmMemoryAl > locatio > +nLib/StandaloneMmMemoryAllocationLib.inf > + > +MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/Stand > alo > +neMmServicesTableLib.inf > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > + > +HobLib|StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmH > obLib.in > +f > + > +TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/StandaloneMmAcpiTimerLib. > i > +nf > + > +ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/St > andal > +oneMmReportStatusCodeLib.inf > + > +StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntr > yPoin > +t/StandaloneMmDriverEntryPoint.inf > + > +VariableReadLib|MinPlatformPkg/Library/SmmVariableReadLib/Standalone > MmV > +ariableReadLib.inf > + > +VariableWriteLib|MinPlatformPkg/Library/SmmVariableWriteLib/Standalone > M > +mVariableWriteLib.inf > + > !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE > > PerformanceLib|MdeModulePkg/Library/SmmCorePerformanceLib/SmmCore > PerformanceLib.inf > !endif > diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc > b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc > index 4b295babf5..ecb4d8f65e 100644 > --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc > +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc > @@ -111,15 +111,6 @@ > > TestPointCheckLib|MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest > PointCheckLib.inf > > TestPointLib|MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLib.inf > > -[LibraryClasses.common.MM_STANDALONE] > - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > - > MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmMemoryAll > ocationLib/StandaloneMmMemoryAllocationLib.inf > - > MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/Standa > loneMmServicesTableLib.inf > - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > - > StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntry > Point/StandaloneMmDriverEntryPoint.inf > - > VariableReadLib|MinPlatformPkg/Library/SmmVariableReadLib/StandaloneM > mVariableReadLib.inf > - > VariableWriteLib|MinPlatformPkg/Library/SmmVariableWriteLib/Standalone > MmVariableWriteLib.inf > - > > ### > > # > # Components Section - list of the modules and components that will be > processed by compilation > -- > 2.39.2.windows.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118648): https://edk2.groups.io/g/devel/message/118648 Mute This Topic: https://groups.io/mt/104269623/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] AlderlakeOpenBoardPkg: Fix BootStage 5 can't install Windows11.
Pushed as 0ab97ab > -Original Message- > From: Hsueh, DoraX > Sent: Monday, May 6, 2024 2:50 AM > To: devel@edk2.groups.io > Cc: Hsueh, DoraX ; Chaganty, Rangasai V > ; Chuang, Rosen ; > Kasbekar, Saloni ; Tang, Haoyu > ; Desimone, Nathaniel L > ; Chiu, Chasel > Subject: [PATCH] AlderlakeOpenBoardPkg: Fix BootStage 5 can't install > Windows11. > > From: DoraX Hsueh > > https://bugzilla.tianocore.org/show_bug.cgi?id=4665 > > 1. Since installing windows does not meet the minimum system requirements, >Added TPM related code to meet the requirements. > 2. Support stage 6, add FvAdvancedPreMemory. > > Cc: Sai Chaganty > Cc: Rosen Chuang > Cc: Saloni Kasbekar > Cc: Haoyu Tang > Cc: Nate DeSimone > Cc: Chasel Chiu > Signed-off-by: DoraX Hsueh > --- > .../Include/Fdf/FlashMapInclude.fdf | 26 > .../AlderlakePRvp/OpenBoardPkg.dsc| 1 + > .../AlderlakePRvp/OpenBoardPkg.fdf| 66 +-- > .../AlderlakePRvp/OpenBoardPkgPcd.dsc | 10 ++- > 4 files changed, 86 insertions(+), 17 deletions(-) > > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > index 03c198c0..3e515d4e 100644 > --- > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > +++ > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > @@ -26,27 +26,29 @@ SET > gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset = 0x000300 > SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize = > 0x0003 # > > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedOffset= > 0x000E # Flash addr (0xFF0E) > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize = > 0x0031 # > -SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset = > 0x003F # Flash addr (0xFF40) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize = > 0x002E # > +SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset = > 0x003C # Flash addr (0xFF3C) > SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize = > 0x0036 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset= > 0x0075 # Flash addr (0xFF76) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset= > 0x0072 # Flash addr (0xFF72) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecuritySize = > 0x0009 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset = > 0x007E # Flash addr (0xFF7F) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset = > 0x007B # Flash addr (0xFF7B) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootSize= > 0x000A # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset= > 0x0088 # Flash addr (0xFF86) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset= > 0x0085 # Flash addr (0xFF85) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize = > 0x0018 # > > -SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesOffset = > 0x00A0 # Flash addr (0xFFA0) > +SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesOffset = > 0x009D # Flash addr (0xFF9D) > SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesSize = > 0x0008 # Keep 0x8 or larger > -SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset = > 0x00A8 # Flash addr (0xFFA8) > +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset = > 0x00A5 # Flash addr (0xFFA5) > SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize= > 0x0023 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset = > 0x00CB # Flash addr (0xFFCB) > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize= > 0x0004 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset= > 0x00CF # Flash addr (0xFFCF) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset = > 0x00C8 # Flash addr (0xFFC8) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize= > 0x0006 # > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset= > 0x00CE # Flash addr (0xFFCE) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize
Re: [edk2-devel] [PATCH] AlderlakeOpenBoardPkg: Fix BootStage 5 can't install Windows11.
Reviewed-by: Nate DeSimone > -Original Message- > From: Hsueh, DoraX > Sent: Monday, May 6, 2024 2:50 AM > To: devel@edk2.groups.io > Cc: Hsueh, DoraX ; Chaganty, Rangasai V > ; Chuang, Rosen ; > Kasbekar, Saloni ; Tang, Haoyu > ; Desimone, Nathaniel L > ; Chiu, Chasel > Subject: [PATCH] AlderlakeOpenBoardPkg: Fix BootStage 5 can't install > Windows11. > > From: DoraX Hsueh > > https://bugzilla.tianocore.org/show_bug.cgi?id=4665 > > 1. Since installing windows does not meet the minimum system requirements, >Added TPM related code to meet the requirements. > 2. Support stage 6, add FvAdvancedPreMemory. > > Cc: Sai Chaganty > Cc: Rosen Chuang > Cc: Saloni Kasbekar > Cc: Haoyu Tang > Cc: Nate DeSimone > Cc: Chasel Chiu > Signed-off-by: DoraX Hsueh > --- > .../Include/Fdf/FlashMapInclude.fdf | 26 > .../AlderlakePRvp/OpenBoardPkg.dsc| 1 + > .../AlderlakePRvp/OpenBoardPkg.fdf| 66 +-- > .../AlderlakePRvp/OpenBoardPkgPcd.dsc | 10 ++- > 4 files changed, 86 insertions(+), 17 deletions(-) > > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > index 03c198c0..3e515d4e 100644 > --- > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > +++ > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > @@ -26,27 +26,29 @@ SET > gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset = 0x000300 > SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize = > 0x0003 # > > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedOffset= > 0x000E # Flash addr (0xFF0E) > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize = > 0x0031 # > -SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset = > 0x003F # Flash addr (0xFF40) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize = > 0x002E # > +SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset = > 0x003C # Flash addr (0xFF3C) > SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize = > 0x0036 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset= > 0x0075 # Flash addr (0xFF76) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset= > 0x0072 # Flash addr (0xFF72) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecuritySize = > 0x0009 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset = > 0x007E # Flash addr (0xFF7F) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset = > 0x007B # Flash addr (0xFF7B) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootSize= > 0x000A # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset= > 0x0088 # Flash addr (0xFF86) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset= > 0x0085 # Flash addr (0xFF85) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize = > 0x0018 # > > -SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesOffset = > 0x00A0 # Flash addr (0xFFA0) > +SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesOffset = > 0x009D # Flash addr (0xFF9D) > SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesSize = > 0x0008 # Keep 0x8 or larger > -SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset = > 0x00A8 # Flash addr (0xFFA8) > +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset = > 0x00A5 # Flash addr (0xFFA5) > SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize= > 0x0023 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset = > 0x00CB # Flash addr (0xFFCB) > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize= > 0x0004 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset= > 0x00CF # Flash addr (0xFFCF) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset = > 0x00C8 # Flash addr (0xFFC8) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize= > 0x0006 # > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset= > 0x00CE # Flash addr (0xFFCE) > SET gMinPlat
Re: [edk2-devel] [PATCH] AlderlakeOpenBoardPkg: Update to reference RaptorLakeFspBinPkg FSP
Pushed as 7e51d29 > -Original Message- > From: Hsueh, DoraX > Sent: Monday, May 6, 2024 2:42 AM > To: devel@edk2.groups.io > Cc: Hsueh, DoraX ; Chaganty, Rangasai V > ; Chuang, Rosen ; > Kasbekar, Saloni ; Desimone, Nathaniel L > > Subject: [PATCH] AlderlakeOpenBoardPkg: Update to reference > RaptorLakeFspBinPkg FSP > > From: DoraX Hsueh > > https://bugzilla.tianocore.org/show_bug.cgi?id=4771 > > Due to AlderLakeFspBinPkg will not be maintained going forward, ADL > Openboard will reference RaptorLakeFspBinPkg FSP. > > Cc: Sai Chaganty > Cc: Rosen Chuang > Cc: Saloni Kasbekar > Cc: Nate DeSimone > Signed-off-by: DoraX Hsueh > --- > .../Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc | 2 +- > .../Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/build_config.cfg | 2 +- > .../SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf | 2 +- > .../OpenBoardPlatformInitPei/OpenBoardPlatformInitPostMem.inf | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc > index ea92ec75..1af1dd5a 100644 > --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc > +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc > @@ -14,7 +14,7 @@ >DEFINE PLATFORM_PACKAGE= MinPlatformPkg >DEFINE PLATFORM_SI_PACKAGE = AlderlakeSiliconPkg >DEFINE PLATFORM_SI_BIN_PACKAGE = AlderlakeSiliconBinPkg > - DEFINE PLATFORM_FSP_BIN_PACKAGE= > AlderLakeFspBinPkg/Client/AlderLakeP > + DEFINE PLATFORM_FSP_BIN_PACKAGE= > RaptorLakeFspBinPkg/Client/RaptorLakeP >DEFINE PLATFORM_BOARD_PACKAGE = AlderlakeOpenBoardPkg >DEFINE BOARD = AlderlakePRvp >DEFINE PROJECT = > $(PLATFORM_BOARD_PACKAGE)/$(BOARD) > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/build_config.cfg > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/build_config.cfg > index ae391bec..e74a1a4b 100644 > --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/build_config.cfg > +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/build_config.cfg > @@ -26,7 +26,7 @@ TARGET = DEBUG > TARGET_SHORT = D > PERFORMANCE_BUILD = FALSE > FSP_WRAPPER_BUILD = TRUE > -FSP_BIN_PKG = AlderlakeFspBinPkg/Client/AlderlakeP > +FSP_BIN_PKG = RaptorLakeFspBinPkg/Client/RaptorLakeP > FSP_PKG_NAME = AlderlakeSiliconPkg > FSP_BINARY_BUILD = FALSE > FSP_TEST_RELEASE = FALSE > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf > > b/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf > index abc84057..14da8dd7 100644 > --- > a/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf > +++ > b/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf > @@ -64,7 +64,7 @@ >IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec >MinPlatformPkg/MinPlatformPkg.dec >AlderlakeSiliconPkg/SiPkg.dec > - AlderLakeFspBinPkg/Client/AlderLakeP/AlderLakeFspBinPkg.dec > + RaptorLakeFspBinPkg/Client/RaptorLakeP/RaptorLakeFspBinPkg.dec >AlderlakeOpenBoardPkg/OpenBoardPkg.dec > > [LibraryClasses] > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/OpenBoardPlatformInit/OpenBoardPlatformInitPei/OpenBoardPlatformInitPostMem.inf > > b/Platform/Intel/AlderlakeOpenBoardPkg/OpenBoardPlatformInit/OpenBoardPlatformInitPei/OpenBoardPlatformInitPostMem.inf > index 31c01919..09a17fa7 100644 > --- > a/Platform/Intel/AlderlakeOpenBoardPkg/OpenBoardPlatformInit/OpenBoardPlatformInitPei/OpenBoardPlatformInitPostMem.inf > +++ > b/Platform/Intel/AlderlakeOpenBoardPkg/OpenBoardPlatformInit/OpenBoardPlatformInitPei/OpenBoardPlatformInitPostMem.inf > @@ -31,7 +31,7 @@ >UefiCpuPkg/UefiCpuPkg.dec >IntelFsp2Pkg/IntelFsp2Pkg.dec >IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec > - AlderLakeFspBinPkg/Client/AlderLakeP/AlderLakeFspBinPkg.dec > + RaptorLakeFspBinPkg/Client/RaptorLakeP/RaptorLakeFspBinPkg.dec >AlderlakeOpenBoardPkg/OpenBoardPkg.dec >MinPlatformPkg/MinPlatformPkg.dec >IntelSiliconPkg/IntelSiliconPkg.dec > -- > 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118605): https://edk2.groups.io/g/devel/message/118605 Mute This Topic: https://groups.io/mt/105936315/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] AlderlakeOpenBoardPkg: Update to reference RaptorLakeFspBinPkg FSP
Reviewed-by: Nate DeSimone > -Original Message- > From: Hsueh, DoraX > Sent: Monday, May 6, 2024 2:42 AM > To: devel@edk2.groups.io > Cc: Hsueh, DoraX ; Chaganty, Rangasai V > ; Chuang, Rosen ; > Kasbekar, Saloni ; Desimone, Nathaniel L > > Subject: [PATCH] AlderlakeOpenBoardPkg: Update to reference > RaptorLakeFspBinPkg FSP > > From: DoraX Hsueh > > https://bugzilla.tianocore.org/show_bug.cgi?id=4771 > > Due to AlderLakeFspBinPkg will not be maintained going forward, ADL > Openboard will reference RaptorLakeFspBinPkg FSP. > > Cc: Sai Chaganty > Cc: Rosen Chuang > Cc: Saloni Kasbekar > Cc: Nate DeSimone > Signed-off-by: DoraX Hsueh > --- > .../Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc | 2 +- > .../Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/build_config.cfg | 2 +- > .../SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf | 2 +- > .../OpenBoardPlatformInitPei/OpenBoardPlatformInitPostMem.inf | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc > index ea92ec75..1af1dd5a 100644 > --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc > +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc > @@ -14,7 +14,7 @@ >DEFINE PLATFORM_PACKAGE= MinPlatformPkg >DEFINE PLATFORM_SI_PACKAGE = AlderlakeSiliconPkg >DEFINE PLATFORM_SI_BIN_PACKAGE = AlderlakeSiliconBinPkg > - DEFINE PLATFORM_FSP_BIN_PACKAGE= > AlderLakeFspBinPkg/Client/AlderLakeP > + DEFINE PLATFORM_FSP_BIN_PACKAGE= > RaptorLakeFspBinPkg/Client/RaptorLakeP >DEFINE PLATFORM_BOARD_PACKAGE = AlderlakeOpenBoardPkg >DEFINE BOARD = AlderlakePRvp >DEFINE PROJECT = > $(PLATFORM_BOARD_PACKAGE)/$(BOARD) > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/build_config.cfg > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/build_config.cfg > index ae391bec..e74a1a4b 100644 > --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/build_config.cfg > +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/build_config.cfg > @@ -26,7 +26,7 @@ TARGET = DEBUG > TARGET_SHORT = D > PERFORMANCE_BUILD = FALSE > FSP_WRAPPER_BUILD = TRUE > -FSP_BIN_PKG = AlderlakeFspBinPkg/Client/AlderlakeP > +FSP_BIN_PKG = RaptorLakeFspBinPkg/Client/RaptorLakeP > FSP_PKG_NAME = AlderlakeSiliconPkg > FSP_BINARY_BUILD = FALSE > FSP_TEST_RELEASE = FALSE > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf > > b/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf > index abc84057..14da8dd7 100644 > --- > a/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf > +++ > b/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf > @@ -64,7 +64,7 @@ >IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec >MinPlatformPkg/MinPlatformPkg.dec >AlderlakeSiliconPkg/SiPkg.dec > - AlderLakeFspBinPkg/Client/AlderLakeP/AlderLakeFspBinPkg.dec > + RaptorLakeFspBinPkg/Client/RaptorLakeP/RaptorLakeFspBinPkg.dec >AlderlakeOpenBoardPkg/OpenBoardPkg.dec > > [LibraryClasses] > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/OpenBoardPlatformInit/OpenBoardPlatformInitPei/OpenBoardPlatformInitPostMem.inf > > b/Platform/Intel/AlderlakeOpenBoardPkg/OpenBoardPlatformInit/OpenBoardPlatformInitPei/OpenBoardPlatformInitPostMem.inf > index 31c01919..09a17fa7 100644 > --- > a/Platform/Intel/AlderlakeOpenBoardPkg/OpenBoardPlatformInit/OpenBoardPlatformInitPei/OpenBoardPlatformInitPostMem.inf > +++ > b/Platform/Intel/AlderlakeOpenBoardPkg/OpenBoardPlatformInit/OpenBoardPlatformInitPei/OpenBoardPlatformInitPostMem.inf > @@ -31,7 +31,7 @@ >UefiCpuPkg/UefiCpuPkg.dec >IntelFsp2Pkg/IntelFsp2Pkg.dec >IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec > - AlderLakeFspBinPkg/Client/AlderLakeP/AlderLakeFspBinPkg.dec > + RaptorLakeFspBinPkg/Client/RaptorLakeP/RaptorLakeFspBinPkg.dec >AlderlakeOpenBoardPkg/OpenBoardPkg.dec >MinPlatformPkg/MinPlatformPkg.dec >IntelSiliconPkg/IntelSiliconPkg.dec > -- > 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118604): https://edk2.groups.io/g/devel/message/118604 Mute This Topic: https://groups.io/mt/105936315/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] IntelFsp2Pkg/PatchFv.py: FIX for GCC 32BIT build error
Pushed as 248aa15
> -Original Message-
> From: Duggapu, Chinni B
> Sent: Monday, April 22, 2024 9:03 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel ; Desimone, Nathaniel L
> ; Duggapu, Chinni B
> ; S, Ashraf Ali ; Kuo,
> Ted
> Subject: [PATCH] IntelFsp2Pkg/PatchFv.py: FIX for GCC 32BIT build error
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4762
>
> Map file generating 8 byte address offset is not matched with the pattern
> defined in patchFv tool resulting build error.
>
> Cc: Chasel Chiu
> Cc: Nate DeSimone
> Cc: Duggapu Chinni B
> Cc: Ashraf Ali S
> Cc: Ted Kuo
>
> Signed-off-by: Duggapu Chinni B
> ---
> IntelFsp2Pkg/Tools/PatchFv.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/IntelFsp2Pkg/Tools/PatchFv.py b/IntelFsp2Pkg/Tools/PatchFv.py
> index bd9aa71e3c..d35aa1dc9f 100644
> --- a/IntelFsp2Pkg/Tools/PatchFv.py
> +++ b/IntelFsp2Pkg/Tools/PatchFv.py
> @@ -432,7 +432,7 @@ class Symbols:
> if reportLine.strip().find("Archive member included") != -1:
> #GCC
> #0x1d55IoRead8
> -patchMapFileMatchString =
> r"\s+(0x[0-9a-fA-F]{16})\s+([^\s][^0x][_a-zA-Z0-9\-]+)\s"
> +patchMapFileMatchString =
> r"\s+(0x[0-9a-fA-F]{8,16})\s+([^\s][^0x][_a-zA-Z0-9\-]+)\s"
> matchKeyGroupIndex = 2
> matchSymbolGroupIndex = 1
> prefix = '_'
> --
> 2.44.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#118562): https://edk2.groups.io/g/devel/message/118562
Mute This Topic: https://groups.io/mt/105684430/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] IntelFsp2Pkg/PatchFv.py: FIX for GCC 32BIT build error
Reviewed-by: Nate DeSimone
> -Original Message-
> From: Duggapu, Chinni B
> Sent: Monday, April 22, 2024 9:03 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel ; Desimone, Nathaniel L
> ; Duggapu, Chinni B
> ; S, Ashraf Ali ; Kuo,
> Ted
> Subject: [PATCH] IntelFsp2Pkg/PatchFv.py: FIX for GCC 32BIT build error
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4762
>
> Map file generating 8 byte address offset is not matched with the pattern
> defined in patchFv tool resulting build error.
>
> Cc: Chasel Chiu
> Cc: Nate DeSimone
> Cc: Duggapu Chinni B
> Cc: Ashraf Ali S
> Cc: Ted Kuo
>
> Signed-off-by: Duggapu Chinni B
> ---
> IntelFsp2Pkg/Tools/PatchFv.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/IntelFsp2Pkg/Tools/PatchFv.py b/IntelFsp2Pkg/Tools/PatchFv.py
> index bd9aa71e3c..d35aa1dc9f 100644
> --- a/IntelFsp2Pkg/Tools/PatchFv.py
> +++ b/IntelFsp2Pkg/Tools/PatchFv.py
> @@ -432,7 +432,7 @@ class Symbols:
> if reportLine.strip().find("Archive member included") != -1:
> #GCC
> #0x1d55IoRead8
> -patchMapFileMatchString =
> r"\s+(0x[0-9a-fA-F]{16})\s+([^\s][^0x][_a-zA-Z0-9\-]+)\s"
> +patchMapFileMatchString =
> r"\s+(0x[0-9a-fA-F]{8,16})\s+([^\s][^0x][_a-zA-Z0-9\-]+)\s"
> matchKeyGroupIndex = 2
> matchSymbolGroupIndex = 1
> prefix = '_'
> --
> 2.44.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#118547): https://edk2.groups.io/g/devel/message/118547
Mute This Topic: https://groups.io/mt/105684430/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] PACKAGE_GUID duplication in Intel silicon folders
Pushed as d97a14d > -Original Message- > From: Hsueh, DoraX > Sent: Wednesday, May 1, 2024 11:21 PM > To: devel@edk2.groups.io > Cc: Hsueh, DoraX ; Chaganty, Rangasai V > ; Chuang, Rosen > ; Kasbekar, Saloni > ; Desimone, Nathaniel L > ; Lohr, Paul A > Subject: [PATCH] PACKAGE_GUID duplication in Intel silicon folders > > From: DoraX Hsueh > > https://bugzilla.tianocore.org/show_bug.cgi?id=4759 > > Modify PACKAGE_GUID duplication in Intel silicon folders. > > Cc: Sai Chaganty > Cc: Rosen Chuang > Cc: Saloni Kasbekar > Cc: Nate DeSimone > Cc: Paul Lohr > Signed-off-by: DoraX Hsueh > --- > Silicon/Intel/AlderlakeSiliconPkg/SiPkg.dec | 2 +- > Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec | 2 +- > Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec | 2 +- > Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Silicon/Intel/AlderlakeSiliconPkg/SiPkg.dec > b/Silicon/Intel/AlderlakeSiliconPkg/SiPkg.dec > index aafce7a6..d6dc6eb9 100644 > --- a/Silicon/Intel/AlderlakeSiliconPkg/SiPkg.dec > +++ b/Silicon/Intel/AlderlakeSiliconPkg/SiPkg.dec > @@ -10,7 +10,7 @@ > DEC_SPECIFICATION = 0x00010017 > PACKAGE_NAME = SiPkg > PACKAGE_VERSION = 0.1 > -PACKAGE_GUID = F245E276-44A0-46b3-AEB5-9898BBCF008D > +PACKAGE_GUID = 1CAF6538-7B9C-4188-B928-17F7DD953DCF > > [Includes.Common.Private] > > diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec > b/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec > index ca3e83bd..d96ff820 100644 > --- a/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec > +++ b/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec > @@ -11,7 +11,7 @@ > DEC_SPECIFICATION = 0x00010017 > PACKAGE_NAME = SiPkg > PACKAGE_VERSION = 0.1 > -PACKAGE_GUID = F245E276-44A0-46b3-AEB5-9898BBCF008D > +PACKAGE_GUID = CA5148B1-3BB0-4D2D-AC3F-5497C8FEFB3D > > [Includes] >Include > diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec > b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec > index 6c9af567..83c4beb4 100644 > --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec > +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec > @@ -12,7 +12,7 @@ > DEC_SPECIFICATION = 0x00010017 > PACKAGE_NAME = SiPkg > PACKAGE_VERSION = 0.1 > -PACKAGE_GUID = F245E276-44A0-46b3-AEB5-9898BBCF008D > +PACKAGE_GUID = 3043D26F-2A8C-441F-AFD9-8E80B7D65C7A > > > [Includes] > diff --git a/Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec > b/Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec > index 991ca155..5fc4099f 100644 > --- a/Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec > +++ b/Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec > @@ -11,7 +11,7 @@ > DEC_SPECIFICATION = 0x00010017 > PACKAGE_NAME = SiPkg > PACKAGE_VERSION = 0.1 > -PACKAGE_GUID = F245E276-44A0-46b3-AEB5-9898BBCF008D > +PACKAGE_GUID = 0DEADE0D-B5F7-45D0-915F-77DB2497D270 > > [Includes.Common.Private] > > -- > 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118546): https://edk2.groups.io/g/devel/message/118546 Mute This Topic: https://groups.io/mt/105858243/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] PACKAGE_GUID duplication in Intel silicon folders
Reviewed-by: Nate DeSimone > -Original Message- > From: Hsueh, DoraX > Sent: Wednesday, May 1, 2024 11:21 PM > To: devel@edk2.groups.io > Cc: Hsueh, DoraX ; Chaganty, Rangasai V > ; Chuang, Rosen ; > Kasbekar, Saloni ; Desimone, Nathaniel L > ; Lohr, Paul A > Subject: [PATCH] PACKAGE_GUID duplication in Intel silicon folders > > From: DoraX Hsueh > > https://bugzilla.tianocore.org/show_bug.cgi?id=4759 > > Modify PACKAGE_GUID duplication in Intel silicon folders. > > Cc: Sai Chaganty > Cc: Rosen Chuang > Cc: Saloni Kasbekar > Cc: Nate DeSimone > Cc: Paul Lohr > Signed-off-by: DoraX Hsueh > --- > Silicon/Intel/AlderlakeSiliconPkg/SiPkg.dec | 2 +- > Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec | 2 +- > Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec | 2 +- > Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Silicon/Intel/AlderlakeSiliconPkg/SiPkg.dec > b/Silicon/Intel/AlderlakeSiliconPkg/SiPkg.dec > index aafce7a6..d6dc6eb9 100644 > --- a/Silicon/Intel/AlderlakeSiliconPkg/SiPkg.dec > +++ b/Silicon/Intel/AlderlakeSiliconPkg/SiPkg.dec > @@ -10,7 +10,7 @@ > DEC_SPECIFICATION = 0x00010017 > PACKAGE_NAME = SiPkg > PACKAGE_VERSION = 0.1 > -PACKAGE_GUID = F245E276-44A0-46b3-AEB5-9898BBCF008D > +PACKAGE_GUID = 1CAF6538-7B9C-4188-B928-17F7DD953DCF > > [Includes.Common.Private] > > diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec > b/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec > index ca3e83bd..d96ff820 100644 > --- a/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec > +++ b/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec > @@ -11,7 +11,7 @@ > DEC_SPECIFICATION = 0x00010017 > PACKAGE_NAME = SiPkg > PACKAGE_VERSION = 0.1 > -PACKAGE_GUID = F245E276-44A0-46b3-AEB5-9898BBCF008D > +PACKAGE_GUID = CA5148B1-3BB0-4D2D-AC3F-5497C8FEFB3D > > [Includes] >Include > diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec > b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec > index 6c9af567..83c4beb4 100644 > --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec > +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec > @@ -12,7 +12,7 @@ > DEC_SPECIFICATION = 0x00010017 > PACKAGE_NAME = SiPkg > PACKAGE_VERSION = 0.1 > -PACKAGE_GUID = F245E276-44A0-46b3-AEB5-9898BBCF008D > +PACKAGE_GUID = 3043D26F-2A8C-441F-AFD9-8E80B7D65C7A > > > [Includes] > diff --git a/Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec > b/Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec > index 991ca155..5fc4099f 100644 > --- a/Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec > +++ b/Silicon/Intel/TigerlakeSiliconPkg/SiPkg.dec > @@ -11,7 +11,7 @@ > DEC_SPECIFICATION = 0x00010017 > PACKAGE_NAME = SiPkg > PACKAGE_VERSION = 0.1 > -PACKAGE_GUID = F245E276-44A0-46b3-AEB5-9898BBCF008D > +PACKAGE_GUID = 0DEADE0D-B5F7-45D0-915F-77DB2497D270 > > [Includes.Common.Private] > > -- > 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118545): https://edk2.groups.io/g/devel/message/118545 Mute This Topic: https://groups.io/mt/105858243/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] AlderlakeOpenBoardPkg: Halt the TCO timer.
Pushed as 0eb01a2
> -Original Message-
> From: Hsueh, DoraX
> Sent: Monday, April 22, 2024 1:40 AM
> To: devel@edk2.groups.io
> Cc: Hsueh, DoraX ; Chaganty, Rangasai V
> ; Chuang, Rosen ;
> Kasbekar, Saloni ; Tang, Haoyu
> ; Desimone, Nathaniel L
> ; Chiu, Chasel
> Subject: [PATCH] AlderlakeOpenBoardPkg: Halt the TCO timer.
>
> From: DoraX Hsueh
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=4761
>
> Halt the TCO timer to fix release mode hang.
>
> Cc: Sai Chaganty
> Cc: Rosen Chuang
> Cc: Saloni Kasbekar
> Cc: Haoyu Tang
> Cc: Nate DeSimone
> Cc: Chasel Chiu
> Signed-off-by: DoraX Hsueh
> ---
> .../AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc | 3 ++-
> .../Library/SecFspWrapperPlatformSecLib/PlatformInit.c| 8
> .../SecFspWrapperPlatformSecLib.inf | 1 +
> 3 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git
> a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc
> b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc
> index 59350f06..ea92ec75 100644
> --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc
> +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc
> @@ -233,8 +233,9 @@
>
> [LibraryClasses.X64.DXE_SMM_DRIVER]
>
> -!if $(TARGET) == DEBUG
>
> SpiFlashCommonLib|IntelSiliconPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
> +
> +!if $(TARGET) == DEBUG
>
> TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.inf
>
> TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.inf
> !endif
> diff --git
> a/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/PlatformInit.c
>
> b/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/PlatformInit.c
> index f7ec4f9e..e930c9c7 100644
> ---
> a/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/PlatformInit.c
> +++
> b/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/PlatformInit.c
> @@ -12,6 +12,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> #include
> #include
> #include
> +#include
> +#include
>
> /**
>Platform initialization.
> @@ -28,6 +30,12 @@ PlatformInit (
>IN VOID *EndOfRange
>)
> {
> +
> + ///
> + /// Halt the TCO timer as early as possible
> + ///
> + IoWrite16 (PcdGet16 (PcdTcoBaseAddress) + R_TCO_IO_TCO1_CNT,
> B_TCO_IO_TCO1_CNT_TMR_HLT);
> +
>//
>// Platform initialization
>// Enable Serial port here
> diff --git
> a/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
>
> b/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
> index 3e51cb36..abc84057 100644
> ---
> a/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
> +++
> b/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
> @@ -89,6 +89,7 @@
>gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress ##
> CONSUMES
>gIntelFsp2PkgTokenSpaceGuid.PcdFspTemporaryRamSize ##
> CONSUMES
>gMinPlatformPkgTokenSpaceGuid.PcdSecSerialPortDebugEnable ##
> CONSUMES
> + gSiPkgTokenSpaceGuid.PcdTcoBaseAddress ##
> CONSUMES
>
> [FixedPcd]
>gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase ##
> CONSUMES
> --
> 2.26.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#118544): https://edk2.groups.io/g/devel/message/118544
Mute This Topic: https://groups.io/mt/105665490/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] AlderlakeOpenBoardPkg: Halt the TCO timer.
Reviewed-by: Nate DeSimone
> -Original Message-
> From: Hsueh, DoraX
> Sent: Monday, April 22, 2024 1:40 AM
> To: devel@edk2.groups.io
> Cc: Hsueh, DoraX ; Chaganty, Rangasai V
> ; Chuang, Rosen ;
> Kasbekar, Saloni ; Tang, Haoyu
> ; Desimone, Nathaniel L
> ; Chiu, Chasel
> Subject: [PATCH] AlderlakeOpenBoardPkg: Halt the TCO timer.
>
> From: DoraX Hsueh
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=4761
>
> Halt the TCO timer to fix release mode hang.
>
> Cc: Sai Chaganty
> Cc: Rosen Chuang
> Cc: Saloni Kasbekar
> Cc: Haoyu Tang
> Cc: Nate DeSimone
> Cc: Chasel Chiu
> Signed-off-by: DoraX Hsueh
> ---
> .../AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc | 3 ++-
> .../Library/SecFspWrapperPlatformSecLib/PlatformInit.c| 8
> .../SecFspWrapperPlatformSecLib.inf | 1 +
> 3 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git
> a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc
> b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc
> index 59350f06..ea92ec75 100644
> --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc
> +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc
> @@ -233,8 +233,9 @@
>
> [LibraryClasses.X64.DXE_SMM_DRIVER]
>
> -!if $(TARGET) == DEBUG
>
> SpiFlashCommonLib|IntelSiliconPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
> +
> +!if $(TARGET) == DEBUG
>
> TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.inf
>
> TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.inf
> !endif
> diff --git
> a/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/PlatformInit.c
>
> b/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/PlatformInit.c
> index f7ec4f9e..e930c9c7 100644
> ---
> a/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/PlatformInit.c
> +++
> b/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/PlatformInit.c
> @@ -12,6 +12,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> #include
> #include
> #include
> +#include
> +#include
>
> /**
>Platform initialization.
> @@ -28,6 +30,12 @@ PlatformInit (
>IN VOID *EndOfRange
>)
> {
> +
> + ///
> + /// Halt the TCO timer as early as possible
> + ///
> + IoWrite16 (PcdGet16 (PcdTcoBaseAddress) + R_TCO_IO_TCO1_CNT,
> B_TCO_IO_TCO1_CNT_TMR_HLT);
> +
>//
>// Platform initialization
>// Enable Serial port here
> diff --git
> a/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
>
> b/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
> index 3e51cb36..abc84057 100644
> ---
> a/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
> +++
> b/Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
> @@ -89,6 +89,7 @@
>gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress ##
> CONSUMES
>gIntelFsp2PkgTokenSpaceGuid.PcdFspTemporaryRamSize ##
> CONSUMES
>gMinPlatformPkgTokenSpaceGuid.PcdSecSerialPortDebugEnable ##
> CONSUMES
> + gSiPkgTokenSpaceGuid.PcdTcoBaseAddress ##
> CONSUMES
>
> [FixedPcd]
>gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase ##
> CONSUMES
> --
> 2.26.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#118543): https://edk2.groups.io/g/devel/message/118543
Mute This Topic: https://groups.io/mt/105665490/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] AlderlakeOpenBoardPkg: Fix BootStage 5 can't install Windows11.
Hi Dora, Feedback below. Thanks, Nate > -Original Message- > From: Hsueh, DoraX > Sent: Monday, April 22, 2024 1:37 AM > To: devel@edk2.groups.io > Cc: Hsueh, DoraX ; Chaganty, Rangasai V > ; Chuang, Rosen ; > Kasbekar, Saloni ; Tang, Haoyu > ; Desimone, Nathaniel L > ; Chiu, Chasel > Subject: [PATCH] AlderlakeOpenBoardPkg: Fix BootStage 5 can't install > Windows11. > > From: DoraX Hsueh > > https://bugzilla.tianocore.org/show_bug.cgi?id=4665 > > 1. Since installing windows does not meet the minimum system requirements, >Added TPM related code to meet the requirements. > 2. Support stage 6, add FvAdvancedPreMemory. > > Cc: Sai Chaganty > Cc: Rosen Chuang > Cc: Saloni Kasbekar > Cc: Haoyu Tang > Cc: Nate DeSimone > Cc: Chasel Chiu > Signed-off-by: DoraX Hsueh > --- > .../Include/Fdf/FlashMapInclude.fdf | 26 +++-- > .../AlderlakePRvp/OpenBoardPkg.dsc| 1 + > .../AlderlakePRvp/OpenBoardPkg.fdf| 37 +-- > .../AlderlakePRvp/OpenBoardPkgPcd.dsc | 10 - > 4 files changed, 57 insertions(+), 17 deletions(-) > > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > index 03c198c0..3e515d4e 100644 > --- > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > +++ > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > @@ -26,27 +26,29 @@ SET > gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset = 0x000300 > SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize = > 0x0003 # > > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedOffset= > 0x000E # Flash addr (0xFF0E) > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize = > 0x0031 # > -SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset = > 0x003F # Flash addr (0xFF40) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize = > 0x002E # > +SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset = > 0x003C # Flash addr (0xFF3C) > SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize = > 0x0036 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset= > 0x0075 # Flash addr (0xFF76) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset= > 0x0072 # Flash addr (0xFF72) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecuritySize = > 0x0009 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset = > 0x007E # Flash addr (0xFF7F) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset = > 0x007B # Flash addr (0xFF7B) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootSize= > 0x000A # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset= > 0x0088 # Flash addr (0xFF86) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset= > 0x0085 # Flash addr (0xFF85) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize = > 0x0018 # > > -SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesOffset = > 0x00A0 # Flash addr (0xFFA0) > +SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesOffset = > 0x009D # Flash addr (0xFF9D) > SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesSize = > 0x0008 # Keep 0x8 or larger > -SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset = > 0x00A8 # Flash addr (0xFFA8) > +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset = > 0x00A5 # Flash addr (0xFFA5) > SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize= > 0x0023 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset = > 0x00CB # Flash addr (0xFFCB) > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize= > 0x0004 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset= > 0x00CF # Flash addr (0xFFCF) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset = > 0x00C8 # Flash addr (0xFFC8) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize= > 0x0006 # > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset= > 0x00CE # Flash addr (0xFFCE) > SET gMinPlat
Re: [edk2-devel] [PATCH] Readme.md: Update AlderlakeOpenBoardPkg known limitations.
Hi Dora, Feedback below. Thanks, Nate > -Original Message- > From: Hsueh, DoraX > Sent: Monday, April 22, 2024 1:39 AM > To: devel@edk2.groups.io > Cc: Hsueh, DoraX ; Chaganty, Rangasai V > ; Chuang, Rosen ; > Kasbekar, Saloni ; Tang, Haoyu > ; Desimone, Nathaniel L > ; Chiu, Chasel > Subject: [PATCH] Readme.md: Update AlderlakeOpenBoardPkg known > limitations. > > From: DoraX Hsueh > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4667 > > Updates Alderlake P Rvp details to the Readme.md. > > Cc: Sai Chaganty > Cc: Rosen Chuang > Cc: Saloni Kasbekar > Cc: Haoyu Tang > Cc: Nate DeSimone > Cc: Chasel Chiu > Signed-off-by: DoraX Hsueh > --- > Platform/Intel/Readme.md | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Platform/Intel/Readme.md b/Platform/Intel/Readme.md > index d29a9072..652b4ec5 100644 > --- a/Platform/Intel/Readme.md > +++ b/Platform/Intel/Readme.md > @@ -410,7 +410,9 @@ For PurleyOpenBoardPkg (TiogaPass) > > **AlderlakeOpenBoardPkg** > 1. This firmware project has been tested booting to Microsoft Windows 11 x64 > with M2 SSD Disk and Integrated Graphic Device. > -2. AlderlakeOpenBoardPkg/Acpi/MinDsdt has been modified from > MinPlatformPkg/Acpi/MinDsdt to avoid hang on boot to Microsoft Windows 11 x64. > +2. Since the FSP binary is incompatible with the latest Edk2 version, a > working edk2 version needs to be kept > + EDK2 SHA-1: e10f1f5a043a402fb2daf2091b8f725fd2951743 > + EDK2-Platforms SHA-1: fc6e3523d868650ad4f8aaac0ccdd8f138370341 It is non-sense to list a required SHA for edk2-platforms when you are modifying a package that is inside edk2-platforms. This act of modification will result in a different SHA for edk2-platforms. > > **WhitleyOpenBoardPkg** > 1. This firmware project has been tested booting to UEFI shell with headless > serial console > -- > 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118541): https://edk2.groups.io/g/devel/message/118541 Mute This Topic: https://groups.io/mt/105666152/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] AlderlakeOpenBoardPkg: Change MinPlatform MinDsdt and Update SpiFlashCommonLib
Pushed as 39bb294 > -Original Message- > From: Hsueh, DoraX > Sent: Monday, March 25, 2024 10:48 PM > To: devel@edk2.groups.io > Cc: Hsueh, DoraX ; Chaganty, Rangasai V > ; Chuang, Rosen ; > Kasbekar, Saloni ; Tang, Haoyu > ; Desimone, Nathaniel L > > Subject: [PATCH] AlderlakeOpenBoardPkg: Change MinPlatform MinDsdt and > Update SpiFlashCommonLib > > From: DoraX Hsueh > > https://bugzilla.tianocore.org/show_bug.cgi?id=4662 > > 1. Change MinPlatform MinDsdt to fix hang logo issue. > 2. Update SecFspWrapperPlatformSecLib for FSP use. > 3. Update SpiFlashCommonLib to fix boot assert issue. > 4. Create SmmLocked callback to fix assert > > Cc: Sai Chaganty > Cc: Rosen Chuang > Cc: Saloni Kasbekar > Cc: Haoyu Tang > Cc: Nate DeSimone > Signed-off-by: DoraX Hsueh > --- > .../Acpi/MinDsdt/MinDsdt.asl | 68 --- > .../Acpi/MinDsdt/MinDsdt.c| 232 --- > .../Acpi/MinDsdt/MinDsdt.inf | 48 --- > .../AlderlakePRvp/OpenBoardPkg.dsc| 6 +- > .../AlderlakePRvp/OpenBoardPkg.fdf| 2 +- > .../AlderlakePRvp/OpenBoardPkgPcd.dsc | 8 + > .../FspWrapperPlatformSecLib.c| 186 + > .../SecFspWrapperPlatformSecLib/FsptCoreUpd.h | 394 ++ > .../SecFspWrapperPlatformSecLib/Ia32/Fsp.h| 42 ++ > .../Ia32/PeiCoreEntry.nasm| 130 ++ > .../Ia32/SecEntry.nasm| 361 > .../Ia32/Stack.nasm | 72 > .../PlatformInit.c| 47 +++ > .../SecFspWrapperPlatformSecLib.inf | 106 + > .../SecGetPerformance.c | 89 > .../SecPlatformInformation.c | 78 > .../SecRamInitData.c | 57 +++ > .../SecTempRamDone.c | 93 + > .../Include/Library/SpiFlashCommon.h | 99 - > .../SmmSpiFlashCommonLib.inf | 49 --- > .../SmmSpiFlashCommonLib/SpiFlashCommon.c | 215 -- > .../SpiFlashCommonSmmLib.c| 60 --- > .../OpenBoardPlatformInitPostMem.c| 96 + > .../OpenBoardPlatformInitPostMem.inf | 20 - > .../DxeSaPolicyInit.c | 71 > .../DxeSiliconPolicyUpdateLib.inf | 2 + > .../PeiCpuPolicyUpdatePreMem.c| 3 - > .../PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf | 3 +- > 28 files changed, 1742 insertions(+), 895 deletions(-) > delete mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/Acpi/MinDsdt/MinDsdt.asl > delete mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/Acpi/MinDsdt/MinDsdt.c > delete mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/Acpi/MinDsdt/MinDsdt.inf > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FspWrapperPlatformSecLib.c > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FsptCoreUpd.h > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Fsp.h > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.nasm > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.nasm > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Stack.nasm > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/PlatformInit.c > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecGetPerformance.c > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecPlatformInformation.c > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecRamInitData.c > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecTempRamDone.c > delete mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/Include/Library/SpiFlashCommon.h > delete mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf > delete mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c > delete mode 100644 > Plat
Re: [edk2-devel] [PATCH] AlderlakeOpenBoardPkg: Change MinPlatform MinDsdt and Update SpiFlashCommonLib
Reviewed-by: Nate DeSimone > -Original Message- > From: Hsueh, DoraX > Sent: Monday, March 25, 2024 10:48 PM > To: devel@edk2.groups.io > Cc: Hsueh, DoraX ; Chaganty, Rangasai V > ; Chuang, Rosen ; > Kasbekar, Saloni ; Tang, Haoyu > ; Desimone, Nathaniel L > > Subject: [PATCH] AlderlakeOpenBoardPkg: Change MinPlatform MinDsdt and > Update SpiFlashCommonLib > > From: DoraX Hsueh > > https://bugzilla.tianocore.org/show_bug.cgi?id=4662 > > 1. Change MinPlatform MinDsdt to fix hang logo issue. > 2. Update SecFspWrapperPlatformSecLib for FSP use. > 3. Update SpiFlashCommonLib to fix boot assert issue. > 4. Create SmmLocked callback to fix assert > > Cc: Sai Chaganty > Cc: Rosen Chuang > Cc: Saloni Kasbekar > Cc: Haoyu Tang > Cc: Nate DeSimone > Signed-off-by: DoraX Hsueh > --- > .../Acpi/MinDsdt/MinDsdt.asl | 68 --- > .../Acpi/MinDsdt/MinDsdt.c| 232 --- > .../Acpi/MinDsdt/MinDsdt.inf | 48 --- > .../AlderlakePRvp/OpenBoardPkg.dsc| 6 +- > .../AlderlakePRvp/OpenBoardPkg.fdf| 2 +- > .../AlderlakePRvp/OpenBoardPkgPcd.dsc | 8 + > .../FspWrapperPlatformSecLib.c| 186 + > .../SecFspWrapperPlatformSecLib/FsptCoreUpd.h | 394 ++ > .../SecFspWrapperPlatformSecLib/Ia32/Fsp.h| 42 ++ > .../Ia32/PeiCoreEntry.nasm| 130 ++ > .../Ia32/SecEntry.nasm| 361 > .../Ia32/Stack.nasm | 72 > .../PlatformInit.c| 47 +++ > .../SecFspWrapperPlatformSecLib.inf | 106 + > .../SecGetPerformance.c | 89 > .../SecPlatformInformation.c | 78 > .../SecRamInitData.c | 57 +++ > .../SecTempRamDone.c | 93 + > .../Include/Library/SpiFlashCommon.h | 99 - > .../SmmSpiFlashCommonLib.inf | 49 --- > .../SmmSpiFlashCommonLib/SpiFlashCommon.c | 215 -- > .../SpiFlashCommonSmmLib.c| 60 --- > .../OpenBoardPlatformInitPostMem.c| 96 + > .../OpenBoardPlatformInitPostMem.inf | 20 - > .../DxeSaPolicyInit.c | 71 > .../DxeSiliconPolicyUpdateLib.inf | 2 + > .../PeiCpuPolicyUpdatePreMem.c| 3 - > .../PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf | 3 +- > 28 files changed, 1742 insertions(+), 895 deletions(-) > delete mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/Acpi/MinDsdt/MinDsdt.asl > delete mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/Acpi/MinDsdt/MinDsdt.c > delete mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/Acpi/MinDsdt/MinDsdt.inf > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FspWrapperPlatformSecLib.c > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FsptCoreUpd.h > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Fsp.h > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.nasm > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.nasm > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Stack.nasm > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/PlatformInit.c > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecGetPerformance.c > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecPlatformInformation.c > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecRamInitData.c > create mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecTempRamDone.c > delete mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/Include/Library/SpiFlashCommon.h > delete mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf > delete mode 100644 > Platform/Intel/AlderlakeOpenBoardPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c > delete mode 100644
Re: [edk2-devel] [PATCH] AlderlakeSiliconPkg: Update for SPI2 Protocol and Identify flash regions by GUID
Pushed as e0051bc
> -Original Message-
> From: devel@edk2.groups.io On Behalf Of
> dorax.hs...@intel.com
> Sent: Thursday, February 1, 2024 10:32 PM
> To: devel@edk2.groups.io
> Cc: Hsueh, DoraX ; Chaganty, Rangasai V
> ; Chuang, Rosen ;
> Kasbekar, Saloni ; Tang, Haoyu
>
> Subject: [edk2-devel] [PATCH] AlderlakeSiliconPkg: Update for SPI2 Protocol
> and Identify flash regions by GUID
>
> From: DoraX Hsueh
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=4664
>
> 1. Updates references to the "PCH_SPI_PROTOCOL" to instead refer to
> "PCH_SPI2_PROTOCOL".
> 2. Updates the library to identify flash regions by GUID and internally
> map the GUID entries to values specific to AlderlakeSiliconPkg.
> 3. Libs/modules that need to reference IntelSiliconPkg are updated.
> 4. Add gUsbConfigGuid to fix USB not working issue in OS.
>
> Cc: Sai Chaganty
> Cc: Rosen Chuang
> Cc: Saloni Kasbekar
> Cc: Haoyu Tang
> Signed-off-by: DoraX Hsueh
> ---
> .../Cpu/Include/Register/CommonMsr.h | 4 +
> .../Fru/AdlPch/CommonLib.dsc | 2 +-
> .../AlderlakeSiliconPkg/Fru/AdlPch/PeiLib.dsc | 2 -
> .../Include/Library/SpiAccessLib.h| 44 ++
> .../Include/Register/PttPtpRegs.h | 26 +
> .../Include/Register/TcoRegs.h| 1 +
> .../Spi/IncludePrivate/Library/SpiCommonLib.h | 60 +--
> .../Spi/IncludePrivate/Register/SpiRegs.h | 8 +-
> .../PeiDxeSmmSpiAccessLib.inf | 33 ++
> .../PeiDxeSmmSpiAccessLib/SpiAccessLib.c | 75 +++
> .../IpBlock/Spi/Library/PeiSpiLib/PchSpi.c| 2 +-
> .../Spi/Library/PeiSpiLib/PeiSpiLib.inf | 2 +-
> .../BaseSpiCommonLib/BaseSpiCommonLib.inf | 19 +-
> .../BaseSpiCommonLib/SpiCommon.c | 491 --
> .../AlderlakeSiliconPkg/IpBlock/Spi/Smm/Spi.c | 30 +-
> .../IpBlock/Spi/Smm/SpiSmm.inf| 5 +-
> .../IncludePrivate/Library/SmmPchPrivateLib.h | 27 +
> .../SmmPchPrivateLib/SmmPchPrivateLib.c | 61 +++
> .../SmmPchPrivateLib/SmmPchPrivateLib.inf | 32 ++
> .../Product/Alderlake/SiPkgDxeLib.dsc | 5 +
> Silicon/Intel/AlderlakeSiliconPkg/SiPkg.dec | 4 +-
> 21 files changed, 733 insertions(+), 200 deletions(-)
> create mode 100644
> Silicon/Intel/AlderlakeSiliconPkg/Include/Library/SpiAccessLib.h
> create mode 100644
> Silicon/Intel/AlderlakeSiliconPkg/Include/Register/PttPtpRegs.h
> create mode 100644
> Silicon/Intel/AlderlakeSiliconPkg/IpBlock/Spi/Library/PeiDxeSmmSpiAccessLib/PeiDxeSmmSpiAccessLib.inf
> create mode 100644
> Silicon/Intel/AlderlakeSiliconPkg/IpBlock/Spi/Library/PeiDxeSmmSpiAccessLib/SpiAccessLib.c
> create mode 100644
> Silicon/Intel/AlderlakeSiliconPkg/Pch/IncludePrivate/Library/SmmPchPrivateLib.h
> create mode 100644
> Silicon/Intel/AlderlakeSiliconPkg/Pch/LibraryPrivate/SmmPchPrivateLib/SmmPchPrivateLib.c
> create mode 100644
> Silicon/Intel/AlderlakeSiliconPkg/Pch/LibraryPrivate/SmmPchPrivateLib/SmmPchPrivateLib.inf
>
> diff --git
> a/Silicon/Intel/AlderlakeSiliconPkg/Cpu/Include/Register/CommonMsr.h
> b/Silicon/Intel/AlderlakeSiliconPkg/Cpu/Include/Register/CommonMsr.h
> index caa0e67b..44a476c0 100644
> --- a/Silicon/Intel/AlderlakeSiliconPkg/Cpu/Include/Register/CommonMsr.h
> +++ b/Silicon/Intel/AlderlakeSiliconPkg/Cpu/Include/Register/CommonMsr.h
> @@ -56,5 +56,9 @@ typedef union {
>
> } MSR_CORE_THREAD_COUNT_REGISTER;
>
> +/**
> + Special Chipset Usage MSR
> +**/
> +#define MSR_SPCL_CHIPSET_USAGE 0x01FE
>
> #endif /* _COMMONMSR_h */
> diff --git a/Silicon/Intel/AlderlakeSiliconPkg/Fru/AdlPch/CommonLib.dsc
> b/Silicon/Intel/AlderlakeSiliconPkg/Fru/AdlPch/CommonLib.dsc
> index 3f508f83..ee5800a9 100644
> --- a/Silicon/Intel/AlderlakeSiliconPkg/Fru/AdlPch/CommonLib.dsc
> +++ b/Silicon/Intel/AlderlakeSiliconPkg/Fru/AdlPch/CommonLib.dsc
> @@ -11,7 +11,7 @@
>
>
> EspiLib|$(PLATFORM_SI_PACKAGE)/IpBlock/Espi/Library/PeiDxeSmmEspiLib/PeiDxeSmmEspiLib.inf
>
> -
> +
> SpiAccessLib|$(PLATFORM_SI_PACKAGE)/IpBlock/Spi/Library/PeiDxeSmmSpiAccessLib/PeiDxeSmmSpiAccessLib.inf
>
> PmcLib|$(PLATFORM_SI_PACKAGE)/IpBlock/Pmc/Library/PeiDxeSmmPmcLib/PeiDxeSmmPmcLib.inf
>
> PmcPrivateLib|$(PLATFORM_SI_PACKAGE)/IpBlock/Pmc/LibraryPrivate/PeiDxeSmmPmcPrivateLib/PeiDxeSmmPmcPrivateLib.inf
>
> SpiCommonLib|$(PLATFORM_SI_PACKAGE)/IpBlock/Spi/LibraryPrivate/BaseSpiCommonLib/BaseSpiCommonLib.inf
> diff --git a/Silicon/Intel/AlderlakeSiliconPkg/Fru/AdlPch/PeiLib.dsc
> b/Silicon/Intel/AlderlakeSiliconPkg/Fru/AdlPch/PeiLib.dsc
> index ebe2bbfd..cbaf8e37 100644
> --- a/Silicon/Intel/AlderlakeSiliconPkg/Fru/AdlPch/PeiLib.dsc
> +++ b/Silicon/Intel/AlderlakeSiliconPkg/Fru/AdlPch/PeiLib.dsc
> @@ -5,8 +5,6 @@
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> ##
>
> - SpiLib|$(PLATFORM_SI_PACKAGE)/IpBlock/Spi/Library/PeiSpiLib/PeiSpiLib.inf
> -
>
>
Re: [edk2-devel] [PATCH] AlderlakeSiliconPkg: Update for SPI2 Protocol and Identify flash regions by GUID
Reviewed-by: Nate DeSimone
> -Original Message-
> From: devel@edk2.groups.io On Behalf Of
> dorax.hs...@intel.com
> Sent: Thursday, February 1, 2024 10:32 PM
> To: devel@edk2.groups.io
> Cc: Hsueh, DoraX ; Chaganty, Rangasai V
> ; Chuang, Rosen ;
> Kasbekar, Saloni ; Tang, Haoyu
>
> Subject: [edk2-devel] [PATCH] AlderlakeSiliconPkg: Update for SPI2 Protocol
> and Identify flash regions by GUID
>
> From: DoraX Hsueh
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=4664
>
> 1. Updates references to the "PCH_SPI_PROTOCOL" to instead refer to
> "PCH_SPI2_PROTOCOL".
> 2. Updates the library to identify flash regions by GUID and internally
> map the GUID entries to values specific to AlderlakeSiliconPkg.
> 3. Libs/modules that need to reference IntelSiliconPkg are updated.
> 4. Add gUsbConfigGuid to fix USB not working issue in OS.
>
> Cc: Sai Chaganty
> Cc: Rosen Chuang
> Cc: Saloni Kasbekar
> Cc: Haoyu Tang
> Signed-off-by: DoraX Hsueh
> ---
> .../Cpu/Include/Register/CommonMsr.h | 4 +
> .../Fru/AdlPch/CommonLib.dsc | 2 +-
> .../AlderlakeSiliconPkg/Fru/AdlPch/PeiLib.dsc | 2 -
> .../Include/Library/SpiAccessLib.h| 44 ++
> .../Include/Register/PttPtpRegs.h | 26 +
> .../Include/Register/TcoRegs.h| 1 +
> .../Spi/IncludePrivate/Library/SpiCommonLib.h | 60 +--
> .../Spi/IncludePrivate/Register/SpiRegs.h | 8 +-
> .../PeiDxeSmmSpiAccessLib.inf | 33 ++
> .../PeiDxeSmmSpiAccessLib/SpiAccessLib.c | 75 +++
> .../IpBlock/Spi/Library/PeiSpiLib/PchSpi.c| 2 +-
> .../Spi/Library/PeiSpiLib/PeiSpiLib.inf | 2 +-
> .../BaseSpiCommonLib/BaseSpiCommonLib.inf | 19 +-
> .../BaseSpiCommonLib/SpiCommon.c | 491 --
> .../AlderlakeSiliconPkg/IpBlock/Spi/Smm/Spi.c | 30 +-
> .../IpBlock/Spi/Smm/SpiSmm.inf| 5 +-
> .../IncludePrivate/Library/SmmPchPrivateLib.h | 27 +
> .../SmmPchPrivateLib/SmmPchPrivateLib.c | 61 +++
> .../SmmPchPrivateLib/SmmPchPrivateLib.inf | 32 ++
> .../Product/Alderlake/SiPkgDxeLib.dsc | 5 +
> Silicon/Intel/AlderlakeSiliconPkg/SiPkg.dec | 4 +-
> 21 files changed, 733 insertions(+), 200 deletions(-)
> create mode 100644
> Silicon/Intel/AlderlakeSiliconPkg/Include/Library/SpiAccessLib.h
> create mode 100644
> Silicon/Intel/AlderlakeSiliconPkg/Include/Register/PttPtpRegs.h
> create mode 100644
> Silicon/Intel/AlderlakeSiliconPkg/IpBlock/Spi/Library/PeiDxeSmmSpiAccessLib/PeiDxeSmmSpiAccessLib.inf
> create mode 100644
> Silicon/Intel/AlderlakeSiliconPkg/IpBlock/Spi/Library/PeiDxeSmmSpiAccessLib/SpiAccessLib.c
> create mode 100644
> Silicon/Intel/AlderlakeSiliconPkg/Pch/IncludePrivate/Library/SmmPchPrivateLib.h
> create mode 100644
> Silicon/Intel/AlderlakeSiliconPkg/Pch/LibraryPrivate/SmmPchPrivateLib/SmmPchPrivateLib.c
> create mode 100644
> Silicon/Intel/AlderlakeSiliconPkg/Pch/LibraryPrivate/SmmPchPrivateLib/SmmPchPrivateLib.inf
>
> diff --git
> a/Silicon/Intel/AlderlakeSiliconPkg/Cpu/Include/Register/CommonMsr.h
> b/Silicon/Intel/AlderlakeSiliconPkg/Cpu/Include/Register/CommonMsr.h
> index caa0e67b..44a476c0 100644
> --- a/Silicon/Intel/AlderlakeSiliconPkg/Cpu/Include/Register/CommonMsr.h
> +++ b/Silicon/Intel/AlderlakeSiliconPkg/Cpu/Include/Register/CommonMsr.h
> @@ -56,5 +56,9 @@ typedef union {
>
> } MSR_CORE_THREAD_COUNT_REGISTER;
>
> +/**
> + Special Chipset Usage MSR
> +**/
> +#define MSR_SPCL_CHIPSET_USAGE 0x01FE
>
> #endif /* _COMMONMSR_h */
> diff --git a/Silicon/Intel/AlderlakeSiliconPkg/Fru/AdlPch/CommonLib.dsc
> b/Silicon/Intel/AlderlakeSiliconPkg/Fru/AdlPch/CommonLib.dsc
> index 3f508f83..ee5800a9 100644
> --- a/Silicon/Intel/AlderlakeSiliconPkg/Fru/AdlPch/CommonLib.dsc
> +++ b/Silicon/Intel/AlderlakeSiliconPkg/Fru/AdlPch/CommonLib.dsc
> @@ -11,7 +11,7 @@
>
>
> EspiLib|$(PLATFORM_SI_PACKAGE)/IpBlock/Espi/Library/PeiDxeSmmEspiLib/PeiDxeSmmEspiLib.inf
>
> -
> +
> SpiAccessLib|$(PLATFORM_SI_PACKAGE)/IpBlock/Spi/Library/PeiDxeSmmSpiAccessLib/PeiDxeSmmSpiAccessLib.inf
>
> PmcLib|$(PLATFORM_SI_PACKAGE)/IpBlock/Pmc/Library/PeiDxeSmmPmcLib/PeiDxeSmmPmcLib.inf
>
> PmcPrivateLib|$(PLATFORM_SI_PACKAGE)/IpBlock/Pmc/LibraryPrivate/PeiDxeSmmPmcPrivateLib/PeiDxeSmmPmcPrivateLib.inf
>
> SpiCommonLib|$(PLATFORM_SI_PACKAGE)/IpBlock/Spi/LibraryPrivate/BaseSpiCommonLib/BaseSpiCommonLib.inf
> diff --git a/Silicon/Intel/AlderlakeSiliconPkg/Fru/AdlPch/PeiLib.dsc
> b/Silicon/Intel/AlderlakeSiliconPkg/Fru/AdlPch/PeiLib.dsc
> index ebe2bbfd..cbaf8e37 100644
> --- a/Silicon/Intel/AlderlakeSiliconPkg/Fru/A
Re: [edk2-devel] [PATCH] AlderlakeOpenBoardPkg: Fix BootStage 5 can't install Windows11.
Hi Dora, Removing FvAdvanced in a violation of the MinPlatform specification. The relevant section is here: https://tianocore-docs.github.io/edk2-MinimumPlatformSpecification/draft/appendix_a_full_maps/a1_firmware_volume_layout.html#a1-firmware-volume-layout Please add FvAdvanced back into the ROM. In addition, PcdBootStage should be set to 6 by default (not 5). Thanks, Nate > -Original Message- > From: Hsueh, DoraX > Sent: Friday, February 2, 2024 1:12 AM > To: devel@edk2.groups.io > Cc: Hsueh, DoraX ; Chaganty, Rangasai V > ; Chuang, Rosen ; > Kasbekar, Saloni ; Tang, Haoyu > ; Desimone, Nathaniel L > > Subject: [PATCH] AlderlakeOpenBoardPkg: Fix BootStage 5 can't install > Windows11. > > From: DoraX Hsueh > > https://bugzilla.tianocore.org/show_bug.cgi?id=4665 > > Since installing windows does not meet the minimum system requirements, > Added TPM related code to meet the requirements. > > Cc: Sai Chaganty > Cc: Rosen Chuang > Cc: Saloni Kasbekar > Cc: Haoyu Tang > Cc: Nate DeSimone > Signed-off-by: DoraX Hsueh > --- > .../Include/Fdf/FlashMapInclude.fdf | 20 +- > .../AlderlakePRvp/OpenBoardPkg.fdf| 37 +++ > .../AlderlakePRvp/OpenBoardPkgPcd.dsc | 10 - > .../AlderlakeOpenBoardPkg/BiosInfo/BiosInfo.c | 9 + > .../BiosInfo/BiosInfo.inf | 2 - > .../AlderlakeOpenBoardPkg/OpenBoardPkg.dec| 1 - > 6 files changed, 25 insertions(+), 54 deletions(-) > > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > index 03c198c0..9a4ae7e8 100644 > --- > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > +++ > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > @@ -25,23 +25,21 @@ SET > gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize= 0x20 > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset = > 0x0003 # Flash addr (0xFF03) > SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize = > 0x0003 # > > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedOffset= > 0x000E # Flash addr (0xFF0E) > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize = > 0x0031 # > -SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset = > 0x003F # Flash addr (0xFF40) > -SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize = > 0x0036 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset= > 0x0075 # Flash addr (0xFF76) > +SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset = > 0x000E # Flash addr (0xFF40) > +SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize = > 0x0065 # > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset= > 0x0073 # Flash addr (0xFF76) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecuritySize = > 0x0009 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset = > 0x007E # Flash addr (0xFF7F) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset = > 0x007C # Flash addr (0xFF7F) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootSize= > 0x000A # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset= > 0x0088 # Flash addr (0xFF86) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset= > 0x0086 # Flash addr (0xFF86) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize = > 0x0018 # > > -SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesOffset = > 0x00A0 # Flash addr (0xFFA0) > +SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesOffset = > 0x009E # Flash addr (0xFFA0) > SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesSize = > 0x0008 # Keep 0x8 or larger > -SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset = > 0x00A8 # Flash addr (0xFFA8) > +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset = > 0x00A6 # Flash addr (0xFFA8) > SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize= > 0x0023 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset = > 0x00CB # Flash addr (0xFFCB) > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize= > 0x0004 # >
Re: [edk2-devel] [PATCH 2/3] MinPlatformPkg: Update the comments of GetInformation function
Pushed as 1c41906 > -Original Message- > From: Shang, Qingyu > Sent: Monday, April 8, 2024 2:47 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L > ; Liming Gao ; > Dong, Eric ; Gahan Saraiya > Subject: [PATCH 2/3] MinPlatformPkg: Update the comments of > GetInformation function > > Refer to Uefi spec 2.10 section 11.11.2, add a new retval EFI_NOT_FOUND to > EFI_ADAPTER_INFORMATION_PROTOCOL.GetInformation(). > Reference: [mantis #1866] - GetInfo() of Adapter Information Protocol should > have a provision for IHV to return no data. > > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Liming Gao > Cc: Eric Dong > Signed-off-by: Qingyu > Signed-off-by: Gahan Saraiya > --- > .../Test/Library/TestPointLib/DxeTestPointAip.c | 5 - > .../Test/Library/TestPointLib/SmmTestPointAip.c | 5 - > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip. > c > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip. > c > index a7fe9530cf..f2c44afb50 100644 > --- > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip. > c > +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoi > +++ ntAip.c > @@ -12,7 +12,9 @@ > >This function returns information of type InformationType from the adapter. >If an adapter does not support the requested informational type, then > - EFI_UNSUPPORTED is returned. > + EFI_UNSUPPORTED is returned. If an adapter does not contain > + Information for the requested InformationType, it fills > + InformationBlockSize with 0 and returns EFI_NOT_FOUND. > >@param[in] This A pointer to the > EFI_ADAPTER_INFORMATION_PROTOCOL instance. >@param[in] InformationTypeA pointer to an EFI_GUID that defines > the > contents of InformationBlock. > @@ -22,6 +24,7 @@ > >@retval EFI_SUCCESSThe InformationType information was > retrieved. >@retval EFI_UNSUPPORTEDThe InformationType is not known. > + @retval EFI_NOT_FOUND Information is not available for the > requested information type. >@retval EFI_DEVICE_ERROR The device reported an error. >@retval EFI_OUT_OF_RESOURCES The request could not be completed > due to a lack of resources. >@retval EFI_INVALID_PARAMETER This is NULL. > diff --git > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip > .c > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAi > p.c > index 84c3f8292e..96fadb6f6f 100644 > --- > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip > .c > +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoi > +++ ntAip.c > @@ -12,7 +12,9 @@ > >This function returns information of type InformationType from the adapter. >If an adapter does not support the requested informational type, then > - EFI_UNSUPPORTED is returned. > + EFI_UNSUPPORTED is returned. If an adapter does not contain > + Information for the requested InformationType, it fills > + InformationBlockSize with 0 and returns EFI_NOT_FOUND. > >@param[in] This A pointer to the > EFI_ADAPTER_INFORMATION_PROTOCOL instance. >@param[in] InformationTypeA pointer to an EFI_GUID that defines > the > contents of InformationBlock. > @@ -22,6 +24,7 @@ > >@retval EFI_SUCCESSThe InformationType information was > retrieved. >@retval EFI_UNSUPPORTEDThe InformationType is not known. > + @retval EFI_NOT_FOUND Information is not available for the > requested information type. >@retval EFI_DEVICE_ERROR The device reported an error. >@retval EFI_OUT_OF_RESOURCES The request could not be completed > due to a lack of resources. >@retval EFI_INVALID_PARAMETER This is NULL. > -- > 2.39.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117505): https://edk2.groups.io/g/devel/message/117505 Mute This Topic: https://groups.io/mt/105398062/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 2/3] MinPlatformPkg: Update the comments of GetInformation function
Reviewed-by: Nate DeSimone > -Original Message- > From: Shang, Qingyu > Sent: Monday, April 8, 2024 2:47 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L > ; Liming Gao ; > Dong, Eric ; Gahan Saraiya > Subject: [PATCH 2/3] MinPlatformPkg: Update the comments of > GetInformation function > > Refer to Uefi spec 2.10 section 11.11.2, add a new retval EFI_NOT_FOUND to > EFI_ADAPTER_INFORMATION_PROTOCOL.GetInformation(). > Reference: [mantis #1866] - GetInfo() of Adapter Information Protocol should > have a provision for IHV to return no data. > > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Liming Gao > Cc: Eric Dong > Signed-off-by: Qingyu > Signed-off-by: Gahan Saraiya > --- > .../Test/Library/TestPointLib/DxeTestPointAip.c | 5 - > .../Test/Library/TestPointLib/SmmTestPointAip.c | 5 - > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip. > c > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip. > c > index a7fe9530cf..f2c44afb50 100644 > --- > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip. > c > +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoi > +++ ntAip.c > @@ -12,7 +12,9 @@ > >This function returns information of type InformationType from the adapter. >If an adapter does not support the requested informational type, then > - EFI_UNSUPPORTED is returned. > + EFI_UNSUPPORTED is returned. If an adapter does not contain > + Information for the requested InformationType, it fills > + InformationBlockSize with 0 and returns EFI_NOT_FOUND. > >@param[in] This A pointer to the > EFI_ADAPTER_INFORMATION_PROTOCOL instance. >@param[in] InformationTypeA pointer to an EFI_GUID that defines > the > contents of InformationBlock. > @@ -22,6 +24,7 @@ > >@retval EFI_SUCCESSThe InformationType information was > retrieved. >@retval EFI_UNSUPPORTEDThe InformationType is not known. > + @retval EFI_NOT_FOUND Information is not available for the > requested information type. >@retval EFI_DEVICE_ERROR The device reported an error. >@retval EFI_OUT_OF_RESOURCES The request could not be completed > due to a lack of resources. >@retval EFI_INVALID_PARAMETER This is NULL. > diff --git > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip > .c > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAi > p.c > index 84c3f8292e..96fadb6f6f 100644 > --- > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip > .c > +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoi > +++ ntAip.c > @@ -12,7 +12,9 @@ > >This function returns information of type InformationType from the adapter. >If an adapter does not support the requested informational type, then > - EFI_UNSUPPORTED is returned. > + EFI_UNSUPPORTED is returned. If an adapter does not contain > + Information for the requested InformationType, it fills > + InformationBlockSize with 0 and returns EFI_NOT_FOUND. > >@param[in] This A pointer to the > EFI_ADAPTER_INFORMATION_PROTOCOL instance. >@param[in] InformationTypeA pointer to an EFI_GUID that defines > the > contents of InformationBlock. > @@ -22,6 +24,7 @@ > >@retval EFI_SUCCESSThe InformationType information was > retrieved. >@retval EFI_UNSUPPORTEDThe InformationType is not known. > + @retval EFI_NOT_FOUND Information is not available for the > requested information type. >@retval EFI_DEVICE_ERROR The device reported an error. >@retval EFI_OUT_OF_RESOURCES The request could not be completed > due to a lack of resources. >@retval EFI_INVALID_PARAMETER This is NULL. > -- > 2.39.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117504): https://edk2.groups.io/g/devel/message/117504 Mute This Topic: https://groups.io/mt/105398062/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v6 3/3] IntelFsp2WrapperPkg: Fix UPD structure Reserved bytes
Reviewed-by: Nate DeSimone
> -Original Message-
> From: Duggapu, Chinni B
> Sent: Friday, April 5, 2024 10:06 AM
> To: devel@edk2.groups.io
> Cc: Chaganty, Rangasai V ; Desimone,
> Nathaniel L ; Chiu, Chasel
> ; Duggapu, Chinni B
> Subject: [PATCH v6 3/3] IntelFsp2WrapperPkg: Fix UPD structure Reserved
> bytes
>
> Changes to update SecRamInitData UPD structure reserved bytes as par the
> latest spec.
>
>
> Cc: Sai Chaganty
> Cc: Nate DeSimone
> Cc: Chiu Chasel
> Cc: Duggapu Chinni B
>
>
> Signed-off-by: Duggapu Chinni B
> ---
> .../SecFspWrapperPlatformSecLibSample/SecRamInitData.c | 7 +--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git
> a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRa
> mInitData.c
> b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRa
> mInitData.c
> index f4ed658674..dabcd83eef 100644
> ---
> .../SecFspWrapperPlatformSecLibSample/SecRamInitData.c | 7 +--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git
> a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
>
> b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
> index f4ed658674..dabcd83eef 100644
> ---
> a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
> +++
> b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
> @@ -34,8 +34,11 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST FSPT_UPD_CORE_DATA
> FsptUpdDataPtr = {
> // UPD header revision must be equal or greater than 2 when the
> structure is compliant with FSP spec 2.2.
> //
> 0x02,
> -{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
> - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
> +{
> + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
> + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
> + 0x00, 0x00, 0x00
> +}
>},
>//
>// If FSP spec version < 2.2, remove FSPT_ARCH_UPD structure.
> --
> 2.39.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#117503): https://edk2.groups.io/g/devel/message/117503
Mute This Topic: https://groups.io/mt/105352679/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v6 2/3] IntelFsp2WrapperPkg: Fsp T new ARCH UPD Support
Reviewed-by: Nate DeSimone
> -Original Message-
> From: Duggapu, Chinni B
> Sent: Friday, April 5, 2024 10:06 AM
> To: devel@edk2.groups.io
> Cc: Chaganty, Rangasai V ; Desimone,
> Nathaniel L ; Chiu, Chasel
> ; Duggapu, Chinni B
> Subject: [PATCH v6 2/3] IntelFsp2WrapperPkg: Fsp T new ARCH UPD Support
>
> Changes to update SecRamInitData as per New Spec
>
>
> Cc: Sai Chaganty
> Cc: Nate DeSimone
> Cc: Chiu Chasel
> Cc: Duggapu Chinni B
>
>
> Signed-off-by: Duggapu Chinni B
> ---
> .../SecFspWrapperPlatformSecLibSample/SecRamInitData.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git
> a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
>
> b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
> index fb0d9a8683..f4ed658674 100644
> ---
> a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
> +++
> b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
> @@ -43,14 +43,15 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST FSPT_UPD_CORE_DATA
> FsptUpdDataPtr = {
>// Else, use FSPT_ARCH2_UPD structure.
>//
>{
> -0x02,
> +0x03,
> {
>0x00, 0x00, 0x00
> },
> 0x0020,
> 0x,
> +0x,
> {
> - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
> + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
>0x00, 0x00, 0x00, 0x00, 0x00, 0x00
> }
>},
> --
> 2.39.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#117502): https://edk2.groups.io/g/devel/message/117502
Mute This Topic: https://groups.io/mt/105352676/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v6 1/3] IntelFsp2Pkg: Fsp T new ARCH UPD Support
Hi Chinni,
One minor feedback below. With that change...
Reviewed-by: Nate DeSimone
> -Original Message-
> From: Duggapu, Chinni B
> Sent: Friday, April 5, 2024 10:06 AM
> To: devel@edk2.groups.io
> Cc: Chaganty, Rangasai V ; Desimone,
> Nathaniel L ; Chiu, Chasel
> ; Duggapu, Chinni B
> Subject: [PATCH v6 1/3] IntelFsp2Pkg: Fsp T new ARCH UPD Support
>
> Changes to support spec changes
>
> 1. Remove usage of Pcd.
> 2. Change code to validate the Temporary Ram size input.
> 3. Consume the input saved in YMM Register
>
> Cc: Sai Chaganty
> Cc: Nate DeSimone
> Cc: Chiu Chasel
> Cc: Duggapu Chinni B
>
>
> Signed-off-by: Duggapu Chinni B
> ---
> IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf | 1 +
> IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf | 1 +
> .../FspSecCore/Ia32/Fsp24ApiEntryM.nasm | 1 -
> .../FspSecCore/Ia32/FspApiEntryM.nasm | 1 -
> .../FspSecCore/Ia32/FspApiEntryT.nasm | 60 +---
> .../FspSecCore/Ia32/SaveRestoreSseNasm.inc| 11 +++
> IntelFsp2Pkg/FspSecCore/SecFsp.c | 9 +++
> IntelFsp2Pkg/FspSecCore/SecFsp.h | 1 +
> IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm | 68 +++
> IntelFsp2Pkg/Include/FspEas/FspApi.h | 12 +++-
> IntelFsp2Pkg/Include/Library/FspPlatformLib.h | 13
> .../Include/SaveRestoreSseAvxNasm.inc | 21 ++
> .../BaseFspPlatformLib/FspPlatformMemory.c| 38 +++
> 13 files changed, 211 insertions(+), 26 deletions(-)
>
> diff --git a/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf
> b/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf
> index cb011f99f9..8cb0e6411f 100644
> --- a/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf
> +++ b/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf
> @@ -60,6 +60,7 @@
>FspSecPlatformLib
>CpuLib
>FspMultiPhaseLib
> + FspPlatformLib
>
> [Pcd]
>gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase ## CONSUMES
> diff --git a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
> b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
> index 8029832235..ef19c6ae78 100644
> --- a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
> +++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
> @@ -59,6 +59,7 @@
>FspCommonLib
>FspSecPlatformLib
>CpuLib
> + FspPlatformLib
>
> [Pcd]
>gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase ## CONSUMES
> diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/Fsp24ApiEntryM.nasm
> b/IntelFsp2Pkg/FspSecCore/Ia32/Fsp24ApiEntryM.nasm
> index 15f8ecea83..5fa5c03569 100644
> --- a/IntelFsp2Pkg/FspSecCore/Ia32/Fsp24ApiEntryM.nasm
> +++ b/IntelFsp2Pkg/FspSecCore/Ia32/Fsp24ApiEntryM.nasm
> @@ -11,7 +11,6 @@
> ; Following are fixed PCDs
> ;
> extern ASM_PFX(PcdGet32(PcdTemporaryRamBase))
> -extern ASM_PFX(PcdGet32(PcdTemporaryRamSize))
> extern ASM_PFX(PcdGet32(PcdFspTemporaryRamSize))
> extern ASM_PFX(PcdGet8 (PcdFspHeapSizePercentage))
>
> diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> index 61ab4612a3..861cce4d01 100644
> --- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> +++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> @@ -11,7 +11,6 @@
> ; Following are fixed PCDs
> ;
> extern ASM_PFX(PcdGet32(PcdTemporaryRamBase))
> -extern ASM_PFX(PcdGet32(PcdTemporaryRamSize))
> extern ASM_PFX(PcdGet32(PcdFspTemporaryRamSize))
> extern ASM_PFX(PcdGet8 (PcdFspHeapSizePercentage))
>
> diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm
> b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm
> index 900126b93b..088bd7ee7f 100644
> --- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm
> +++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm
> @@ -109,7 +109,8 @@ struc LoadMicrocodeParamsFsp24
> .FsptArchReserved:resb3
> .FsptArchLength: resd1
> .FspDebugHandler resq1
> -.FsptArchUpd: resd4
> +.FspTemporaryRamSize: resd1 ; Supported only if ArchRevison is
> >= 3
> +.FsptArchUpd: resd3
> ; }
> ; FSPT_CORE_UPD {
> .MicrocodeCodeAddr: resq1
> @@ -267,7 +268,7 @@ ASM_PFX(LoadMicrocodeDefault):
> cmpbyte [esp + LoadMicrocodeParamsFsp22.FspUpdHeaderRevision], 2
> jb Fsp20UpdHeader
> cmpbyte [esp + LoadMicrocodeParamsFsp22.FsptArchRevision], 2
> - je Fsp24UpdHeader
> + jaeFsp24UpdHeader
> jmpFsp22UpdHeader
>
> Fsp20UpdHeader:
> @@ -405,7 +406,7 @@ CheckAddress:
> cmp byte [esp + LoadMicrocodeParamsFsp22.FspUpdHeaderRevision], 2
> jb Fsp20UpdHeader1
> cmpbyt
Re: [edk2-devel] [PATCH] MinPlatformPkg: Add missed call to FreePool
Hi Babu, If the call to InitializeHeader() fails then the buffer will still not be de-allcoated properly. Please add a Done: label and a goto Done; so that the buffer will still be freed in the case of an error. Thanks, Nate -Original Message- From: Pabba, PhanindraX Babu Sent: Thursday, February 22, 2024 10:01 PM To: devel@edk2.groups.io Cc: Pabba, PhanindraX Babu ; Chiu, Chasel ; Desimone, Nathaniel L ; Liming Gao ; Dong, Eric Subject: [PATCH] MinPlatformPkg: Add missed call to FreePool From: PhanindraX Babu Pabba Adding missed out call to FreePool API to free the allocated memory. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: PhanindraX Babu Pabba --- Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 2 +- Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c index 2a833ec9..f637e1c9 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c @@ -1002,7 +1002,7 @@ InstallMcfgFromScratch ( McfgTable->Header.Length, );-+ FreePool (McfgTable); return Status; } diff --git a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c index 9bc22245..f5b1a71c 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c +++ b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c @@ -195,6 +195,7 @@ PublishAcpiTablesFromFv ( // Increment the instance // Instance++;+ FreePool (CurrentTable); CurrentTable = NULL; } }-- 2.39.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117095): https://edk2.groups.io/g/devel/message/117095 Mute This Topic: https://groups.io/mt/104524859/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] IpmiFeaturePkg: Add missed call to FreePool
Pushed as 6feac9b -Original Message- From: Pabba, PhanindraX Babu Sent: Thursday, February 22, 2024 10:52 PM To: devel@edk2.groups.io Cc: Pabba, PhanindraX Babu ; Desimone, Nathaniel L ; Liming Gao Subject: [PATCH] IpmiFeaturePkg: Add missed call to FreePool From: PhanindraX Babu Pabba Adding missed out call to FreePool API to free the allocated memory. Cc: Nate DeSimone Cc: Liming Gao Signed-off-by: PhanindraX Babu Pabba --- .../Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.c b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.c index 990b4b9e..070a3452 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.c +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.c @@ -250,6 +250,7 @@ BmcAcpiEntryPoint ( // Increment the instance // Instance++; + FreePool (CurrentTable); } } -- 2.39.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117094): https://edk2.groups.io/g/devel/message/117094 Mute This Topic: https://groups.io/mt/104524860/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] IpmiFeaturePkg: Add missed call to FreePool
Reviewed-by: Nate DeSimone -Original Message- From: Pabba, PhanindraX Babu Sent: Thursday, February 22, 2024 10:52 PM To: devel@edk2.groups.io Cc: Pabba, PhanindraX Babu ; Desimone, Nathaniel L ; Liming Gao Subject: [PATCH] IpmiFeaturePkg: Add missed call to FreePool From: PhanindraX Babu Pabba Adding missed out call to FreePool API to free the allocated memory. Cc: Nate DeSimone Cc: Liming Gao Signed-off-by: PhanindraX Babu Pabba --- .../Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.c b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.c index 990b4b9e..070a3452 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.c +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.c @@ -250,6 +250,7 @@ BmcAcpiEntryPoint ( // Increment the instance // Instance++; + FreePool (CurrentTable); } } -- 2.39.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117093): https://edk2.groups.io/g/devel/message/117093 Mute This Topic: https://groups.io/mt/104524860/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] IntelFsp2Pkg: Fsp 2.x Changes
Hi Chinni, Switching from TopOfCar to SizeOfFspMemory doesn't address my previous feedback. Please also give this patch a better title. Adding new FSP-T Arch UPDs or something like that. Look forward to a V5 patch. Thanks, Nate -Original Message- From: Duggapu, Chinni B Sent: Wednesday, February 28, 2024 12:30 AM To: devel@edk2.groups.io Cc: Chaganty, Rangasai V ; Desimone, Nathaniel L ; Chiu, Chasel ; Duggapu, Chinni B Subject: [PATCH v4] IntelFsp2Pkg: Fsp 2.x Changes Changes to support spec changes 1. Remove usage of Pcd. 2. Change code to validate the Temporary Ram size input. 3. Consume the input saved in YMM Register Cc: Sai Chaganty Cc: Nate DeSimone Cc: Chiu Chasel Cc: Duggapu Chinni B Signed-off-by: Duggapu Chinni B --- IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf | 2 +- IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf | 2 +- IntelFsp2Pkg/FspSecCore/FspSecCoreT.inf | 1 + .../FspSecCore/Ia32/Fsp24ApiEntryM.nasm | 1 - .../FspSecCore/Ia32/FspApiEntryM.nasm | 1 - .../FspSecCore/Ia32/FspApiEntryT.nasm | 70 ++--- .../FspSecCore/Ia32/SaveRestoreSseNasm.inc| 11 +++ IntelFsp2Pkg/FspSecCore/SecFsp.c | 17 +++- IntelFsp2Pkg/FspSecCore/SecFspApiChk.c| 4 +- IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm | 78 +++ IntelFsp2Pkg/Include/FspEas/FspApi.h | 5 +- .../Include/SaveRestoreSseAvxNasm.inc | 21 + IntelFsp2Pkg/IntelFsp2Pkg.dec | 5 ++ .../SecRamInitData.c | 3 +- 14 files changed, 185 insertions(+), 36 deletions(-) diff --git a/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf b/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf index cb011f99f9..cf8cb2eda9 100644 --- a/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf +++ b/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf @@ -63,11 +63,11 @@ [Pcd] gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase ## CONSUMES - gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamSize ## CONSUMES gIntelFsp2PkgTokenSpaceGuid.PcdFspTemporaryRamSize ## CONSUMES gIntelFsp2PkgTokenSpaceGuid.PcdFspHeapSizePercentage ## CONSUMES gIntelFsp2PkgTokenSpaceGuid.PcdFspMaxInterruptSupported ## CONSUMES gIntelFsp2PkgTokenSpaceGuid.PcdFspPrivateTemporaryRamSize## CONSUMES + gIntelFsp2PkgTokenSpaceGuid.PcdGlobalDataPointerAddress ## CONSUMES [Ppis] gEfiTemporaryRamSupportPpiGuid ## PRODUCES diff --git a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf index 8029832235..717941c33f 100644 --- a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf +++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf @@ -62,11 +62,11 @@ [Pcd] gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase ## CONSUMES - gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamSize ## CONSUMES gIntelFsp2PkgTokenSpaceGuid.PcdFspTemporaryRamSize ## CONSUMES gIntelFsp2PkgTokenSpaceGuid.PcdFspHeapSizePercentage ## CONSUMES gIntelFsp2PkgTokenSpaceGuid.PcdFspMaxInterruptSupported ## CONSUMES gIntelFsp2PkgTokenSpaceGuid.PcdFspPrivateTemporaryRamSize## CONSUMES + gIntelFsp2PkgTokenSpaceGuid.PcdGlobalDataPointerAddress ## CONSUMES [Ppis] gEfiTemporaryRamSupportPpiGuid ## PRODUCES diff --git a/IntelFsp2Pkg/FspSecCore/FspSecCoreT.inf b/IntelFsp2Pkg/FspSecCore/FspSecCoreT.inf index e5a6eaa164..05c0d5f48b 100644 --- a/IntelFsp2Pkg/FspSecCore/FspSecCoreT.inf +++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreT.inf @@ -51,6 +51,7 @@ gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase ## CONSUMES gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamSize ## CONSUMES gIntelFsp2PkgTokenSpaceGuid.PcdFspReservedBufferSize ## CONSUMES + gIntelFsp2PkgTokenSpaceGuid.PcdGlobalDataPointerAddress ## CONSUMES [Ppis] gEfiTemporaryRamSupportPpiGuid ## PRODUCES diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/Fsp24ApiEntryM.nasm b/IntelFsp2Pkg/FspSecCore/Ia32/Fsp24ApiEntryM.nasm index 15f8ecea83..5fa5c03569 100644 --- a/IntelFsp2Pkg/FspSecCore/Ia32/Fsp24ApiEntryM.nasm +++ b/IntelFsp2Pkg/FspSecCore/Ia32/Fsp24ApiEntryM.nasm @@ -11,7 +11,6 @@ ; Following are fixed PCDs ; extern ASM_PFX(PcdGet32(PcdTemporaryRamBase)) -extern ASM_PFX(PcdGet32(PcdTemporaryRamSize)) extern ASM_PFX(PcdGet32(PcdFspTemporaryRamSize)) extern ASM_PFX(PcdGet8 (PcdFspHeapSizePercentage)) diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm index 61ab4612a3..861cce4d01 100644 --- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm +++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm @@ -11,7 +11,6 @@ ; Following are fixed PCDs ; extern ASM_PFX(PcdGet32(PcdTemporaryRamBase)) -extern ASM_PFX(PcdGet32(PcdTemporaryRamSize)) extern ASM_PFX(PcdGet32
Re: [edk2-devel] [PATCH v1] PurleyOpenBoardPkg/TiogaPass: Fix Build
Pushed as 103c88b. > -Original Message- > From: devel@edk2.groups.io On Behalf Of Nate > DeSimone > Sent: Friday, February 9, 2024 2:48 PM > To: devel@edk2.groups.io > Cc: Chiu, Chasel > Subject: [edk2-devel] [PATCH v1] PurleyOpenBoardPkg/TiogaPass: Fix Build > > Adds library instances for MM_Standalone, which are now required to build > IpmiFeaturePkg. > > Cc: Chasel Chiu > Signed-off-by: Nate DeSimone > --- > .../Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc | 4 > 1 file changed, 4 insertions(+) > > diff --git > a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc > b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc > index 64e8978942..7738120017 100644 > --- > a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc > +++ > b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc > @@ -160,6 +160,8 @@ > !else > > BoardBdsHookLib|$(PLATFORM_BOARD_PACKAGE)/Override/Platform/Intel/ > BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib.inf > !endif > + > +[LibraryClasses.common.DXE_DRIVER, > LibraryClasses.common.UEFI_DRIVER] > !if gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable == TRUE > > IpmiBaseLib|OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLib/I > pmiBaseLib.inf > !endif > @@ -169,6 +171,8 @@ > > TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib/S > mmTestPointCheckLib.inf > !endif > > TestPointLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointLib/SmmTestPoin > tLib.inf > + > +[LibraryClasses.common.DXE_SMM_DRIVER, > +LibraryClasses.common.MM_STANDALONE] > !if gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable == TRUE > > IpmiBaseLib|OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBase > Lib/SmmIpmiBaseLib.inf > !endif > -- > 2.39.2.windows.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115899): https://edk2.groups.io/g/devel/message/115899 Mute This Topic: https://groups.io/mt/104539262/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] IntelFsp2Pkg: Fsp 2.x Changes
Hi Chinni, Using the FspGlobalDataPointer as a scratchpad for your top of CAR early and then putting the real global data into it later is an ugly hack. If you are going to initialize the FspGlobalDataPointer in FSP-T, then FSP-T needs to actually initialize that FSP global data structure fully. Moreover, you have added the assumption that FspGlobalDataPointer is initialized to top of CAR to SecFsp.c but you don't actually write top of CAR to that location in the IA32 version of TempRamInit(), only the X64 version has that addition. Since SecFsp.c is used on both, you have effectively broken all 32-bit FSP builds. For obvious reasons, your patch will not be merged without additional work. Additional feedback below inline. Thanks, Nate > -Original Message- > From: Duggapu, Chinni B > Sent: Thursday, February 15, 2024 9:07 PM > To: devel@edk2.groups.io > Cc: Chaganty, Rangasai V ; Desimone, > Nathaniel L ; Chiu, Chasel > ; Duggapu, Chinni B > Subject: [PATCH v2] IntelFsp2Pkg: Fsp 2.x Changes > > Changes to support spec changes > > 1. Remove usage of Pcd. > 2. Change code to validate the Temporary Ram size input. > 3. Consume the input saved in YMM Register > > Cc: Sai Chaganty > Cc: Nate DeSimone > Cc: Chiu Chasel > Cc: Duggapu Chinni B > > > Signed-off-by: Duggapu Chinni B > --- > IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf | 2 +- > IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf | 2 +- > IntelFsp2Pkg/FspSecCore/FspSecCoreT.inf | 1 + > .../FspSecCore/Ia32/Fsp24ApiEntryM.nasm | 1 - > .../FspSecCore/Ia32/FspApiEntryM.nasm | 1 - > .../FspSecCore/Ia32/FspApiEntryT.nasm | 110 -- > .../FspSecCore/Ia32/SaveRestoreSseNasm.inc| 11 ++ > IntelFsp2Pkg/FspSecCore/SecFsp.c | 23 ++-- > IntelFsp2Pkg/FspSecCore/SecFspApiChk.c| 4 +- > IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm | 79 +++-- > IntelFsp2Pkg/FspSecCore/X64/FspHelper.nasm| 6 +- > IntelFsp2Pkg/Include/FspEas/FspApi.h | 5 +- > .../Include/SaveRestoreSseAvxNasm.inc | 21 > IntelFsp2Pkg/IntelFsp2Pkg.dec | 4 + > .../SecRamInitData.c | 3 +- > 15 files changed, 206 insertions(+), 67 deletions(-) > > diff --git a/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf > b/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf > index cb011f99f9..cf8cb2eda9 100644 > --- a/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf > +++ b/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf > @@ -63,11 +63,11 @@ > > [Pcd] >gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase ## CONSUMES > - gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamSize ## CONSUMES >gIntelFsp2PkgTokenSpaceGuid.PcdFspTemporaryRamSize ## CONSUMES >gIntelFsp2PkgTokenSpaceGuid.PcdFspHeapSizePercentage ## CONSUMES >gIntelFsp2PkgTokenSpaceGuid.PcdFspMaxInterruptSupported ## CONSUMES >gIntelFsp2PkgTokenSpaceGuid.PcdFspPrivateTemporaryRamSize## CONSUMES > + gIntelFsp2PkgTokenSpaceGuid.PcdGlobalDataPointerAddress ## CONSUMES > > [Ppis] >gEfiTemporaryRamSupportPpiGuid ## PRODUCES > diff --git a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf > b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf > index 8029832235..717941c33f 100644 > --- a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf > +++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf > @@ -62,11 +62,11 @@ > > [Pcd] >gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase ## CONSUMES > - gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamSize ## CONSUMES >gIntelFsp2PkgTokenSpaceGuid.PcdFspTemporaryRamSize ## CONSUMES >gIntelFsp2PkgTokenSpaceGuid.PcdFspHeapSizePercentage ## CONSUMES >gIntelFsp2PkgTokenSpaceGuid.PcdFspMaxInterruptSupported ## CONSUMES >gIntelFsp2PkgTokenSpaceGuid.PcdFspPrivateTemporaryRamSize## CONSUMES > + gIntelFsp2PkgTokenSpaceGuid.PcdGlobalDataPointerAddress ## CONSUMES > > [Ppis] >gEfiTemporaryRamSupportPpiGuid ## PRODUCES > diff --git a/IntelFsp2Pkg/FspSecCore/FspSecCoreT.inf > b/IntelFsp2Pkg/FspSecCore/FspSecCoreT.inf > index e5a6eaa164..05c0d5f48b 100644 > --- a/IntelFsp2Pkg/FspSecCore/FspSecCoreT.inf > +++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreT.inf > @@ -51,6 +51,7 @@ >gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase ## CONSUMES >gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamSize ## CONSUMES >gIntelFsp2PkgTokenSpaceGuid.PcdFspReservedBufferSize ## CONSUMES > + gIntelFsp2PkgTokenSpaceGuid.PcdGlobalDataPointerAddress ## CONSUMES > > [Ppis] >gEfiTemporaryRamSupportPpiGuid
Re: [edk2-devel] Peims are not gettting Dispatched in EagleStream Platform
> -Original Message-
> From: memristor2
> Sent: Thursday, February 22, 2024 5:51 AM
> To: Desimone, Nathaniel L
> Cc: devel@edk2.groups.io; ler...@redhat.com
> Subject: RE: [edk2-devel] Peims are not gettting Dispatched in EagleStream
> Platform
>
> Thank you. Based on what you told me (memory corruption and and the
> unlikelihood of the stack pointer being NULL) my only suspicion would be the
> microcode I am using, since the only platform dependent parts up until this
> part would be the microcode and the FSP-T and since I am using the FSP for
> EagleStream only the microcode would be left to change.
Having correct microcode is absolutely essential for sure. But microcode & FSP
are not the only platform dependent components. Any code contained in a
*BoardPkg is considered to be platform dependent in some way. I would be
surprised if simply adding the microcode will fix this problem.
> Up until now I was using Whitley's microcode (since EagleStream's hadn't been
> released yet). To be honest I still don't have a proper comprehension of the
> concept of the microcode so I thought maybe I could use Whitley's microcode.
Here is what microcode is in a nutshell. Every x86 processor designed since
~1990 is actually a RISC-based CPU design internally. The microcode contains a
lookup table that maps each CPU instruction into one or more sub-instructions
(sometimes called micro-instructions or micro-OPs (µOPs for short)) which are
the instructions that the hidden RISC processor executes. This hidden RISC
processor has an unpublished instruction set that no one outside of the CPU
vendor sees.
The initial purpose of RISC was to eliminate the need for microcode, as the
complex decode engine and ROM consumed transistors that could instead be used
for things like a wider ALU. But then in the mid-1990s, a new technology came
along called out-of-order execution. The idea behind out-of-order execution is
that we can expand the purpose of microcode to be more than just a lookup table,
it can actually change the sequence of micro-OPs so that the program runs
faster. So now, microcode is not only a lookup table, but it also provides a
programmable instruction _scheduler_.
The use of out-of-order execution was made possible by Moore's law. Moore's law
drove rapidly increasing transistor counts during the 1990s. No longer would you
need to decide whether to use your transistor budget for microcode or for a
wider ALU... you had plenty of transistors so you could do both! Both of them
together yields the fastest CPU designs by a large margin. All of these factors
came together at once, and suddenly any CPU design that didn't use microcode was
obsolete by the year 2000.
Fast forward to today, the RISC vs. CISC argument is obsolete. Modern
high-performance CPUs require very complex microcode. The existence of that
microcode abstracts most of the differences between traditionally RISC ISAs like
ARM and traditionally CISC ISAs like x86.
> But now that EagleStream's microcode has been released I'll try with that and
> let you know whether it works or not. Yet I am still skeptical about it being
> a microcode issue because my thought is that the microcode is procosser
> architecture-based code rather than it being platform-based code. Please
> correct me if I am wrong on this matter.
You intuition that it is not a microcode issue is correct. There are a lot of
things in the BoardPkg that change with each platform design. For an example of
that, try diff'ing KabylakeOpenBoardPkg with AlderlakeOpenBoardPkg.
>
>
> On Thursday, February 22nd, 2024 at 3:42 AM, Desimone, Nathaniel L
> wrote:
>
> > > -Original Message-
> > > From: devel@edk2.groups.io devel@edk2.groups.io On Behalf Of Laszlo
> > > Ersek
> > > Sent: Wednesday, February 21, 2024 3:59 PM
> > > To: devel@edk2.groups.io; memrist...@proton.me
> > > Subject: Re: [edk2-devel] Peims are not gettting Dispatched in
> > > EagleStream Platform
> > >
> > > On 2/21/24 07:59, memristor2 via groups.io wrote:
> > >
> > > > Hi,
> > > > I am trying to build edk2-platforms for EagleStream Platform. The
> > > > problem I am facing now is that the Peims are not getting
> > > > dispatched when The PeiMain routine calls PeiDispatcher().
> > > > After digging deeper into it it seems that the DepexSatisfied()
> > > > routine is always returning false. So I also checked this and
> > > > realized that the place that is returning false is inside the
> > > > PeimDispatchReadiness
> > > > function:
> > > > ||```
> > > > case (EFI_DEP_END): DEBUG ((DEBUG_DISPATCH, " END\n"));
> > > > StackPtr--; // // Check to make sure EvalStack is balanced. If
> > > > not, then there is // an error in the dependency grammar, so
> > > > return EFI_INVALID_PARAMETER.
> > > > //
> > > > if (StackPtr != [0]) {
> > > >
> > > > DEBUG ((DEBUG_DISPATCH, " RESULT = FALSE (Underflow Error)\n"));
> > > > return FALSE; }
> > > >
> > > > DEBUG ((DEBUG_DISPATCH, " RESULT = %a\n", IsPpiInstalled
> > > >
Re: [edk2-devel] [PATCH v1 1/1] IpmiFeaturePkg/GenericIpmi:StandaloneMmGenericIpmi
Pushed as 8517d20. > -Original Message- > From: devel@edk2.groups.io On Behalf Of Huang, > Li-Xia > Sent: Monday, January 29, 2024 9:36 PM > To: devel@edk2.groups.io > Subject: [edk2-devel] [PATCH v1 1/1] > IpmiFeaturePkg/GenericIpmi:StandaloneMmGenericIpmi > > StandaloneMmGenericIpmi driver is not loaded successfully due to wrong > Depex. Set Depex to TURE in StandaloneMmGenericImpi.inf. > > Signed-off-by: Lixia Huang > --- > > Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Standa > loneMm/StandaloneMmGenericIpmi.inf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git > a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Stan > daloneMm/StandaloneMmGenericIpmi.inf > b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Stan > daloneMm/StandaloneMmGenericIpmi.inf > index e4abc4db29fe..935880a05859 100644 > --- > a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Stan > daloneMm/StandaloneMmGenericIpmi.inf > +++ > b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Stan > +++ daloneMm/StandaloneMmGenericIpmi.inf > @@ -58,4 +58,4 @@ >gIpmiFeaturePkgTokenSpaceGuid.PcdIpmbInterfaceSupport > > [Depex] > - gIpmiTransportProtocolGuid > + TRUE > -- > 2.26.2.windows.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115893): https://edk2.groups.io/g/devel/message/115893 Mute This Topic: https://groups.io/mt/104048562/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v1 1/1] IpmiFeaturePkg/GenericIpmi:StandaloneMmGenericIpmi
Reviewed-by: Nate DeSimone > -Original Message- > From: devel@edk2.groups.io On Behalf Of Huang, > Li-Xia > Sent: Monday, January 29, 2024 9:36 PM > To: devel@edk2.groups.io > Subject: [edk2-devel] [PATCH v1 1/1] > IpmiFeaturePkg/GenericIpmi:StandaloneMmGenericIpmi > > StandaloneMmGenericIpmi driver is not loaded successfully due to wrong > Depex. Set Depex to TURE in StandaloneMmGenericImpi.inf. > > Signed-off-by: Lixia Huang > --- > > Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Standa > loneMm/StandaloneMmGenericIpmi.inf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git > a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Stan > daloneMm/StandaloneMmGenericIpmi.inf > b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Stan > daloneMm/StandaloneMmGenericIpmi.inf > index e4abc4db29fe..935880a05859 100644 > --- > a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Stan > daloneMm/StandaloneMmGenericIpmi.inf > +++ > b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Stan > +++ daloneMm/StandaloneMmGenericIpmi.inf > @@ -58,4 +58,4 @@ >gIpmiFeaturePkgTokenSpaceGuid.PcdIpmbInterfaceSupport > > [Depex] > - gIpmiTransportProtocolGuid > + TRUE > -- > 2.26.2.windows.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115892): https://edk2.groups.io/g/devel/message/115892 Mute This Topic: https://groups.io/mt/104048562/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] Peims are not gettting Dispatched in EagleStream Platform
> -Original Message-
> From: devel@edk2.groups.io On Behalf Of Laszlo
> Ersek
> Sent: Wednesday, February 21, 2024 3:59 PM
> To: devel@edk2.groups.io; memrist...@proton.me
> Subject: Re: [edk2-devel] Peims are not gettting Dispatched in EagleStream
> Platform
>
> On 2/21/24 07:59, memristor2 via groups.io wrote:
> > Hi,
> > I am trying to build edk2-platforms for EagleStream Platform. The
> > problem I am facing now is that the Peims are not getting dispatched
> > when The PeiMain routine calls PeiDispatcher().
> > After digging deeper into it it seems that the DepexSatisfied()
> > routine is always returning false. So I also checked this and realized
> > that the place that is returning false is inside the
> > PeimDispatchReadiness
> > function:
> > ||​```
> > case (EFI_DEP_END):    DEBUG ((DEBUG_DISPATCH, "  END\n"));
> > Â Â Â Â StackPtr--;
> > Â Â Â Â //
> > Â Â Â Â // Check to make sure EvalStack is balanced. Â If not, then
> > there is
> > Â Â Â Â // an error in the dependency grammar, so return
> > EFI_INVALID_PARAMETER.
> > Â Â Â Â //
> >     if (StackPtr != [0]) {
> >
> > Â Â Â Â Â DEBUGÂ ((DEBUG_DISPATCH, " Â RESULT = FALSE (Underflow
> > Error)\n"));
> >      return FALSE;
> > Â Â Â Â }
> >
> > Â Â Â Â DEBUGÂ ((DEBUG_DISPATCH, " Â RESULT = %a\n", IsPpiInstalled
> > (PeiServices, StackPtr) ? "TRUE"Â : "FALSE"));
> >
> >     return IsPpiInstalled (PeiServices, StackPtr); ``` It seems
> > that when entering IsPpiInstalled StackPtr in always NULL.
> > Any thoughts on this?
>
> StackPtr being NULL seems extremely unlikely; it is supposed to point to
> elements of the EvalStack local array (or I guess one past the last element).
>
> Now, I can see two potential problems here:
>
> - your depex is malformed (for whatever reason), and the eval stack is not
> torn
> down entirely before reachig EFI_DEP_END. The code seems to handle that
> correctly, by returning FALSE.
>
> - your depex is malformed such that it immediately starts with an
> EFI_DEP_END. The code is actually buggy for that case, because it decrements
> StackPtr *first*, before comparing it against [0].
> That decrement invokes undefined behavior. However, I assume in practice the
> behavior will be the same as in the previous paragraph.
>
> A NULL StackPtr value I cannot explain at all.
Agreed with Laszlo here... the only thing that I could think of is memory
corruption. Several people at Intel (myself included) as working on getting an
EaglestreamOpenBoardPkg posted to edk2-platforms right now. I would recommend
you wait for us to release our code as opposed to trying to develop support for
Eagle Steam independently.
>
> Laszlo
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#115760): https://edk2.groups.io/g/devel/message/115760
Mute This Topic: https://groups.io/mt/104498510/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/2] Intel maintainers updates
The series has been pushed as 73ebcac~..b7b8dd4. > -Original Message- > From: devel@edk2.groups.io On Behalf Of Nathaniel > Haller > Sent: Friday, February 16, 2024 5:47 PM > To: devel@edk2.groups.io > Subject: [edk2-devel] [PATCH 0/2] Intel maintainers updates > > Adding maintainers for new Intel packages, EaglestreamSiliconBinPkg and > EaglestreamOpenBoardBinPkg, then replacing Isaac W Oram from the Intel > package maintainers lists. > > Nathaniel Haller (2): > Add maintainers for EaglestreamSiliconBinPkg and > EaglestreamOpenBoardBinPkg > Update Maintainers for Intel packages > > Maintainers.txt | 17 ++--- > 1 file changed, 14 insertions(+), 3 deletions(-) > > -- > 2.43.0.windows.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115754): https://edk2.groups.io/g/devel/message/115754 Mute This Topic: https://groups.io/mt/104454911/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] Merge commit in edk2-non-osi
> -Original Message- > From: Ard Biesheuvel > Sent: Wednesday, February 21, 2024 3:29 PM > To: devel@edk2.groups.io; Kinney, Michael D > Cc: Desimone, Nathaniel L > Subject: Re: [edk2-devel] Merge commit in edk2-non-osi > > On Wed, 21 Feb 2024 at 16:05, Michael D Kinney > wrote: > > > > Hi Ard, > > > > I disagree. We have never allowed a force push to the main branch of > > TianoCore repos. This has happened before and was discussed and the > > policy is to not fix. Even the edk2 repo has some merge commits in > > its history that were discussed and not fixed. > > > > We can never know how many downstream consumers are syncing with > main > > branches. > > > > Fair enough. Better to be cautious, and my argument works both ways: > the contents would not change by 'fixing' the history, and this change does > not > look problematic for bisect. Fair enough, I will continue with my reviews/patch merges. -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115753): https://edk2.groups.io/g/devel/message/115753 Mute This Topic: https://groups.io/mt/104481195/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] Merge commit in edk2-non-osi
Hi Everyone, It appears that a merge commit was introduced to edk2-non-osi due to a PR merge: https://github.com/tianocore/edk2-non-osi/commit/61b65fccfe4c75bc9ecb7b542412a436e3db5de6 I would like to remind everyone that we generally don't accept submissions via PRs yet. At the very least please click "Rebase and merge" when closing the PR instead of "Merge pull request". Since that merge commit is currently at the top of the tree, can we delete it? Thanks, Nate -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115691): https://edk2.groups.io/g/devel/message/115691 Mute This Topic: https://groups.io/mt/104481195/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 2/2] Update Maintainers for Intel packages
As mentioned by Mike K, please add [edk2-non-osi] to the subject line in the future. Reviewed-by: Nate DeSimone > -Original Message- > From: Haller, Nathaniel D > Sent: Friday, February 16, 2024 5:48 PM > To: devel@edk2.groups.io > Cc: Desimone, Nathaniel L ; Chiu, Chasel > > Subject: [PATCH 2/2] Update Maintainers for Intel packages > > Update PurleySiliconBinPkg, WhitleyOpenBoardBinPkg, and > WhitleySiliconBinPkg maintainers. > > Cc: Nate DeSimone > Cc: Chasel Chiu > Signed-off-by: Nathaniel Haller > --- > Maintainers.txt | 7 --- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/Maintainers.txt b/Maintainers.txt index 66ac96d..eaf13fd 100644 > --- a/Maintainers.txt > +++ b/Maintainers.txt > @@ -46,9 +46,9 @@ M: Chasel Chiu > M: Nate DeSimone > > Platform/Intel/WhitleyOpenBoardBinPkg > -M: Isaac Oram > M: Nate DeSimone > M: Chasel Chiu > +M: Nathaniel Haller > > Platform/Intel/EaglestreamOpenBoardBinPkg > M: Nate DeSimone @@ -87,11 +87,12 > @@ M: Sai Chaganty > > Silicon/Intel/PurleySiliconBinPkg > M: Nate DeSimone > -M: Isaac W Oram > +M: Chasel Chiu > > Silicon/Intel/WhitleySiliconBinPkg > M: Nate DeSimone > -M: Isaac W Oram > +M: Chasel Chiu > +M: Nathaniel Haller > > Silicon/Intel/EaglestreamSiliconBinPkg > M: Nate DeSimone > -- > 2.43.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115673): https://edk2.groups.io/g/devel/message/115673 Mute This Topic: https://groups.io/mt/104454913/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 1/2] Add maintainers for EaglestreamSiliconBinPkg and EaglestreamOpenBoardBinPkg
As mentioned by Mike K, please add [edk2-non-osi] to the subject line in the future. Reviewed-by: Nate DeSimone > -Original Message- > From: Haller, Nathaniel D > Sent: Friday, February 16, 2024 5:47 PM > To: devel@edk2.groups.io > Cc: Desimone, Nathaniel L ; Chiu, Chasel > > Subject: [PATCH 1/2] Add maintainers for EaglestreamSiliconBinPkg and > EaglestreamOpenBoardBinPkg > > Cc: Nate DeSimone > Cc: Chasel Chiu > Signed-off-by: Nathaniel Haller > --- > Maintainers.txt | 10 ++ > 1 file changed, 10 insertions(+) > > diff --git a/Maintainers.txt b/Maintainers.txt index 1d5dacb..66ac96d 100644 > --- a/Maintainers.txt > +++ b/Maintainers.txt > @@ -50,6 +50,11 @@ M: Isaac Oram > M: Nate DeSimone > M: Chasel Chiu > > +Platform/Intel/EaglestreamOpenBoardBinPkg > +M: Nate DeSimone > +M: Chasel Chiu > +M: Nathaniel Haller > + > Platform/Intel/CoffeelakeSiliconBinPkg > M: Chasel Chiu > M: Sai Chaganty @@ -88,6 +93,11 @@ > Silicon/Intel/WhitleySiliconBinPkg > M: Nate DeSimone > M: Isaac W Oram > > +Silicon/Intel/EaglestreamSiliconBinPkg > +M: Nate DeSimone > +M: Chasel Chiu > +M: Nathaniel Haller > + > Silicon/Intel/QuarkSocBinPkg > M: Michael D Kinney > M: Kelly Steele > -- > 2.43.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115672): https://edk2.groups.io/g/devel/message/115672 Mute This Topic: https://groups.io/mt/104454912/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] UefiPayloadPkg: Add macro to enable selection of timer
Hi Benjamin, We consider using the LAPIC as a timer to be technically superior because it is closer to the CPU. The HPET is a PCH device, which means all access to the timer needs go from CPU -> Home Agent -> Fabric/IO Ring -> DMI Controller -> PCH. Using the LAPIC cuts this path to just the Home Agent. That reduces access latency, which for a timer means higher resolution. Hope that helps, Nate From: devel@edk2.groups.io on behalf of Benjamin Doron Date: Tuesday, January 9, 2024 at 3:48 PM To: Ma <>, Ma, Hua , devel@edk2.groups.io Subject: Re: [edk2-devel] [PATCH] UefiPayloadPkg: Add macro to enable selection of timer Hi, Are there platforms that will use this? What advantages does using the LAPIC as a timer offer? Thanks. Regards, Benjamin -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113504): https://edk2.groups.io/g/devel/message/113504 Mute This Topic: https://groups.io/mt/103538255/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] UefiPayloadPkg: Add macro to enable selection of timer
Hi Hua,
Please make TIMER_SUPPORT a FixedAtBuiildPcd instead of a build flag. Something
like PcdDxeTimerSelection or similar.
Thanks,
Nate
> -Original Message-
> From: devel@edk2.groups.io On Behalf Of Ma, Hua
> Sent: Thursday, January 4, 2024 9:39 PM
> To: devel@edk2.groups.io
> Cc: Ma, Hua
> Subject: [edk2-devel] [PATCH] UefiPayloadPkg: Add macro to enable selection
> of timer
>
> Add macro to enable selection of timer
>
> - HPET: UEFI Payload will use HPET timer
> - LAPIC: UEFI Payload will use local APIC timer
>
> Signed-off-by: Hua Ma
> ---
> UefiPayloadPkg/UefiPayloadPkg.dsc | 16
> UefiPayloadPkg/UefiPayloadPkg.fdf | 4
> 2 files changed, 20 insertions(+)
>
> diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc
> b/UefiPayloadPkg/UefiPayloadPkg.dsc
> index b8b13ad201..4f195c1e52 100644
> --- a/UefiPayloadPkg/UefiPayloadPkg.dsc
> +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
> @@ -139,6 +139,12 @@
># Note: for emulation platform such as QEMU, this may not work and should
> set it as FALSE
>DEFINE CPU_TIMER_LIB_ENABLE = TRUE
>
> + #
> + # HPET: UEFI Payload will use HPET timer # LAPIC: UEFI Payload will
> + use local APIC timer #
> + DEFINE TIMER_SUPPORT = HPET
> +
>DEFINE MULTIPLE_DEBUG_PORT_SUPPORT = FALSE
>
> [BuildOptions]
> @@ -676,7 +682,17 @@
>
> MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuAp
> p.inf
>
>
> +!if $(TIMER_SUPPORT) == "HPET"
>PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf
> +!elseif $(TIMER_SUPPORT) == "LAPIC"
> + OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf {
> +
> +
> +NestedInterruptTplLib|OvmfPkg/Library/NestedInterruptTplLib/NestedInter
> +ruptTplLib.inf
> + }
> +!else
> + !error "Invalid TIMER_SUPPORT"
> +!endif
> +
>MdeModulePkg/Universal/Metronome/Metronome.inf
>MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
> diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf
> b/UefiPayloadPkg/UefiPayloadPkg.fdf
> index 835798be1c..7d04a8cffd 100644
> --- a/UefiPayloadPkg/UefiPayloadPkg.fdf
> +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
> @@ -161,7 +161,11 @@ INF
> MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
> !endif
> INF UefiCpuPkg/CpuDxe/CpuDxe.inf
>
> +!if $(TIMER_SUPPORT) == "HPET"
> INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf
> +!elseif $(TIMER_SUPPORT) == "LAPIC"
> +INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf
> +!endif
> INF MdeModulePkg/Universal/Metronome/Metronome.inf
> INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
> INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
> --
> 2.39.1.windows.1
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113503): https://edk2.groups.io/g/devel/message/113503
Mute This Topic: https://groups.io/mt/103538255/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] EmulatorPkg: Add EFI_STATUS return to EMU_THUNK_PROTOCOL.SetTime()
Pushed as 9cf1d03
> -Original Message-
> From: devel@edk2.groups.io On Behalf Of Nate
> DeSimone
> Sent: Friday, September 29, 2023 3:12 PM
> To: devel@edk2.groups.io
> Cc: Andrew Fish ; Ni, Ray ; Kinney,
> Michael D ; Chiu, Chasel
>
> Subject: [edk2-devel] [PATCH v2] EmulatorPkg: Add EFI_STATUS return to
> EMU_THUNK_PROTOCOL.SetTime()
>
> There is an inconsistency between the UNIX and Windows implementations of
> EMU_THUNK_PROTOCOL.SetTime(). The Windows version returns an
> EFI_STATUS value whereas the the UNIX implementation is VOID. However,
> the UNIX implementation is an unimplemented stub whereas the Windows
> version is implementated.
>
> The current EMU_THUNK_PROTOCOL function pointer definition specifies a
> VOID return type. However, EMU_THUNK_PROTOCOL.SetTime() is close to the
> spec defined gRT->SetTime() except for missing the EFI_STATUS return type.
>
> Therefore, I conclude that the most sensible reconciliation is to add the
> EFI_STATUS return type to the protocol definition.
>
> Cc: Andrew Fish
> Cc: Ray Ni
> Cc: Michael D Kinney
> Cc: Chasel Chiu
> Signed-off-by: Nate DeSimone
> ---
> EmulatorPkg/Include/Protocol/EmuThunk.h | 5 +++--
> EmulatorPkg/Unix/Host/EmuThunk.c| 4 ++--
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/EmulatorPkg/Include/Protocol/EmuThunk.h
> b/EmulatorPkg/Include/Protocol/EmuThunk.h
> index c419d0a677..bdd57f410b 100644
> --- a/EmulatorPkg/Include/Protocol/EmuThunk.h
> +++ b/EmulatorPkg/Include/Protocol/EmuThunk.h
> @@ -2,6 +2,7 @@
>Emulator Thunk to abstract OS services from pure EFI code
>
>Copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
> + Copyright (c) 2023, Intel Corporation. All rights reserved.
>
>SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -148,12 +149,12 @@ VOID
> typedef
> VOID
> (EFIAPI *EMU_GET_TIME)(
> - OUT EFI_TIME *Time,
> + OUT EFI_TIME*Time,
>OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL
>);
>
> typedef
> -VOID
> +EFI_STATUS
> (EFIAPI *EMU_SET_TIME)(
>IN EFI_TIME *Time
>);
> diff --git a/EmulatorPkg/Unix/Host/EmuThunk.c
> b/EmulatorPkg/Unix/Host/EmuThunk.c
> index ee0843eebf..c57c105a53 100644
> --- a/EmulatorPkg/Unix/Host/EmuThunk.c
> +++ b/EmulatorPkg/Unix/Host/EmuThunk.c
> @@ -387,14 +387,14 @@ SecGetTime (
>}
> }
>
> -VOID
> +EFI_STATUS
> SecSetTime (
>IN EFI_TIME *Time
>)
> {
>// Don't change the time on the system
>// We could save delta to localtime() and have SecGetTime adjust return
> values?
> - return;
> + return EFI_UNSUPPORTED;
> }
>
> EFI_STATUS
> --
> 2.39.2.windows.1
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113320): https://edk2.groups.io/g/devel/message/113320
Mute This Topic: https://groups.io/mt/103312902/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v1 1/1] BoardModulePkg\Library\BiosIdLib: Support Standalone MM
Pushed as b46ecad
> -Original Message-
> From: Huang, Li-Xia
> Sent: Monday, December 25, 2023 11:56 PM
> To: devel@edk2.groups.io
> Cc: Dong, Eric ; Desimone, Nathaniel L
>
> Subject: [PATCH v1 1/1] BoardModulePkg\Library\BiosIdLib: Support
> Standalone MM
>
> Add Standalone Mm BiosIdLib and format code with Uncrustify.
>
> Cc: Eric Dong
> Cc: Nate DeSimone
>
> Signed-off-by: Lixia Huang
> ---
> Platform/Intel/BoardModulePkg/Library/BiosIdLib/BiosIdCommon.c|
> 96
> Platform/Intel/BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.c|
> 111
> +++---
> Platform/Intel/BoardModulePkg/Library/BiosIdLib/PeiBiosIdLib.c|
> 118
> +++-
> Platform/Intel/BoardModulePkg/Library/BiosIdLib/StandaloneMmBiosIdLib.c
> | 65 +++
> Platform/Intel/BoardModulePkg/BoardModulePkg.dsc |
> 1 +
> Platform/Intel/BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf |
> 1
> +
> Platform/Intel/BoardModulePkg/Library/BiosIdLib/PeiBiosIdLib.inf |
> 6
> +-
>
> Platform/Intel/BoardModulePkg/Library/BiosIdLib/StandaloneMmBiosIdLib.i
> nf | 42 +++
> 8 files changed, 241 insertions(+), 199 deletions(-)
>
> diff --git
> a/Platform/Intel/BoardModulePkg/Library/BiosIdLib/BiosIdCommon.c
> b/Platform/Intel/BoardModulePkg/Library/BiosIdLib/BiosIdCommon.c
> new file mode 100644
> index ..5735566bfe3a
> --- /dev/null
> +++ b/Platform/Intel/BoardModulePkg/Library/BiosIdLib/BiosIdCommon.c
> @@ -0,0 +1,96 @@
> +/** @file
> + Boot service common BIOS ID library implementation.
> +
> + These functions in this file can be called during DXE and cannot be
> + called during runtime or in SMM which should use a RT or SMM library.
> +
> +
> +Copyright (c) 2023, Intel Corporation. All rights reserved.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> +
> +**/
> +
> +#include
> +#include
> +#include
> +#include
> +
> +/**
> + This function returns the BIOS Version & Release Date and Time by getting
> and converting BIOS ID.
> +
> + @param[out] BiosVersion The Bios Version out of the conversion.
> + @param[out] BiosReleaseDate The Bios Release Date out of the
> conversion.
> + @param[out] BiosReleaseTime The Bios Release Time out of the
> conversion.
> +
> + @retval EFI_SUCCESS BIOS Version & Release Date and Time have
> been got successfully.
> + @retval EFI_NOT_FOUND BIOS ID image is not found, and no
> parameter will be modified.
> + @retval EFI_INVALID_PARAMETER All the parameters are NULL.
> +
> +**/
> +EFI_STATUS
> +EFIAPI
> +GetBiosVersionDateTime (
> + OUT CHAR16 *BiosVersion OPTIONAL,
> + OUT CHAR16 *BiosReleaseDate OPTIONAL,
> + OUT CHAR16 *BiosReleaseTime OPTIONAL
> + )
> +{
> + EFI_STATUS Status;
> + BIOS_ID_IMAGE BiosIdImage;
> +
> + if ((BiosVersion == NULL) && (BiosReleaseDate == NULL) &&
> (BiosReleaseTime == NULL)) {
> +return EFI_INVALID_PARAMETER;
> + }
> +
> + Status = GetBiosId ();
> + if (EFI_ERROR (Status)) {
> +return EFI_NOT_FOUND;
> + }
> +
> + if (BiosVersion != NULL) {
> +//
> +// Fill the BiosVersion data from the BIOS ID.
> +//
> +CopyMem (BiosVersion, &(BiosIdImage.BiosIdString), sizeof
> + (BIOS_ID_STRING)); }
> +
> + if (BiosReleaseDate != NULL) {
> +//
> +// Fill the build timestamp date from the BIOS ID in the "MM/DD/YY"
> format.
> +//
> +BiosReleaseDate[0] = BiosIdImage.BiosIdString.TimeStamp[2];
> +BiosReleaseDate[1] = BiosIdImage.BiosIdString.TimeStamp[3];
> +BiosReleaseDate[2] = (CHAR16)((UINT8)('/'));
> +
> +BiosReleaseDate[3] = BiosIdImage.BiosIdString.TimeStamp[4];
> +BiosReleaseDate[4] = BiosIdImage.BiosIdString.TimeStamp[5];
> +BiosReleaseDate[5] = (CHAR16)((UINT8)('/'));
> +
> +//
> +// Add 20 for SMBIOS table
> +// Current Linux kernel will misjudge 09 as year 0, so using 2009 for
> SMBIOS table
> +//
> +BiosReleaseDate[6] = '2';
> +BiosReleaseDate[7] = '0';
> +BiosReleaseDate[8] = BiosIdImage.BiosIdString.TimeStamp[0];
> +BiosReleaseDate[9] = BiosIdImage.BiosIdString.TimeStamp[1];
> +
> +BiosReleaseDate[10] = (CHAR16)((UINT8)('\0')); }
> +
> + if (BiosReleaseTime != NULL) {
> +//
> +// Fill the build timestamp time from the BIOS ID in the "HH:MM" format.
> +//
> +BiosReleaseTime[0] = BiosIdImage.BiosIdString.TimeStamp[6];
> +BiosReleaseTime[1] = BiosIdImage.BiosIdString.TimeStamp[7];
&g
Re: [edk2-devel] [PATCH v1 1/1] BoardModulePkg\Library\BiosIdLib: Support Standalone MM
Hi Li,
It looks like the standalone MM version of this library is missing the search
for the BiosId file. I suspect the issue you ran into is that standalone MM
only has support for 1 FV, and it is highly likely that the BiosId file is not
in the standalone MM FV. This is understandable; however, it does highlight yet
another deficiency in the architecture of standalone MM. Again, that is not
your fault and is beyond the scope of this patch.
Reviewed-by: Nate DeSimone
> -Original Message-
> From: Huang, Li-Xia
> Sent: Monday, December 25, 2023 11:56 PM
> To: devel@edk2.groups.io
> Cc: Dong, Eric ; Desimone, Nathaniel L
>
> Subject: [PATCH v1 1/1] BoardModulePkg\Library\BiosIdLib: Support
> Standalone MM
>
> Add Standalone Mm BiosIdLib and format code with Uncrustify.
>
> Cc: Eric Dong
> Cc: Nate DeSimone
>
> Signed-off-by: Lixia Huang
> ---
> Platform/Intel/BoardModulePkg/Library/BiosIdLib/BiosIdCommon.c|
> 96
> Platform/Intel/BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.c|
> 111
> +++---
> Platform/Intel/BoardModulePkg/Library/BiosIdLib/PeiBiosIdLib.c|
> 118
> +++-
> Platform/Intel/BoardModulePkg/Library/BiosIdLib/StandaloneMmBiosIdLib.c
> | 65 +++
> Platform/Intel/BoardModulePkg/BoardModulePkg.dsc |
> 1 +
> Platform/Intel/BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf |
> 1
> +
> Platform/Intel/BoardModulePkg/Library/BiosIdLib/PeiBiosIdLib.inf |
> 6
> +-
>
> Platform/Intel/BoardModulePkg/Library/BiosIdLib/StandaloneMmBiosIdLib.i
> nf | 42 +++
> 8 files changed, 241 insertions(+), 199 deletions(-)
>
> diff --git
> a/Platform/Intel/BoardModulePkg/Library/BiosIdLib/BiosIdCommon.c
> b/Platform/Intel/BoardModulePkg/Library/BiosIdLib/BiosIdCommon.c
> new file mode 100644
> index ..5735566bfe3a
> --- /dev/null
> +++ b/Platform/Intel/BoardModulePkg/Library/BiosIdLib/BiosIdCommon.c
> @@ -0,0 +1,96 @@
> +/** @file
> + Boot service common BIOS ID library implementation.
> +
> + These functions in this file can be called during DXE and cannot be
> + called during runtime or in SMM which should use a RT or SMM library.
> +
> +
> +Copyright (c) 2023, Intel Corporation. All rights reserved.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> +
> +**/
> +
> +#include
> +#include
> +#include
> +#include
> +
> +/**
> + This function returns the BIOS Version & Release Date and Time by getting
> and converting BIOS ID.
> +
> + @param[out] BiosVersion The Bios Version out of the conversion.
> + @param[out] BiosReleaseDate The Bios Release Date out of the
> conversion.
> + @param[out] BiosReleaseTime The Bios Release Time out of the
> conversion.
> +
> + @retval EFI_SUCCESS BIOS Version & Release Date and Time have
> been got successfully.
> + @retval EFI_NOT_FOUND BIOS ID image is not found, and no
> parameter will be modified.
> + @retval EFI_INVALID_PARAMETER All the parameters are NULL.
> +
> +**/
> +EFI_STATUS
> +EFIAPI
> +GetBiosVersionDateTime (
> + OUT CHAR16 *BiosVersion OPTIONAL,
> + OUT CHAR16 *BiosReleaseDate OPTIONAL,
> + OUT CHAR16 *BiosReleaseTime OPTIONAL
> + )
> +{
> + EFI_STATUS Status;
> + BIOS_ID_IMAGE BiosIdImage;
> +
> + if ((BiosVersion == NULL) && (BiosReleaseDate == NULL) &&
> (BiosReleaseTime == NULL)) {
> +return EFI_INVALID_PARAMETER;
> + }
> +
> + Status = GetBiosId ();
> + if (EFI_ERROR (Status)) {
> +return EFI_NOT_FOUND;
> + }
> +
> + if (BiosVersion != NULL) {
> +//
> +// Fill the BiosVersion data from the BIOS ID.
> +//
> +CopyMem (BiosVersion, &(BiosIdImage.BiosIdString), sizeof
> + (BIOS_ID_STRING)); }
> +
> + if (BiosReleaseDate != NULL) {
> +//
> +// Fill the build timestamp date from the BIOS ID in the "MM/DD/YY"
> format.
> +//
> +BiosReleaseDate[0] = BiosIdImage.BiosIdString.TimeStamp[2];
> +BiosReleaseDate[1] = BiosIdImage.BiosIdString.TimeStamp[3];
> +BiosReleaseDate[2] = (CHAR16)((UINT8)('/'));
> +
> +BiosReleaseDate[3] = BiosIdImage.BiosIdString.TimeStamp[4];
> +BiosReleaseDate[4] = BiosIdImage.BiosIdString.TimeStamp[5];
> +BiosReleaseDate[5] = (CHAR16)((UINT8)('/'));
> +
> +//
> +// Add 20 for SMBIOS table
> +// Current Linux kernel will misjudge 09 as year 0, so using 2009 for
> SMBIOS table
> +//
> +BiosReleaseDate[6] = '2';
> +BiosReleaseDate[7] = '0';
> +BiosReleaseDate[8] = BiosIdImag
Re: [edk2-devel] [PATCH edk2-platforms 0/4] IpmiFeaturePkg: Support Standalone MM.
The series has been pushed as 59ef582~..fc6e352
> -Original Message-
> From: Xu, Wei6
> Sent: Wednesday, December 20, 2023 9:02 AM
> To: devel@edk2.groups.io
> Cc: Xu, Wei6 ; Abner Chang ;
> Desimone, Nathaniel L
> Subject: [PATCH edk2-platforms 0/4] IpmiFeaturePkg: Support Standalone
> MM.
>
> This patch series add Standalone MM support for ServerManagementLib,
> BmcAcpiSwChild, BmcElog and GenericElog.
> PR: https://github.com/tianocore/edk2-platforms/pull/117
>
> Cc: Abner Chang
> Cc: Nate DeSimone
>
> Wei6 Xu (4):
> IpmiFeaturePkg/ServerManagementLib: Support Standalone MM
> IpmiFeaturePkg/BmcAcpiSwChild: Support Standalone MM
> IpmiFeaturePkg/GenericElog: Support Standalone MM
> IpmiFeaturePkg/BmcElog: Support Standalone MM
>
> .../BmcAcpiSwChild/BmcAcpiSwChild.c | 12 +-
> .../BmcAcpiSwChild/BmcAcpiSwChild.h | 15 +-
> .../BmcAcpiSwChild/BmcAcpiSwChild.inf |5 +-
> .../BmcAcpiSwChildStandaloneMm.c | 31 +
> .../BmcAcpiSwChildStandaloneMm.inf| 40 +
> .../BmcAcpiSwChildTraditionalMm.c | 31 +
> .../IpmiFeaturePkg/BmcElog/Smm/BmcElog.c | 14 +-
> .../IpmiFeaturePkg/BmcElog/Smm/BmcElog.h | 15 +-
> .../BmcElog/Smm/BmcElogStandaloneMm.c | 28 +
> .../BmcElog/Smm/BmcElogTraditionalMm.c| 28 +
> .../IpmiFeaturePkg/BmcElog/SmmBmcElog.inf |6 +-
> .../BmcElog/StandaloneMmBmcElog.inf | 44 +
> .../GenericElog/Smm/GenericElog.c | 35 +-
> .../GenericElog/Smm/GenericElog.h | 28 +-
> .../GenericElog/Smm/GenericElog.inf |5 +-
> .../GenericElog/Smm/GenericElogStandaloneMm.c | 28 +
> .../Smm/GenericElogStandaloneMm.inf | 41 +
> .../Smm/GenericElogTraditionalMm.c| 28 +
> .../IpmiFeaturePkg/Include/IpmiFeature.dsc|6 +
> .../ServerManagementElog.c| 235
> .../ServerManagementLib.inf |4 +-
> ...ManagementLib.c => ServerManagementTime.c} | 1175 +++--
> .../StandaloneMmServerManagementLib.inf | 29 +
> 23 files changed, 1099 insertions(+), 784 deletions(-) create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpiSwChild/B
> mcAcpiSwChildStandaloneMm.c
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpiSwChild/B
> mcAcpiSwChildStandaloneMm.inf
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpiSwChild/B
> mcAcpiSwChildTraditionalMm.c
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/Smm/Bmc
> ElogStandaloneMm.c
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/Smm/Bmc
> ElogTraditionalMm.c
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/Standalon
> eMmBmcElog.inf
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericElog/Smm/
> GenericElogStandaloneMm.c
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericElog/Smm/
> GenericElogStandaloneMm.inf
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericElog/Smm/
> GenericElogTraditionalMm.c
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/ServerMana
> gementLib/ServerManagementElog.c
> rename
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/ServerMana
> gementLib/{ServerManagementLib.c => ServerManagementTime.c} (55%)
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/ServerMana
> gementLib/StandaloneMmServerManagementLib.inf
>
> --
> 2.29.2.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#112790): https://edk2.groups.io/g/devel/message/112790
Mute This Topic: https://groups.io/mt/103284557/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 0/4] IpmiFeaturePkg: Support Standalone MM.
For the series...
Reviewed-by: Nate DeSimone =
> -Original Message-
> From: Xu, Wei6
> Sent: Wednesday, December 20, 2023 9:02 AM
> To: devel@edk2.groups.io
> Cc: Xu, Wei6 ; Abner Chang ;
> Desimone, Nathaniel L
> Subject: [PATCH edk2-platforms 0/4] IpmiFeaturePkg: Support Standalone
> MM.
>
> This patch series add Standalone MM support for ServerManagementLib,
> BmcAcpiSwChild, BmcElog and GenericElog.
> PR: https://github.com/tianocore/edk2-platforms/pull/117
>
> Cc: Abner Chang
> Cc: Nate DeSimone
>
> Wei6 Xu (4):
> IpmiFeaturePkg/ServerManagementLib: Support Standalone MM
> IpmiFeaturePkg/BmcAcpiSwChild: Support Standalone MM
> IpmiFeaturePkg/GenericElog: Support Standalone MM
> IpmiFeaturePkg/BmcElog: Support Standalone MM
>
> .../BmcAcpiSwChild/BmcAcpiSwChild.c | 12 +-
> .../BmcAcpiSwChild/BmcAcpiSwChild.h | 15 +-
> .../BmcAcpiSwChild/BmcAcpiSwChild.inf |5 +-
> .../BmcAcpiSwChildStandaloneMm.c | 31 +
> .../BmcAcpiSwChildStandaloneMm.inf| 40 +
> .../BmcAcpiSwChildTraditionalMm.c | 31 +
> .../IpmiFeaturePkg/BmcElog/Smm/BmcElog.c | 14 +-
> .../IpmiFeaturePkg/BmcElog/Smm/BmcElog.h | 15 +-
> .../BmcElog/Smm/BmcElogStandaloneMm.c | 28 +
> .../BmcElog/Smm/BmcElogTraditionalMm.c| 28 +
> .../IpmiFeaturePkg/BmcElog/SmmBmcElog.inf |6 +-
> .../BmcElog/StandaloneMmBmcElog.inf | 44 +
> .../GenericElog/Smm/GenericElog.c | 35 +-
> .../GenericElog/Smm/GenericElog.h | 28 +-
> .../GenericElog/Smm/GenericElog.inf |5 +-
> .../GenericElog/Smm/GenericElogStandaloneMm.c | 28 +
> .../Smm/GenericElogStandaloneMm.inf | 41 +
> .../Smm/GenericElogTraditionalMm.c| 28 +
> .../IpmiFeaturePkg/Include/IpmiFeature.dsc|6 +
> .../ServerManagementElog.c| 235
> .../ServerManagementLib.inf |4 +-
> ...ManagementLib.c => ServerManagementTime.c} | 1175 +++--
> .../StandaloneMmServerManagementLib.inf | 29 +
> 23 files changed, 1099 insertions(+), 784 deletions(-) create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpiSwChild/B
> mcAcpiSwChildStandaloneMm.c
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpiSwChild/B
> mcAcpiSwChildStandaloneMm.inf
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpiSwChild/B
> mcAcpiSwChildTraditionalMm.c
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/Smm/Bmc
> ElogStandaloneMm.c
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/Smm/Bmc
> ElogTraditionalMm.c
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/Standalon
> eMmBmcElog.inf
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericElog/Smm/
> GenericElogStandaloneMm.c
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericElog/Smm/
> GenericElogStandaloneMm.inf
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericElog/Smm/
> GenericElogTraditionalMm.c
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/ServerMana
> gementLib/ServerManagementElog.c
> rename
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/ServerMana
> gementLib/{ServerManagementLib.c => ServerManagementTime.c} (55%)
> create mode 100644
> Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/ServerMana
> gementLib/StandaloneMmServerManagementLib.inf
>
> --
> 2.29.2.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#112789): https://edk2.groups.io/g/devel/message/112789
Mute This Topic: https://groups.io/mt/103284557/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] MinPlatformPkg: Support SecFspWrapperPlatformSecLib in X64
Hi Ted,
Looking at this code, the X64 version will only work if
PcdFspWrapperResetVectorInFsp == TRUE. Moreover, the IA32 version will only
work if PcdFspWrapperResetVectorInFsp == FALSE. So... what is the point of
having a PCD if the PCD must always be set to one value or the other? Please
choose one of these options:
Option 1: Make the PCD work correctly for all the 4 cases:
- IA32 + Bootloader Reset Vector
- IA32 + FSP Reset Vector
- X64 + Bootloader Reset Vector
- X64 + FSP Reset Vector
Option 2: Make a separate instance of PlatformSecLib for the case of FSP-O
providing the reset vector.
Additional feedback is below inline.
Thanks,
Nate
> -Original Message-
> From: Kuo, Ted
> Sent: Sunday, December 17, 2023 8:03 PM
> To: devel@edk2.groups.io
> Cc: Chaganty, Rangasai V ; Chiu, Chasel
> ; Desimone, Nathaniel L
> ; Dong, Eric ; S,
> Ashraf Ali ; Duggapu, Chinni B
> ; Gao, Liming
> Subject: [edk2-devel][edk2-platforms][PATCH v1] MinPlatformPkg: Support
> SecFspWrapperPlatformSecLib in X64
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=4623
> 1.Added PeiCoreEntry.nasm, SecEntry.nasm and Stack.nasm for X64.
> 2.Made changes in common file to support both IA32 and X64.
> 3.Added the PCDs below for FSP-T UPD revsions and X64 feature.
> - PcdFspWrapperResetVectorInFsp
> - PcdFspWrapperBfvforResetVectorInFsp
> - PcdFsptUpdHeaderRevision
> - PcdFsptArchUpdHeaderRevision
>
> Cc: Sai Chaganty
> Cc: Chasel Chiu
> Cc: Nate DeSimone
> Cc: Eric Dong
> Cc: Ashraf Ali S
> Cc: Chinni B Duggapu
> Cc: Liming Gao
> Signed-off-by: Ted Kuo
> ---
> .../SecFspWrapperPlatformSecLib/FsptCoreUpd.h | 25 +-
> .../Ia32/SecEntry.nasm| 4 +-
> .../SecFspWrapperPlatformSecLib.inf | 12 +-
> .../SecGetPerformance.c | 11 +-
> .../SecPlatformInformation.c | 8 +-
> .../SecRamInitData.c | 56 -
> .../X64/PeiCoreEntry.nasm | 224 ++
> .../X64/SecEntry.nasm | 214 +
> .../X64/Stack.nasm| 72 ++
> .../Ia32 => Include}/Fsp.h| 4 +-
> .../Intel/MinPlatformPkg/MinPlatformPkg.dec | 21 ++
> 11 files changed, 629 insertions(+), 22 deletions(-)
> create mode 100644
> Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/X64/PeiCoreEntry.nasm
> create mode 100644
> Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/X64/SecEntry.nasm
> create mode 100644
> Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/X64/Stack.nasm
> rename
> Platform/Intel/MinPlatformPkg/{FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32
> => Include}/Fsp.h (86%)
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FsptCoreUpd.h
>
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FsptCoreUpd.h
> index 7c0f605b92..7c4ddc09a8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FsptCoreUpd.h
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FsptCoreUpd.h
> @@ -1,6 +1,6 @@
> /** @file
>
> -Copyright (c) 2017, Intel Corporation. All rights reserved.
> +Copyright (c) 2017 - 2023, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> @@ -10,6 +10,28 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>
> #pragma pack(1)
>
> +#if defined (MDE_CPU_X64)
> +/** Fsp T Core UPD
> +**/
> +typedef struct {
> +
> +/** Offset 0x0040
> +**/
> + EFI_PHYSICAL_ADDRESSMicrocodeRegionBase;
> +
> +/** Offset 0x0048
> +**/
> + UINT64 MicrocodeRegionSize;
> +
> +/** Offset 0x0050
> +**/
> + EFI_PHYSICAL_ADDRESSCodeRegionBase;
> +
> +/** Offset 0x0058
> +**/
> + UINT64 CodeRegionSize;
> +} FSPT_CORE_UPD;
> +#else
> /** Fsp T Core UPD
> **/
> typedef struct {
> @@ -34,6 +56,7 @@ typedef struct {
> **/
>UINT8 Reserved[16];
> } FSPT_CORE_UPD;
> +#endif
>
> #pragma pack()
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.nasm
>
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.nasm
> index 7f6d771e41..de44066a20 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.nasm
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/Sec
Re: [edk2-devel] [PATCH v1 2/2] IpmiFeaturePkg/GenericIpmi: Fix GCC compiler error
Pushed as 59ef582
-Original Message-
From: Huang, Li-Xia
Sent: Monday, December 18, 2023 10:10 PM
To: devel@edk2.groups.io
Cc: Abner Chang ; Desimone, Nathaniel L
Subject: [PATCH v1 2/2] IpmiFeaturePkg/GenericIpmi: Fix GCC compiler error
Fix GCC compiler error in StandaloneMmGenericIpmi.
Cc: Abner Chang
Cc: Nate DeSimone
Signed-off-by: Lixia Huang
---
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
| 2 --
1 file changed, 2 deletions(-)
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
index 1b9841e4b745..edc9eec9395a 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
@@ -185,12 +185,10 @@ Returns:
**/
{
EFI_STATUSStatus;
- UINT8 ErrorCount;
IPMI_INTERFACE_STATE InterfaceState;
UINT8 Index;
DEBUG ((DEBUG_INFO, "SmmInitializeIpmiKcsPhysicalLayer entry \n"));
- ErrorCount = 0;
InterfaceState = IpmiInterfaceNotReady;
Status = gMmst->MmAllocatePool (
--
2.26.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#112734): https://edk2.groups.io/g/devel/message/112734
Mute This Topic: https://groups.io/mt/103258537/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v1 2/2] IpmiFeaturePkg/GenericIpmi: Fix GCC compiler error
Reviewed-by: Nate DeSimone
-Original Message-
From: Huang, Li-Xia
Sent: Monday, December 18, 2023 10:10 PM
To: devel@edk2.groups.io
Cc: Abner Chang ; Desimone, Nathaniel L
Subject: [PATCH v1 2/2] IpmiFeaturePkg/GenericIpmi: Fix GCC compiler error
Fix GCC compiler error in StandaloneMmGenericIpmi.
Cc: Abner Chang
Cc: Nate DeSimone
Signed-off-by: Lixia Huang
---
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
| 2 --
1 file changed, 2 deletions(-)
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
index 1b9841e4b745..edc9eec9395a 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
@@ -185,12 +185,10 @@ Returns:
**/
{
EFI_STATUSStatus;
- UINT8 ErrorCount;
IPMI_INTERFACE_STATE InterfaceState;
UINT8 Index;
DEBUG ((DEBUG_INFO, "SmmInitializeIpmiKcsPhysicalLayer entry \n"));
- ErrorCount = 0;
InterfaceState = IpmiInterfaceNotReady;
Status = gMmst->MmAllocatePool (
--
2.26.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#112733): https://edk2.groups.io/g/devel/message/112733
Mute This Topic: https://groups.io/mt/103258537/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 1/1] OutOfBandManagement/SpcrFeaturePkg: PCD based IRQ/GSI
Pushed as 3c0adfe.
-Original Message-
From: Abdul Lateef Attar
Sent: Wednesday, August 2, 2023 11:35 PM
To: devel@edk2.groups.io
Cc: Abdul Lateef Attar ; Chaganty, Rangasai V
; Oram, Isaac W ;
Desimone, Nathaniel L ; Gao, Liming
; Abner Chang
Subject: [PATCH 1/1] OutOfBandManagement/SpcrFeaturePkg: PCD based IRQ/GSI
From: Abdul Lateef Attar
Create a new PCD to hold the IRQ or GSI number for SPCR, with default values of
4.
Update the ACPI SPCR table's IRQ value based on PCD.
Cc: Sai Chaganty
Cc: Isaac Oram
Cc: Nate DeSimone
Cc: Liming Gao
Cc: Abner Chang
Signed-off-by: Abdul Lateef Attar
Change-Id: I7218903fa5572f8139ad45db598ab085f079713b
---
.../OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dec | 5 +
.../SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpiDxe.inf | 4
.../SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.h | 3 +++
.../SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.c | 7 ---
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git
a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dec
b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dec
index b084fad89220..d69d650f3f20 100644
--- a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dec
+++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.d
+++ ec
@@ -7,6 +7,7 @@
# for the build infrastructure.
#
# Copyright (c) 2020, Intel Corporation. All rights reserved.
+# Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved
#
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -24,6 +25,10 @@
[Includes] [Guids]
gSpcrFeaturePkgTokenSpaceGuid = { 0xe978c988, 0xeeba, 0x4671, { 0xb8, 0x0d,
0xcc, 0x8b, 0x89, 0xb5, 0xd1, 0xef }}
+[PcdsFixedAtBuild]
+ # SPCR default IRQ set to 4
+ gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrInterrupt|4|UINT8|0x0010
+
[PcdsFeatureFlag]
gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrFeatureEnable|FALSE|BOOLEAN|0x0001
diff --git
a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpiDxe.inf
b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpiDxe.inf
index 9a4f95e86bbf..cd43afea5242 100644
---
a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpiDxe.inf
+++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/Spcr
+++ AcpiDxe.inf
@@ -24,6 +24,7 @@ [LibraryClasses]
UefiDriverEntryPoint
UefiLib
SpcrDeviceLib
+ PcdLib
[Packages]
MdePkg/MdePkg.dec
@@ -51,5 +52,8 @@ [Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio
+[FixedPcd]
+ gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrInterrupt
+
[Depex]
TRUE
diff --git
a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.h
b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.h
index c11da439fcb8..245a847762c5 100644
--- a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.h
+++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/Spcr
+++ Acpi.h
@@ -3,6 +3,8 @@
SPCR is abbreviation of Serial Port Console Redirection Table (SPCR).
Copyright (c) 2004 - 2020, Intel Corporation. All rights reserved.
+ Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.
+
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -23,6 +25,7 @@
#include
#include #include
+#include
#include
#include
diff --git
a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.c
b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.c
index 51449d0fad9e..e92db96caaa9 100644
--- a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.c
+++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/Spcr
+++ Acpi.c
@@ -3,7 +3,7 @@
SPCR is abbreviation of Serial Port Console Redirection Table (SPCR).
Copyright (c) 2004 - 2020, Intel Corporation. All rights reserved.
- Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -83,8 +83,8 @@ EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE gSpcrInfo = {
},
0x03, //INTERRUPT_TYPE,
- 0x04, //IRQ,
- 0x04, //GLOBAL_SYSTEM_INTERRUPT,
+ FixedPcdGet8 (PcdSpcrInterrupt), // IRQ,
+ FixedPcdGet8 (PcdSpcrInterrupt), // GLOBAL_SYSTEM_INTERRUPT,
0x07, //BAUD_RATE,
0x00, //PARITY,
0x01, //STOP_BITS,
@@ -441,6 +441,7 @@ OutOfBandACPITableConstruction (
gSpcrInfo.FlowControl = UART_FLOW_CONTROL_HARDWARE;
}
+
if (HasIsaSerialNode(SavedDevicePath)) {
GetIsaTypeInfo (SavedDevicePath);
} else {
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#112331): https://edk2.groups.io/g/devel/message/112331
Mute
Re: [edk2-devel] [PATCH 1/1] OutOfBandManagement/SpcrFeaturePkg: PCD based IRQ/GSI
Reviewed-by: Nate DeSimone
-Original Message-
From: Abdul Lateef Attar
Sent: Wednesday, August 2, 2023 11:35 PM
To: devel@edk2.groups.io
Cc: Abdul Lateef Attar ; Chaganty, Rangasai V
; Oram, Isaac W ;
Desimone, Nathaniel L ; Gao, Liming
; Abner Chang
Subject: [PATCH 1/1] OutOfBandManagement/SpcrFeaturePkg: PCD based IRQ/GSI
From: Abdul Lateef Attar
Create a new PCD to hold the IRQ or GSI number for SPCR, with default values of
4.
Update the ACPI SPCR table's IRQ value based on PCD.
Cc: Sai Chaganty
Cc: Isaac Oram
Cc: Nate DeSimone
Cc: Liming Gao
Cc: Abner Chang
Signed-off-by: Abdul Lateef Attar
Change-Id: I7218903fa5572f8139ad45db598ab085f079713b
---
.../OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dec | 5 +
.../SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpiDxe.inf | 4
.../SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.h | 3 +++
.../SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.c | 7 ---
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git
a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dec
b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dec
index b084fad89220..d69d650f3f20 100644
--- a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dec
+++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.d
+++ ec
@@ -7,6 +7,7 @@
# for the build infrastructure.
#
# Copyright (c) 2020, Intel Corporation. All rights reserved.
+# Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved
#
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -24,6 +25,10 @@
[Includes] [Guids]
gSpcrFeaturePkgTokenSpaceGuid = { 0xe978c988, 0xeeba, 0x4671, { 0xb8, 0x0d,
0xcc, 0x8b, 0x89, 0xb5, 0xd1, 0xef }}
+[PcdsFixedAtBuild]
+ # SPCR default IRQ set to 4
+ gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrInterrupt|4|UINT8|0x0010
+
[PcdsFeatureFlag]
gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrFeatureEnable|FALSE|BOOLEAN|0x0001
diff --git
a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpiDxe.inf
b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpiDxe.inf
index 9a4f95e86bbf..cd43afea5242 100644
---
a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpiDxe.inf
+++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/Spcr
+++ AcpiDxe.inf
@@ -24,6 +24,7 @@ [LibraryClasses]
UefiDriverEntryPoint
UefiLib
SpcrDeviceLib
+ PcdLib
[Packages]
MdePkg/MdePkg.dec
@@ -51,5 +52,8 @@ [Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio
+[FixedPcd]
+ gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrInterrupt
+
[Depex]
TRUE
diff --git
a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.h
b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.h
index c11da439fcb8..245a847762c5 100644
--- a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.h
+++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/Spcr
+++ Acpi.h
@@ -3,6 +3,8 @@
SPCR is abbreviation of Serial Port Console Redirection Table (SPCR).
Copyright (c) 2004 - 2020, Intel Corporation. All rights reserved.
+ Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.
+
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -23,6 +25,7 @@
#include
#include #include
+#include
#include
#include
diff --git
a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.c
b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.c
index 51449d0fad9e..e92db96caaa9 100644
--- a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpi.c
+++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrAcpiDxe/Spcr
+++ Acpi.c
@@ -3,7 +3,7 @@
SPCR is abbreviation of Serial Port Console Redirection Table (SPCR).
Copyright (c) 2004 - 2020, Intel Corporation. All rights reserved.
- Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -83,8 +83,8 @@ EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE gSpcrInfo = {
},
0x03, //INTERRUPT_TYPE,
- 0x04, //IRQ,
- 0x04, //GLOBAL_SYSTEM_INTERRUPT,
+ FixedPcdGet8 (PcdSpcrInterrupt), // IRQ,
+ FixedPcdGet8 (PcdSpcrInterrupt), // GLOBAL_SYSTEM_INTERRUPT,
0x07, //BAUD_RATE,
0x00, //PARITY,
0x01, //STOP_BITS,
@@ -441,6 +441,7 @@ OutOfBandACPITableConstruction (
gSpcrInfo.FlowControl = UART_FLOW_CONTROL_HARDWARE;
}
+
if (HasIsaSerialNode(SavedDevicePath)) {
GetIsaTypeInfo (SavedDevicePath);
} else {
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#112330): https://edk2.groups.io/g/devel/message
Re: [edk2-devel] [PATCH v1 1/1] IpmiFeaturePkg/GenericIpmi: Sync change from SMM
Pushed as 7afba0.
-Original Message-
From: Huang, Li-Xia
Sent: Tuesday, December 5, 2023 11:00 PM
To: devel@edk2.groups.io
Cc: Abner Chang ; Desimone, Nathaniel L
Subject: [PATCH v1 1/1] IpmiFeaturePkg/GenericIpmi: Sync change from SMM
Sync change from SMM to StandaloneMm GenericIpmi driver.
Update SmmIpmbInterface and SmmSsifInterface Lib to support MM_STANDALONE. And
Format code with uncrustify.
Cc: Abner Chang
Cc: Nate DeSimone
Signed-off-by: Lixia Huang
---
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
| 315 +---
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/BmcInterfaceCommonAccess/IpmbInterfaceLib/SmmIpmbInterfaceLib.c
| 4 +-
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/BmcInterfaceCommonAccess/SsifInterfaceLib/SmmSsifInterfaceLib.c
| 64 ++--
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.inf
| 10 +
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature.dsc
| 2 +-
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/BmcInterfaceCommonAccess/IpmbInterfaceLib/SmmIpmbInterfaceLib.inf
| 4 +-
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/BmcInterfaceCommonAccess/SsifInterfaceLib/SmmSsifInterfaceLib.inf
| 4 +-
7 files changed, 326 insertions(+), 77 deletions(-)
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
index d808e2517c99..1b9841e4b745 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Stan
+++ daloneMm/StandaloneMmGenericIpmi.c
@@ -19,17 +19,157 @@
#include
#include
#include
+#include
#include
#include "IpmiHooks.h"
#include "IpmiBmcCommon.h"
#include "IpmiBmc.h"
-IPMI_BMC_INSTANCE_DATA *mIpmiInstance;
-EFI_HANDLE mHandle;
+IPMI_BMC_INSTANCE_DATA *mIpmiInstance;
+EFI_HANDLE mIpmiTransportHandle;
+EFI_HANDLE mIpmiTransport2Handle;
/**
+
+Routine Description:
+ Initialize the API and parameters for IPMI Transport2 Instance
+
+Arguments:
+ IpmiInstance- Pointer to IPMI Instance.
+
+Returns:
+ VOID- Nothing.
+
+**/
+VOID
+InitIpmiTransport2 (
+ IN IPMI_BMC_INSTANCE_DATA *IpmiInstance
+ )
+{
+ IpmiInstance->IpmiTransport2.InterfaceType = FixedPcdGet8
(PcdDefaultSystemInterface);
+ IpmiInstance->IpmiTransport2.IpmiTransport2BmcStatus = BmcStatusOk;
+ IpmiInstance->IpmiTransport2.IpmiSubmitCommand2 = IpmiSendCommand2;
+ IpmiInstance->IpmiTransport2.IpmiSubmitCommand2Ex= IpmiSendCommand2Ex;
+
+ if (FixedPcdGet8 (PcdBtInterfaceSupport) == 1) {
+InitBtInterfaceData (>IpmiTransport2); }
+
+ if (FixedPcdGet8 (PcdSsifInterfaceSupport) == 1) {
+InitSsifInterfaceData (>IpmiTransport2); }
+
+ if (FixedPcdGet8 (PcdIpmbInterfaceSupport) == 1) {
+InitIpmbInterfaceData (>IpmiTransport2);
+ }
+}
+
+/**
+
+Routine Description:
+ Notify call back to initialize the interfaces and install SMM IPMI
+ protocol.
+
+Arguments:
+ Protocol- Pointer to the protocol guid.
+ Interface - Pointer to the protocol instance.
+ Handle - Handle on which the protocol is installed.
+
+Returns:
+ Status of Notify call back.
+
+**/
+EFI_STATUS
+EFIAPI
+SmmNotifyCallback (
+ IN CONST EFI_GUID*Protocol,
+ INVOID*Interface,
+ INEFI_HANDLE Handle
+ )
+{
+ EFI_STATUSStatus;
+ IPMI_INTERFACE_STATE InterfaceState;
+
+ InterfaceState = IpmiInterfaceNotReady;
+
+ if (FixedPcdGet8 (PcdSsifInterfaceSupport) == 1) {
+InitSsifInterfaceData (>IpmiTransport2);
+
+if (mIpmiInstance->IpmiTransport2.Interface.Ssif.InterfaceState ==
IpmiInterfaceInitialized) {
+ InterfaceState = IpmiInterfaceInitialized;
+}
+ }
+
+ if (FixedPcdGet8 (PcdIpmbInterfaceSupport) == 1) {
+InitIpmbInterfaceData (>IpmiTransport2); }
+
+ if (mIpmiInstance->IpmiTransport2.Interface.Ipmb.InterfaceState ==
IpmiInterfaceInitialized) {
+InterfaceState = IpmiInterfaceInitialized; }
+
+ if (InterfaceState != IpmiInterfaceInitialized) {
+return EFI_SUCCESS;
+ }
+
+ // Default Interface data should be initialized to install Ipmi Transport2
Protocol.
+ if (InterfaceState == IpmiInterfaceInitialized) {
+mIpmiTransport2Handle = NULL;
+Status= gMmst->MmInstallProtocolInterface (
+ ,
+ ,
+ EFI_NATIV
Re: [edk2-devel] [PATCH v1 1/1] IpmiFeaturePkg/GenericIpmi: Sync change from SMM
Reviewed-by: Nate DeSimone
-Original Message-
From: Huang, Li-Xia
Sent: Tuesday, December 5, 2023 11:00 PM
To: devel@edk2.groups.io
Cc: Abner Chang ; Desimone, Nathaniel L
Subject: [PATCH v1 1/1] IpmiFeaturePkg/GenericIpmi: Sync change from SMM
Sync change from SMM to StandaloneMm GenericIpmi driver.
Update SmmIpmbInterface and SmmSsifInterface Lib to support MM_STANDALONE. And
Format code with uncrustify.
Cc: Abner Chang
Cc: Nate DeSimone
Signed-off-by: Lixia Huang
---
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
| 315 +---
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/BmcInterfaceCommonAccess/IpmbInterfaceLib/SmmIpmbInterfaceLib.c
| 4 +-
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/BmcInterfaceCommonAccess/SsifInterfaceLib/SmmSsifInterfaceLib.c
| 64 ++--
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.inf
| 10 +
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature.dsc
| 2 +-
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/BmcInterfaceCommonAccess/IpmbInterfaceLib/SmmIpmbInterfaceLib.inf
| 4 +-
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/BmcInterfaceCommonAccess/SsifInterfaceLib/SmmSsifInterfaceLib.inf
| 4 +-
7 files changed, 326 insertions(+), 77 deletions(-)
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
index d808e2517c99..1b9841e4b745 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/StandaloneMm/StandaloneMmGenericIpmi.c
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Stan
+++ daloneMm/StandaloneMmGenericIpmi.c
@@ -19,17 +19,157 @@
#include
#include
#include
+#include
#include
#include "IpmiHooks.h"
#include "IpmiBmcCommon.h"
#include "IpmiBmc.h"
-IPMI_BMC_INSTANCE_DATA *mIpmiInstance;
-EFI_HANDLE mHandle;
+IPMI_BMC_INSTANCE_DATA *mIpmiInstance;
+EFI_HANDLE mIpmiTransportHandle;
+EFI_HANDLE mIpmiTransport2Handle;
/**
+
+Routine Description:
+ Initialize the API and parameters for IPMI Transport2 Instance
+
+Arguments:
+ IpmiInstance- Pointer to IPMI Instance.
+
+Returns:
+ VOID- Nothing.
+
+**/
+VOID
+InitIpmiTransport2 (
+ IN IPMI_BMC_INSTANCE_DATA *IpmiInstance
+ )
+{
+ IpmiInstance->IpmiTransport2.InterfaceType = FixedPcdGet8
(PcdDefaultSystemInterface);
+ IpmiInstance->IpmiTransport2.IpmiTransport2BmcStatus = BmcStatusOk;
+ IpmiInstance->IpmiTransport2.IpmiSubmitCommand2 = IpmiSendCommand2;
+ IpmiInstance->IpmiTransport2.IpmiSubmitCommand2Ex= IpmiSendCommand2Ex;
+
+ if (FixedPcdGet8 (PcdBtInterfaceSupport) == 1) {
+InitBtInterfaceData (>IpmiTransport2); }
+
+ if (FixedPcdGet8 (PcdSsifInterfaceSupport) == 1) {
+InitSsifInterfaceData (>IpmiTransport2); }
+
+ if (FixedPcdGet8 (PcdIpmbInterfaceSupport) == 1) {
+InitIpmbInterfaceData (>IpmiTransport2);
+ }
+}
+
+/**
+
+Routine Description:
+ Notify call back to initialize the interfaces and install SMM IPMI
+ protocol.
+
+Arguments:
+ Protocol- Pointer to the protocol guid.
+ Interface - Pointer to the protocol instance.
+ Handle - Handle on which the protocol is installed.
+
+Returns:
+ Status of Notify call back.
+
+**/
+EFI_STATUS
+EFIAPI
+SmmNotifyCallback (
+ IN CONST EFI_GUID*Protocol,
+ INVOID*Interface,
+ INEFI_HANDLE Handle
+ )
+{
+ EFI_STATUSStatus;
+ IPMI_INTERFACE_STATE InterfaceState;
+
+ InterfaceState = IpmiInterfaceNotReady;
+
+ if (FixedPcdGet8 (PcdSsifInterfaceSupport) == 1) {
+InitSsifInterfaceData (>IpmiTransport2);
+
+if (mIpmiInstance->IpmiTransport2.Interface.Ssif.InterfaceState ==
IpmiInterfaceInitialized) {
+ InterfaceState = IpmiInterfaceInitialized;
+}
+ }
+
+ if (FixedPcdGet8 (PcdIpmbInterfaceSupport) == 1) {
+InitIpmbInterfaceData (>IpmiTransport2); }
+
+ if (mIpmiInstance->IpmiTransport2.Interface.Ipmb.InterfaceState ==
IpmiInterfaceInitialized) {
+InterfaceState = IpmiInterfaceInitialized; }
+
+ if (InterfaceState != IpmiInterfaceInitialized) {
+return EFI_SUCCESS;
+ }
+
+ // Default Interface data should be initialized to install Ipmi Transport2
Protocol.
+ if (InterfaceState == IpmiInterfaceInitialized) {
+mIpmiTransport2Handle = NULL;
+Status= gMmst->MmInstallProtocolInterface (
+ ,
+ ,
+ EFI_NATIV
Re: [edk2-devel] [PATCH v2] PcAtChipsetPkg: Fix AcpiTimerLib incompatibility with XhciDxe
Pushed as df2ec2a
-Original Message-
From: devel@edk2.groups.io On Behalf Of Nate DeSimone
Sent: Monday, December 4, 2023 10:48 AM
To: devel@edk2.groups.io
Cc: Ni, Ray ; Kinney, Michael D
Subject: [edk2-devel] [PATCH v2] PcAtChipsetPkg: Fix AcpiTimerLib
incompatibility with XhciDxe
The DXE & MM standalone variant of AcpiTimerLib defines a global named
mPerformanceCounterFrequency. A global with an identical name is also present
in MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
Since XhciDxe has a dependency on TimerLib, this can cause link errors due to
the same symbol being defined twice if the platform DSC chooses to use
AcpiTimerLib as the TimerLib implementation for any given platform.
To resolve this, I have changed made the definition of
mPerformanceCounterFrequency to static and renamed it to
mAcpiTimerLibTscFrequency. Since this variable is not used outside of the
DxeStandaloneMmAcpiTimerLib.c compilation unit, there is no reason to have it
exported as a global.
Cc: Ray Ni
Cc: Michael D Kinney
Signed-off-by: Nate DeSimone
---
.../AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c
b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c
index 16ac48938f..ccceb8a649 100644
--- a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c
+++ b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c
@@ -1,7 +1,7 @@
/** @file
ACPI Timer implements one instance of Timer Library.
- Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2023, Intel Corporation. All rights
+ reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -11,6 +11,11 @@
#include
#include
+//
+// Cached performance counter frequency // static UINT64
+mAcpiTimerLibTscFrequency = 0;
+
extern GUID mFrequencyHobGuid;
/**
@@ -48,11 +53,6 @@ InternalCalculateTscFrequency (
VOID
);
-//
-// Cached performance counter frequency -//
-UINT64 mPerformanceCounterFrequency = 0;
-
/**
Internal function to retrieves the 64-bit frequency in Hz.
@@ -66,7 +66,7 @@ InternalGetPerformanceCounterFrequency (
VOID
)
{
- return mPerformanceCounterFrequency;
+ return mAcpiTimerLibTscFrequency;
}
/**
@@ -92,9 +92,9 @@ CommonAcpiTimerLibConstructor (
//
GuidHob = GetFirstGuidHob ();
if (GuidHob != NULL) {
-mPerformanceCounterFrequency = *(UINT64 *)GET_GUID_HOB_DATA (GuidHob);
+mAcpiTimerLibTscFrequency = *(UINT64 *)GET_GUID_HOB_DATA (GuidHob);
} else {
-mPerformanceCounterFrequency = InternalCalculateTscFrequency ();
+mAcpiTimerLibTscFrequency = InternalCalculateTscFrequency ();
}
return EFI_SUCCESS;
--
2.39.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#112141): https://edk2.groups.io/g/devel/message/112141
Mute This Topic: https://groups.io/mt/103024047/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] PcAtChipsetPkg: Fix AcpiTimerLib incompatibility with XhciDxe
> -Original Message- > From: Pedro Falcato > Sent: Monday, December 4, 2023 11:59 AM > To: devel@edk2.groups.io; Desimone, Nathaniel L > > Cc: Ni, Ray ; Kinney, Michael D > > Subject: Re: [edk2-devel] [PATCH v2] PcAtChipsetPkg: Fix AcpiTimerLib > incompatibility with XhciDxe > > On Mon, Dec 4, 2023 at 6:48 PM Nate DeSimone > mailto:nathaniel.l.desim...@intel.com>> wrote: > > > > The DXE & MM standalone variant of AcpiTimerLib defines a global named > > mPerformanceCounterFrequency. A global with an identical name is also > > present in MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c > > > > Since XhciDxe has a dependency on TimerLib, this can cause link errors > > due to the same symbol being defined twice if the platform DSC chooses > > to use AcpiTimerLib as the TimerLib implementation for any given > > platform. > > > > To resolve this, I have changed made the definition of > > mPerformanceCounterFrequency to static and renamed it to > > mAcpiTimerLibTscFrequency. Since this variable is not used outside of > > the DxeStandaloneMmAcpiTimerLib.c compilation unit, there is no reason > > to have it exported as a global. > > > > Cc: Ray Ni mailto:ray...@intel.com>> > > Cc: Michael D Kinney > > mailto:michael.d.kin...@intel.com>> > > Signed-off-by: Nate DeSimone > > mailto:nathaniel.l.desim...@intel.com>> > > --- > > .../AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c | 18 > > +- > > 1 file changed, 9 insertions(+), 9 deletions(-) > > > > diff --git > > a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c > > b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c > > index 16ac48938f..ccceb8a649 100644 > > --- > > a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c > > +++ > b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib. > > +++ c > > @@ -1,7 +1,7 @@ > > /** @file > >ACPI Timer implements one instance of Timer Library. > > > > - Copyright (c) 2013 - 2018, Intel Corporation. All rights > > reserved. > > + Copyright (c) 2013 - 2023, Intel Corporation. All rights > > + reserved. > >SPDX-License-Identifier: BSD-2-Clause-Patent > > > > **/ > > @@ -11,6 +11,11 @@ > > #include > > #include > > > > +// > > +// Cached performance counter frequency // static UINT64 > > +mAcpiTimerLibTscFrequency = 0; > > I'd say you don't need to rename it if it's a static variable. Now the > identifier is > 2x longer with no additional relevant information. This is in response to Mike K's feedback: https://edk2.groups.io/g/devel/message/111966 > > Aren't we supposed to use STATIC vs static, CONST vs const, etc? Annoyingly > :/ Apparently not. Honestly, I lose track of what the current coding style is sometimes too. > > -- > Pedro -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#112052): https://edk2.groups.io/g/devel/message/112052 Mute This Topic: https://groups.io/mt/102976788/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [PATCH v2] MdeModulePkg/Bus: Fix XhciDxe Linker Issues
The DXE & MM standalone variant of AcpiTimerLib defines a global
named mPerformanceCounterFrequency. A global with an identical
name is also present in MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
Since XhciDxe has a dependency on TimerLib, this can cause link
errors due to the same symbol being defined twice if the platform
DSC chooses to use AcpiTimerLib as the TimerLib implementation for
any given platform.
To resolve this, I noted that some of the globals in Xhci.c are not
used outside of the Xhci.c compilation unit:
- mPerformanceCounterStartValue
- mPerformanceCounterEndValue
- mPerformanceCounterFrequency
- mPerformanceCounterValuesCached
I have changed the definition for all of these to static and added
an Xhci prefix. Since they are not used outside of the Xhci.c
compilation unit, there is no reason to have them exported as
globals.
Cc: Ray Ni
Cc: Michael D Kinney
Signed-off-by: Nate DeSimone
---
MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c | 32 ++---
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
index 7a2e32a9dd..f4e61d223c 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
@@ -2,7 +2,7 @@
The XHCI controller driver.
(C) Copyright 2023 Hewlett Packard Enterprise Development LP
-Copyright (c) 2011 - 2022, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2023, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -86,10 +86,10 @@ EFI_USB2_HC_PROTOCOL gXhciUsb2HcTemplate = {
0x0
};
-UINT64 mPerformanceCounterStartValue;
-UINT64 mPerformanceCounterEndValue;
-UINT64 mPerformanceCounterFrequency;
-BOOLEAN mPerformanceCounterValuesCached = FALSE;
+static UINT64 mXhciPerformanceCounterStartValue;
+static UINT64 mXhciPerformanceCounterEndValue;
+static UINT64 mXhciPerformanceCounterFrequency;
+static BOOLEAN mXhciPerformanceCounterValuesCached = FALSE;
/**
Retrieves the capability of root hub ports.
@@ -2318,17 +2318,17 @@ XhcConvertTimeToTicks (
UINTN Shift;
// Cache the return values to avoid repeated calls to
GetPerformanceCounterProperties ()
- if (!mPerformanceCounterValuesCached) {
-mPerformanceCounterFrequency = GetPerformanceCounterProperties (
- ,
-
- );
+ if (!mXhciPerformanceCounterValuesCached) {
+mXhciPerformanceCounterFrequency = GetPerformanceCounterProperties (
+ ,
+
+ );
-mPerformanceCounterValuesCached = TRUE;
+mXhciPerformanceCounterValuesCached = TRUE;
}
// Prevent returning a tick value of 0, unless Time is already 0
- if (0 == mPerformanceCounterFrequency) {
+ if (0 == mXhciPerformanceCounterFrequency) {
return Time;
}
@@ -2342,7 +2342,7 @@ XhcConvertTimeToTicks (
//
Ticks = MultU64x64 (
DivU64x64Remainder (
- mPerformanceCounterFrequency,
+ mXhciPerformanceCounterFrequency,
Divisor,
),
@@ -2384,12 +2384,12 @@ XhcGetElapsedTicks (
//
// Determine if the counter is counting up or down
//
- if (mPerformanceCounterStartValue < mPerformanceCounterEndValue) {
+ if (mXhciPerformanceCounterStartValue < mXhciPerformanceCounterEndValue) {
//
// Counter counts upwards, check for an overflow condition
//
if (*PreviousTick > CurrentTick) {
- Delta = (mPerformanceCounterEndValue - *PreviousTick) + CurrentTick;
+ Delta = (mXhciPerformanceCounterEndValue - *PreviousTick) + CurrentTick;
} else {
Delta = CurrentTick - *PreviousTick;
}
@@ -2398,7 +2398,7 @@ XhcGetElapsedTicks (
// Counter counts downwards, check for an underflow condition
//
if (*PreviousTick < CurrentTick) {
- Delta = (mPerformanceCounterStartValue - CurrentTick) + *PreviousTick;
+ Delta = (mXhciPerformanceCounterStartValue - CurrentTick) +
*PreviousTick;
} else {
Delta = *PreviousTick - CurrentTick;
}
--
2.39.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#112049): https://edk2.groups.io/g/devel/message/112049
Mute This Topic: https://groups.io/mt/102976787/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [PATCH v2] PcAtChipsetPkg: Fix AcpiTimerLib incompatibility with XhciDxe
The DXE & MM standalone variant of AcpiTimerLib defines a global
named mPerformanceCounterFrequency. A global with an identical
name is also present in MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
Since XhciDxe has a dependency on TimerLib, this can cause link
errors due to the same symbol being defined twice if the platform
DSC chooses to use AcpiTimerLib as the TimerLib implementation for
any given platform.
To resolve this, I have changed made the definition of
mPerformanceCounterFrequency to static and renamed it to
mAcpiTimerLibTscFrequency. Since this variable is not used outside
of the DxeStandaloneMmAcpiTimerLib.c compilation unit, there is no
reason to have it exported as a global.
Cc: Ray Ni
Cc: Michael D Kinney
Signed-off-by: Nate DeSimone
---
.../AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c
b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c
index 16ac48938f..ccceb8a649 100644
--- a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c
+++ b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c
@@ -1,7 +1,7 @@
/** @file
ACPI Timer implements one instance of Timer Library.
- Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2023, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -11,6 +11,11 @@
#include
#include
+//
+// Cached performance counter frequency
+//
+static UINT64 mAcpiTimerLibTscFrequency = 0;
+
extern GUID mFrequencyHobGuid;
/**
@@ -48,11 +53,6 @@ InternalCalculateTscFrequency (
VOID
);
-//
-// Cached performance counter frequency
-//
-UINT64 mPerformanceCounterFrequency = 0;
-
/**
Internal function to retrieves the 64-bit frequency in Hz.
@@ -66,7 +66,7 @@ InternalGetPerformanceCounterFrequency (
VOID
)
{
- return mPerformanceCounterFrequency;
+ return mAcpiTimerLibTscFrequency;
}
/**
@@ -92,9 +92,9 @@ CommonAcpiTimerLibConstructor (
//
GuidHob = GetFirstGuidHob ();
if (GuidHob != NULL) {
-mPerformanceCounterFrequency = *(UINT64 *)GET_GUID_HOB_DATA (GuidHob);
+mAcpiTimerLibTscFrequency = *(UINT64 *)GET_GUID_HOB_DATA (GuidHob);
} else {
-mPerformanceCounterFrequency = InternalCalculateTscFrequency ();
+mAcpiTimerLibTscFrequency = InternalCalculateTscFrequency ();
}
return EFI_SUCCESS;
--
2.39.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#112050): https://edk2.groups.io/g/devel/message/112050
Mute This Topic: https://groups.io/mt/102976788/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [PATCH v1] MdeModulePkg/Bus: Fix XhciDxe Linker Issues
The DXE & MM standalone variant of AcpiTimerLib defines a global
named mPerformanceCounterFrequency. A global with an identical
name is also present in MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
Since XhciDxe has a dependency on TimerLib, this can cause link
errors due to the same symbol being defined twice if the platform
DSC chooses to use AcpiTimerLib as the TimerLib implementation for
any given platform.
To resolve this, I noted that some of the globals in Xhci.c are not
used outside of the Xhci.c compilation unit:
- mPerformanceCounterStartValue
- mPerformanceCounterEndValue
- mPerformanceCounterFrequency
- mPerformanceCounterValuesCached
I have changed the definition for all of these to STATIC. Since they
are not used outside of the Xhci.c compilation unit, there is no
reason to have them exported as globals.
Cc: Ray Ni
Cc: Michael D Kinney
Signed-off-by: Nate DeSimone
---
MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
index 7a2e32a9dd..cc8332500b 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
@@ -2,7 +2,7 @@
The XHCI controller driver.
(C) Copyright 2023 Hewlett Packard Enterprise Development LP
-Copyright (c) 2011 - 2022, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2023, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -86,10 +86,10 @@ EFI_USB2_HC_PROTOCOL gXhciUsb2HcTemplate = {
0x0
};
-UINT64 mPerformanceCounterStartValue;
-UINT64 mPerformanceCounterEndValue;
-UINT64 mPerformanceCounterFrequency;
-BOOLEAN mPerformanceCounterValuesCached = FALSE;
+STATIC UINT64 mPerformanceCounterStartValue;
+STATIC UINT64 mPerformanceCounterEndValue;
+STATIC UINT64 mPerformanceCounterFrequency;
+STATIC BOOLEAN mPerformanceCounterValuesCached = FALSE;
/**
Retrieves the capability of root hub ports.
--
2.39.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111961): https://edk2.groups.io/g/devel/message/111961
Mute This Topic: https://groups.io/mt/102907650/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [PATCH] IntelFsp2Pkg/PatchFv: Fix syntax issue in markdown manual
From: Ray Ni According to the markdown language syntax, headings should be after number signs (#). The number of number signs correspond to the heading level. But current PatchFvUserManual.md doesn't insert a space between the number signs and the heading title, resulting the markdown file is not rendered well in markdown viewers. The patch doesn't change any content but only adds spaces to ensure the headings are correctly recognized. Signed-off-by: Ray Ni Cc: Chasel Chiu Reviewed-by: Nate DeSimone Cc: Duggapu Chinni B Cc: Ray Han Lim Ng Cc: Star Zeng Cc: Ted Kuo Reviewed-by: Ashraf Ali S Cc: Susovan Mohapatra --- .../Tools/UserManuals/PatchFvUserManual.md| 38 +-- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/IntelFsp2Pkg/Tools/UserManuals/PatchFvUserManual.md b/IntelFsp2Pkg/Tools/UserManuals/PatchFvUserManual.md index f28eedf625..205ad57773 100644 --- a/IntelFsp2Pkg/Tools/UserManuals/PatchFvUserManual.md +++ b/IntelFsp2Pkg/Tools/UserManuals/PatchFvUserManual.md @@ -1,9 +1,9 @@ -#Name +# Name **_PatchFv.py_** - The python script that patches the firmware volumes (**FV**) with in the flash device (**FD**) file post FSP build. From version 0.60, script is capable of patching flash device (**FD**) directly. -#Synopsis +# Synopsis ``` PatchFv FvBuildDir [FvFileBaseNames:]FdFileBaseNameToPatch ["Offset, Value"]+ @@ -18,32 +18,32 @@ PatchFv FdFileDir FdFileName ["Offset, Value"]+ | ["Offset, Value, $Command, @Comment"]+ ``` -#Description +# Description The **_PatchFv.py_** tool allows the developer to fix up FD images to follow the Intel FSP Architecture specification. It also makes the FD image relocatable. The tool is written in Python and uses Python 2.7 or later to run. Consider using the tool in a build script. -#FvBuildDir (Argument 1) +# FvBuildDir (Argument 1) This is the first argument that **_PatchFv.py_** requires. It is the build directory for all firmware volumes created during the FSP build. The path must be either an absolute path or a relevant path, relevant to the top level of the FSP tree. -Example usage: + Example usage: ``` Build\YouPlatformFspPkg\%BD_TARGET%_%VS_VERSION%%VS_X86%\FV ``` The example used contains Windows batch script %VARIABLES%. -#FvFileBaseNames (Argument 2: Optional Part 1) +# FvFileBaseNames (Argument 2: Optional Part 1) The firmware volume file base names (**_FvFileBaseNames_**) are the independent -Fv?s that are to be patched within the FD. (0 or more in the form -**FVFILEBASENAME:**) The colon **:** is used for delimiting the single +FVs that are to be patched within the FD. (0 or more in the form +**FvFileBaseNames:**) The colon **:** is used for delimiting the single argument and must be appended to the end of each (**_FvFileBaseNames_**). -Example usage: + Example usage: ``` STAGE1:STAGE2:MANIFEST:YOURPLATFORM ``` @@ -55,14 +55,14 @@ In the example **STAGE1** is **STAGE1.Fv** in **YOURPLATFORM.fd**. Firmware device file name to patch (**_FdFileNameToPatch_**) is the base name of the FD file that is to be patched. (1 only, in the form **YOURPLATFORM**) -Example usage: + Example usage: ``` STAGE1:STAGE2:MANIFEST:YOURPLATFORM ``` In the example **YOURPLATFORM** is from **_YOURPLATFORM.fd_** -#"Offset, Value[, Command][, Comment]" (Argument 3) +# "Offset, Value[, Command][, Comment]" (Argument 3) The **_Offset_** can be a positive or negative number and represents where the **_Value_** to be patched is located within the FD. The **_Value_** is what will be written at the given **_Offset_** in the FD. Constants may be used for @@ -79,10 +79,10 @@ The entire argument includes the quote marks like in the example argument below: 0xFFC0, SomeCore:__EntryPoint - [0x00F0],@SomeCore Entry ``` -###Constants: +### Constants: Hexadecimal (use **0x** as prefix) | Decimal -Examples: + Examples: | **Positive Hex** | **Negative Hex** | **Positive Decimal** | **Negative Decimal** | | ---: | ---: | ---: | ---: | @@ -93,7 +93,7 @@ ModuleName:FunctionName | ModuleName:GlobalVariableName ModuleGuid:Offset ``` -###Operators: +### Operators: ``` @@ -113,7 +113,7 @@ From version 0.60 tool allows to pass flash device file path as Argument 1 and flash device name as Argument 2 and rules for passing offset & value are same as explained in the previous sections. -Example usage: + Example usage: Argument 1 ``` YouPlatformFspBinPkg\ @@ -123,21 +123,21 @@ Argument 2 Fsp_Rebased_T ``` -###Special Commands: +### Special Commands: Special commands must use the **$** symbol as a prefix to the command itself. There is only one command available at this time. ``` -$COPY ? Copy a binary block from source to destination. +$COPY Copy a binary block from source to destination. ``` -#
[edk2-devel] [PATCH v1] PcAtChipsetPkg: Fix AcpiTimerLib incompatibility with XhciDxe
The DXE & MM standalone variant of AcpiTimerLib defines a global named mPerformanceCounterFrequency. A global with an identical name is also present in MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c Since XhciDxe has a dependency on TimerLib, this can cause link errors due to the same symbol being defined twice if the platform DSC chooses to use AcpiTimerLib as the TimerLib implementation for any given platform. To resolve this, I have changed made the definition of mPerformanceCounterFrequency to STATIC. Since this variable is not used outside of the DxeStandaloneMmAcpiTimerLib.c compilation unit, there is no reason to have it exported as a global. Cc: Ray Ni Cc: Michael D Kinney Signed-off-by: Nate DeSimone --- .../Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c index 16ac48938f..41d2af7d55 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c @@ -1,7 +1,7 @@ /** @file ACPI Timer implements one instance of Timer Library. - Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved. + Copyright (c) 2013 - 2023, Intel Corporation. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -51,7 +51,7 @@ InternalCalculateTscFrequency ( // // Cached performance counter frequency // -UINT64 mPerformanceCounterFrequency = 0; +STATIC UINT64 mPerformanceCounterFrequency = 0; /** Internal function to retrieves the 64-bit frequency in Hz. -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111962): https://edk2.groups.io/g/devel/message/111962 Mute This Topic: https://groups.io/mt/102907651/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] Vlv2TbltDevicePkg: Fix DxeCore Build Failures
Pushed as 10beadf -Original Message- From: devel@edk2.groups.io On Behalf Of Nate DeSimone Sent: Thursday, November 30, 2023 4:18 PM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Ni, Ray ; Chaganty, Rangasai V ; Gao, Liming ; Kinney, Michael D ; Sun, Zailiang ; Qian, Yi ; Taylor Beebe ; Kubacki, Michael Subject: [edk2-devel] [edk2-platforms][PATCH v1] Vlv2TbltDevicePkg: Fix DxeCore Build Failures Commit 7284c44 in edk2 introduces an incompatibility that causes any project that uses DxeMain.inf to fail to build. This is due to the addition of ImagePropertiesRecordLib, and a new added dependency on that library in DxeMain. Platforms will not have this LibraryClass defined in their DSC yet and hence currently fail to build. This changes addes ImagePropertiesRecordLib to Vlv2TbltDevicePkg and resolves the build failure. Cc: Chasel Chiu Cc: Ray Ni Cc: Sai Chaganty Cc: Liming Gao Cc: Michael D Kinney Cc: Zailiang Sun Cc: Yi Qian Cc: Taylor Beebe Cc: Michael Kubacki Signed-off-by: Nate DeSimone --- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 1 + Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 1 + 2 files changed, 2 insertions(+) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 4adbaa6966..0c66705377 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -209,6 +209,7 @@ PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf !endif + + ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib + /ImagePropertiesRecordLib.inf # # CryptLib diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index c7d9733dad..0689f275f1 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -211,6 +211,7 @@ PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf !endif + + ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib + /ImagePropertiesRecordLib.inf # # CryptLib -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111958): https://edk2.groups.io/g/devel/message/111958 Mute This Topic: https://groups.io/mt/102907285/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] QuarkPlatformPkg: Fix DxeCore Build Failures
Pushed as 91e4065 -Original Message- From: devel@edk2.groups.io On Behalf Of Nate DeSimone Sent: Thursday, November 30, 2023 4:18 PM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Ni, Ray ; Chaganty, Rangasai V ; Gao, Liming ; Kinney, Michael D ; Kelly Steele ; Taylor Beebe ; Kubacki, Michael Subject: [edk2-devel] [edk2-platforms][PATCH v1] QuarkPlatformPkg: Fix DxeCore Build Failures Commit 7284c44 in edk2 introduces an incompatibility that causes any project that uses DxeMain.inf to fail to build. This is due to the addition of ImagePropertiesRecordLib, and a new added dependency on that library in DxeMain. Platforms will not have this LibraryClass defined in their DSC yet and hence currently fail to build. This changes addes ImagePropertiesRecordLib to QuarkPlatformPkg and resolves the build failure. Cc: Chasel Chiu Cc: Ray Ni Cc: Sai Chaganty Cc: Liming Gao Cc: Michael D Kinney Cc: Kelly Steele Cc: Taylor Beebe Cc: Michael Kubacki Signed-off-by: Nate DeSimone --- Platform/Intel/QuarkPlatformPkg/Quark.dsc| 1 + Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc | 1 + 2 files changed, 2 insertions(+) diff --git a/Platform/Intel/QuarkPlatformPkg/Quark.dsc b/Platform/Intel/QuarkPlatformPkg/Quark.dsc index 7cc548058a..40d9768336 100644 --- a/Platform/Intel/QuarkPlatformPkg/Quark.dsc +++ b/Platform/Intel/QuarkPlatformPkg/Quark.dsc @@ -196,6 +196,7 @@ !endif FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf + + ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib + /ImagePropertiesRecordLib.inf # # CPU diff --git a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc index 59577eda4f..67472930c9 100644 --- a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc +++ b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc @@ -167,6 +167,7 @@ !endif CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf + + ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib + /ImagePropertiesRecordLib.inf # # CPU -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111956): https://edk2.groups.io/g/devel/message/111956 Mute This Topic: https://groups.io/mt/102906246/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] QuarkPlatformPkg: Fix DxeCore Build Failures
Hey Taylor, I think I gotten everything in Platform/Intel, it should also fix QemuOpenBoardPkg and AmdMinBoardPkg. I saw that Levi also fixed ARM\VExpressPkg in https://edk2.groups.io/g/devel/message/111905. Everything else I'm not sure. Thanks for being proactive on fixing it! Best Regards, Nate -Original Message- From: Taylor Beebe Sent: Thursday, November 30, 2023 4:22 PM To: Desimone, Nathaniel L ; devel@edk2.groups.io Cc: Chiu, Chasel ; Ni, Ray ; Chaganty, Rangasai V ; Gao, Liming ; Kinney, Michael D ; Kelly Steele ; Kubacki, Michael Subject: Re: [edk2-platforms][PATCH v1] QuarkPlatformPkg: Fix DxeCore Build Failures Hey Nate, I'm about to send out a series to add the library across the repo -- just having some smtp authentication issues :D Are you updating all the packages or just a subset? -Taylor On 11/30/2023 4:18 PM, Nate DeSimone wrote: > Commit 7284c44 in edk2 introduces an incompatibility that causes any > project that uses DxeMain.inf to fail to build. This is due to the > addition of ImagePropertiesRecordLib, and a new added dependency on > that library in DxeMain. Platforms will not have this LibraryClass > defined in their DSC yet and hence currently fail to build. > > This changes addes ImagePropertiesRecordLib to QuarkPlatformPkg and > resolves the build failure. > > Cc: Chasel Chiu > Cc: Ray Ni > Cc: Sai Chaganty > Cc: Liming Gao > Cc: Michael D Kinney > Cc: Kelly Steele > Cc: Taylor Beebe > Cc: Michael Kubacki > Signed-off-by: Nate DeSimone > --- > Platform/Intel/QuarkPlatformPkg/Quark.dsc| 1 + > Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/Platform/Intel/QuarkPlatformPkg/Quark.dsc > b/Platform/Intel/QuarkPlatformPkg/Quark.dsc > index 7cc548058a..40d9768336 100644 > --- a/Platform/Intel/QuarkPlatformPkg/Quark.dsc > +++ b/Platform/Intel/QuarkPlatformPkg/Quark.dsc > @@ -196,6 +196,7 @@ > !endif > > > FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.i > nf > + > + ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordL > + ib/ImagePropertiesRecordLib.inf > > # > # CPU > diff --git a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc > b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc > index 59577eda4f..67472930c9 100644 > --- a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc > +++ b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc > @@ -167,6 +167,7 @@ > !endif > > > CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.in > f > + > + ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordL > + ib/ImagePropertiesRecordLib.inf > > # > # CPU -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111931): https://edk2.groups.io/g/devel/message/111931 Mute This Topic: https://groups.io/mt/102906246/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] Intel-MinPlatform: Fix DxeCore Build Failures
Pushed as 2e880c0 -Original Message- From: devel@edk2.groups.io On Behalf Of Nate DeSimone Sent: Thursday, November 30, 2023 4:06 PM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Ni, Ray ; Chaganty, Rangasai V ; Gao, Liming ; Kinney, Michael D ; Taylor Beebe ; Kubacki, Michael Subject: [edk2-devel] [edk2-platforms][PATCH v1] Intel-MinPlatform: Fix DxeCore Build Failures Commit 7284c44 in edk2 introduces an incompatibility that causes any project that uses DxeMain.inf to fail to build. This is due to the addition of ImagePropertiesRecordLib, and a new added dependency on that library in DxeMain. Platforms will not have this LibraryClass defined in their DSC yet and hence currently fail to build. This changes addes ImagePropertiesRecordLib to CoreCommonLib.dsc, which will be picked up by all platforms that adhere to the MinPlatform Architecture. This will fix most Intel platform builds in edk2-platforms. Cc: Chasel Chiu Cc: Ray Ni Cc: Sai Chaganty Cc: Liming Gao Cc: Michael D Kinney Cc: Taylor Beebe Cc: Michael Kubacki Signed-off-by: Nate DeSimone --- Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 1 + 1 file changed, 1 insertion(+) diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc index 300b7d7652..e40b2ff6e1 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc @@ -174,3 +174,4 @@ VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf + + ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib + /ImagePropertiesRecordLib.inf -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111930): https://edk2.groups.io/g/devel/message/111930 Mute This Topic: https://groups.io/mt/102906021/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] QuarkPlatformPkg: Fix DxeCore Build Failures
Commit 7284c44 in edk2 introduces an incompatibility that causes any project that uses DxeMain.inf to fail to build. This is due to the addition of ImagePropertiesRecordLib, and a new added dependency on that library in DxeMain. Platforms will not have this LibraryClass defined in their DSC yet and hence currently fail to build. This changes addes ImagePropertiesRecordLib to QuarkPlatformPkg and resolves the build failure. Cc: Chasel Chiu Cc: Ray Ni Cc: Sai Chaganty Cc: Liming Gao Cc: Michael D Kinney Cc: Kelly Steele Cc: Taylor Beebe Cc: Michael Kubacki Signed-off-by: Nate DeSimone --- Platform/Intel/QuarkPlatformPkg/Quark.dsc| 1 + Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc | 1 + 2 files changed, 2 insertions(+) diff --git a/Platform/Intel/QuarkPlatformPkg/Quark.dsc b/Platform/Intel/QuarkPlatformPkg/Quark.dsc index 7cc548058a..40d9768336 100644 --- a/Platform/Intel/QuarkPlatformPkg/Quark.dsc +++ b/Platform/Intel/QuarkPlatformPkg/Quark.dsc @@ -196,6 +196,7 @@ !endif FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf + ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf # # CPU diff --git a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc index 59577eda4f..67472930c9 100644 --- a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc +++ b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc @@ -167,6 +167,7 @@ !endif CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf + ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf # # CPU -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111927): https://edk2.groups.io/g/devel/message/111927 Mute This Topic: https://groups.io/mt/102906246/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] Vlv2TbltDevicePkg: Fix DxeCore Build Failures
Commit 7284c44 in edk2 introduces an incompatibility that causes any project that uses DxeMain.inf to fail to build. This is due to the addition of ImagePropertiesRecordLib, and a new added dependency on that library in DxeMain. Platforms will not have this LibraryClass defined in their DSC yet and hence currently fail to build. This changes addes ImagePropertiesRecordLib to Vlv2TbltDevicePkg and resolves the build failure. Cc: Chasel Chiu Cc: Ray Ni Cc: Sai Chaganty Cc: Liming Gao Cc: Michael D Kinney Cc: Zailiang Sun Cc: Yi Qian Cc: Taylor Beebe Cc: Michael Kubacki Signed-off-by: Nate DeSimone --- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 1 + Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 1 + 2 files changed, 2 insertions(+) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 4adbaa6966..0c66705377 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -209,6 +209,7 @@ PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf !endif + ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf # # CryptLib diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index c7d9733dad..0689f275f1 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -211,6 +211,7 @@ PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf !endif + ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf # # CryptLib -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111928): https://edk2.groups.io/g/devel/message/111928 Mute This Topic: https://groups.io/mt/102906247/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] Intel-MinPlatform: Fix DxeCore Build Failures
Commit 7284c44 in edk2 introduces an incompatibility that causes any project that uses DxeMain.inf to fail to build. This is due to the addition of ImagePropertiesRecordLib, and a new added dependency on that library in DxeMain. Platforms will not have this LibraryClass defined in their DSC yet and hence currently fail to build. This changes addes ImagePropertiesRecordLib to CoreCommonLib.dsc, which will be picked up by all platforms that adhere to the MinPlatform Architecture. This will fix most Intel platform builds in edk2-platforms. Cc: Chasel Chiu Cc: Ray Ni Cc: Sai Chaganty Cc: Liming Gao Cc: Michael D Kinney Cc: Taylor Beebe Cc: Michael Kubacki Signed-off-by: Nate DeSimone --- Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 1 + 1 file changed, 1 insertion(+) diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc index 300b7d7652..e40b2ff6e1 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc @@ -174,3 +174,4 @@ VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf + ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111925): https://edk2.groups.io/g/devel/message/111925 Mute This Topic: https://groups.io/mt/102906021/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 edk2-platforms 1/1] UserAuthFeaturePkg/UserAuthenticationSmm: Support Standalone MM.
Pushed as bd1c9ed
-Original Message-
From: Xu, Wei6
Sent: Thursday, November 30, 2023 7:07 AM
To: devel@edk2.groups.io
Cc: Xu, Wei6 ; Bi, Dandan ; Desimone,
Nathaniel L ; Gao, Liming
Subject: [PATCH v2 edk2-platforms 1/1]
UserAuthFeaturePkg/UserAuthenticationSmm: Support Standalone MM.
Refactor UserAuthenticationSmm to support Standalone MM.
- Factor out variable lock code logic that references boot services.
- UserAuthenticationStandaloneMmDxe is added to lock the variables.
It is only used for UserAuthenticationStandaloneMm.
- UserAuthenticationStandaloneMm doesn't lock the variables, needs to
rely on UserAuthenticationStandaloneMmDxe to do the lock.
- UserAuthenticationSmm still locks the variables by itself, no need
to include UserAuthenticationStandaloneMmDxe.
- Register gEfiEventExitBootServicesGuid notify which is used by the
StandaloneMmCore.
Since gEdkiiVariableLockProtocolGuid is a deprecated interface, use
gEdkiiVariablePolicyProtocolGuid to lock password variables instead.
Cc: Dandan Bi
Cc: Nate DeSimone
Cc: Liming Gao
Signed-off-by: Wei6 Xu
---
.../Include/UserAuthFeature.dsc | 4 +-
.../UserAuthenticationSmm.c | 40 -
.../UserAuthenticationSmm.h | 28 ---
.../UserAuthenticationSmm.inf | 13 +--
.../UserAuthenticationStandaloneMm.c | 43 ++
.../UserAuthenticationStandaloneMm.inf| 58 +
.../UserAuthenticationStandaloneMmDxe.c | 31 +++
.../UserAuthenticationStandaloneMmDxe.inf | 42 ++
.../UserAuthenticationTraditionalMm.c | 28 +++
.../UserAuthenticationVariable.h | 36
.../UserAuthenticationVariableLock.c | 84 +++
11 files changed, 363 insertions(+), 44 deletions(-) create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandaloneMm.c
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandaloneMm.inf
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandaloneMmDxe.c
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandaloneMmDxe.inf
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationTraditionalMm.c
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationVariable.h
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationVariableLock.c
diff --git
a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc
b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc
index 2f39a5580caf..1541dc3f80f3 100644
---
a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc
+++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFe
+++ ature.dsc
@@ -6,7 +6,7 @@
# INF files to generate AutoGen.c and AutoGen.h files # for the build
infrastructure.
#
-# Copyright (c) 2020 - 2021, Intel Corporation. All rights reserved.
+# Copyright (c) 2020 - 2023, Intel Corporation. All rights
+reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -75,3 +75,5 @@
UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.inf
UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe.inf
UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.inf
+
+ UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandalo
+ neMm.inf
+ UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandalo
+ neMmDxe.inf
diff --git
a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.c
b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.c
index 16e3405a82ef..98f40c1812c1 100644
---
a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.c
+++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthentication
+++ DxeSmm/UserAuthenticationSmm.c
@@ -1,6 +1,6 @@
/** @file
- Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.
+ Copyright (c) 2019 - 2023, Intel Corporation. All rights
+ reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -642,7 +642,7 @@ UaExitBootServices ( {
DEBUG ((DEBUG_INFO, "Unregister User Authentication Smi\n"));
- gSmst->SmiHandlerUnRegister(mSmmHandle);
+ gMmst->MmiHandlerUnRegister(mSmmHandle);
return EFI_SUCCESS;
}
@@ -657,54 +657,44 @@ UaExitBootServices (
**/
EFI_STATUS
-EFIAPI
PasswordSmmInit (
- IN EFI_HANDLE ImageHandle,
- IN EFI_SYSTEM_TABLE *SystemTable
+ VOID
)
Re: [edk2-devel] [PATCH v2 edk2-platforms 1/1] UserAuthFeaturePkg/UserAuthenticationSmm: Support Standalone MM.
Reviewed-by: Nate DeSimone
-Original Message-
From: Xu, Wei6
Sent: Thursday, November 30, 2023 7:07 AM
To: devel@edk2.groups.io
Cc: Xu, Wei6 ; Bi, Dandan ; Desimone,
Nathaniel L ; Gao, Liming
Subject: [PATCH v2 edk2-platforms 1/1]
UserAuthFeaturePkg/UserAuthenticationSmm: Support Standalone MM.
Refactor UserAuthenticationSmm to support Standalone MM.
- Factor out variable lock code logic that references boot services.
- UserAuthenticationStandaloneMmDxe is added to lock the variables.
It is only used for UserAuthenticationStandaloneMm.
- UserAuthenticationStandaloneMm doesn't lock the variables, needs to
rely on UserAuthenticationStandaloneMmDxe to do the lock.
- UserAuthenticationSmm still locks the variables by itself, no need
to include UserAuthenticationStandaloneMmDxe.
- Register gEfiEventExitBootServicesGuid notify which is used by the
StandaloneMmCore.
Since gEdkiiVariableLockProtocolGuid is a deprecated interface, use
gEdkiiVariablePolicyProtocolGuid to lock password variables instead.
Cc: Dandan Bi
Cc: Nate DeSimone
Cc: Liming Gao
Signed-off-by: Wei6 Xu
---
.../Include/UserAuthFeature.dsc | 4 +-
.../UserAuthenticationSmm.c | 40 -
.../UserAuthenticationSmm.h | 28 ---
.../UserAuthenticationSmm.inf | 13 +--
.../UserAuthenticationStandaloneMm.c | 43 ++
.../UserAuthenticationStandaloneMm.inf| 58 +
.../UserAuthenticationStandaloneMmDxe.c | 31 +++
.../UserAuthenticationStandaloneMmDxe.inf | 42 ++
.../UserAuthenticationTraditionalMm.c | 28 +++
.../UserAuthenticationVariable.h | 36
.../UserAuthenticationVariableLock.c | 84 +++
11 files changed, 363 insertions(+), 44 deletions(-) create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandaloneMm.c
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandaloneMm.inf
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandaloneMmDxe.c
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandaloneMmDxe.inf
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationTraditionalMm.c
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationVariable.h
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationVariableLock.c
diff --git
a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc
b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc
index 2f39a5580caf..1541dc3f80f3 100644
---
a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc
+++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFe
+++ ature.dsc
@@ -6,7 +6,7 @@
# INF files to generate AutoGen.c and AutoGen.h files # for the build
infrastructure.
#
-# Copyright (c) 2020 - 2021, Intel Corporation. All rights reserved.
+# Copyright (c) 2020 - 2023, Intel Corporation. All rights
+reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -75,3 +75,5 @@
UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.inf
UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe.inf
UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.inf
+
+ UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandalo
+ neMm.inf
+ UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandalo
+ neMmDxe.inf
diff --git
a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.c
b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.c
index 16e3405a82ef..98f40c1812c1 100644
---
a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.c
+++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthentication
+++ DxeSmm/UserAuthenticationSmm.c
@@ -1,6 +1,6 @@
/** @file
- Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.
+ Copyright (c) 2019 - 2023, Intel Corporation. All rights
+ reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -642,7 +642,7 @@ UaExitBootServices ( {
DEBUG ((DEBUG_INFO, "Unregister User Authentication Smi\n"));
- gSmst->SmiHandlerUnRegister(mSmmHandle);
+ gMmst->MmiHandlerUnRegister(mSmmHandle);
return EFI_SUCCESS;
}
@@ -657,54 +657,44 @@ UaExitBootServices (
**/
EFI_STATUS
-EFIAPI
PasswordSmmInit (
- IN EFI_HANDLE ImageHandle,
- IN EFI_SYSTEM_TABLE *SystemTable
+ VOID
)
Re: [edk2-devel] [edk2-platforms][PATCH] MinPlatformPkg: should build Performance driver only when perf enabled
Pushed as 4e34823 -Original Message- From: Li, Yi1 Sent: Monday, November 27, 2023 9:09 PM To: devel@edk2.groups.io Cc: Li, Yi1 ; Chiu, Chasel ; Desimone, Nathaniel L ; Gao, Liming ; Dong, Eric Subject: [edk2-platforms][PATCH] MinPlatformPkg: should build Performance driver only when perf enabled Should build FirmwarePerformancePei only when perf enabled. Avoiding unconditional compilation of performance PEI drivers can save 2KB(LZMA compressed) in PostMem FV, small but important. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Yi Li --- .../MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf index 3edc239e5..bc8ebc84b 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fd +++ f @@ -1,12 +1,14 @@ ## @file # FDF file of Platform. # -# Copyright (c) 2017, Intel Corporation. All rights reserved. +# Copyright (c) 2017 - 2023, Intel Corporation. All rights +reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # ## !if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE - INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf + !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE +INF + MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePe + rformancePei.inf + !endif !endif -- 2.42.0.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111877): https://edk2.groups.io/g/devel/message/111877 Mute This Topic: https://groups.io/mt/102845821/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] MinPlatformPkg: should build Performance driver only when perf enabled
Reviewed-by: Nate DeSimone -Original Message- From: Li, Yi1 Sent: Monday, November 27, 2023 9:09 PM To: devel@edk2.groups.io Cc: Li, Yi1 ; Chiu, Chasel ; Desimone, Nathaniel L ; Gao, Liming ; Dong, Eric Subject: [edk2-platforms][PATCH] MinPlatformPkg: should build Performance driver only when perf enabled Should build FirmwarePerformancePei only when perf enabled. Avoiding unconditional compilation of performance PEI drivers can save 2KB(LZMA compressed) in PostMem FV, small but important. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Yi Li --- .../MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf index 3edc239e5..bc8ebc84b 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fd +++ f @@ -1,12 +1,14 @@ ## @file # FDF file of Platform. # -# Copyright (c) 2017, Intel Corporation. All rights reserved. +# Copyright (c) 2017 - 2023, Intel Corporation. All rights +reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # ## !if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE - INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf + !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE +INF + MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePe + rformancePei.inf + !endif !endif -- 2.42.0.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111876): https://edk2.groups.io/g/devel/message/111876 Mute This Topic: https://groups.io/mt/102845821/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 1/1] Platform/Intel/Readme.md: Link to the OSS FSP repo
Pushed as 2cd4f97 -Original Message- From: Pedro Falcato Sent: Wednesday, November 29, 2023 3:41 PM To: devel@edk2.groups.io Cc: Pedro Falcato ; Desimone, Nathaniel L ; Chaganty, Rangasai V Subject: [PATCH 1/1] Platform/Intel/Readme.md: Link to the OSS FSP repo Link to github.com/intel/FSP, which is the canonical OSS place for all your FSP needs. The old link is not accessible publicly. Signed-off-by: Pedro Falcato Cc: Nate DeSimone Cc: Sai Chaganty --- Platform/Intel/Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/Intel/Readme.md b/Platform/Intel/Readme.md index 112d0af1f6eb..d29a90729f1a 100644 --- a/Platform/Intel/Readme.md +++ b/Platform/Intel/Readme.md @@ -47,7 +47,7 @@ A UEFI firmware implementation using MinPlatformPkg is constructed using the fol || || | [EDK II](https://github.com/tianocore/edk2) | -| [Intel(r) FSP](https://github.com/IntelFsp/FSP) | +| [Intel(r) FSP](https://github.com/intel/FSP) | | [Minimum Platform (`MinPlatformPkg`)](https://github.com/tianocore/edk2-platforms/tree/master/Platform/Intel/MinPlatformPkg) | | [Board Support (\OpenBoardPkg)](https://github.com/tianocore/edk2-platforms/tree/master/Platform/Intel) | -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111875): https://edk2.groups.io/g/devel/message/111875 Mute This Topic: https://groups.io/mt/102883723/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] IpmiFeaturePkg: Fix Build
Pushed as 967557e -Original Message- From: devel@edk2.groups.io On Behalf Of Nate DeSimone Sent: Wednesday, November 29, 2023 4:40 PM To: devel@edk2.groups.io Cc: Chaganty, Rangasai V ; Gao, Liming Subject: [edk2-devel] [edk2-platforms][PATCH v1] IpmiFeaturePkg: Fix Build Add missing MemoryAllocationLib dependency Cc: Sai Chaganty Cc: Liming Gao Signed-off-by: Nate DeSimone --- .../IpmiFeaturePkg/GenericElog/Smm/GenericElog.inf | 1 + 1 file changed, 1 insertion(+) diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericElog/Smm/GenericElog.inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericElog/Smm/GenericElog.inf index 00f4154cdd..ea1cf9d61b 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericElog/Smm/GenericElog.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericElog/Smm/GenericElog.inf @@ -28,6 +28,7 @@ UefiDriverEntryPoint DebugLib SmmServicesTableLib + MemoryAllocationLib [Protocols] gSmmGenericElogProtocolGuid # PROTOCOL ALWAYS_PRODUCED -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111874): https://edk2.groups.io/g/devel/message/111874 Mute This Topic: https://groups.io/mt/102884732/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 1/1] UserAuthFeaturePkg/UserAuthenticationSmm: Support Standalone MM.
Hi Wei,
There is a bigger issue here that your patch series highlights. It is not
possible to implement the user authentication feature in standalone MM without
also having a DXE driver. But that is an issue that is beyond the scope of this
patch series as it will require modifications to the variable driver.
Please send a v2 patch with the following changes:
- Please update copyright year on UserAuthFeature.dsc and
UserAuthenticationSmm.*
- Please rename UserAuthenticationVariableLockDxe so that it is clear that this
driver is only used for the standalone MM case. Perhaps
UserAuthenticationStandaloneMmDxe
Thanks,
Nate
-Original Message-
From: Xu, Wei6
Sent: Thursday, November 9, 2023 9:38 PM
To: devel@edk2.groups.io
Cc: Xu, Wei6 ; Bi, Dandan ; Desimone,
Nathaniel L ; Gao, Liming
Subject: [PATCH edk2-platforms 1/1] UserAuthFeaturePkg/UserAuthenticationSmm:
Support Standalone MM.
Refactor UserAuthenticationSmm to support Standalone MM.
- Factor out variable lock code logic that references boot services.
- UserAuthenticationVariableLockDxe is added to lock the variables.
- UserAuthenticationStandaloneMm doesn't lock the variables, needs to
reply on UserAuthenticationVariableLockDxe to do the lock.
- UserAuthenticationSmm still locks the variables by itself, no need
to include UserAuthenticationVariableLockDxe.
- Register gEfiEventExitBootServicesGuid notify which is used by the
StandaloneMmCore.
Since gEdkiiVariableLockProtocolGuid is a deprecated interface, use
gEdkiiVariablePolicyProtocolGuid to lock password variables instead.
Cc: Dandan Bi
Cc: Nate DeSimone
Cc: Liming Gao
Signed-off-by: Wei6 Xu
---
.../Include/UserAuthFeature.dsc | 2 +
.../UserAuthenticationSmm.c | 38 -
.../UserAuthenticationSmm.h | 26 +++---
.../UserAuthenticationSmm.inf | 11 ++-
.../UserAuthenticationStandaloneMm.c | 43 ++
.../UserAuthenticationStandaloneMm.inf| 58 +
.../UserAuthenticationTraditionalMm.c | 28 +++
.../UserAuthenticationVariable.h | 36
.../UserAuthenticationVariableLock.c | 84 +++
.../UserAuthenticationVariableLockDxe.c | 31 +++
.../UserAuthenticationVariableLockDxe.inf | 42 ++
11 files changed, 359 insertions(+), 40 deletions(-) create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandaloneMm.c
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandaloneMm.inf
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationTraditionalMm.c
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationVariable.h
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationVariableLock.c
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationVariableLockDxe.c
create mode 100644
Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationVariableLockDxe.inf
diff --git
a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc
b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc
index 2f39a5580caf..d772b213aaeb 100644
---
a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc
+++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFe
+++ ature.dsc
@@ -75,3 +75,5 @@
UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.inf
UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe.inf
UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.inf
+
+ UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationStandalo
+ neMm.inf
+ UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationVariable
+ LockDxe.inf
diff --git
a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.c
b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.c
index 16e3405a82ef..89515ea11e85 100644
---
a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.c
+++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthentication
+++ DxeSmm/UserAuthenticationSmm.c
@@ -642,7 +642,7 @@ UaExitBootServices ( {
DEBUG ((DEBUG_INFO, "Unregister User Authentication Smi\n"));
- gSmst->SmiHandlerUnRegister(mSmmHandle);
+ gMmst->MmiHandlerUnRegister(mSmmHandle);
return EFI_SUCCESS;
}
@@ -657,54 +657,44 @@ UaExitBootServices (
**/
EFI_STATUS
-EFIAPI
PasswordSmmInit (
- IN EFI_HANDLE ImageHandle,
- IN EFI_SYSTEM_TABLE *Sys
Re: [edk2-devel] [PATCH v2 edk2-platforms 1/1] IpmiFeaturePkg/SmmIpmiBaseLib: Support Standalone MM.
Pushed as 2466092
-Original Message-
From: Xu, Wei6
Sent: Sunday, November 5, 2023 7:19 AM
To: devel@edk2.groups.io
Cc: Xu, Wei6 ; Abner Chang ; Desimone,
Nathaniel L ; Gao, Liming
Subject: [PATCH v2 edk2-platforms 1/1] IpmiFeaturePkg/SmmIpmiBaseLib: Support
Standalone MM.
Add MM_STANDALONE type support for SmmIpmiBaseLib instance. Replace Smst with
Mmst. Remove unused UefiBootServicesTableLib reference.
Cc: Abner Chang
Cc: Nate DeSimone
Cc: Liming Gao
Signed-off-by: Wei6 Xu
---
.../Library/SmmIpmiBaseLib/SmmIpmiBaseLib.c | 39 +--
.../Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf | 7 ++--
2 files changed, 12 insertions(+), 34 deletions(-)
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.c
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.c
index 6282adc269f8..d05798d94866 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.c
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiB
+++ aseLib/SmmIpmiBaseLib.c
@@ -2,15 +2,14 @@
A Library to support all BMC access via IPMI command during SMM Phase.
@copyright
- Copyright 1999 - 2021 Intel Corporation.
+ Copyright 1999 - 2023 Intel Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent **/
-#include
+#include
#include
#include
-#include
-#include
+#include
#include
STATIC IPMI_TRANSPORT *mIpmiTransport = NULL;
@@ -37,7 +36,7 @@ NotifyIpmiTransportCallback (
EFI_STATUS Status;
Status = EFI_SUCCESS;
if (mIpmiTransport == NULL) {
-Status = gSmst->SmmLocateProtocol (
+Status = gMmst->MmLocateProtocol (
,
NULL,
(VOID **) @@ -60,15 +59,15 @@
InitializeIpmiBase ( {
EFI_STATUS Status;
if (mIpmiTransport == NULL) {
-Status = gSmst->SmmLocateProtocol (
+Status = gMmst->MmLocateProtocol (
,
NULL,
(VOID **)
);
if (EFI_ERROR (Status)) {
- Status = gSmst->SmmRegisterProtocolNotify (
+ Status = gMmst->MmRegisterProtocolNotify (
,
-(EFI_SMM_NOTIFY_FN) NotifyIpmiTransportCallback,
+(EFI_MM_NOTIFY_FN) NotifyIpmiTransportCallback,
);
}
@@ -104,30 +103,10 @@ IpmiSubmitCommand (
OUT UINT8 *ResponseData,
IN OUT UINT32 *ResponseDataSize
)
-/*++
-
-Routine Description:
-
- Routine to send commands to BMC
-
-Arguments:
-
- NetFunction - Net function of the command
- Command - IPMI Command
- CommandData - Command Data
- CommandDataSize - Size of CommandData
- ResponseData - Response Data
- ResponseDataSize - Response Data Size
-
-Returns:
-
- EFI_NOT_AVAILABLE_YET - IpmiTransport Protocol is not installed yet
-
---*/
{
EFI_STATUS Status;
- Status = gSmst->SmmLocateProtocol (, NULL,
(VOID **) );
+ Status = gMmst->MmLocateProtocol (,
+ NULL, (VOID **) );
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -164,7 +143,7 @@ GetBmcStatus (
{
EFI_STATUS Status;
- Status = gSmst->SmmLocateProtocol (, NULL,
(VOID **) );
+ Status = gMmst->MmLocateProtocol (,
+ NULL, (VOID **) );
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf
index 7ea688fc165f..df43c81e6493 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiB
+++ aseLib/SmmIpmiBaseLib.inf
@@ -1,7 +1,7 @@
## @file
#
# @copyright
-# Copyright 2010 - 2021 Intel Corporation.
+# Copyright 2010 - 2023 Intel Corporation.
# SPDX-License-Identifier: BSD-2-Clause-Patent ##
@@ -11,7 +11,7 @@
FILE_GUID = 2B5AD78E-5CF8-45d2-B2AC-749A09425911
MODULE_TYPE= DXE_SMM_DRIVER
VERSION_STRING = 1.0
- LIBRARY_CLASS = IpmiBaseLib|DXE_SMM_DRIVER SMM_CORE
+ LIBRARY_CLASS = IpmiBaseLib|DXE_SMM_DRIVER SMM_CORE
MM_STANDALONE MM_CORE_STANDALONE
[sources]
SmmIpmiBaseLib.c
@@ -21,9 +21,8 @@
IpmiFeaturePkg/IpmiFeaturePkg.dec
[LibraryClasses]
- UefiBootServicesTableLib
DebugLib
- SmmServicesTableLib
+ MmServicesTableLib
[Protocols]
gSmmIpmiTransportProtocolGuid
--
2.29.2.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111870): https://edk2.groups.io/g/devel/message/111870
Mute This Topic: https://groups.io/
Re: [edk2-devel] [PATCH v2 edk2-platforms 1/1] IpmiFeaturePkg/SmmIpmiBaseLib: Support Standalone MM.
Reviewed-by: Nate DeSimone
-Original Message-
From: Xu, Wei6
Sent: Sunday, November 5, 2023 7:19 AM
To: devel@edk2.groups.io
Cc: Xu, Wei6 ; Abner Chang ; Desimone,
Nathaniel L ; Gao, Liming
Subject: [PATCH v2 edk2-platforms 1/1] IpmiFeaturePkg/SmmIpmiBaseLib: Support
Standalone MM.
Add MM_STANDALONE type support for SmmIpmiBaseLib instance. Replace Smst with
Mmst. Remove unused UefiBootServicesTableLib reference.
Cc: Abner Chang
Cc: Nate DeSimone
Cc: Liming Gao
Signed-off-by: Wei6 Xu
---
.../Library/SmmIpmiBaseLib/SmmIpmiBaseLib.c | 39 +--
.../Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf | 7 ++--
2 files changed, 12 insertions(+), 34 deletions(-)
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.c
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.c
index 6282adc269f8..d05798d94866 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.c
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiB
+++ aseLib/SmmIpmiBaseLib.c
@@ -2,15 +2,14 @@
A Library to support all BMC access via IPMI command during SMM Phase.
@copyright
- Copyright 1999 - 2021 Intel Corporation.
+ Copyright 1999 - 2023 Intel Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent **/
-#include
+#include
#include
#include
-#include
-#include
+#include
#include
STATIC IPMI_TRANSPORT *mIpmiTransport = NULL;
@@ -37,7 +36,7 @@ NotifyIpmiTransportCallback (
EFI_STATUS Status;
Status = EFI_SUCCESS;
if (mIpmiTransport == NULL) {
-Status = gSmst->SmmLocateProtocol (
+Status = gMmst->MmLocateProtocol (
,
NULL,
(VOID **) @@ -60,15 +59,15 @@
InitializeIpmiBase ( {
EFI_STATUS Status;
if (mIpmiTransport == NULL) {
-Status = gSmst->SmmLocateProtocol (
+Status = gMmst->MmLocateProtocol (
,
NULL,
(VOID **)
);
if (EFI_ERROR (Status)) {
- Status = gSmst->SmmRegisterProtocolNotify (
+ Status = gMmst->MmRegisterProtocolNotify (
,
-(EFI_SMM_NOTIFY_FN) NotifyIpmiTransportCallback,
+(EFI_MM_NOTIFY_FN) NotifyIpmiTransportCallback,
);
}
@@ -104,30 +103,10 @@ IpmiSubmitCommand (
OUT UINT8 *ResponseData,
IN OUT UINT32 *ResponseDataSize
)
-/*++
-
-Routine Description:
-
- Routine to send commands to BMC
-
-Arguments:
-
- NetFunction - Net function of the command
- Command - IPMI Command
- CommandData - Command Data
- CommandDataSize - Size of CommandData
- ResponseData - Response Data
- ResponseDataSize - Response Data Size
-
-Returns:
-
- EFI_NOT_AVAILABLE_YET - IpmiTransport Protocol is not installed yet
-
---*/
{
EFI_STATUS Status;
- Status = gSmst->SmmLocateProtocol (, NULL,
(VOID **) );
+ Status = gMmst->MmLocateProtocol (,
+ NULL, (VOID **) );
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -164,7 +143,7 @@ GetBmcStatus (
{
EFI_STATUS Status;
- Status = gSmst->SmmLocateProtocol (, NULL,
(VOID **) );
+ Status = gMmst->MmLocateProtocol (,
+ NULL, (VOID **) );
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf
index 7ea688fc165f..df43c81e6493 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiB
+++ aseLib/SmmIpmiBaseLib.inf
@@ -1,7 +1,7 @@
## @file
#
# @copyright
-# Copyright 2010 - 2021 Intel Corporation.
+# Copyright 2010 - 2023 Intel Corporation.
# SPDX-License-Identifier: BSD-2-Clause-Patent ##
@@ -11,7 +11,7 @@
FILE_GUID = 2B5AD78E-5CF8-45d2-B2AC-749A09425911
MODULE_TYPE= DXE_SMM_DRIVER
VERSION_STRING = 1.0
- LIBRARY_CLASS = IpmiBaseLib|DXE_SMM_DRIVER SMM_CORE
+ LIBRARY_CLASS = IpmiBaseLib|DXE_SMM_DRIVER SMM_CORE
MM_STANDALONE MM_CORE_STANDALONE
[sources]
SmmIpmiBaseLib.c
@@ -21,9 +21,8 @@
IpmiFeaturePkg/IpmiFeaturePkg.dec
[LibraryClasses]
- UefiBootServicesTableLib
DebugLib
- SmmServicesTableLib
+ MmServicesTableLib
[Protocols]
gSmmIpmiTransportProtocolGuid
--
2.29.2.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111867): https://edk2.groups.io/g/devel/message/111867
Mute This Topic: https://grou
Re: [edk2-devel] [PATCH 1/1] Platform/Intel/Readme.md: Link to the OSS FSP repo
Reviewed-by: Nate DeSimone -Original Message- From: Pedro Falcato Sent: Wednesday, November 29, 2023 3:41 PM To: devel@edk2.groups.io Cc: Pedro Falcato ; Desimone, Nathaniel L ; Chaganty, Rangasai V Subject: [PATCH 1/1] Platform/Intel/Readme.md: Link to the OSS FSP repo Link to github.com/intel/FSP, which is the canonical OSS place for all your FSP needs. The old link is not accessible publicly. Signed-off-by: Pedro Falcato Cc: Nate DeSimone Cc: Sai Chaganty --- Platform/Intel/Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/Intel/Readme.md b/Platform/Intel/Readme.md index 112d0af1f6eb..d29a90729f1a 100644 --- a/Platform/Intel/Readme.md +++ b/Platform/Intel/Readme.md @@ -47,7 +47,7 @@ A UEFI firmware implementation using MinPlatformPkg is constructed using the fol || || | [EDK II](https://github.com/tianocore/edk2) | -| [Intel(r) FSP](https://github.com/IntelFsp/FSP) | +| [Intel(r) FSP](https://github.com/intel/FSP) | | [Minimum Platform (`MinPlatformPkg`)](https://github.com/tianocore/edk2-platforms/tree/master/Platform/Intel/MinPlatformPkg) | | [Board Support (\OpenBoardPkg)](https://github.com/tianocore/edk2-platforms/tree/master/Platform/Intel) | -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111866): https://edk2.groups.io/g/devel/message/111866 Mute This Topic: https://groups.io/mt/102883723/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] IpmiFeaturePkg: Fix Build
Add missing MemoryAllocationLib dependency Cc: Sai Chaganty Cc: Liming Gao Signed-off-by: Nate DeSimone --- .../IpmiFeaturePkg/GenericElog/Smm/GenericElog.inf | 1 + 1 file changed, 1 insertion(+) diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericElog/Smm/GenericElog.inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericElog/Smm/GenericElog.inf index 00f4154cdd..ea1cf9d61b 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericElog/Smm/GenericElog.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericElog/Smm/GenericElog.inf @@ -28,6 +28,7 @@ UefiDriverEntryPoint DebugLib SmmServicesTableLib + MemoryAllocationLib [Protocols] gSmmGenericElogProtocolGuid # PROTOCOL ALWAYS_PRODUCED -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111865): https://edk2.groups.io/g/devel/message/111865 Mute This Topic: https://groups.io/mt/102884732/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] MinPlatformPkg: Add edk2-platforms/Features to PACKAGES_PATH
Pushed as be6742a -Original Message- From: devel@edk2.groups.io On Behalf Of Nate DeSimone Sent: Monday, November 27, 2023 5:04 PM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Gao, Liming ; Dong, Eric Subject: [edk2-devel] [edk2-platforms][PATCH v1] MinPlatformPkg: Add edk2-platforms/Features to PACKAGES_PATH Cc: Chasel Chiu Cc: Liming Gao Cc: Eric Dong Signed-off-by: Nate DeSimone --- Platform/Intel/build.cfg | 5 +++-- Platform/Intel/build_bios.py | 11 +++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Platform/Intel/build.cfg b/Platform/Intel/build.cfg index 2ff536bb3e..6ab2ced1a5 100644 --- a/Platform/Intel/build.cfg +++ b/Platform/Intel/build.cfg @@ -1,7 +1,7 @@ # @ build.cfg # This is the main/default build configuration file # -# Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved. +# Copyright (c) 2019 - 2023, Intel Corporation. All rights +reserved. # Copyright (c) 2021 - 2022, American Megatrends International LLC. # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -13,7 +13,8 @@ WORKSPACE_FSP_BIN = FSP EDK_TOOLS_BIN = edk2-BaseTools-win32 EDK_BASETOOLS = BaseTools WORKSPACE_DRIVERS = edk2-platforms/Drivers -WORKSPACE_FEATURES = edk2-platforms/Features/Intel +WORKSPACE_FEATURES = edk2-platforms/Features WORKSPACE_FEATURES_INTEL = +edk2-platforms/Features/Intel WORKSPACE_PLATFORM = edk2-platforms/Platform/Intel WORKSPACE_SILICON = edk2-platforms/Silicon/Intel WORKSPACE_PLATFORM_BIN = diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py index 43a241c837..c79a653f4d 100755 --- a/Platform/Intel/build_bios.py +++ b/Platform/Intel/build_bios.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3 # # @ build_bios.py # Builds BIOS using configuration files and dynamically @@ -109,6 +109,8 @@ def pre_build(build_config, build_type="DEBUG", silent=False, toolchain=None): config["WORKSPACE_SILICON"]) config["WORKSPACE_FEATURES"] = os.path.join(config["WORKSPACE"], config["WORKSPACE_FEATURES"]) +config["WORKSPACE_FEATURES_INTEL"] = os.path.join(config["WORKSPACE"], + + config["WORKSPACE_FEATURES_INTEL"]) config["WORKSPACE_DRIVERS"] = os.path.join(config["WORKSPACE"], config["WORKSPACE_DRIVERS"]) config["WORKSPACE_PLATFORM_BIN"] = \ @@ -123,9 +125,10 @@ def pre_build(build_config, build_type="DEBUG", silent=False, toolchain=None): config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_SILICON"] config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_SILICON_BIN"] config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_FEATURES"] -# add all feature domains in WORKSPACE_FEATURES to package path -for filename in os.listdir(config["WORKSPACE_FEATURES"]): -filepath = os.path.join(config["WORKSPACE_FEATURES"], filename) +config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_FEATURES_INTEL"] +# add all feature domains in WORKSPACE_FEATURES_INTEL to package path +for filename in os.listdir(config["WORKSPACE_FEATURES_INTEL"]): +filepath = os.path.join(config["WORKSPACE_FEATURES_INTEL"], + filename) # feature domains folder does not contain dec file if os.path.isdir(filepath) and \ not glob.glob(os.path.join(filepath, "*.dec")): -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111862): https://edk2.groups.io/g/devel/message/111862 Mute This Topic: https://groups.io/mt/102842749/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] MinPlatformPkg: Update PatchFv Tools for Python 3.x
Pushed as d02c09d
-Original Message-
From: devel@edk2.groups.io On Behalf Of Nate DeSimone
Sent: Monday, November 27, 2023 5:04 PM
To: devel@edk2.groups.io
Cc: Chiu, Chasel ; Gao, Liming
; Dong, Eric
Subject: [edk2-devel] [edk2-platforms][PATCH v1] MinPlatformPkg: Update PatchFv
Tools for Python 3.x
PatchFv tools now run on Python 3.x
Cc: Chasel Chiu
Cc: Liming Gao
Cc: Eric Dong
Signed-off-by: Nate DeSimone
---
.../MinPlatformPkg/Tools/PatchFv/PatchBfv.py | 35
.../Tools/PatchFv/PatchBinFv.py | 69
.../Tools/PatchFv/RebaseBinFv.py | 82 +--
3 files changed, 92 insertions(+), 94 deletions(-)
diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
index 1312bfc328..f05480b91f 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
@@ -1,6 +1,6 @@
## @ PatchBfv.py
#
-# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2023, Intel Corporation. All rights
+reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -11,8 +11,7 @@ import
sys import time import shutil import struct -import binascii
-from ctypes import *
+from ctypes import *
class FileChecker:
def __init__(self):
@@ -21,17 +20,17 @@ class FileChecker:
self.pcd = ["", "", ""]
def PrintPcd(self):
-print "PCD: " + self.pcd[0] + "|" + self.pcd[1] + "(" + self.pcd[2] +
")"
+print("PCD: {0}|{1}({2})".format(*(self.pcd)))
def ProcessReport(self):
try :
file = open(self.reportFile)
except Exception:
-print "fail to open " + self.reportFile
+print("fail to open " + self.reportFile)
return
try:
file.seek(0)
-print "checking - " + self.pcd[0]
+print("checking - " + self.pcd[0])
ValuePair = self.GetPcdFromReport (file, self.pcd[0])
self.pcd[1] = ValuePair[0]
self.pcd[2] = ValuePair[1]
@@ -42,12 +41,12 @@ class FileChecker:
def PatchFd(self):
fileName = self.fdName
-print "patching BFV - " + fileName
+print("patching BFV - " + fileName)
try :
file = open(fileName, "rb")
except Exception:
-print "fail to open " + fileName
+print("fail to open " + fileName)
return
try:
buffer = file.read()
@@ -57,7 +56,7 @@ class FileChecker:
offset = -4
l = struct.pack("L", int(self.pcd[1],16))
-print " [" + hex(offset) + "] " + binascii.hexlify(data[-4:]) + "
<= " + binascii.hexlify(l)
+print(" [" + hex(offset) + "] " + bytes(data[-4:]).hex() +
+ " <= " + bytes(l).hex())
data[-4:] = l
file = open(fileName, "wb") @@ -77,36 +76,36 @@ class FileChecker:
newline = line[:-1]
-if (cmp (newline, TargetPkg) == 0):
+if newline == TargetPkg:
FoundPkg = True
continue
-if (cmp (newline, "") == 0) or ((cmp (newline[0], " ") != 0) and
(cmp (newline[0], "0") != 0)):
+if newline == "" or (newline[0] != " " and newline[0] != "0"):
FoundPkg = False
if (FoundPkg == True) :
newline = newline.strip()
splitLine = newline.split(" ", 2)
-if (cmp (splitLine[0], "*F") == 0) or (cmp (splitLine[0],
"*P") == 0) :
-if (cmp (splitLine[1], TargetPcd) == 0):
-print "found - " + TargetPkg + "." + TargetPcd
+if splitLine[0] == "*F" or splitLine[0] == "*P":
+if splitLine[1] == TargetPcd:
+print("found - " + TargetPkg + "." + TargetPcd)
splitLine = splitLine[2].strip()[1:].strip().split("
", 1)
-if (cmp (splitLine[0], "FIXED") == 0) or (cmp
(splitLine[0], "PATCH") == 0):
+if splitLine[0] == "FIXED" or splitLine[0] == "PATCH":
SplitLine = splitLine[1].strip()[1:].split(")", 1)
Type = SplitLine[0]
Value = SplitLine[1].strip()[1:].strip().split()[0]
-print " Type - (" + Type + "), Valu
Re: [edk2-devel] [edk2-platforms][PATCH v1] PurleyOpenBoardPkg/BoardMtOlympus: Fix Build
Pushed as 0114e8b
-Original Message-
From: devel@edk2.groups.io On Behalf Of Nate DeSimone
Sent: Monday, November 27, 2023 5:04 PM
To: devel@edk2.groups.io
Cc: Chiu, Chasel
Subject: [edk2-devel] [edk2-platforms][PATCH v1]
PurleyOpenBoardPkg/BoardMtOlympus: Fix Build
Updates Microcode and Silicon FV sizes so they can accomodate the newest
content.
Cc: Chasel Chiu
Signed-off-by: Nate DeSimone
---
.../BoardMtOlympus/OpenBoardPkg.fdf | 25 +++
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.fdf
b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.fdf
index 413d98a070..86d1673458 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.fdf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.fdf
@@ -1,7 +1,7 @@
## @file
# FDF file for the MtOlympus board.
#
-# Copyright (c) 2018 - 2021, Intel Corporation. All rights reserved.
+# Copyright (c) 2018 - 2023, Intel Corporation. All rights
+reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -43,11 +43,11 @@ FV =
FvOsBoot
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspUBase|gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspUSize
FV = FvLateSiliconCompressed
-0x0090|0x0040
+0x0090|0x0030
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootBase|gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize
FV = FvUefiBoot
-0x00D0|0x0007C000
+0x00C0|0x0007C000
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
#NV_VARIABLE_STORE
DATA = {
@@ -86,10 +86,10 @@ DATA = {
0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
-0x00D7C000|0x2000
+0x00C7C000|0x2000
#NV_EVENT_LOG
-0x00D7E000|0x2000
+0x00C7E000|0x2000
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
#NV_FTW_WORKING
DATA = {
@@ -103,28 +103,28 @@ DATA = {
0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
-0x00D8|0x0008
+0x00C8|0x0008
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
#NV_FTW_SPARE
-0x00E0|0x0001
+0x00D0|0x0003
gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeBase|gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeSize
FV = MICROCODE_FV
-0x00E1|0x0001
+0x00D3|0x0001
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryBase|gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize
FV = FvPostMemory
-0x00E2|0x0003
+0x00D4|0x0002
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSBase|gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize
FILE =
$(PLATFORM_SI_BIN_PACKAGE)/FV/FvPostMemorySilicon/$(TARGET)/FvPostMemorySilicon.Fv
-0x00E5|0x0006
+0x00D6|0x0005
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryBase|gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemorySize
FV = FvPreMemory
-0x00EB|0x0013
+0x00DB|0x0023
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMBase|gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMSize
FILE =
$(PLATFORM_SI_BIN_PACKAGE)/FV/FvPreMemorySilicon/$(TARGET)/FvPreMemorySilicon.Fv
@@ -135,6 +135,9 @@ FILE =
$(PLATFORM_SI_BIN_PACKAGE)/FV/FvTempMemorySilicon/$(TARGET)/FvTempMemoryS
SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase=
gEfiPchTokenSpaceGuid.PcdFlashAreaBaseAddress +
gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeBase
SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeSize=
gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeSize
+SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase =
gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeBase
+SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize =
gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeSize
+
SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchAddress=
gEfiPchTokenSpaceGuid.PcdFlashAreaBaseAddress +
gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeBase + 0x60
SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize =
gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeSize - 0x60
--
2.39.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111860): https://edk2.groups.io/g/devel/message/111860
Mute This Topic: https://groups.io/mt/102883385/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] PurleyOpenBoardPkg: Fix Build
Pushed as 4009d4c -Original Message- From: devel@edk2.groups.io On Behalf Of Nate DeSimone Sent: Monday, November 27, 2023 5:04 PM To: devel@edk2.groups.io Cc: Chiu, Chasel Subject: [edk2-devel] [edk2-platforms][PATCH v1] PurleyOpenBoardPkg: Fix Build Adds SmmLockBox driver which is needed to build with the newest version of MinPlatformPkg Cc: Chasel Chiu Signed-off-by: Nate DeSimone --- .../Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc | 3 ++- .../Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc index 39c5cf78ab..65f22bb90e 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc @@ -1,7 +1,7 @@ ## @file # The main build description file for the MtOlympus board. # -# Copyright (c) 2018 - 2021, Intel Corporation. All rights reserved. +# Copyright (c) 2018 - 2023, Intel Corporation. All rights +reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -195,6 +195,7 @@ $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf $(PLATFORM_BOARD_PACKAGE)/Policy/S3NvramSave/S3NvramSave.inf + MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf # # Shell diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc index 5747717ecb..64e8978942 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc @@ -1,7 +1,7 @@ ## @file # The main build description file for the TiogaPass board. # -# Copyright (c) 2018, Intel Corporation. All rights reserved. +# Copyright (c) 2018 - 2023, Intel Corporation. All rights +reserved. # Copyright (c) 2021, American Megatrends International LLC. # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -226,6 +226,7 @@ $(PLATFORM_BOARD_PACKAGE)/Policy/S3NvramSave/S3NvramSave.inf BoardModulePkg/BoardBdsHookDxe/BoardBdsHookDxe.inf + MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf # # Shell -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111859): https://edk2.groups.io/g/devel/message/111859 Mute This Topic: https://groups.io/mt/102883380/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] WhitleyOpenBoardPkg: Replace Python Interpreter Name
Pushed as 7528798 -Original Message- From: devel@edk2.groups.io On Behalf Of Nate DeSimone Sent: Friday, November 17, 2023 10:36 PM To: devel@edk2.groups.io Cc: Chiu, Chasel Subject: [edk2-devel] [edk2-platforms][PATCH v1] WhitleyOpenBoardPkg: Replace Python Interpreter Name Removes the assumption that the python interpreter will have the name python. Cc: Chasel Chiu Signed-off-by: Nate DeSimone +# Copyright (c) 2021 - 2023, Intel Corporation. All rights +reserved. # Copyright (c) 2022, American Megatrends International LLC. # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -107,7 +107,7 @@ def pre_build_ex(config, functions): if not os.path.exists(out_file_dir): os.mkdir(out_file_dir) -command = ["python", +command = [sys.executable, os.path.join(config["MIN_PACKAGE_TOOLS"], "AmlGenOffset", "AmlGenOffset.py"), "-d", "--aml_filter", config["AML_FILTER"], "-o", out_file_path, diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_board.py b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_board.py index ccf7a8c55a..61b893686c 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_board.py +++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_board.py @@ -2,7 +2,7 @@ # Extensions for building JunctionCity using build_bios.py # # -# Copyright (c) 2021, Intel Corporation. All rights reserved. +# Copyright (c) 2021 - 2023, Intel Corporation. All rights +reserved. # Copyright (c) 2021, American Megatrends International LLC. # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -107,7 +107,7 @@ def pre_build_ex(config, functions): if not os.path.exists(out_file_dir): os.mkdir(out_file_dir) -command = ["python", +command = [sys.executable, os.path.join(config["MIN_PACKAGE_TOOLS"], "AmlGenOffset", "AmlGenOffset.py"), "-d", "--aml_filter", config["AML_FILTER"], "-o", out_file_path, diff --git a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py index e2d32d3e13..8d62dd43b8 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py +++ b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py @@ -1,7 +1,7 @@ # @ build_board.py # Extensions for building WilsonCityRvp using build_bios.py # -# Copyright (c) 2021, Intel Corporation. All rights reserved. +# Copyright (c) 2021 - 2023, Intel Corporation. All rights +reserved. # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -105,7 +105,7 @@ def pre_build_ex(config, functions): if not os.path.exists(out_file_dir): os.mkdir(out_file_dir) -command = ["python", +command = [sys.executable, os.path.join(config["MIN_PACKAGE_TOOLS"], "AmlGenOffset", "AmlGenOffset.py"), "-d", "--aml_filter", config["AML_FILTER"], "-o", out_file_path, -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111829): https://edk2.groups.io/g/devel/message/111829 Mute This Topic: https://groups.io/mt/102862612/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] MinPlatformPkg: Remove usage of PYTHON_HOME
Pushed as 073fbeb -Original Message- From: devel@edk2.groups.io On Behalf Of Nate DeSimone Sent: Friday, November 17, 2023 10:36 PM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Gao, Liming ; Dong, Eric Subject: [edk2-devel] [edk2-platforms][PATCH v1] MinPlatformPkg: Remove usage of PYTHON_HOME Removes usage PYTHON_HOME from RebaseFspBinBaseAddress.py Cc: Chasel Chiu Cc: Liming Gao Cc: Eric Dong Signed-off-by: Nate DeSimone --- .../MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py index b7e4bcf5f9..32db9eb1c4 100644 --- a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py +++ b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py @@ -1,6 +1,6 @@ ## @ RebaseFspBinBaseAddress.py # -# Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved. +# Copyright (c) 2019 - 2023, Intel Corporation. All rights +reserved. # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -65,11 +65,7 @@ file.close() # Get FSP-M Size, in order to calculate the FSP-T Base. Used SplitFspBin.py script # to dump the header, and get the ImageSize in FSP-M section # -pythontool = 'python' -if 'PYTHON_HOME' in os.environ: -pythontool = os.environ['PYTHON_HOME'] + os.sep + 'python' -else: -pythontool = sys.executable +pythontool = sys.executable Process = subprocess.Popen([pythontool, splitFspBinPath, "info","-f",fspBinFilePath], stdout=subprocess.PIPE) Output = Process.communicate()[0] FsptInfo = Output.rsplit(b"FSP_M", 1); -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111828): https://edk2.groups.io/g/devel/message/111828 Mute This Topic: https://groups.io/mt/102667304/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] PurleyOpenBoardPkg: Replace Python Interpreter Name
Pushed as 15e9fae
-Original Message-
From: devel@edk2.groups.io On Behalf Of Nate DeSimone
Sent: Friday, November 17, 2023 10:36 PM
To: devel@edk2.groups.io
Cc: Chiu, Chasel
Subject: [edk2-devel] [edk2-platforms][PATCH v1] PurleyOpenBoardPkg: Replace
Python Interpreter Name
Removes the assumption that the python interpreter will have the name python.
Cc: Chasel Chiu
Signed-off-by: Nate DeSimone
---
.../PurleyOpenBoardPkg/BoardMtOlympus/build_board.py | 8
.../PurleyOpenBoardPkg/BoardTiogaPass/build_board.py | 10 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
index 2ba615d3e4..ffe762e289 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
@@ -1,7 +1,7 @@
# @ build_board.py
# This adds additional functions to the build_bios.py # -# Copyright (c)
2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2023, Intel Corporation. All rights
+reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent #
@@ -48,7 +48,7 @@ def pre_build_ex(config, functions):
print("AML_FILTER= ", config.get("AML_FILTER"))
# build the command with arguments
-command = ["python",
+command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
"AmlGenOffset",
"AmlGenOffset.py"), @@ -110,7 +110,7 @@ def
post_build_ex(config, functions):
print("post_build_ex Error")
sys.exit(1)
-common_patch_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_patch_command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
"PatchFv", "PatchBinFv.py"),
config["TARGET"], @@ -131,7 +131,7 @@ def
post_build_ex(config, functions):
print("Patch Error!")
sys.exit(1)
-common_rebase_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_rebase_command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
"PatchFv", "RebaseBinFv.py"),
config["TARGET"], diff --git
a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
index 46fd389ef1..3b66df7115 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
@@ -1,7 +1,7 @@
# @ build_board.py
# This adds additional functions to the build_bios.py # -# Copyright (c)
2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2018 - 2023, Intel Corporation. All rights
+reserved.
# Copyright (c) 2021, American Megatrends International LLC. #
SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -49,7 +49,7 @@ def
pre_build_ex(config, functions):
print("AML_FILTER= ", config.get("AML_FILTER"))
# build the command with arguments
-command = ["python",
+command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
"AmlGenOffset",
"AmlGenOffset.py"), @@ -111,7 +111,7 @@ def
post_build_ex(config, functions):
print("post_build_ex Error")
sys.exit(1)
-common_patch_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_patch_command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
"PatchFv", "PatchBinFv.py"),
config["TARGET"], @@ -132,7 +132,7 @@ def
post_build_ex(config, functions):
print("Patch Error!")
sys.exit(1)
-common_rebase_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_rebase_command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
"PatchFv", "RebaseBinFv.py"),
config["TARGET"], @@ -161,7 +161,7 @@ def
post_build_ex(config, functions):
print("Patch Error!")
sys.exit(1)
-common_patchbfv_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_patchbfv_command = [sy
[edk2-devel] [edk2-platforms][PATCH v1] PurleyOpenBoardPkg/BoardMtOlympus: Fix Build
Updates Microcode and Silicon FV sizes so
they can accomodate the newest content.
Cc: Chasel Chiu
Signed-off-by: Nate DeSimone
---
.../BoardMtOlympus/OpenBoardPkg.fdf | 25 +++
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.fdf
b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.fdf
index 413d98a070..86d1673458 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.fdf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.fdf
@@ -1,7 +1,7 @@
## @file
# FDF file for the MtOlympus board.
#
-# Copyright (c) 2018 - 2021, Intel Corporation. All rights reserved.
+# Copyright (c) 2018 - 2023, Intel Corporation. All rights reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -43,11 +43,11 @@ FV = FvOsBoot
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspUBase|gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspUSize
FV = FvLateSiliconCompressed
-0x0090|0x0040
+0x0090|0x0030
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootBase|gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize
FV = FvUefiBoot
-0x00D0|0x0007C000
+0x00C0|0x0007C000
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
#NV_VARIABLE_STORE
DATA = {
@@ -86,10 +86,10 @@ DATA = {
0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
}
-0x00D7C000|0x2000
+0x00C7C000|0x2000
#NV_EVENT_LOG
-0x00D7E000|0x2000
+0x00C7E000|0x2000
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
#NV_FTW_WORKING
DATA = {
@@ -103,28 +103,28 @@ DATA = {
0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
}
-0x00D8|0x0008
+0x00C8|0x0008
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
#NV_FTW_SPARE
-0x00E0|0x0001
+0x00D0|0x0003
gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeBase|gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeSize
FV = MICROCODE_FV
-0x00E1|0x0001
+0x00D3|0x0001
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryBase|gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize
FV = FvPostMemory
-0x00E2|0x0003
+0x00D4|0x0002
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSBase|gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize
FILE =
$(PLATFORM_SI_BIN_PACKAGE)/FV/FvPostMemorySilicon/$(TARGET)/FvPostMemorySilicon.Fv
-0x00E5|0x0006
+0x00D6|0x0005
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryBase|gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemorySize
FV = FvPreMemory
-0x00EB|0x0013
+0x00DB|0x0023
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMBase|gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMSize
FILE =
$(PLATFORM_SI_BIN_PACKAGE)/FV/FvPreMemorySilicon/$(TARGET)/FvPreMemorySilicon.Fv
@@ -135,6 +135,9 @@ FILE =
$(PLATFORM_SI_BIN_PACKAGE)/FV/FvTempMemorySilicon/$(TARGET)/FvTempMemoryS
SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase=
gEfiPchTokenSpaceGuid.PcdFlashAreaBaseAddress +
gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeBase
SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeSize=
gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeSize
+SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase =
gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeBase
+SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize =
gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeSize
+
SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchAddress=
gEfiPchTokenSpaceGuid.PcdFlashAreaBaseAddress +
gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeBase + 0x60
SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize =
gCpuUncoreTokenSpaceGuid.PcdFlashNvStorageMicrocodeSize - 0x60
--
2.39.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111772): https://edk2.groups.io/g/devel/message/111772
Mute This Topic: https://groups.io/mt/102842750/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] MinPlatformPkg: Add edk2-platforms/Features to PACKAGES_PATH
Cc: Chasel Chiu Cc: Liming Gao Cc: Eric Dong Signed-off-by: Nate DeSimone --- Platform/Intel/build.cfg | 5 +++-- Platform/Intel/build_bios.py | 11 +++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Platform/Intel/build.cfg b/Platform/Intel/build.cfg index 2ff536bb3e..6ab2ced1a5 100644 --- a/Platform/Intel/build.cfg +++ b/Platform/Intel/build.cfg @@ -1,7 +1,7 @@ # @ build.cfg # This is the main/default build configuration file # -# Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved. +# Copyright (c) 2019 - 2023, Intel Corporation. All rights reserved. # Copyright (c) 2021 - 2022, American Megatrends International LLC. # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -13,7 +13,8 @@ WORKSPACE_FSP_BIN = FSP EDK_TOOLS_BIN = edk2-BaseTools-win32 EDK_BASETOOLS = BaseTools WORKSPACE_DRIVERS = edk2-platforms/Drivers -WORKSPACE_FEATURES = edk2-platforms/Features/Intel +WORKSPACE_FEATURES = edk2-platforms/Features +WORKSPACE_FEATURES_INTEL = edk2-platforms/Features/Intel WORKSPACE_PLATFORM = edk2-platforms/Platform/Intel WORKSPACE_SILICON = edk2-platforms/Silicon/Intel WORKSPACE_PLATFORM_BIN = diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py index 43a241c837..c79a653f4d 100755 --- a/Platform/Intel/build_bios.py +++ b/Platform/Intel/build_bios.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3 # # @ build_bios.py # Builds BIOS using configuration files and dynamically @@ -109,6 +109,8 @@ def pre_build(build_config, build_type="DEBUG", silent=False, toolchain=None): config["WORKSPACE_SILICON"]) config["WORKSPACE_FEATURES"] = os.path.join(config["WORKSPACE"], config["WORKSPACE_FEATURES"]) +config["WORKSPACE_FEATURES_INTEL"] = os.path.join(config["WORKSPACE"], +config["WORKSPACE_FEATURES_INTEL"]) config["WORKSPACE_DRIVERS"] = os.path.join(config["WORKSPACE"], config["WORKSPACE_DRIVERS"]) config["WORKSPACE_PLATFORM_BIN"] = \ @@ -123,9 +125,10 @@ def pre_build(build_config, build_type="DEBUG", silent=False, toolchain=None): config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_SILICON"] config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_SILICON_BIN"] config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_FEATURES"] -# add all feature domains in WORKSPACE_FEATURES to package path -for filename in os.listdir(config["WORKSPACE_FEATURES"]): -filepath = os.path.join(config["WORKSPACE_FEATURES"], filename) +config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_FEATURES_INTEL"] +# add all feature domains in WORKSPACE_FEATURES_INTEL to package path +for filename in os.listdir(config["WORKSPACE_FEATURES_INTEL"]): +filepath = os.path.join(config["WORKSPACE_FEATURES_INTEL"], filename) # feature domains folder does not contain dec file if os.path.isdir(filepath) and \ not glob.glob(os.path.join(filepath, "*.dec")): -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111771): https://edk2.groups.io/g/devel/message/111771 Mute This Topic: https://groups.io/mt/102842749/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] MinPlatformPkg: Update PatchFv Tools for Python 3.x
PatchFv tools now run on Python 3.x
Cc: Chasel Chiu
Cc: Liming Gao
Cc: Eric Dong
Signed-off-by: Nate DeSimone
---
.../MinPlatformPkg/Tools/PatchFv/PatchBfv.py | 35
.../Tools/PatchFv/PatchBinFv.py | 69
.../Tools/PatchFv/RebaseBinFv.py | 82 +--
3 files changed, 92 insertions(+), 94 deletions(-)
diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
index 1312bfc328..f05480b91f 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
@@ -1,6 +1,6 @@
## @ PatchBfv.py
#
-# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2023, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
@@ -11,8 +11,7 @@ import sys
import time
import shutil
import struct
-import binascii
-from ctypes import *
+from ctypes import *
class FileChecker:
def __init__(self):
@@ -21,17 +20,17 @@ class FileChecker:
self.pcd = ["", "", ""]
def PrintPcd(self):
-print "PCD: " + self.pcd[0] + "|" + self.pcd[1] + "(" + self.pcd[2] +
")"
+print("PCD: {0}|{1}({2})".format(*(self.pcd)))
def ProcessReport(self):
try :
file = open(self.reportFile)
except Exception:
-print "fail to open " + self.reportFile
+print("fail to open " + self.reportFile)
return
try:
file.seek(0)
-print "checking - " + self.pcd[0]
+print("checking - " + self.pcd[0])
ValuePair = self.GetPcdFromReport (file, self.pcd[0])
self.pcd[1] = ValuePair[0]
self.pcd[2] = ValuePair[1]
@@ -42,12 +41,12 @@ class FileChecker:
def PatchFd(self):
fileName = self.fdName
-print "patching BFV - " + fileName
+print("patching BFV - " + fileName)
try :
file = open(fileName, "rb")
except Exception:
-print "fail to open " + fileName
+print("fail to open " + fileName)
return
try:
buffer = file.read()
@@ -57,7 +56,7 @@ class FileChecker:
offset = -4
l = struct.pack("L", int(self.pcd[1],16))
-print " [" + hex(offset) + "] " + binascii.hexlify(data[-4:]) + "
<= " + binascii.hexlify(l)
+print(" [" + hex(offset) + "] " + bytes(data[-4:]).hex() + " <= "
+ bytes(l).hex())
data[-4:] = l
file = open(fileName, "wb")
@@ -77,36 +76,36 @@ class FileChecker:
newline = line[:-1]
-if (cmp (newline, TargetPkg) == 0):
+if newline == TargetPkg:
FoundPkg = True
continue
-if (cmp (newline, "") == 0) or ((cmp (newline[0], " ") != 0) and
(cmp (newline[0], "0") != 0)):
+if newline == "" or (newline[0] != " " and newline[0] != "0"):
FoundPkg = False
if (FoundPkg == True) :
newline = newline.strip()
splitLine = newline.split(" ", 2)
-if (cmp (splitLine[0], "*F") == 0) or (cmp (splitLine[0],
"*P") == 0) :
-if (cmp (splitLine[1], TargetPcd) == 0):
-print "found - " + TargetPkg + "." + TargetPcd
+if splitLine[0] == "*F" or splitLine[0] == "*P":
+if splitLine[1] == TargetPcd:
+print("found - " + TargetPkg + "." + TargetPcd)
splitLine = splitLine[2].strip()[1:].strip().split("
", 1)
-if (cmp (splitLine[0], "FIXED") == 0) or (cmp
(splitLine[0], "PATCH") == 0):
+if splitLine[0] == "FIXED" or splitLine[0] == "PATCH":
SplitLine = splitLine[1].strip()[1:].split(")", 1)
Type = SplitLine[0]
Value = SplitLine[1].strip()[1:].strip().split()[0]
-print " Type - (" + Type + "), Value - (" + Value
+ ")"
+print(" Type - (" + Type + "), Value - (" + Value
+ ")")
return [Value, Type]
return ["", ""]
-
+
def main():
global FileChecker
fileCheck
[edk2-devel] [edk2-platforms][PATCH v1] PurleyOpenBoardPkg: Fix Build
Adds SmmLockBox driver which is needed to build with the newest version of MinPlatformPkg Cc: Chasel Chiu Signed-off-by: Nate DeSimone --- .../Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc | 3 ++- .../Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc index 39c5cf78ab..65f22bb90e 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/OpenBoardPkg.dsc @@ -1,7 +1,7 @@ ## @file # The main build description file for the MtOlympus board. # -# Copyright (c) 2018 - 2021, Intel Corporation. All rights reserved. +# Copyright (c) 2018 - 2023, Intel Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -195,6 +195,7 @@ $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf $(PLATFORM_BOARD_PACKAGE)/Policy/S3NvramSave/S3NvramSave.inf + MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf # # Shell diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc index 5747717ecb..64e8978942 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/OpenBoardPkg.dsc @@ -1,7 +1,7 @@ ## @file # The main build description file for the TiogaPass board. # -# Copyright (c) 2018, Intel Corporation. All rights reserved. +# Copyright (c) 2018 - 2023, Intel Corporation. All rights reserved. # Copyright (c) 2021, American Megatrends International LLC. # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -226,6 +226,7 @@ $(PLATFORM_BOARD_PACKAGE)/Policy/S3NvramSave/S3NvramSave.inf BoardModulePkg/BoardBdsHookDxe/BoardBdsHookDxe.inf + MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf # # Shell -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111774): https://edk2.groups.io/g/devel/message/111774 Mute This Topic: https://groups.io/mt/102842752/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] PurleyOpenBoardPkg: Replace Python Interpreter Name
Removes the assumption that the python interpreter will have the name
python.
Cc: Chasel Chiu
Signed-off-by: Nate DeSimone
---
.../PurleyOpenBoardPkg/BoardMtOlympus/build_board.py | 8
.../PurleyOpenBoardPkg/BoardTiogaPass/build_board.py | 10 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
index 2ba615d3e4..ffe762e289 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
@@ -1,7 +1,7 @@
# @ build_board.py
# This adds additional functions to the build_bios.py
#
-# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2023, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -48,7 +48,7 @@ def pre_build_ex(config, functions):
print("AML_FILTER= ", config.get("AML_FILTER"))
# build the command with arguments
-command = ["python",
+command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
"AmlGenOffset",
"AmlGenOffset.py"),
@@ -110,7 +110,7 @@ def post_build_ex(config, functions):
print("post_build_ex Error")
sys.exit(1)
-common_patch_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_patch_command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
"PatchFv", "PatchBinFv.py"),
config["TARGET"],
@@ -131,7 +131,7 @@ def post_build_ex(config, functions):
print("Patch Error!")
sys.exit(1)
-common_rebase_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_rebase_command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
"PatchFv", "RebaseBinFv.py"),
config["TARGET"],
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
index 46fd389ef1..3b66df7115 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
@@ -1,7 +1,7 @@
# @ build_board.py
# This adds additional functions to the build_bios.py
#
-# Copyright (c) 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2018 - 2023, Intel Corporation. All rights reserved.
# Copyright (c) 2021, American Megatrends International LLC.
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -49,7 +49,7 @@ def pre_build_ex(config, functions):
print("AML_FILTER= ", config.get("AML_FILTER"))
# build the command with arguments
-command = ["python",
+command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
"AmlGenOffset",
"AmlGenOffset.py"),
@@ -111,7 +111,7 @@ def post_build_ex(config, functions):
print("post_build_ex Error")
sys.exit(1)
-common_patch_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_patch_command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
"PatchFv", "PatchBinFv.py"),
config["TARGET"],
@@ -132,7 +132,7 @@ def post_build_ex(config, functions):
print("Patch Error!")
sys.exit(1)
-common_rebase_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_rebase_command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
"PatchFv", "RebaseBinFv.py"),
config["TARGET"],
@@ -161,7 +161,7 @@ def post_build_ex(config, functions):
print("Patch Error!")
sys.exit(1)
-common_patchbfv_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_patchbfv_command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
"PatchFv", "PatchBfv.py"),
os.path.join(config["BUILD_DIR_PATH"],
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111423): https://edk2.groups.io/g/devel/message/111423
Mute This Topic: https://groups.io/mt/102667305/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
