Re: [edk2-devel] [edk2-platforms: PATCH] MinPlatformPkg: Add FSP 2.4 MultiPhase library.
This sample library does not do anything. If the design is such that a NULL library is functional, then a NULL library should be implemented. Having a sample library that has the same function as a NULL library doesn't make sense to me. It looks like a NULL library would work fine in this design. If you update to IntelFsp2WrapperPkg/Library/BaseFspWrapperPlatformMultiPhaseLibNull/BaseFspWrapperPlatformMultiPhaseLibNull.inf, that would be acceptable to me. Regards, Isaac -Original Message- From: Chiu, Chasel Sent: Wednesday, August 31, 2022 11:19 AM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Desimone, Nathaniel L ; Oram, Isaac W ; Gao, Liming ; Dong, Eric Subject: [edk2-platforms: PATCH] MinPlatformPkg: Add FSP 2.4 MultiPhase library. FSP Wrapper has implemented FSP 2.4 MultiPhase support and required platform to include new library instance. Cc: Nate DeSimone Cc: Isaac Oram Cc: Liming Gao Cc: Eric Dong Signed-off-by: Chasel Chiu --- Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc index 8e91dba6ac..d4191c4b01 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc @@ -54,6 +54,8 @@ TpmPlatformHierarchyLib|MinPlatformPkg/Tcg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf FspMeasurementLib|IntelFsp2WrapperPkg/Library/BaseFspMeasurementLib/BaseFspMeasurementLib.inf+ FspWrapperPlatformMultiPhaseLib|IntelFsp2WrapperPkg/Library/BaseFspWrapperPlatformMultiPhaseLibSample/BaseFspWrapperPlatformMultiPhaseLibSample.inf+ FspWrapperMultiPhaseProcessLib|IntelFsp2WrapperPkg/Library/FspWrapperMultiPhaseProcessLib/FspWrapperMultiPhaseProcessLib.inf TcgEventLogRecordLib|SecurityPkg/Library/TcgEventLogRecordLib/TcgEventLogRecordLib.inf TpmMeasurementLib|SecurityPkg/Library/PeiTpmMeasurementLib/PeiTpmMeasurementLib.inf -- 2.35.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#93015): https://edk2.groups.io/g/devel/message/93015 Mute This Topic: https://groups.io/mt/93377589/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 2/5] Silicon/Intel: Port SmmControl protocol to PPI for S3
@Chaganty, Rangasai V<mailto:rangasai.v.chaga...@intel.com> Is it fair to say that the build time address for ACPI BAR is the cross silicon design? I think it is and therefore we should move the PCD to IntelSiliconPkg. I agree with Benjamin that we don’t really want features depending on specific silicon packages. We want API definitions in IntelSiliconPkg. Regards, Isaac From: devel@edk2.groups.io On Behalf Of Benjamin Doron Sent: Monday, August 29, 2022 5:58 PM To: Oram, Isaac W Cc: devel@edk2.groups.io; Desimone, Nathaniel L ; Sinha, Ankit ; Ni, Ray ; Chaganty, Rangasai V Subject: Re: [edk2-devel][edk2-platforms][PATCH v1 2/5] Silicon/Intel: Port SmmControl protocol to PPI for S3 Right, but Kabylake has a different implementation that retrieves it from HW registers - PchAcpiBaseGet(). This is probably optional, there is a PCD, but it's in a different package scope. I don't know how to handle the Packages in the INF to keep this silicon package agnostic. For that matter, it might not really be a CFL plus shim, because Tigerlake, etc are different package DECs too. Best regards, Benjamin On Mon, 29 Aug 2022 at 19:17, Oram, Isaac W mailto:isaac.w.o...@intel.com>> wrote: I think that the shim lib might be overkill. PmcGetAcpiBase just resolves to PcdGet16 (PcdAcpiBaseAddress); I think that you should be able to use that PCD for any Intel chipset/silicon for the foreseeable future. I would prefer to see contents of sections in INF files indented, but it is a nit. Regards, Isaac -Original Message- From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> mailto:devel@edk2.groups.io>> On Behalf Of Benjamin Doron Sent: Monday, August 29, 2022 1:36 PM To: devel@edk2.groups.io<mailto:devel@edk2.groups.io> Cc: Desimone, Nathaniel L mailto:nathaniel.l.desim...@intel.com>>; Sinha, Ankit mailto:ankit.si...@intel.com>>; Ni, Ray mailto:ray...@intel.com>>; Chaganty, Rangasai V mailto:rangasai.v.chaga...@intel.com>>; Oram, Isaac W mailto:isaac.w.o...@intel.com>> Subject: [edk2-devel][edk2-platforms][PATCH v1 2/5] Silicon/Intel: Port SmmControl protocol to PPI for S3 S3 resume may require communication with SMM, for which we need the SmmControl PPI. Therefore, port the DXE drivers to a library, like there is for SMM Access. As the registers are common across Intel platforms in the tree, while a helper function definition is not, implement a new library as a compatibility shim. Tested, working on Kabylake. Further testing required after the refactor for compatibility. Cc: Nate DeSimone mailto:nathaniel.l.desim...@intel.com>> Cc: Ankit Sinha mailto:ankit.si...@intel.com>> Cc: Ray Ni mailto:ray...@intel.com>> Cc: Rangasai V Chaganty mailto:rangasai.v.chaga...@intel.com>> Cc: Isaac Oram mailto:isaac.w.o...@intel.com>> Signed-off-by: Benjamin Doron mailto:benjamin.doro...@gmail.com>> --- .../BaseIntelCompatShimLibCfl.c | 24 ++ .../BaseIntelCompatShimLibCfl.inf | 24 ++ .../PeiSmmControlLib/PeiSmmControlLib.c | 309 ++ .../PeiSmmControlLib/PeiSmmControlLib.inf | 36 ++ .../Include/Library/IntelCompatShimLib.h | 20 ++ .../Include/Library/SmmControlLib.h | 26 ++ .../Intel/IntelSiliconPkg/IntelSiliconPkg.dec | 4 + .../BaseIntelCompatShimLibKbl.c | 29 ++ .../BaseIntelCompatShimLibKbl.inf | 24 ++ 9 files changed, 496 insertions(+) create mode 100644 Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseIntelCompatShimLibCfl/BaseIntelCompatShimLibCfl.c create mode 100644 Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseIntelCompatShimLibCfl/BaseIntelCompatShimLibCfl.inf create mode 100644 Silicon/Intel/IntelSiliconPkg/Feature/SmmControl/Library/PeiSmmControlLib/PeiSmmControlLib.c create mode 100644 Silicon/Intel/IntelSiliconPkg/Feature/SmmControl/Library/PeiSmmControlLib/PeiSmmControlLib.inf create mode 100644 Silicon/Intel/IntelSiliconPkg/Include/Library/IntelCompatShimLib.h create mode 100644 Silicon/Intel/IntelSiliconPkg/Include/Library/SmmControlLib.h create mode 100644 Silicon/Intel/KabylakeSiliconPkg/Library/BaseIntelCompatShimLibKbl/BaseIntelCompatShimLibKbl.c create mode 100644 Silicon/Intel/KabylakeSiliconPkg/Library/BaseIntelCompatShimLibKbl/BaseIntelCompatShimLibKbl.inf diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseIntelCompatShimLibCfl/BaseIntelCompatShimLibCfl.c b/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseIntelCompatShimLibCfl/BaseIntelCompatShimLibCfl.c new file mode 100644 index ..5353126267e6 --- /dev/null +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseIntelCompatShimLibC +++ fl/BaseIntelCompatShimLibCfl.c @@ -0,0 +1,24 @@ +/** @file + A Coffeelake+ compatibility shim + + Copyright (c) 2022, Baruch Binyamin Doron + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include + +/** +
Re: [edk2-devel][edk2-platforms][PATCH v1 4/5] MinPlatformPkg: Implement working S3 resume
FspWrapperHobProcessLib.h
- Resolve ToDo
CorePeiInclude.dsc, CorePostMemoryInclude.fdf
- MinPlatformPkg should not consume advanced feature content directly.
- I dislike conditioning the performance on boot to shell. Please remove.
Basically, items can be removed in stage 7 (optimization) if they are not
desired. I think that performance info should be ubiquitous, so just
unconditionally include this.
Regards,
Isaac
-Original Message-
From: Benjamin Doron
Sent: Monday, August 29, 2022 1:36 PM
To: devel@edk2.groups.io
Cc: Chiu, Chasel ; Desimone, Nathaniel L
; Sinha, Ankit ; Oram,
Isaac W ; Gao, Liming ; Dong,
Eric
Subject: [edk2-devel][edk2-platforms][PATCH v1 4/5] MinPlatformPkg: Implement
working S3 resume
Consume S3 resume memory allocation on resume flow.
Also, include complementary FirmwarePerformanceDataTablePei module in
MinPlatform FV for S3 resume performance measurement.
Cc: Chasel Chiu
Cc: Nate DeSimone
Cc: Ankit Sinha
Cc: Isaac Oram
Cc: Liming Gao
Cc: Eric Dong
Signed-off-by: Benjamin Doron
---
.../FspWrapperHobProcessLib.c | 70 ++-
.../PeiFspWrapperHobProcessLib.inf| 2 +
.../Include/Dsc/CorePeiInclude.dsc| 4 ++
.../Include/Fdf/CorePostMemoryInclude.fdf | 4 ++
4 files changed, 79 insertions(+), 1 deletion(-)
diff --git
a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c
b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c
index 7ee4d3a31c49..992ec5d41bd8 100644
---
a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobP
+++ rocessLib/FspWrapperHobProcessLib.c
@@ -16,14 +16,17 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include
#include #include
+#include #include
#include #include
#include #include
#include +#include
#include +#include // // Additional pages are
used by DXE memory manager.@@ -130,6 +133,55 @@ GetPeiMemSize (
return MinSize + Size + PEI_ADDITIONAL_MEMORY_SIZE; } +/**+ Get S3 PEI
memory information.++ @note At this point, memory is ready, and PeiServices
are available to use.+ Platform can get some data from SMRAM directly.++
@param[out] S3PeiMemSize PEI memory size to be installed in S3 phase.+
@param[out] S3PeiMemBase PEI memory base to be installed in S3 phase.++
@return If S3 PEI memory information is got
successfully.+**/+EFI_STATUS+EFIAPI+GetS3MemoryInfo (+ OUT UINT64
*S3PeiMemSize,+ OUT EFI_PHYSICAL_ADDRESS *S3PeiMemBase+ )+{+ EFI_STATUS
Status;+ EFI_PEI_READ_ONLY_VARIABLE2_PPI *VariablePpi;+
UINTNDataSize;+ ACPI_S3_MEMORY
S3MemoryInfo;++ *S3PeiMemBase = 0;+ *S3PeiMemSize = 0;++ Status =
PeiServicesLocatePpi (, 0, NULL, (VOID **)
);+ ASSERT_EFI_ERROR (Status);++ DataSize = sizeof
(S3MemoryInfo);+ Status = VariablePpi->GetVariable (+
VariablePpi,+ ACPI_S3_MEMORY_NV_NAME,+
,+ NULL,+
,+ +
);+ ASSERT_EFI_ERROR (Status);++ if (EFI_ERROR (Status)) {+return
Status;+ }++ *S3PeiMemBase = S3MemoryInfo.S3PeiMemBase;+ *S3PeiMemSize =
S3MemoryInfo.S3PeiMemSize;+ return EFI_SUCCESS;+}+ /** Post FSP-M HOB
process for Memory Resource Descriptor. @@ -280,7 +332,7 @@ PostFspmHobProcess (
0x1000 ); -+ if (BootMode != BOOT_ON_S3_RESUME) { // //
Capsule mode //@@ -337,7 +389,23 @@ PostFspmHobProcess (
if (Capsule != NULL) { Status = Capsule->CreateState
((EFI_PEI_SERVICES **)PeiServices, CapsuleBuffer, CapsuleBufferLength); }+
} else {+// TODO: Must BuildResourceDescriptorHob()?+Status =
GetS3MemoryInfo (, );+ASSERT_EFI_ERROR (Status); +
DEBUG ((DEBUG_INFO, "S3 resume PeiMemBase: 0x%08x\n", PeiMemBase));+
DEBUG ((DEBUG_INFO, "S3 resume PeiMemSize: 0x%08x\n", PeiMemSize));++
//+// Install efi memory+//+Status = PeiServicesInstallPeiMemory
(+ PeiMemBase,+ PeiMemSize+ );+
ASSERT_EFI_ERROR (Status);+ }// // Create a memory allocation HOB at
fixed location for MP Services PPI AP wait loop.diff --git
a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/PeiFspWrapperHobProcessLib.inf
b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/PeiFspWrapperHobProcessLib.inf
index b846e7af1d2d..e2aac36bf018 100644
---
a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/PeiFspWrapperHobProcessLib.inf
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobP
+++ rocessLib/PeiFspWrapper
Re: [edk2-devel][edk2-platforms][PATCH v1 3/5] S3FeaturePkg: Implement working S3 resume
S3Feature.dsc - remove commented out code # Add library instances here that are not included in package components and should be tested # in the package build. - These comments don't make a lot of sense to me in the feature include DSC. Looks like cut and paste propagation that is not appropriate here. Note instances in Components.IA32 and Components.X64 sections. # NOTE: RSC will be after end-of-BS, use DebugLibSerialPort # - No gBS in SerialPortInitialize() # - No global assigns after ReadyToLock possible, due to LockBox copy - These comments also don't make sense to me S3Dxe.c - infromation should be "information" in multiple instances - GetPeiMemSize - Generally we would prefer #defines in .h or near top of the file after includes and before function prototypes and implementations. - Resolve ToDo S3Pei.c - Resolve ToDo and TODO/TEST Regards, Isaac -Original Message- From: Benjamin Doron Sent: Monday, August 29, 2022 1:36 PM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Sinha, Ankit ; Chaganty, Rangasai V ; Oram, Isaac W ; Gao, Liming Subject: [edk2-devel][edk2-platforms][PATCH v1 3/5] S3FeaturePkg: Implement working S3 resume Follow-up commits to MinPlatform (PeiFspWrapperHobProcessLib for memory) and FSP-related board libraries (policy overrides) required for successful S3 resume. Factored allocation logic into new module to avoid MinPlatform dependency on S3Feature package. TODO: Can optimise required size. Cc: Nate DeSimone Cc: Ankit Sinha Cc: Sai Chaganty Cc: Isaac Oram Cc: Liming Gao Signed-off-by: Benjamin Doron --- .../S3FeaturePkg/Include/PostMemory.fdf | 15 ++ .../S3FeaturePkg/Include/PreMemory.fdf| 8 +- .../S3FeaturePkg/Include/S3Feature.dsc| 42 - .../S3FeaturePkg/S3Dxe/S3Dxe.c| 156 ++ .../S3FeaturePkg/S3Dxe/S3Dxe.inf | 49 ++ .../S3FeaturePkg/S3Pei/S3Pei.c| 83 +- .../S3FeaturePkg/S3Pei/S3Pei.inf | 8 +- .../Include/AcpiS3MemoryNvData.h | 22 +++ 8 files changed, 375 insertions(+), 8 deletions(-) create mode 100644 Features/Intel/PowerManagement/S3FeaturePkg/S3Dxe/S3Dxe.c create mode 100644 Features/Intel/PowerManagement/S3FeaturePkg/S3Dxe/S3Dxe.inf create mode 100644 Platform/Intel/MinPlatformPkg/Include/AcpiS3MemoryNvData.h diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/Include/PostMemory.fdf b/Features/Intel/PowerManagement/S3FeaturePkg/Include/PostMemory.fdf index 9e17f853c630..5d3d96f4f317 100644 --- a/Features/Intel/PowerManagement/S3FeaturePkg/Include/PostMemory.fdf +++ b/Features/Intel/PowerManagement/S3FeaturePkg/Include/PostMemory.fdf @@ -2,7 +2,22 @@ # FDF file for post-memory S3 advanced feature modules. # # Copyright (c) 2019, Intel Corporation. All rights reserved.+# Copyright (c) 2022, Baruch Binyamin Doron. # # SPDX-License-Identifier: BSD-2-Clause-Patent # ##++## Dependencies+ INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf+ INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf++## Save-state module stack+ INF S3FeaturePkg/S3Dxe/S3Dxe.inf+ INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf+ # FSP may perform CPU finalisation, requires CpuInitDxe from closed code+ # - Presently, PiSmmCpuDxeSmm shall perform finalisation with this data+ INF UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf++## Restore-state module stack+ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.infdiff --git a/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf b/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf index fdd16a4e0356..e130fa5f098d 100644 --- a/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf +++ b/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf @@ -2,9 +2,15 @@ # FDF file for pre-memory S3 advanced feature modules. # # Copyright (c) 2019, Intel Corporation. All rights reserved.+# Copyright (c) 2022, Baruch Binyamin Doron. # # SPDX-License-Identifier: BSD-2-Clause-Patent # ## -INF S3FeaturePkg/S3Pei/S3Pei.inf+## Dependencies+ INF S3FeaturePkg/S3Pei/S3Pei.inf+ INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf++## Restore-state module stack+ INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.infdiff --git a/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc b/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc index cc34e785076a..bf45b56258ff 100644 --- a/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc +++ b/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc @@ -7,6 +7,7 @@ # for the build infrastructure. # # Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.+# Copyright (c) 2022, Baruch Binyamin Doron. # # SPDX-License-Identifier: BSD-2-Clause-Patent #@@ -25,6 +26,10 @@ !error "DXE_ARCH must be specified to bui
Re: [edk2-devel][edk2-platforms][PATCH v1 2/5] Silicon/Intel: Port SmmControl protocol to PPI for S3
I think that the shim lib might be overkill. PmcGetAcpiBase just resolves to
PcdGet16 (PcdAcpiBaseAddress);
I think that you should be able to use that PCD for any Intel chipset/silicon
for the foreseeable future.
I would prefer to see contents of sections in INF files indented, but it is a
nit.
Regards,
Isaac
-Original Message-
From: devel@edk2.groups.io On Behalf Of Benjamin Doron
Sent: Monday, August 29, 2022 1:36 PM
To: devel@edk2.groups.io
Cc: Desimone, Nathaniel L ; Sinha, Ankit
; Ni, Ray ; Chaganty, Rangasai V
; Oram, Isaac W
Subject: [edk2-devel][edk2-platforms][PATCH v1 2/5] Silicon/Intel: Port
SmmControl protocol to PPI for S3
S3 resume may require communication with SMM, for which we need the SmmControl
PPI. Therefore, port the DXE drivers to a library, like there is for SMM Access.
As the registers are common across Intel platforms in the tree, while a helper
function definition is not, implement a new library as a compatibility shim.
Tested, working on Kabylake. Further testing required after the refactor for
compatibility.
Cc: Nate DeSimone
Cc: Ankit Sinha
Cc: Ray Ni
Cc: Rangasai V Chaganty
Cc: Isaac Oram
Signed-off-by: Benjamin Doron
---
.../BaseIntelCompatShimLibCfl.c | 24 ++
.../BaseIntelCompatShimLibCfl.inf | 24 ++
.../PeiSmmControlLib/PeiSmmControlLib.c | 309 ++
.../PeiSmmControlLib/PeiSmmControlLib.inf | 36 ++
.../Include/Library/IntelCompatShimLib.h | 20 ++
.../Include/Library/SmmControlLib.h | 26 ++
.../Intel/IntelSiliconPkg/IntelSiliconPkg.dec | 4 +
.../BaseIntelCompatShimLibKbl.c | 29 ++
.../BaseIntelCompatShimLibKbl.inf | 24 ++
9 files changed, 496 insertions(+)
create mode 100644
Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseIntelCompatShimLibCfl/BaseIntelCompatShimLibCfl.c
create mode 100644
Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseIntelCompatShimLibCfl/BaseIntelCompatShimLibCfl.inf
create mode 100644
Silicon/Intel/IntelSiliconPkg/Feature/SmmControl/Library/PeiSmmControlLib/PeiSmmControlLib.c
create mode 100644
Silicon/Intel/IntelSiliconPkg/Feature/SmmControl/Library/PeiSmmControlLib/PeiSmmControlLib.inf
create mode 100644
Silicon/Intel/IntelSiliconPkg/Include/Library/IntelCompatShimLib.h
create mode 100644
Silicon/Intel/IntelSiliconPkg/Include/Library/SmmControlLib.h
create mode 100644
Silicon/Intel/KabylakeSiliconPkg/Library/BaseIntelCompatShimLibKbl/BaseIntelCompatShimLibKbl.c
create mode 100644
Silicon/Intel/KabylakeSiliconPkg/Library/BaseIntelCompatShimLibKbl/BaseIntelCompatShimLibKbl.inf
diff --git
a/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseIntelCompatShimLibCfl/BaseIntelCompatShimLibCfl.c
b/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseIntelCompatShimLibCfl/BaseIntelCompatShimLibCfl.c
new file mode 100644
index ..5353126267e6
--- /dev/null
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseIntelCompatShimLibC
+++ fl/BaseIntelCompatShimLibCfl.c
@@ -0,0 +1,24 @@
+/** @file
+ A Coffeelake+ compatibility shim
+
+ Copyright (c) 2022, Baruch Binyamin Doron
+ SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include
+#include
+
+/**
+ Get PCH ACPI base address.
+
+ @retval Address Address of PWRM base address.
+**/
+UINT16
+EFIAPI
+CompatShimGetAcpiBase (
+ VOID
+ )
+{
+ return PmcGetAcpiBase ();
+}
diff --git
a/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseIntelCompatShimLibCfl/BaseIntelCompatShimLibCfl.inf
b/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseIntelCompatShimLibCfl/BaseIntelCompatShimLibCfl.inf
new file mode 100644
index ..48b071ed05ae
--- /dev/null
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseIntelCompatShimLibC
+++ fl/BaseIntelCompatShimLibCfl.inf
@@ -0,0 +1,24 @@
+## @file
+# Library description file for the Coffeelake+ compatibility shim # #
+Copyright (c) 2022, Baruch Binyamin Doron #
+SPDX-License-Identifier: BSD-2-Clause-Patent # ##
+
+[Defines]
+INF_VERSION = 0x00010017
+BASE_NAME = BaseIntelCompatShimLibCfl
+FILE_GUID = 3D0BB32E-D328-4615-ADFC-782CECC68D53
+VERSION_STRING = 1.0
+MODULE_TYPE = BASE
+LIBRARY_CLASS = IntelCompatShimLib
+
+[LibraryClasses]
+PmcLib
+
+[Packages]
+CoffeelakeSiliconPkg/SiPkg.dec
+
+[Sources]
+BaseIntelCompatShimLibCfl.c
diff --git
a/Silicon/Intel/IntelSiliconPkg/Feature/SmmControl/Library/PeiSmmControlLib/PeiSmmControlLib.c
b/Silicon/Intel/IntelSiliconPkg/Feature/SmmControl/Library/PeiSmmControlLib/PeiSmmControlLib.c
new file mode 100644
index ..80c2c1be90b1
--- /dev/null
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/SmmControl/Library/PeiSmmCon
+++ trolLib/PeiSmmControlLib.c
@@ -0,0 +1,309 @@
+/** @file+ This is to publish the SMM Control Ppi instance.++ Copyright (c)
2019 - 2020, Intel Corporation. All rights reserved.+
SPDX-License-Identifier: BSD-2-Clause-Patent++**/+#include
+#include +#include
+#include +#include
+#include ++#include
+#include ++#define
Re: [edk2-devel][edk2-platforms][PATCH v1 1/5] IntelSiliconPkg/Feature/PeiSmmAccessLibSmramc: Implement chipset support
Reviewed-by: Isaac Oram
I would prefer to see contents of sections indented, but it is a nit.
It might be slightly better to have PcdsFixedAtBuild type PCD for the register
information, but this is pretty stable HW, so it is ok.
Regards,
Isaac
-Original Message-
From: Benjamin Doron
Sent: Monday, August 29, 2022 1:36 PM
To: devel@edk2.groups.io
Cc: Desimone, Nathaniel L ; Sinha, Ankit
; Ni, Ray ; Chaganty, Rangasai V
; Oram, Isaac W
Subject: [edk2-devel][edk2-platforms][PATCH v1 1/5]
IntelSiliconPkg/Feature/PeiSmmAccessLibSmramc: Implement chipset support
SMRAM must be opened to retrieve the lockbox for S3, and SMM communication
depends on this PPI. For security purposes, SMRAM lock must be performed before
EndOfPei (although FSP notify performs lockdown too).
It seems to me that this library is generic and applicable to all Intel
platforms in the tree using the MCH SMRAMC register.
Cc: Nate DeSimone
Cc: Ankit Sinha
Cc: Ray Ni
Cc: Rangasai V Chaganty
Cc: Isaac Oram
Signed-off-by: Benjamin Doron
---
.../PeiSmmAccessLibSmramc/PeiSmmAccessLib.c | 430 ++
.../PeiSmmAccessLibSmramc/PeiSmmAccessLib.inf | 41 ++
2 files changed, 471 insertions(+)
create mode 100644
Silicon/Intel/IntelSiliconPkg/Feature/SmmAccess/Library/PeiSmmAccessLibSmramc/PeiSmmAccessLib.c
create mode 100644
Silicon/Intel/IntelSiliconPkg/Feature/SmmAccess/Library/PeiSmmAccessLibSmramc/PeiSmmAccessLib.inf
diff --git
a/Silicon/Intel/IntelSiliconPkg/Feature/SmmAccess/Library/PeiSmmAccessLibSmramc/PeiSmmAccessLib.c
b/Silicon/Intel/IntelSiliconPkg/Feature/SmmAccess/Library/PeiSmmAccessLibSmramc/PeiSmmAccessLib.c
new file mode 100644
index ..5b472bf86abf
--- /dev/null
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/SmmAccess/Library/PeiSmmAcce
+++ ssLibSmramc/PeiSmmAccessLib.c
@@ -0,0 +1,430 @@
+/** @file+ This is to publish the SMM Access Ppi instance.++ Copyright (c)
2019 - 2020, Intel Corporation. All rights reserved.+
SPDX-License-Identifier: BSD-2-Clause-Patent++**/+#include
+#include +#include
+#include +#include
+#include +#include
+#include ++#include
+#include ++#define
SMM_ACCESS_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('4', '5', 's', 'a')++///+///
Private data+///+typedef struct {+ UINTN Signature;+
EFI_HANDLEHandle;+ EFI_PEI_MM_ACCESS_PPI SmmAccess;+ //+ //
Local Data for SMM Access interface goes here+ //+ UINTN
NumberRegions;+ EFI_SMRAM_DESCRIPTOR *SmramDesc;+}
SMM_ACCESS_PRIVATE_DATA;++#define SMM_ACCESS_PRIVATE_DATA_FROM_THIS(a) \+
CR (a, \+ SMM_ACCESS_PRIVATE_DATA, \+ SmmAccess, \+
SMM_ACCESS_PRIVATE_DATA_SIGNATURE \+ )++//+// Common registers:+//+//
DEVICE 0 (Memory Controller Hub)+//+#define SA_MC_BUS 0x00+#define
SA_MC_DEV 0x00+#define SA_MC_FUN 0x00+///+///
Description:+/// The SMRAMC register controls how accesses to Compatible SMRAM
spaces are treated. The Open, Close and Lock bits function only when G_SMRAME
bit is set to 1. Also, the Open bit must be reset before the Lock bit is
set.+///+#define R_SA_SMRAMC (0x88)+#define B_SA_SMRAMC_D_LCK_MASK
(0x10)+#define B_SA_SMRAMC_D_CLS_MASK (0x20)+#define
B_SA_SMRAMC_D_OPEN_MASK(0x40)++/**+ This routine accepts a request to
"open" a region of SMRAM. The+ region could be legacy ABSEG, HSEG, or TSEG
near top of physical memory.+ The use of "open" means that the memory is
visible from all PEIM+ and SMM agents.++ @param[in] PeiServices -
General purpose services available to every PEIM.+ @param[in] This
- Pointer to the SMM Access Interface.+ @param[in] DescriptorIndex -
Region of SMRAM to Open.++ @retval EFI_SUCCESS- The region was
successfully opened.+ @retval EFI_DEVICE_ERROR - The region could not
be opened because locked by+chipset.+
@retval EFI_INVALID_PARAMETER - The descriptor index was out of
bounds.+**/+EFI_STATUS+EFIAPI+Open (+ IN EFI_PEI_SERVICES
**PeiServices,+ IN EFI_PEI_MM_ACCESS_PPI *This,+ IN UINTN
DescriptorIndex+ )+{+ SMM_ACCESS_PRIVATE_DATA *SmmAccess;+ UINT8
Index;+ UINT64 Address;+ UINT8
SmramControl;++ SmmAccess = SMM_ACCESS_PRIVATE_DATA_FROM_THIS (This);+ if
(DescriptorIndex >= SmmAccess->NumberRegions) {+DEBUG ((DEBUG_WARN, "SMRAM
region out of range\n"));++return EFI_INVALID_PARAMETER;+ } else if
(SmmAccess->SmramDesc[DescriptorIndex].RegionState & EFI_SMRAM_LOCKED) {+
//+// Cannot open a "locked" region+//+DEBUG ((DEBUG_WARN, "Cannot
open a locked SMRAM region\n"));++return EFI_DEVICE_ERROR;+ }++ ///+ ///
BEGIN CHIPSET CODE+ ///+ ///+ /// SMRAM register is PCI 0:0:0:88, SMRAMC (8
bit)+ ///+ Address = PCI_SEGMENT_LIB_ADDRESS (0,
Re: [edk2-devel] [edk2-platforms][PATCH v1 00/02] Add QemuOpenBoardPkg
Series Reviewed-by: Isaac Oram -Original Message- From: devel@edk2.groups.io On Behalf Of Théo Jehl Sent: Friday, August 26, 2022 5:02 PM To: devel@edk2.groups.io Cc: Leif Lindholm ; Kinney, Michael D ; Oram, Isaac W ; Pedro Falcato ; Gerd Hoffmann ; Stefan Hajnoczi Subject: [edk2-devel] [edk2-platforms][PATCH v1 00/02] Add QemuOpenBoardPkg QemuOpenBoardPkg adds a MinPlatform port to QEMU x86_64. This package can boot UEFI Linux and Windows. This port brings a starting place for understanding the MinPlatform, and board porting. QemuOpenBoardPkg is my project for Google Summer of Code 2022. I proposed this project to better understand UEFI inner workings, and to get started with platform level code. CCing Gerd Hoffmann and Stefan Hajnoczi for their feedback, because of their work on OVMF and QEMU. Cc: Leif Lindholm Cc: Michael D Kinney Cc: Isaac Oram Cc: Pedro Falcato Cc: Gerd Hoffmann Cc: Stefan Hajnoczi Signed-off-by: Théo Jehl Théo Jehl (2): QemuOpenBoardPkg: Add QemuOpenBoardPkg Add maintainers and reviewers for MinPlatform Arch QEMU board port. -- 2.32.1 (Apple Git-133) -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#92918): https://edk2.groups.io/g/devel/message/92918 Mute This Topic: https://groups.io/mt/93282181/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 v2 1/1] MinPlatformPkg: Add FspNvsBuffer compression option
A PCD to control library class instance seems redundant. The build already has capabilities to control library class instance per driver, per driver type, per architecture, etc. Let me know if there is some benefit to overriding PCD in board DSC vs overriding library class in board DSC that I am missing. We want to simplify what developers need to see and deal with. Minimize the number of basic decisions needed to get a functional port. I would prefer a single instance of LargeVariable*Lib. As a board port developer, if your silicon FSP supports compressing the data and your board port doesn't want the redundancy, that is a stage 7 optimization to write your own instance of the library class or your own version of SaveMemoryConfigDxe. No need to burden the rest of the boards with needing to know about and configure this to optimize a corner case. I also think decompression and compression decisions should reside at the boot loader level not internal to FSP. First to minimize FSP content, second because bootloaders already typically decide and implement decompression that matches their build specific compression. I will grant that it is probably mostly the same common algorithm implementation. Ultimately though, those are mostly philosophical objections. If you really want two instances of the library, I can live with it. I will be able to have reasonable default behavior that is pretty simple for most. The more concrete objection is the asymmetric design, where common code implements compression and per platform code implements decompression. That seems distasteful. I can live with this too because it is kind of already this way, but more consistent combined with more encapsulated seems better than expanding the asymmetric design. Regards, Isaac -Original Message- From: Desimone, Nathaniel L Sent: Tuesday, August 23, 2022 12:51 PM To: Oram, Isaac W ; devel@edk2.groups.io; mikub...@linux.microsoft.com Cc: Chiu, Chasel ; Gao, Liming ; Dong, Eric Subject: RE: [edk2-devel] [edk2-platforms][PATCH v2 1/1] MinPlatformPkg: Add FspNvsBuffer compression option Agreed with Isaac that having the compression capability be more general use would be nice. However, I think it would better match the EDK II design style if we had a second implementation of LargeVariable*Lib that added the compression capability on top of the original LargeVariable*Lib. I also think having a PCD to explicitly control whether to apply compression to the FSP NVS buffer is important. Because there are some FSP implementations like ICX and SPR that already include the CompressLib inside the FSP binary itself. On those FSP implementations, the data in the FSP_NON_VOLATILE_STORAGE_HOB is already compressed. Said PCD would simply control which instance of the LibraryClass gets linked with SaveMemoryConfigDxe. Also agreed with Isaac to please be careful to make sure that any new LibraryClasses are in the Include/*.dsc files somewhere so existing boards don't need modifications to their BoardPkg.dsc file. Thanks, Nate -Original Message- From: Oram, Isaac W Sent: Tuesday, August 23, 2022 11:34 AM To: devel@edk2.groups.io; mikub...@linux.microsoft.com Cc: Chiu, Chasel ; Desimone, Nathaniel L ; Gao, Liming ; Dong, Eric Subject: RE: [edk2-devel] [edk2-platforms][PATCH v2 1/1] MinPlatformPkg: Add FspNvsBuffer compression option Implementing this way will break the build for most of the open MinPlatform ports. At minimum, please add the CompressLib to CoreCommonLib.dsc next to the UefiDecompressLib instantiation so that it is included automatically for most boards. Regarding the design, I agree this is a good capability. And it makes sense to me to be board controlled rather than FSP controlled. I wonder if it might be better to modify the LargeVariableRead/Write such that it compresses/decompresses large variables automatically. Could be controlled via library class instance or maybe via PatchablePerModule PCD. Boards would still have a lot of control if they wanted. Regards, Isaac -Original Message- From: devel@edk2.groups.io On Behalf Of Michael Kubacki Sent: Monday, August 22, 2022 8:23 PM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Desimone, Nathaniel L ; Oram, Isaac W ; Gao, Liming ; Dong, Eric Subject: [edk2-devel] [edk2-platforms][PATCH v2 1/1] MinPlatformPkg: Add FspNvsBuffer compression option From: Michael Kubacki Adds a PCD called "PcdEnableCompressedFspNvsBuffer" that allows the "FspNvsBuffer" UEFI variable data to be saved as compressed data. Especially due to the nature of the data saved in this variable, it compresses well. For example, it has been found to reduce ~63KB of data to ~13KB. Boot time impact has been found to be negligible. The default value is FALSE to keep default behavior consistent. Decompression can be performed on the variable data using the standard UefiDecompressLib. Cc: C
Re: [edk2-devel] [PATCH V2] IntelSiliconPkg: Fix DEBUG macros having incorrect number of arguments
Pushed as 9769bf28d1..e12240390f
Note that I had to fixup your author and signed off messages.
Author can be configured in groups.io settings I believe.
Signed off indicates an issue with your git config settings for name and email.
Also, I now notice the patch email was missing "[edk2-devel]" and
"[edk2-platforms]" prefix to allow people to filter the emails effectively.
Please correct these for future review emails.
Regards,
Isaac
-Original Message-----
From: Oram, Isaac W
Sent: Tuesday, August 23, 2022 11:48 AM
To: Singh, DeepakX ; devel@edk2.groups.io
Cc: Ni, Ray ; Chaganty, Rangasai V
; S, Ashraf Ali ; Pir,
Ovais F
Subject: RE: [PATCH V2] IntelSiliconPkg: Fix DEBUG macros having incorrect
number of arguments
Reviewed-by: Isaac Oram
Note that comparing the two patches shows no delta other than timestamp and
title.
-Original Message-
From: Singh, DeepakX
Sent: Tuesday, August 23, 2022 1:44 AM
To: devel@edk2.groups.io
Cc: Singh, DeepakX ; Ni, Ray ;
Chaganty, Rangasai V ; Oram, Isaac W
; S, Ashraf Ali ; Pir, Ovais F
Subject: [PATCH V2] IntelSiliconPkg: Fix DEBUG macros having incorrect number
of arguments
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4027
Cc: Ray Ni
Cc: Rangasai V Chaganty
Cc: Isaac Oram
Cc: Ashraf Ali S
Cc: Ovais F Pir
Signed-off-by: Singh Deepak5x
---
.../IntelPciDeviceSecurityDxe/IntelPciDeviceSecurityDxe.c | 2 +-
.../Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/VtdReg.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/Silicon/Intel/IntelSiliconPkg/Feature/PcieSecurity/IntelPciDeviceSecurityDxe/IntelPciDeviceSecurityDxe.c
b/Silicon/Intel/IntelSiliconPkg/Feature/PcieSecurity/IntelPciDeviceSecurityDxe/IntelPciDeviceSecurityDxe.c
index aa2bf14fa8..7a70dc7aea 100644
---
a/Silicon/Intel/IntelSiliconPkg/Feature/PcieSecurity/IntelPciDeviceSecurityDxe/IntelPciDeviceSecurityDxe.c
+++
b/Silicon/Intel/IntelSiliconPkg/Feature/PcieSecurity/IntelPciDeviceSecurityDxe/IntelPciDeviceSecurityDxe.c
@@ -488,7 +488,7 @@ DoMeasurementsFromDigestRegister (
DEBUG((DEBUG_INFO, "\n"));
}
-DEBUG((DEBUG_INFO, "ExtendDigestRegister...\n", ExtendDigestRegister));
+DEBUG((DEBUG_INFO, "ExtendDigestRegister...\n"));
ExtendDigestRegister (PciIo, DeviceSecurityPolicy, TcgAlgId, DigestSel,
Digest, DeviceSecurityState);
}
}
diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/VtdReg.c
b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/VtdReg.c
index c7a56cf571..ef1737b1b6 100644
--- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/VtdReg.c
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/VtdReg.c
@@ -642,7 +642,7 @@ DumpVtdVerRegs (
IN VTD_VER_REG*VerReg
)
{
- DEBUG ((DEBUG_INFO, " VerReg:\n", VerReg->Uint32));
+ DEBUG ((DEBUG_INFO, " VerReg - 0x%x\n", VerReg->Uint32));
DEBUG ((DEBUG_INFO, "Major - 0x%x\n", VerReg->Bits.Major));
DEBUG ((DEBUG_INFO, "Minor - 0x%x\n", VerReg->Bits.Minor));
}
@@ -657,7 +657,7 @@ DumpVtdCapRegs (
IN VTD_CAP_REG *CapReg
)
{
- DEBUG((DEBUG_INFO, " CapReg:\n", CapReg->Uint64));
+ DEBUG((DEBUG_INFO, " CapReg - 0x%x\n", CapReg->Uint64));
DEBUG((DEBUG_INFO, "ND - 0x%x\n", CapReg->Bits.ND));
DEBUG((DEBUG_INFO, "AFL- 0x%x\n", CapReg->Bits.AFL));
DEBUG((DEBUG_INFO, "RWBF - 0x%x\n", CapReg->Bits.RWBF));
@@ -688,7 +688,7 @@ DumpVtdECapRegs (
IN VTD_ECAP_REG *ECapReg
)
{
- DEBUG((DEBUG_INFO, " ECapReg:\n", ECapReg->Uint64));
+ DEBUG((DEBUG_INFO, " ECapReg - 0x%x\n", ECapReg->Uint64));
DEBUG((DEBUG_INFO, "C - 0x%x\n", ECapReg->Bits.C));
DEBUG((DEBUG_INFO, "QI - 0x%x\n", ECapReg->Bits.QI));
DEBUG((DEBUG_INFO, "DT - 0x%x\n", ECapReg->Bits.DT));
--
2.30.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92724): https://edk2.groups.io/g/devel/message/92724
Mute This Topic: https://groups.io/mt/93211265/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] IntelSiliconPkg: Fix DEBUG macros having incorrect number of arguments
Reviewed-by: Isaac Oram
Note that comparing the two patches shows no delta other than timestamp and
title.
-Original Message-
From: Singh, DeepakX
Sent: Tuesday, August 23, 2022 1:44 AM
To: devel@edk2.groups.io
Cc: Singh, DeepakX ; Ni, Ray ;
Chaganty, Rangasai V ; Oram, Isaac W
; S, Ashraf Ali ; Pir, Ovais F
Subject: [PATCH V2] IntelSiliconPkg: Fix DEBUG macros having incorrect number
of arguments
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4027
Cc: Ray Ni
Cc: Rangasai V Chaganty
Cc: Isaac Oram
Cc: Ashraf Ali S
Cc: Ovais F Pir
Signed-off-by: Singh Deepak5x
---
.../IntelPciDeviceSecurityDxe/IntelPciDeviceSecurityDxe.c | 2 +-
.../Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/VtdReg.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/Silicon/Intel/IntelSiliconPkg/Feature/PcieSecurity/IntelPciDeviceSecurityDxe/IntelPciDeviceSecurityDxe.c
b/Silicon/Intel/IntelSiliconPkg/Feature/PcieSecurity/IntelPciDeviceSecurityDxe/IntelPciDeviceSecurityDxe.c
index aa2bf14fa8..7a70dc7aea 100644
---
a/Silicon/Intel/IntelSiliconPkg/Feature/PcieSecurity/IntelPciDeviceSecurityDxe/IntelPciDeviceSecurityDxe.c
+++
b/Silicon/Intel/IntelSiliconPkg/Feature/PcieSecurity/IntelPciDeviceSecurityDxe/IntelPciDeviceSecurityDxe.c
@@ -488,7 +488,7 @@ DoMeasurementsFromDigestRegister (
DEBUG((DEBUG_INFO, "\n"));
}
-DEBUG((DEBUG_INFO, "ExtendDigestRegister...\n", ExtendDigestRegister));
+DEBUG((DEBUG_INFO, "ExtendDigestRegister...\n"));
ExtendDigestRegister (PciIo, DeviceSecurityPolicy, TcgAlgId, DigestSel,
Digest, DeviceSecurityState);
}
}
diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/VtdReg.c
b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/VtdReg.c
index c7a56cf571..ef1737b1b6 100644
--- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/VtdReg.c
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/VtdReg.c
@@ -642,7 +642,7 @@ DumpVtdVerRegs (
IN VTD_VER_REG*VerReg
)
{
- DEBUG ((DEBUG_INFO, " VerReg:\n", VerReg->Uint32));
+ DEBUG ((DEBUG_INFO, " VerReg - 0x%x\n", VerReg->Uint32));
DEBUG ((DEBUG_INFO, "Major - 0x%x\n", VerReg->Bits.Major));
DEBUG ((DEBUG_INFO, "Minor - 0x%x\n", VerReg->Bits.Minor));
}
@@ -657,7 +657,7 @@ DumpVtdCapRegs (
IN VTD_CAP_REG *CapReg
)
{
- DEBUG((DEBUG_INFO, " CapReg:\n", CapReg->Uint64));
+ DEBUG((DEBUG_INFO, " CapReg - 0x%x\n", CapReg->Uint64));
DEBUG((DEBUG_INFO, "ND - 0x%x\n", CapReg->Bits.ND));
DEBUG((DEBUG_INFO, "AFL- 0x%x\n", CapReg->Bits.AFL));
DEBUG((DEBUG_INFO, "RWBF - 0x%x\n", CapReg->Bits.RWBF));
@@ -688,7 +688,7 @@ DumpVtdECapRegs (
IN VTD_ECAP_REG *ECapReg
)
{
- DEBUG((DEBUG_INFO, " ECapReg:\n", ECapReg->Uint64));
+ DEBUG((DEBUG_INFO, " ECapReg - 0x%x\n", ECapReg->Uint64));
DEBUG((DEBUG_INFO, "C - 0x%x\n", ECapReg->Bits.C));
DEBUG((DEBUG_INFO, "QI - 0x%x\n", ECapReg->Bits.QI));
DEBUG((DEBUG_INFO, "DT - 0x%x\n", ECapReg->Bits.DT));
--
2.30.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92723): https://edk2.groups.io/g/devel/message/92723
Mute This Topic: https://groups.io/mt/93211265/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 v2 1/1] MinPlatformPkg: Add FspNvsBuffer compression option
Implementing this way will break the build for most of the open MinPlatform
ports. At minimum, please add the CompressLib to CoreCommonLib.dsc next to the
UefiDecompressLib instantiation so that it is included automatically for most
boards.
Regarding the design, I agree this is a good capability. And it makes sense to
me to be board controlled rather than FSP controlled.
I wonder if it might be better to modify the LargeVariableRead/Write such that
it compresses/decompresses large variables automatically. Could be controlled
via library class instance or maybe via PatchablePerModule PCD. Boards would
still have a lot of control if they wanted.
Regards,
Isaac
-Original Message-
From: devel@edk2.groups.io On Behalf Of Michael Kubacki
Sent: Monday, August 22, 2022 8:23 PM
To: devel@edk2.groups.io
Cc: Chiu, Chasel ; Desimone, Nathaniel L
; Oram, Isaac W ; Gao,
Liming ; Dong, Eric
Subject: [edk2-devel] [edk2-platforms][PATCH v2 1/1] MinPlatformPkg: Add
FspNvsBuffer compression option
From: Michael Kubacki
Adds a PCD called "PcdEnableCompressedFspNvsBuffer" that allows the
"FspNvsBuffer" UEFI variable data to be saved as compressed data.
Especially due to the nature of the data saved in this variable, it compresses
well. For example, it has been found to reduce ~63KB of data to ~13KB. Boot
time impact has been found to be negligible.
The default value is FALSE to keep default behavior consistent.
Decompression can be performed on the variable data using the standard
UefiDecompressLib.
Cc: Chasel Chiu
Cc: Nate DeSimone
Cc: Isaac Oram
Cc: Liming Gao
Cc: Eric Dong
Signed-off-by: Michael Kubacki
---
Notes:
v2: Rebase onto 9769bf28d1fc
Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c
| 62
Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.inf
| 4 ++
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
| 6 ++
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
| 1 +
4 files changed, 60 insertions(+), 13 deletions(-)
diff --git
a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c
b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c
index 0215e8eeddfb..95b8cef8b32b 100644
---
a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemo
+++ ryConfig.c
@@ -3,6 +3,7 @@
exists, and saves the data to nvRAM.
Copyright (c) 2017 - 2022, Intel Corporation. All rights reserved.
+Copyright (c) Microsoft Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -10,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include
#include #include
+#include
#include
#include
#include
@@ -19,6 +21,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include
#include #include
+#include
#include
#include
@@ -38,20 +41,26 @@ SaveMemoryConfigEntryPoint (
IN EFI_SYSTEM_TABLE *SystemTable
)
{
- EFI_STATUSStatus;
- EFI_HOB_GUID_TYPE *GuidHob;
- VOID *HobData;
- VOID *VariableData;
- UINTN DataSize;
- UINTN BufferSize;
- BOOLEAN DataIsIdentical;
+ EFI_STATUS Status;
+ EFI_HOB_GUID_TYPE *GuidHob;
+ VOID *HobData;
+ VOID *VariableData;
+ UINTN DataSize;
+ UINTN BufferSize;
+ BOOLEANDataIsIdentical;
+ VOID *CompressedData;
+ UINT64 CompressedSize;
+ UINTN CompressedAllocationPages;
- DataSize= 0;
- BufferSize = 0;
- VariableData= NULL;
- GuidHob = NULL;
- HobData = NULL;
- DataIsIdentical = FALSE;
+ DataSize = 0;
+ BufferSize= 0;
+ VariableData = NULL;
+ GuidHob = NULL;
+ HobData = NULL;
+ DataIsIdentical = FALSE;
+ CompressedData= NULL;
+ CompressedSize= 0;
+ CompressedAllocationPages = 0;
//
// Search for the Memory Configuration GUID HOB. If it is not present, then
@@ -73,6 +82,29 @@ SaveMemoryConfigEntryPoint (
}
}
+ if (PcdGetBool (PcdEnableCompressedFspNvsBuffer)) {
+if (DataSize > 0) {
+ CompressedAllocationPages = EFI_SIZE_TO_PAGES (DataSize);
+ CompressedData= AllocatePages (CompressedAllocationPages);
+ if (CompressedData == NULL) {
+DEBUG ((DEBUG_ERROR, "[%a] - Failed to allocate compressed data
buffer.\n", __FUNCTION__));
+ASSERT_EFI_ERROR (EFI_OUT_OF_RESOURCES);
+return EFI_OUT_OF_RESOURCES;
+ }
+
+ CompressedSize = EFI_PAGES_TO_SIZE (CompressedAllocationPages);
+ Status = Compress (HobData, DataSize, CompressedData,
);
+ if (EFI_ERROR (Status
Re: [edk2-devel] [PATCH V2] Maintainers.txt: Update reviewers for IntelSiliconPkg
Reviewed-by: Isaac Oram -Original Message- From: S, Ashraf Ali Sent: Tuesday, August 23, 2022 12:27 AM To: devel@edk2.groups.io Cc: S, Ashraf Ali ; Ni, Ray ; Chaganty, Rangasai V ; Oram, Isaac W Subject: [PATCH V2] Maintainers.txt: Update reviewers for IntelSiliconPkg Add Ashraf Ali S as IntelSiliconPkg reviewers Signed-off-by: Ashraf Ali S Cc: Ray Ni Cc: Rangasai V Chaganty Cc: Isaac Oram --- Maintainers.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Maintainers.txt b/Maintainers.txt index 5e403ce851..3fe5dc21a8 100644 --- a/Maintainers.txt +++ b/Maintainers.txt @@ -277,6 +277,7 @@ F: Silicon/Intel/IntelSiliconPkg/ M: Ray Ni M: Rangasai V Chaganty M: Isaac Oram +R: Ashraf Ali S Silicon/Intel/QuarkSocPkg F: Silicon/Intel/QuarkSocPkg/ -- 2.30.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#92719): https://edk2.groups.io/g/devel/message/92719 Mute This Topic: https://groups.io/mt/93199674/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 0/3] Update PlatformPayloadPkg to match feature conventions
Pushed as 6a847c32c0..1096b98314
Individual patches were
Reviewed-by: Sai Chaganty
Reviewed-by: Guo Dong
-Original Message-
From: devel@edk2.groups.io On Behalf Of Oram, Isaac W
Sent: Wednesday, August 10, 2022 3:47 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W ; Chaganty, Rangasai V
; Desimone, Nathaniel L
; Gao, Liming ; Ni,
Ray ; Dong, Guo
Subject: [edk2-devel][edk2-platforms][PATCH V1 0/3] Update PlatformPayloadPkg
to match feature conventions
The integration of the PlatformPayloadPkg breaks the AdvancedFeaturePkg build.
The first patch fixes the build issue with executing
build -a IA32 -a X64 -p AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
The PlatformPayloadPkg doesn't match advanced feature build and naming
conventions. The second patch simply renames the files and does exact search
and replace on the changes.
The third patch fixes token space guid name, feature enable name, and the like
to match the conventions of other features.
Cc: Sai Chaganty
Cc: Nate DeSimone
Cc: Liming Gao
Cc: Ray Ni
Cc: Guo Dong
Signed-off-by: Isaac Oram
Isaac Oram (3):
PlatformPayloadPkg: Fix AdvancedFeaturePkg build issue
PlatformPayloadPkg: Rename to match other feature conventions
PlatformPayloadFeaturePkg: Update contents to match feature
conventions
.../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 2 +-
.../Include/AdvancedFeatures.dsc | 4 +-
.../Include/AdvancedFeaturesPcd.dsc | 4 +-
.../AdvancedFeaturePkg/Include/PostMemory.fdf | 4 +-
.../AdvancedFeaturePkg/Include/PreMemory.fdf | 4 +-
.../Fvb/FvbInfo.c | 0
.../Fvb/FvbService.c | 0
.../Fvb/FvbService.h | 0
.../Fvb/FvbServiceSmm.c | 0
.../Fvb/FvbSmm.inf| 4 +-
.../Fvb/FvbSmmCommon.h| 0
.../Include/Guid/NvVariableInfoGuid.h | 0
.../Include/Guid/SpiFlashInfoGuid.h | 0
.../Include/Library/FlashDeviceLib.h | 0
.../Include/Library/SpiFlashLib.h | 0
.../Include/PlatformPayloadFeature.dsc| 50 +--
.../Include/PostMemory.fdf| 4 +-
.../Include/PreMemory.fdf | 0
.../Library/FlashDeviceLib/FlashDeviceLib.c | 0
.../Library/FlashDeviceLib/FlashDeviceLib.inf | 3 +-
.../Library/PcdInitLib/PcdInitLib.c | 0
.../Library/PcdInitLib/PcdInitLib.inf | 3 +-
.../Library/SpiFlashLib/PchSpi.c | 0
.../Library/SpiFlashLib/RegsSpi.h | 0
.../Library/SpiFlashLib/SpiCommon.h | 0
.../Library/SpiFlashLib/SpiFlashLib.c | 0
.../Library/SpiFlashLib/SpiFlashLib.inf | 2 +-
.../PchSmiDispatchSmm/PchSmiDispatchSmm.c | 0
.../PchSmiDispatchSmm/PchSmiDispatchSmm.h | 0
.../PchSmiDispatchSmm/PchSmiDispatchSmm.inf | 0
.../PlatformPayloadFeaturePkg.dec}| 8 +-
.../PlatformPayloadFeaturePkg.dsc}| 30 ++-
.../PlatformPayloadFeaturePkg.fdf}| 0
.../PlatformPayloadFeaturePkg.py} | 4 +-
.../Readme.md | 82 ++-
35 files changed, 117 insertions(+), 91 deletions(-) rename
Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Fvb/FvbInfo.c
(100%) rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbService.c (100%) rename
Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbService.h (100%) rename
Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbServiceSmm.c (100%) rename
Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Fvb/FvbSmm.inf
(89%) rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbSmmCommon.h (100%) rename
Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Guid/NvVariableInfoGuid.h (100%) rename
Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Guid/SpiFlashInfoGuid.h (100%) rename
Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Library/FlashDeviceLib.h (100%) rename
Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Library/SpiFlashLib.h (100%) rename
Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/PlatformPayloadFeature.dsc (72%) rename
Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/PostMemory.fdf (77%) rename
Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/PreMemory.fdf (100%) rename
Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/FlashDeviceLib/FlashDeviceLib.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/FlashDeviceLib/FlashDeviceLib.inf (90%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg
Re: [edk2-devel] [PATCH v1 2/3] UserAuthFeaturePkg: Included DXE versions are mutually exclusive
I am not aware of any preference between the drivers. Your plan makes sense to me. I will defer to Sai or Chasel if they know more history and use. Also, please make sure that "build -a IA32 -a X64 -p UserInterface\UserAuthFeaturePkg\UserAuthFeaturePkg.dsc" and "build -a IA32 -a X64 -p AdvancedFeaturePkg\AdvancedFeaturePkg.dsc" complete successfully. Adding the following to UserAuthFeaturePkg.dsc seemed to work for me. [Packages] UserAuthFeaturePkg/UserAuthFeaturePkg.dec [PcdsFeatureFlag] gUserAuthFeaturePkgTokenSpaceGuid.PcdUseVersion1|FALSE Regards, Isaac From: Benjamin Doron Sent: Tuesday, August 9, 2022 10:09 AM To: Oram, Isaac W Cc: devel@edk2.groups.io; Chaganty, Rangasai V ; Desimone, Nathaniel L ; Sinha, Ankit ; Gao, Liming ; Bi, Dandan Subject: Re: [PATCH v1 2/3] UserAuthFeaturePkg: Included DXE versions are mutually exclusive Hi Isaac, From memory, the primary difference between the versions of this module is that v2 uses helper libraries to perform some of the functions in UserAuthenticationDxePassword.c and the HII helpers in UserAuthenticationDxe.c. There are other differences, at least including the handler to challenge for the admin password that should be ported or implemented for v2, but I think only one DXE module version is necessary to be in the tree. We can drop this commit and I can work on improving v2 and deprecating v1 - as was my plan, because v2 needs to challenge for the password - but not at the moment. Unless v1's implementation is preferred? Sorry about the subject prefix. I see that patch 1/3 is in. I think I'll work on 2/3 later and 3/3 separately. Best regards, Benjamin On Mon, 8 Aug 2022 at 18:51, Oram, Isaac W mailto:isaac.w.o...@intel.com>> wrote: Benjamin, Can you update the readme with descriptions of the modules and their functionality? Can you comment the PcdUseVersion1 declaration in the DEC file? If you can think of a more descriptive name than "version 1", that would be better. Note that convention (maybe requirement) is to preface non-edk2 repo changes with the mailing list and repo info [edk2-devel][edk2-platforms] so that rules can filter more easily. And multi-commit reviews should have a cover-letter enabled as well so you can provide an overview of the patch series. Here is the command I use: git format-patch -M --thread origin/master --cover-letter --subject-prefix="edk2-devel][edk2-platforms][PATCH V1" Regards, Isaac -Original Message- From: Benjamin Doron mailto:benjamin.doro...@gmail.com>> Sent: Monday, July 25, 2022 10:12 AM To: devel@edk2.groups.io<mailto:devel@edk2.groups.io> Cc: Chaganty, Rangasai V mailto:rangasai.v.chaga...@intel.com>>; Oram, Isaac W mailto:isaac.w.o...@intel.com>>; Desimone, Nathaniel L mailto:nathaniel.l.desim...@intel.com>>; Sinha, Ankit mailto:ankit.si...@intel.com>>; Gao, Liming mailto:gaolim...@byosoft.com.cn>>; Bi, Dandan mailto:dandan...@intel.com>> Subject: [PATCH v1 2/3] UserAuthFeaturePkg: Included DXE versions are mutually exclusive Versions of the DXE module perform nearly identical functions, and are therefore mutually exclusive. Including both modules results in at least a duplicate HII package and an "already started" assert. Therefore, add a new PCD to determine which module will be included. However, now a second bug can be seen: version 2 does not challenge for the password. An RSC handler to hook UiApp entry is probably needed, as in version 1. Cc: Sai Chaganty mailto:rangasai.v.chaga...@intel.com>> Cc: Isaac Oram mailto:isaac.w.o...@intel.com>> Cc: Nate DeSimone mailto:nathaniel.l.desim...@intel.com>> Cc: Ankit Sinha mailto:ankit.si...@intel.com>> Cc: Liming Gao mailto:gaolim...@byosoft.com.cn>> Cc: Dandan Bi mailto:dandan...@intel.com>> Signed-off-by: Benjamin Doron mailto:benjamin.doro...@gmail.com>> --- Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc| 1 + Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc | 1 + Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.fdf | 9 ++--- Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc | 3 +++ Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec | 3 ++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc index 908fe4d1f7a9..8924dadcaa18 100644 --- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc +++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc @@ -79,6 +79,7 @@ # gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable |TRUE gUserAuthFeaturePk
Re: [edk2-devel] [edk2-platforms][PATCH v1 1/1] MinPlatformPkg: Add FspNvsBuffer compression option
Michael,
I have not been able to apply this patch. Can you rebase and resend a V2?
Thanks,
Isaac
-Original Message-
From: mikub...@linux.microsoft.com
Sent: Friday, August 5, 2022 12:44 PM
To: devel@edk2.groups.io
Cc: Chiu, Chasel ; Desimone, Nathaniel L
; Oram, Isaac W ; Gao,
Liming ; Dong, Eric
Subject: [edk2-platforms][PATCH v1 1/1] MinPlatformPkg: Add FspNvsBuffer
compression option
From: Michael Kubacki
Adds a PCD called "PcdEnableCompressedFspNvsBuffer" that allows the
"FspNvsBuffer" UEFI variable data to be saved as compressed data.
Especially due to the nature of the data saved in this variable, it compresses
well. For example, it has been found to reduce ~63KB of data to ~13KB. Boot
time impact has been found to be negligible.
The default value is FALSE to keep default behavior consistent.
Decompression can be performed on the variable data using the standard
UefiDecompressLib.
Cc: Chasel Chiu
Cc: Nate DeSimone
Cc: Isaac Oram
Cc: Liming Gao
Cc: Eric Dong
Signed-off-by: Michael Kubacki
---
Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c
| 62
Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.inf
| 4 ++
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
| 6 ++
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
| 1 +
4 files changed, 60 insertions(+), 13 deletions(-)
diff --git
a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c
b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c
index 0215e8eeddfb..95b8cef8b32b 100644
---
a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemo
+++ ryConfig.c
@@ -3,6 +3,7 @@
exists, and saves the data to nvRAM.
Copyright (c) 2017 - 2022, Intel Corporation. All rights reserved.
+Copyright (c) Microsoft Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -10,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include
#include #include
+#include
#include
#include
#include
@@ -19,6 +21,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include
#include #include
+#include
#include
#include
@@ -38,20 +41,26 @@ SaveMemoryConfigEntryPoint (
IN EFI_SYSTEM_TABLE *SystemTable
)
{
- EFI_STATUSStatus;
- EFI_HOB_GUID_TYPE *GuidHob;
- VOID *HobData;
- VOID *VariableData;
- UINTN DataSize;
- UINTN BufferSize;
- BOOLEAN DataIsIdentical;
+ EFI_STATUS Status;
+ EFI_HOB_GUID_TYPE *GuidHob;
+ VOID *HobData;
+ VOID *VariableData;
+ UINTN DataSize;
+ UINTN BufferSize;
+ BOOLEANDataIsIdentical;
+ VOID *CompressedData;
+ UINT64 CompressedSize;
+ UINTN CompressedAllocationPages;
- DataSize= 0;
- BufferSize = 0;
- VariableData= NULL;
- GuidHob = NULL;
- HobData = NULL;
- DataIsIdentical = FALSE;
+ DataSize = 0;
+ BufferSize= 0;
+ VariableData = NULL;
+ GuidHob = NULL;
+ HobData = NULL;
+ DataIsIdentical = FALSE;
+ CompressedData= NULL;
+ CompressedSize= 0;
+ CompressedAllocationPages = 0;
//
// Search for the Memory Configuration GUID HOB. If it is not present, then
@@ -73,6 +82,29 @@ SaveMemoryConfigEntryPoint (
}
}
+ if (PcdGetBool (PcdEnableCompressedFspNvsBuffer)) {
+if (DataSize > 0) {
+ CompressedAllocationPages = EFI_SIZE_TO_PAGES (DataSize);
+ CompressedData= AllocatePages (CompressedAllocationPages);
+ if (CompressedData == NULL) {
+DEBUG ((DEBUG_ERROR, "[%a] - Failed to allocate compressed data
buffer.\n", __FUNCTION__));
+ASSERT_EFI_ERROR (EFI_OUT_OF_RESOURCES);
+return EFI_OUT_OF_RESOURCES;
+ }
+
+ CompressedSize = EFI_PAGES_TO_SIZE (CompressedAllocationPages);
+ Status = Compress (HobData, DataSize, CompressedData,
);
+ if (EFI_ERROR (Status)) {
+DEBUG ((DEBUG_ERROR, "[%a] - failed to compress data. Status = %r\n",
__FUNCTION__, Status));
+ASSERT_EFI_ERROR (Status);
+return Status;
+ }
+}
+
+HobData = CompressedData;
+DataSize = (UINTN)CompressedSize;
+ }
+
if (HobData != NULL) {
DEBUG ((DEBUG_INFO, "FspNvsHob.NvsDataLength:%d\n", DataSize));
DEBUG ((DEBUG_INFO, "FspNvsHob.NvsDataPtr : 0x%x\n", HobData));
@@ -136,6 +168,10 @@ SaveMemoryConfigEntryPoint (
DEBUG((DEBUG_ERROR, "Memory S3 Data HOB was not found\n"));
}
+ if (CompressedData != NULL) {
+FreePages (CompressedData, Comp
[edk2-devel][edk2-platforms][PATCH V1 0/3] Update PlatformPayloadPkg to match feature conventions
The integration of the PlatformPayloadPkg breaks the AdvancedFeaturePkg build.
The first patch fixes the build issue with executing
build -a IA32 -a X64 -p AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
The PlatformPayloadPkg doesn't match advanced feature build and naming
conventions. The second patch
simply renames the files and does exact search and replace on the changes.
The third patch fixes token space guid name, feature enable name, and the like
to match the conventions of
other features.
Cc: Sai Chaganty
Cc: Nate DeSimone
Cc: Liming Gao
Cc: Ray Ni
Cc: Guo Dong
Signed-off-by: Isaac Oram
Isaac Oram (3):
PlatformPayloadPkg: Fix AdvancedFeaturePkg build issue
PlatformPayloadPkg: Rename to match other feature conventions
PlatformPayloadFeaturePkg: Update contents to match feature
conventions
.../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 2 +-
.../Include/AdvancedFeatures.dsc | 4 +-
.../Include/AdvancedFeaturesPcd.dsc | 4 +-
.../AdvancedFeaturePkg/Include/PostMemory.fdf | 4 +-
.../AdvancedFeaturePkg/Include/PreMemory.fdf | 4 +-
.../Fvb/FvbInfo.c | 0
.../Fvb/FvbService.c | 0
.../Fvb/FvbService.h | 0
.../Fvb/FvbServiceSmm.c | 0
.../Fvb/FvbSmm.inf| 4 +-
.../Fvb/FvbSmmCommon.h| 0
.../Include/Guid/NvVariableInfoGuid.h | 0
.../Include/Guid/SpiFlashInfoGuid.h | 0
.../Include/Library/FlashDeviceLib.h | 0
.../Include/Library/SpiFlashLib.h | 0
.../Include/PlatformPayloadFeature.dsc| 50 +--
.../Include/PostMemory.fdf| 4 +-
.../Include/PreMemory.fdf | 0
.../Library/FlashDeviceLib/FlashDeviceLib.c | 0
.../Library/FlashDeviceLib/FlashDeviceLib.inf | 3 +-
.../Library/PcdInitLib/PcdInitLib.c | 0
.../Library/PcdInitLib/PcdInitLib.inf | 3 +-
.../Library/SpiFlashLib/PchSpi.c | 0
.../Library/SpiFlashLib/RegsSpi.h | 0
.../Library/SpiFlashLib/SpiCommon.h | 0
.../Library/SpiFlashLib/SpiFlashLib.c | 0
.../Library/SpiFlashLib/SpiFlashLib.inf | 2 +-
.../PchSmiDispatchSmm/PchSmiDispatchSmm.c | 0
.../PchSmiDispatchSmm/PchSmiDispatchSmm.h | 0
.../PchSmiDispatchSmm/PchSmiDispatchSmm.inf | 0
.../PlatformPayloadFeaturePkg.dec}| 8 +-
.../PlatformPayloadFeaturePkg.dsc}| 30 ++-
.../PlatformPayloadFeaturePkg.fdf}| 0
.../PlatformPayloadFeaturePkg.py} | 4 +-
.../Readme.md | 82 ++-
35 files changed, 117 insertions(+), 91 deletions(-)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbInfo.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbService.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbService.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbServiceSmm.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbSmm.inf (89%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbSmmCommon.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Guid/NvVariableInfoGuid.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Guid/SpiFlashInfoGuid.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Library/FlashDeviceLib.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Library/SpiFlashLib.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/PlatformPayloadFeature.dsc (72%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/PostMemory.fdf (77%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/PreMemory.fdf (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/FlashDeviceLib/FlashDeviceLib.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/FlashDeviceLib/FlashDeviceLib.inf (90%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/PcdInitLib/PcdInitLib.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/PcdInitLib/PcdInitLib.inf (92%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/SpiFlashLib/PchSpi.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/SpiFlashLib/RegsSpi.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/SpiFlashLib/SpiCommon.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
[edk2-devel][edk2-platforms][PATCH V1 3/3] PlatformPayloadFeaturePkg: Update contents to match feature conventions
Rename gPlatformPayloadPkgTokenSpaceGuid to gPlatformPayloadFeaturePkgTokenSpaceGuid Rename PcdPayloadPackageFeatureEnable to PcdPlatformPayloadFeatureEnable Update Readme including format improvements Cc: Sai Chaganty Cc: Nate DeSimone Cc: Liming Gao Cc: Ray Ni Cc: Guo Dong Signed-off-by: Isaac Oram --- .../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 2 +- .../Include/AdvancedFeatures.dsc | 2 +- .../Include/AdvancedFeaturesPcd.dsc | 2 +- .../AdvancedFeaturePkg/Include/PostMemory.fdf | 2 +- .../AdvancedFeaturePkg/Include/PreMemory.fdf | 2 +- .../PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf | 2 +- .../PlatformPayloadFeaturePkg.dec | 6 +- .../Intel/PlatformPayloadFeaturePkg/Readme.md | 73 ++- 8 files changed, 48 insertions(+), 43 deletions(-) diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc index df8e678ae8..236c5570ca 100644 --- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc +++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc @@ -84,7 +84,7 @@ # # Individual features # - gPlatformPayloadPkgTokenSpaceGuid.PcdPayloadPackageFeatureEnable |TRUE + gPlatformPayloadFeaturePkgTokenSpaceGuid.PcdPlatformPayloadFeatureEnable |TRUE # # PCD that are required to be set by the build target should be configured here for test purposes diff --git a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc index 6a80546592..804aab89bc 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc +++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc @@ -79,6 +79,6 @@ # # Individual features # -!if gPlatformPayloadPkgTokenSpaceGuid.PcdPayloadPackageFeatureEnable == TRUE +!if gPlatformPayloadFeaturePkgTokenSpaceGuid.PcdPlatformPayloadFeatureEnable == TRUE !include PlatformPayloadFeaturePkg/Include/PlatformPayloadFeature.dsc !endif diff --git a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc index 08f258a48c..0af5a8bfbc 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc +++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc @@ -82,7 +82,7 @@ gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable |FALSE gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnable |FALSE - gPlatformPayloadPkgTokenSpaceGuid.PcdPayloadPackageFeatureEnable |FALSE + gPlatformPayloadFeaturePkgTokenSpaceGuid.PcdPlatformPayloadFeatureEnable |FALSE # # There seems to be some build parsing odd behavior that requires this PCD to be specified even though diff --git a/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf b/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf index 66032ba117..349bdcc491 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf +++ b/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf @@ -80,6 +80,6 @@ # # Individual features # -!if gPlatformPayloadPkgTokenSpaceGuid.PcdPayloadPackageFeatureEnable == TRUE +!if gPlatformPayloadFeaturePkgTokenSpaceGuid.PcdPlatformPayloadFeatureEnable == TRUE !include PlatformPayloadFeaturePkg/Include/PostMemory.fdf !endif diff --git a/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf b/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf index 9cd6de833b..b991a5aabf 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf +++ b/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf @@ -80,6 +80,6 @@ # # Individual features # -!if gPlatformPayloadPkgTokenSpaceGuid.PcdPayloadPackageFeatureEnable == TRUE +!if gPlatformPayloadFeaturePkgTokenSpaceGuid.PcdPlatformPayloadFeatureEnable == TRUE !include PlatformPayloadFeaturePkg/Include/PreMemory.fdf !endif diff --git a/Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf b/Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf index f973465cba..a692d9bf41 100644 --- a/Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf +++ b/Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf @@ -60,7 +60,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize - gPlatformPayloadPkgTokenSpaceGuid.PcdNvsDataFile + gPlatformPayloadFeaturePkgTokenSpaceGuid.PcdNvsDataFile [Depex] TRUE diff --git a/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec b/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec index 78d36f12eb..f02c5f70ca 100644 --- a/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec +++ b/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec @@ -21,7 +21,7 @@ # ##
[edk2-devel][edk2-platforms][PATCH V1 1/3] PlatformPayloadPkg: Fix AdvancedFeaturePkg build issue
Feature packages should build with -a IA32 -a X64.
The commonly board selected libraries were moved to the
PlatformPayloadPkg build so as not to conflict with other
advanced features.
Cc: Sai Chaganty
Cc: Nate DeSimone
Cc: Liming Gao
Cc: Ray Ni
Cc: Guo Dong
Signed-off-by: Isaac Oram
---
.../Include/PlatformPayloadFeature.dsc| 42 +--
.../PlatformPayloadPkg/PlatformPayloadPkg.dsc | 26 +++-
2 files changed, 46 insertions(+), 22 deletions(-)
diff --git
a/Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeature.dsc
b/Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeature.dsc
index 3003c563c9..bc776659b6 100644
--- a/Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeature.dsc
+++ b/Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeature.dsc
@@ -19,7 +19,9 @@
!error "DXE_ARCH must be specified to build this feature!"
!endif
- DEFINE SMM_VARIABLE = TRUE
+ !ifndef SMM_VARIABLE
+DEFINE SMM_VARIABLE = TRUE
+ !endif
@@ -28,7 +30,7 @@
#
-[PcdsPatchableInModule.X64]
+[PcdsPatchableInModule]
!if $(SMM_VARIABLE) == TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
@@ -45,24 +47,11 @@
#
-[LibraryClasses]
- !if $(SMM_VARIABLE) == TRUE
-PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
-PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
-# (Optional for variable modules debug output
-PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
-
DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
-PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
-DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
- !endif
-
[LibraryClasses.common.DXE_SMM_DRIVER,LibraryClasses.common.DXE_RUNTIME_DRIVER]
!if $(SMM_VARIABLE) == TRUE
SpiFlashLib|PlatformPayloadPkg/Library/SpiFlashLib/SpiFlashLib.inf
FlashDeviceLib|PlatformPayloadPkg/Library/FlashDeviceLib/FlashDeviceLib.inf
DxeHobListLib|UefiPayloadPkg/Library/DxeHobListLib/DxeHobListLib.inf
-HobLib|UefiPayloadPkg/Library/DxeHobLib/DxeHobLib.inf
-TimerLib|UefiCpuPkg/Library/CpuTimerLib/BaseCpuTimerLib.inf
!endif
@@ -90,13 +79,20 @@
# SMM Variable Support
#
!if $(SMM_VARIABLE) == TRUE
-PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf
- PlatformPayloadPkg/Fvb/FvbSmm.inf {
-
- NULL|PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf
- }
+PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf {
+
+
PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
+}
+
+PlatformPayloadPkg/Fvb/FvbSmm.inf {
+
+
PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
+NULL|PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf
+}
+
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf {
+
PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf
@@ -106,7 +102,11 @@
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf {
+
PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
NULL|PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf
}
-MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
+MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf {
+
+
PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
+}
!endif
diff --git a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc
b/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc
index adf028c511..702523a73f 100644
--- a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc
+++ b/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc
@@ -27,6 +27,10 @@
PCD_DYNAMIC_AS_DYNAMICEX= TRUE
DXE_ARCH= X64
+ !ifndef SMM_VARIABLE
+DEFINE SMM_VARIABLE = TRUE
+ !endif
+
[Packages]
MinPlatformPkg/MinPlatformPkg.dec
@@ -55,7 +59,7 @@
gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable
|FALSE
gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable
|FALSE
[edk2-devel][edk2-platforms][PATCH V1 2/3] PlatformPayloadPkg: Rename to match other feature conventions
Rename PlatformPayloadPkg to PlatformPayloadFeaturePkg.
Rename Package DEC, DSC, FDF and py scripts to match.
Search and replace PlatformPayloadPkg with PlatformPayloadFeaturePkg.
Cc: Sai Chaganty
Cc: Nate DeSimone
Cc: Liming Gao
Cc: Ray Ni
Cc: Guo Dong
Signed-off-by: Isaac Oram
---
.../Include/AdvancedFeatures.dsc | 2 +-
.../Include/AdvancedFeaturesPcd.dsc| 2 +-
.../AdvancedFeaturePkg/Include/PostMemory.fdf | 2 +-
.../Intel/AdvancedFeaturePkg/Include/PreMemory.fdf | 2 +-
.../Fvb/FvbInfo.c | 0
.../Fvb/FvbService.c | 0
.../Fvb/FvbService.h | 0
.../Fvb/FvbServiceSmm.c| 0
.../Fvb/FvbSmm.inf | 2 +-
.../Fvb/FvbSmmCommon.h | 0
.../Include/Guid/NvVariableInfoGuid.h | 0
.../Include/Guid/SpiFlashInfoGuid.h| 0
.../Include/Library/FlashDeviceLib.h | 0
.../Include/Library/SpiFlashLib.h | 0
.../Include/PlatformPayloadFeature.dsc | 14 +++---
.../Include/PostMemory.fdf | 4 ++--
.../Include/PreMemory.fdf | 0
.../Library/FlashDeviceLib/FlashDeviceLib.c| 0
.../Library/FlashDeviceLib/FlashDeviceLib.inf | 3 +--
.../Library/PcdInitLib/PcdInitLib.c| 0
.../Library/PcdInitLib/PcdInitLib.inf | 3 +--
.../Library/SpiFlashLib/PchSpi.c | 0
.../Library/SpiFlashLib/RegsSpi.h | 0
.../Library/SpiFlashLib/SpiCommon.h| 0
.../Library/SpiFlashLib/SpiFlashLib.c | 0
.../Library/SpiFlashLib/SpiFlashLib.inf| 2 +-
.../PchSmiDispatchSmm/PchSmiDispatchSmm.c | 0
.../PchSmiDispatchSmm/PchSmiDispatchSmm.h | 0
.../PchSmiDispatchSmm/PchSmiDispatchSmm.inf| 0
.../PlatformPayloadFeaturePkg.dec} | 2 +-
.../PlatformPayloadFeaturePkg.dsc} | 4 ++--
.../PlatformPayloadFeaturePkg.fdf} | 0
.../PlatformPayloadFeaturePkg.py} | 4 ++--
.../Readme.md | 9 -
34 files changed, 26 insertions(+), 29 deletions(-)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbInfo.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbService.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbService.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbServiceSmm.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbSmm.inf (92%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbSmmCommon.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Guid/NvVariableInfoGuid.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Guid/SpiFlashInfoGuid.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Library/FlashDeviceLib.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Library/SpiFlashLib.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/PlatformPayloadFeature.dsc (87%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/PostMemory.fdf (77%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/PreMemory.fdf (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/FlashDeviceLib/FlashDeviceLib.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/FlashDeviceLib/FlashDeviceLib.inf (90%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/PcdInitLib/PcdInitLib.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/PcdInitLib/PcdInitLib.inf (92%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/SpiFlashLib/PchSpi.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/SpiFlashLib/RegsSpi.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/SpiFlashLib/SpiCommon.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/SpiFlashLib/SpiFlashLib.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/SpiFlashLib/SpiFlashLib.inf (90%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/PchSmiDispatchSmm/PchSmiDispatchSmm.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/PchSmiDispatchSmm/PchSmiDispatchSmm.h (100%)
rename
Re: [edk2-devel] [PATCH v1 3/3] LogoFeaturePkg,BoardModulePkg: Set existing logo as BGRT
Comments should be wrapped with blank comment lines, so comments like // Determine BGRT display offsets Should be // // Determine BGRT display offsets // There are at least 4 instances to be corrected in Logo.c And some in BoardBootManager.c // MinPlatform has the FSP draw the logo. Please make the comment more generic as it really could be implemented many ways and we wouldn't want to be overly specific here, for example if the features is used by a bootloader without FSP support. There shouldn't be anything that ties this to FSP as far as I can see. Please update the Readme.md removing JPEG comments and updating for new behaviors. Please remove AspireVn7Dash572G use of PcdJpgEnable as this results in a build error for that board. Otherwise, looks good to me. Regards, Isaac -Original Message- From: Benjamin Doron Sent: Monday, July 25, 2022 10:12 AM To: devel@edk2.groups.io Cc: Chaganty, Rangasai V ; Oram, Isaac W ; Desimone, Nathaniel L ; Sinha, Ankit ; Dong, Eric ; Bi, Dandan ; Gao, Liming Subject: [PATCH v1 3/3] LogoFeaturePkg,BoardModulePkg: Set existing logo as BGRT In MinPlatform, FSP-S displays the logo to the user early. However, this means that no BGRT is written either. To reduce duplication in the flash image, a new LogoDxe will set this BMP as the BGRT buffer. The previous LogoDxe drivers here, along with a BootLogoEnableLogo() patch to BDS libraries, would begin displaying the Intel logo over the board FDF's choice - presently, these are the TianoCore logo. Also begin using BootLogoUpdateProgress(). Tested on KabylakeOpenBoardPkg, the boot logo becomes also a BGRT logo. A follow-up patch can be considered to set all platforms to use Intel's logo. Cc: Sai Chaganty Cc: Isaac Oram Cc: Nate DeSimone Cc: Ankit Sinha Cc: Eric Dong Cc: Dandan Bi Cc: Liming Gao Signed-off-by: Benjamin Doron --- Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc | 8 - Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc | 6 +- Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf | 6 +- Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/JpegLogo.idf | 10 -- Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf | 52 -- Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.c | 183 +++- Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.idf | 10 -- Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.jpg | Bin 9741 -> 0 bytes Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/LogoDxe.inf | 24 ++- Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec | 2 +- Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc | 3 - Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib.c | 3 +- Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib.inf | 1 + Platform/Intel/BoardModulePkg/Library/BoardBootManagerLib/BoardBootManager.c | 31 Platform/Intel/BoardModulePkg/Library/BoardBootManagerLib/BoardBootManagerLib.inf | 5 + Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 1 + 16 files changed, 120 insertions(+), 225 deletions(-) diff --git a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc index 5365f0a1b844..da663f5c833f 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc +++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc @@ -77,11 +77,3 @@ gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable |FALSE gUserAuthFeaturePkgTokenSpaceGuid.PcdUseVersion1 |FALSE gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnable |FALSE--#-# There seems to be some build parsing odd behavior that requires this PCD to be specified even though-# the *.fdf that consumes it is dependent on the feature flag.-# This section is to ensure that boards have these PCD instantiated.-#-[PcdsFeatureFlag]- gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable |FALSEdiff --git a/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc b/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc index 0acce1c7dfaf..3e990a84f8ec 100644 --- a/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc +++ b/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.ds +++ c @@ -47,8 +47,4 @@ # @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308 #is completed. [Components.X64]- !if gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable == T
Re: [edk2-devel] [PATCH v1 2/3] UserAuthFeaturePkg: Included DXE versions are mutually exclusive
Benjamin, Can you update the readme with descriptions of the modules and their functionality? Can you comment the PcdUseVersion1 declaration in the DEC file? If you can think of a more descriptive name than "version 1", that would be better. Note that convention (maybe requirement) is to preface non-edk2 repo changes with the mailing list and repo info [edk2-devel][edk2-platforms] so that rules can filter more easily. And multi-commit reviews should have a cover-letter enabled as well so you can provide an overview of the patch series. Here is the command I use: git format-patch -M --thread origin/master --cover-letter --subject-prefix="edk2-devel][edk2-platforms][PATCH V1" Regards, Isaac -Original Message- From: Benjamin Doron Sent: Monday, July 25, 2022 10:12 AM To: devel@edk2.groups.io Cc: Chaganty, Rangasai V ; Oram, Isaac W ; Desimone, Nathaniel L ; Sinha, Ankit ; Gao, Liming ; Bi, Dandan Subject: [PATCH v1 2/3] UserAuthFeaturePkg: Included DXE versions are mutually exclusive Versions of the DXE module perform nearly identical functions, and are therefore mutually exclusive. Including both modules results in at least a duplicate HII package and an "already started" assert. Therefore, add a new PCD to determine which module will be included. However, now a second bug can be seen: version 2 does not challenge for the password. An RSC handler to hook UiApp entry is probably needed, as in version 1. Cc: Sai Chaganty Cc: Isaac Oram Cc: Nate DeSimone Cc: Ankit Sinha Cc: Liming Gao Cc: Dandan Bi Signed-off-by: Benjamin Doron --- Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc| 1 + Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc | 1 + Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.fdf | 9 ++--- Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc | 3 +++ Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec | 3 ++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc index 908fe4d1f7a9..8924dadcaa18 100644 --- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc +++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc @@ -79,6 +79,7 @@ # gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable |TRUE gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable |TRUE+ gUserAuthFeaturePkgTokenSpaceGuid.PcdUseVersion1 |FALSE gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnable |TRUE #diff --git a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc index d59e3e61b9b9..5365f0a1b844 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc +++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc @@ -75,6 +75,7 @@ gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable |FALSE gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable |FALSE+ gUserAuthFeaturePkgTokenSpaceGuid.PcdUseVersion1 |FALSE gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnable |FALSE #diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.fdf b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.fdf index 030dcbe763d8..827deb08de7e 100644 --- a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.fdf +++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory +++ .fdf @@ -7,6 +7,9 @@ # ## -INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.inf-INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe.inf-INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.inf+!if gUserAuthFeaturePkgTokenSpaceGuid.PcdUseVersion1 == TRUE+ INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.inf+!else+ INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe.inf+!endif+ INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.infdiff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc index 2f39a5580caf..022678d5c852 100644 --- a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc +++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFe +++ ature.dsc @@ -72,6 +72,9 @@ UserAuthFeaturePkg/Library/UserPasswordUiLib/UserPasswordUiLib.inf# Add components here that should be included in the package build.+!if gUserAuthFeaturePkgTokenSpaceGuid.PcdUseVersion1 == TRUE UserAuthFeatu
Re: [edk2-devel][edk2-platforms][PATCH V3 1/1] MinPlatformPkg/AcpiTables: Add additional thread mapping in MADT
Pushed as d85e4251ce..306c2d1cef
-Original Message-
From: devel@edk2.groups.io On Behalf Of Oram, Isaac W
Sent: Monday, August 8, 2022 3:41 PM
To: Sinha, Ankit ; devel@edk2.groups.io
Cc: Desimone, Nathaniel L ; Dong, Eric
Subject: Re: [edk2-devel][edk2-platforms][PATCH V3 1/1]
MinPlatformPkg/AcpiTables: Add additional thread mapping in MADT
Reviewed-by: Isaac Oram
-Original Message-
From: Sinha, Ankit
Sent: Monday, August 8, 2022 2:05 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W ; Desimone, Nathaniel L
; Dong, Eric
Subject: [edk2-devel][edk2-platforms][PATCH V3 1/1] MinPlatformPkg/AcpiTables:
Add additional thread mapping in MADT
Add mapping for all enabled and disabled threads in MADT
Cc: Isaac Oram
Cc: Nate DeSimone
Cc: Eric Dong
Signed-off-by: Ankit Sinha
---
Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 49
+++-
1 file changed, 28 insertions(+), 21 deletions(-)
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
index e68b6070607f..5a282e7c18f2 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
@@ -243,46 +243,54 @@ SortCpuLocalApicInTable (
}
}
- //
- // 1. Sort TempCpuApicIdOrderTable,
- //sort it by using ApicId from minimum to maximum (Socket0 to SocketN),
and the BSP must in the fist location of the table.
- //So, start sorting the table from the second element and total elements
are mNumberOfCpus-1.
- //
+ /*
+ 1. Sort TempCpuApicIdOrderTable,
+Sort it by using ApicId from minimum to maximum (Socket0 to SocketN),
and the BSP must be in the fist location of the table.
+
+ 2. Sort and map all the enabled threads after BSP in
+ CpuApicIdOrderTable
+
+ 3. Threads that are not enabled are placed in the bottom of
+ CpuApicIdOrderTable
+
+ 4. Re-assign AcpiProcessorId for AcpiProcessorUid uses purpose.
+ */
+
PerformQuickSort ((TempCpuApicIdOrderTable + 1), (mNumberOfCpus - 1), sizeof
(EFI_CPU_ID_ORDER_MAP), (SORT_COMPARE) ApicIdCompareFunction);
- //
- // 2. Sort and map the primary threads to the front of the
CpuApicIdOrderTable
- //
for (CurrProcessor = 0, Index = 0; Index < mNumberOfCpus; Index++) {
-if ((TempCpuApicIdOrderTable[Index].Thread) == 0) { // primary thread
+if ((TempCpuApicIdOrderTable[Index].Thread) == 0) {
CopyMem ([CurrProcessor],
[Index], sizeof (EFI_CPU_ID_ORDER_MAP));
CurrProcessor++;
}
}
- //
- // 3. Sort and map the second threads to the middle of the
CpuApicIdOrderTable
- //
for (Index = 0; Index < mNumberOfCpus; Index++) {
-if ((TempCpuApicIdOrderTable[Index].Thread) == 1) { //second thread
+if ((TempCpuApicIdOrderTable[Index].Thread) == 1) {
CopyMem ([CurrProcessor],
[Index], sizeof (EFI_CPU_ID_ORDER_MAP));
CurrProcessor++;
}
}
- //
- // 4. Sort and map the not enabled threads to the bottom of the
CpuApicIdOrderTable
- //
for (Index = 0; Index < mNumberOfCpus; Index++) {
-if (TempCpuApicIdOrderTable[Index].Flags == 0) { // not enabled
+if ((TempCpuApicIdOrderTable[Index].Thread) == 2) {
+ CopyMem ([CurrProcessor],
[Index], sizeof (EFI_CPU_ID_ORDER_MAP));
+ CurrProcessor++;
+}
+ }
+
+ for (Index = 0; Index < mNumberOfCpus; Index++) {
+if ((TempCpuApicIdOrderTable[Index].Thread) == 3) {
+ CopyMem ([CurrProcessor],
[Index], sizeof (EFI_CPU_ID_ORDER_MAP));
+ CurrProcessor++;
+}
+ }
+
+ for (Index = 0; Index < mNumberOfCpus; Index++) {
+if (TempCpuApicIdOrderTable[Index].Flags == 0) {
CopyMem ([CurrProcessor],
[Index], sizeof (EFI_CPU_ID_ORDER_MAP));
CurrProcessor++;
}
}
- //
- // 5. Re-assign AcpiProcessorId for AcpiProcessorUid uses purpose.
- //
for (Socket = 0; Socket < FixedPcdGet32 (PcdMaxCpuSocketCount); Socket++) {
for (CurrProcessor = 0, Index = 0; CurrProcessor < mNumberOfCpus;
CurrProcessor++) {
if (mCpuApicIdOrderTable[CurrProcessor].Flags &&
(mCpuApicIdOrderTable[CurrProcessor].SocketNum == Socket)) { @@ -292,7 +300,6
@@ SortCpuLocalApicInTable (
}
}
- //keep for debug purpose
DEBUG ((DEBUG_INFO, "APIC ID Order Table ReOrdered\n"));
DebugDisplayReOrderTable (mCpuApicIdOrderTable);
--
2.27.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92221): https://edk2.groups.io/g/devel/message/92221
Mute This Topic: https://groups.io/mt/92902463/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 V3 1/1] MinPlatformPkg/AcpiTables: Add additional thread mapping in MADT
Reviewed-by: Isaac Oram
-Original Message-
From: Sinha, Ankit
Sent: Monday, August 8, 2022 2:05 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W ; Desimone, Nathaniel L
; Dong, Eric
Subject: [edk2-devel][edk2-platforms][PATCH V3 1/1] MinPlatformPkg/AcpiTables:
Add additional thread mapping in MADT
Add mapping for all enabled and disabled threads in MADT
Cc: Isaac Oram
Cc: Nate DeSimone
Cc: Eric Dong
Signed-off-by: Ankit Sinha
---
Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 49
+++-
1 file changed, 28 insertions(+), 21 deletions(-)
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
index e68b6070607f..5a282e7c18f2 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
@@ -243,46 +243,54 @@ SortCpuLocalApicInTable (
}
}
- //
- // 1. Sort TempCpuApicIdOrderTable,
- //sort it by using ApicId from minimum to maximum (Socket0 to SocketN),
and the BSP must in the fist location of the table.
- //So, start sorting the table from the second element and total elements
are mNumberOfCpus-1.
- //
+ /*
+ 1. Sort TempCpuApicIdOrderTable,
+Sort it by using ApicId from minimum to maximum (Socket0 to SocketN),
and the BSP must be in the fist location of the table.
+
+ 2. Sort and map all the enabled threads after BSP in
+ CpuApicIdOrderTable
+
+ 3. Threads that are not enabled are placed in the bottom of
+ CpuApicIdOrderTable
+
+ 4. Re-assign AcpiProcessorId for AcpiProcessorUid uses purpose.
+ */
+
PerformQuickSort ((TempCpuApicIdOrderTable + 1), (mNumberOfCpus - 1), sizeof
(EFI_CPU_ID_ORDER_MAP), (SORT_COMPARE) ApicIdCompareFunction);
- //
- // 2. Sort and map the primary threads to the front of the
CpuApicIdOrderTable
- //
for (CurrProcessor = 0, Index = 0; Index < mNumberOfCpus; Index++) {
-if ((TempCpuApicIdOrderTable[Index].Thread) == 0) { // primary thread
+if ((TempCpuApicIdOrderTable[Index].Thread) == 0) {
CopyMem ([CurrProcessor],
[Index], sizeof (EFI_CPU_ID_ORDER_MAP));
CurrProcessor++;
}
}
- //
- // 3. Sort and map the second threads to the middle of the
CpuApicIdOrderTable
- //
for (Index = 0; Index < mNumberOfCpus; Index++) {
-if ((TempCpuApicIdOrderTable[Index].Thread) == 1) { //second thread
+if ((TempCpuApicIdOrderTable[Index].Thread) == 1) {
CopyMem ([CurrProcessor],
[Index], sizeof (EFI_CPU_ID_ORDER_MAP));
CurrProcessor++;
}
}
- //
- // 4. Sort and map the not enabled threads to the bottom of the
CpuApicIdOrderTable
- //
for (Index = 0; Index < mNumberOfCpus; Index++) {
-if (TempCpuApicIdOrderTable[Index].Flags == 0) { // not enabled
+if ((TempCpuApicIdOrderTable[Index].Thread) == 2) {
+ CopyMem ([CurrProcessor],
[Index], sizeof (EFI_CPU_ID_ORDER_MAP));
+ CurrProcessor++;
+}
+ }
+
+ for (Index = 0; Index < mNumberOfCpus; Index++) {
+if ((TempCpuApicIdOrderTable[Index].Thread) == 3) {
+ CopyMem ([CurrProcessor],
[Index], sizeof (EFI_CPU_ID_ORDER_MAP));
+ CurrProcessor++;
+}
+ }
+
+ for (Index = 0; Index < mNumberOfCpus; Index++) {
+if (TempCpuApicIdOrderTable[Index].Flags == 0) {
CopyMem ([CurrProcessor],
[Index], sizeof (EFI_CPU_ID_ORDER_MAP));
CurrProcessor++;
}
}
- //
- // 5. Re-assign AcpiProcessorId for AcpiProcessorUid uses purpose.
- //
for (Socket = 0; Socket < FixedPcdGet32 (PcdMaxCpuSocketCount); Socket++) {
for (CurrProcessor = 0, Index = 0; CurrProcessor < mNumberOfCpus;
CurrProcessor++) {
if (mCpuApicIdOrderTable[CurrProcessor].Flags &&
(mCpuApicIdOrderTable[CurrProcessor].SocketNum == Socket)) { @@ -292,7 +300,6
@@ SortCpuLocalApicInTable (
}
}
- //keep for debug purpose
DEBUG ((DEBUG_INFO, "APIC ID Order Table ReOrdered\n"));
DebugDisplayReOrderTable (mCpuApicIdOrderTable);
--
2.27.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92220): https://edk2.groups.io/g/devel/message/92220
Mute This Topic: https://groups.io/mt/92902463/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/3] AcpiDebugFeaturePkg: Included modules are mutually exclusive
Pushed as edc718521e..d85e4251ce
-Original Message-
From: devel@edk2.groups.io On Behalf Of Oram, Isaac W
Sent: Monday, August 8, 2022 12:22 PM
To: devel@edk2.groups.io; benjamin.doro...@gmail.com
Cc: Chaganty, Rangasai V ; Desimone, Nathaniel L
; Sinha, Ankit ; Gao,
Liming ; Dong, Eric
Subject: Re: [edk2-devel] [PATCH v1 1/3] AcpiDebugFeaturePkg: Included modules
are mutually exclusive
Reviewed-by: Isaac Oram
-Original Message-
From: devel@edk2.groups.io On Behalf Of Benjamin Doron
Sent: Monday, July 25, 2022 10:12 AM
To: devel@edk2.groups.io
Cc: Chaganty, Rangasai V ; Oram, Isaac W
; Desimone, Nathaniel L
; Sinha, Ankit ; Gao,
Liming ; Dong, Eric
Subject: [edk2-devel] [PATCH v1 1/3] AcpiDebugFeaturePkg: Included modules are
mutually exclusive
The DXE and SMM versions of AcpiDebug perform the same task and are therefore
mutually exclusive. Including both modules results in a duplicate ACPI table,
resulting in the feature not working at all.
Therefore, add a new PCD to determine which module will be included.
Now, either version successfully write to the debug buffer.
Cc: Sai Chaganty
Cc: Isaac Oram
Cc: Nate DeSimone
Cc: Ankit Sinha
Cc: Liming Gao
Cc: Eric Dong
Signed-off-by: Benjamin Doron
---
Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 1 +
Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc | 1 +
Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebug.c | 4
Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec | 1 +
Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc | 3
+++
Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf | 7
+--
6 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
index 28530b8c674b..908fe4d1f7a9 100644
--- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
+++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
@@ -48,6 +48,7 @@
# Debugging features #
gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable
|TRUE+ gAcpiDebugFeaturePkgTokenSpaceGuid.PcdUseSmmVersion
|FALSE gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable
|TRUE
gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable |TRUE
gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable
|TRUEdiff --git
a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc
b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc
index e214175edaf7..d59e3e61b9b9 100644
--- a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc
+++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc
@@ -59,6 +59,7 @@
# [PcdsFeatureFlag]
gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable
|FALSE+ gAcpiDebugFeaturePkgTokenSpaceGuid.PcdUseSmmVersion
|FALSE gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable
|FALSE
gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable
|FALSE gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable
|FALSEdiff --git
a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebug.c
b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebug.c
index 4caeffc7dec9..0b28e2f7a6d5 100644
--- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebug.c
+++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiD
+++ ebug.c
@@ -483,6 +483,10 @@ InitializeAcpiDebugSmm (
EFI_SMM_BASE2_PROTOCOL*SmmBase2; BOOLEAN InSmm; +
if (!PcdGetBool (PcdAcpiDebugFeatureActive)) {+return EFI_SUCCESS;+ }+
Status = gBS->LocateProtocol (, NULL, (VOID **)
); ASSERT_EFI_ERROR (Status); if (EFI_ERROR (Status)) {diff --git
a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec
b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec
index 915923100731..1a290bab29d9 100644
--- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec
+++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.d
+++ ec
@@ -28,6 +28,7 @@
[PcdsFeatureFlag]
gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable|FALSE|BOOLEAN|0xA001+
gAcpiDebugFeaturePkgTokenSpaceGuid.PcdUseSmmVersion|FALSE|BOOLEAN|0xA002
[PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx] ## This
PCD specifies the ACPI debug message buffer size.diff --git
a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc
b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc
index f5b8bacee039..684549bbdd78 100644
--- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Incl
Re: [edk2-devel] [PATCH v1 1/3] AcpiDebugFeaturePkg: Included modules are mutually exclusive
Reviewed-by: Isaac Oram
-Original Message-
From: devel@edk2.groups.io On Behalf Of Benjamin Doron
Sent: Monday, July 25, 2022 10:12 AM
To: devel@edk2.groups.io
Cc: Chaganty, Rangasai V ; Oram, Isaac W
; Desimone, Nathaniel L
; Sinha, Ankit ; Gao,
Liming ; Dong, Eric
Subject: [edk2-devel] [PATCH v1 1/3] AcpiDebugFeaturePkg: Included modules are
mutually exclusive
The DXE and SMM versions of AcpiDebug perform the same task and are therefore
mutually exclusive. Including both modules results in a duplicate ACPI table,
resulting in the feature not working at all.
Therefore, add a new PCD to determine which module will be included.
Now, either version successfully write to the debug buffer.
Cc: Sai Chaganty
Cc: Isaac Oram
Cc: Nate DeSimone
Cc: Ankit Sinha
Cc: Liming Gao
Cc: Eric Dong
Signed-off-by: Benjamin Doron
---
Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 1 +
Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc | 1 +
Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebug.c | 4
Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec | 1 +
Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc | 3
+++
Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf | 7
+--
6 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
index 28530b8c674b..908fe4d1f7a9 100644
--- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
+++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
@@ -48,6 +48,7 @@
# Debugging features #
gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable
|TRUE+ gAcpiDebugFeaturePkgTokenSpaceGuid.PcdUseSmmVersion
|FALSE gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable
|TRUE
gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable |TRUE
gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable
|TRUEdiff --git
a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc
b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc
index e214175edaf7..d59e3e61b9b9 100644
--- a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc
+++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc
@@ -59,6 +59,7 @@
# [PcdsFeatureFlag]
gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable
|FALSE+ gAcpiDebugFeaturePkgTokenSpaceGuid.PcdUseSmmVersion
|FALSE gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable
|FALSE
gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable
|FALSE gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable
|FALSEdiff --git
a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebug.c
b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebug.c
index 4caeffc7dec9..0b28e2f7a6d5 100644
--- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebug.c
+++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiD
+++ ebug.c
@@ -483,6 +483,10 @@ InitializeAcpiDebugSmm (
EFI_SMM_BASE2_PROTOCOL*SmmBase2; BOOLEAN InSmm; +
if (!PcdGetBool (PcdAcpiDebugFeatureActive)) {+return EFI_SUCCESS;+ }+
Status = gBS->LocateProtocol (, NULL, (VOID **)
); ASSERT_EFI_ERROR (Status); if (EFI_ERROR (Status)) {diff --git
a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec
b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec
index 915923100731..1a290bab29d9 100644
--- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec
+++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.d
+++ ec
@@ -28,6 +28,7 @@
[PcdsFeatureFlag]
gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable|FALSE|BOOLEAN|0xA001+
gAcpiDebugFeaturePkgTokenSpaceGuid.PcdUseSmmVersion|FALSE|BOOLEAN|0xA002
[PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx] ## This
PCD specifies the ACPI debug message buffer size.diff --git
a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc
b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc
index f5b8bacee039..684549bbdd78 100644
--- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc
+++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeat
+++ ure.dsc
@@ -54,5 +54,8 @@
# in the package build.# Add components here that should be included in
the package build.+!if gAcpiDebugFeaturePkgTokenSpaceGuid.PcdUseSmmVersion ==
FALSE AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugDxe.inf+!else
AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugSmm.
Re: [edk2-devel] [edk2-platforms][PATCH v1 1/1] MinPlatformPkg/TestPointCheckLib: Remove unnecessary GetVariable2() call
Pushed as ea2a520c83..60053f3077
-Original Message-
From: devel@edk2.groups.io On Behalf Of Oram, Isaac W
Sent: Friday, August 5, 2022 1:40 PM
To: mikub...@linux.microsoft.com; devel@edk2.groups.io
Cc: Chiu, Chasel ; Desimone, Nathaniel L
; Gao, Liming ; Dong,
Eric
Subject: Re: [edk2-devel] [edk2-platforms][PATCH v1 1/1]
MinPlatformPkg/TestPointCheckLib: Remove unnecessary GetVariable2() call
Reviewed-by: Isaac Oram
-Original Message-
From: mikub...@linux.microsoft.com
Sent: Friday, August 5, 2022 11:02 AM
To: devel@edk2.groups.io
Cc: Chiu, Chasel ; Desimone, Nathaniel L
; Oram, Isaac W ; Gao,
Liming ; Dong, Eric
Subject: [edk2-platforms][PATCH v1 1/1] MinPlatformPkg/TestPointCheckLib:
Remove unnecessary GetVariable2() call
From: Michael Kubacki
The data buffer returned from the GetVariable2() call in
TestPointCheckMemoryTypeInformation() is not actually used or freed.
This change removes the unnecessary function call.
Cc: Chasel Chiu
Cc: Nate DeSimone
Cc: Isaac Oram
Cc: Liming Gao
Cc: Eric Dong
Signed-off-by: Michael Kubacki
---
Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
| 8
1 file changed, 8 deletions(-)
diff --git
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
index 9ee9dd252c7e..0ff6789ac621 100644
---
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
+++
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
@@ -109,7 +109,6 @@ TestPointCheckMemoryTypeInformation (
EFI_HOB_GUID_TYPE *GuidHob;
VOID*CurrentMemoryTypeInformation;
VOID*PreviousMemoryTypeInformation;
- VOID*VariableMemoryTypeInformation;
DEBUG ((DEBUG_INFO, " TestPointCheckMemoryTypeInformation - Enter\n"));
CurrentMemoryTypeInformation = NULL;
@@ -128,13 +127,6 @@ TestPointCheckMemoryTypeInformation (
goto Done;
}
- GetVariable2 (
- EFI_MEMORY_TYPE_INFORMATION_VARIABLE_NAME,
- ,
- ,
- NULL
- );
-
if ((CurrentMemoryTypeInformation != NULL) && (PreviousMemoryTypeInformation
!= NULL)) {
DumpMemoryTypeInfoSummary(CurrentMemoryTypeInformation,
PreviousMemoryTypeInformation);
}
--
2.28.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92213): https://edk2.groups.io/g/devel/message/92213
Mute This Topic: https://groups.io/mt/92840556/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/1] MinPlatformPkg/TestPointCheckLib: Prevent modification of HOB data
Pushed as 436a8612ae..ea2a520c83
-Original Message-
From: devel@edk2.groups.io On Behalf Of Oram, Isaac W
Sent: Friday, August 5, 2022 1:30 PM
To: mikub...@linux.microsoft.com; devel@edk2.groups.io
Cc: Chiu, Chasel ; Desimone, Nathaniel L
; Gao, Liming ; Dong,
Eric
Subject: Re: [edk2-devel] [edk2-platforms][PATCH v1 1/1]
MinPlatformPkg/TestPointCheckLib: Prevent modification of HOB data
Reviewed-by: Isaac Oram
-Original Message-
From: mikub...@linux.microsoft.com
Sent: Friday, August 5, 2022 10:16 AM
To: devel@edk2.groups.io
Cc: Chiu, Chasel ; Desimone, Nathaniel L
; Oram, Isaac W ; Gao,
Liming ; Dong, Eric
Subject: [edk2-platforms][PATCH v1 1/1] MinPlatformPkg/TestPointCheckLib:
Prevent modification of HOB data
From: Michael Kubacki
DumpMemoryTypeInfoSummary() is used to dump information about the
MemoryTypeInformation HOB. The dump function currently modifies the data which
can corrupt the data for later HOB consumers in the DXE phase.
This change makes DumpMemoryTypeInfoSummary() treat the data as read-only.
Cc: Chasel Chiu
Cc: Nate DeSimone
Cc: Isaac Oram
Cc: Liming Gao
Cc: Eric Dong
Signed-off-by: Michael Kubacki
---
Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
| 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
index 9ee9dd252c7e..a30b69dd787c 100644
---
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCh
+++ eckMemoryTypeInformation.c
@@ -22,8 +22,8 @@ ShortNameOfMemoryType(
VOID
DumpMemoryTypeInfoSummary (
- IN EFI_MEMORY_TYPE_INFORMATION *CurrentMemoryTypeInformation,
- IN EFI_MEMORY_TYPE_INFORMATION *PreviousMemoryTypeInformation
+ IN CONST EFI_MEMORY_TYPE_INFORMATION *CurrentMemoryTypeInformation,
+ IN CONST EFI_MEMORY_TYPE_INFORMATION *PreviousMemoryTypeInformation
)
{
UINTNIndex;
@@ -83,7 +83,6 @@ DumpMemoryTypeInfoSummary (
}
if (Next != Previous) {
- PreviousMemoryTypeInformation[Index].NumberOfPages = Next;
MemoryTypeInformationModified = TRUE;
}
@@ -110,7 +109,7 @@ TestPointCheckMemoryTypeInformation (
VOID*CurrentMemoryTypeInformation;
VOID*PreviousMemoryTypeInformation;
VOID*VariableMemoryTypeInformation;
-
+
DEBUG ((DEBUG_INFO, " TestPointCheckMemoryTypeInformation - Enter\n"));
CurrentMemoryTypeInformation = NULL;
PreviousMemoryTypeInformation = NULL;
--
2.28.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92212): https://edk2.groups.io/g/devel/message/92212
Mute This Topic: https://groups.io/mt/92839532/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/1] MinPlatformPkg/TestPointCheckLib: Remove unnecessary GetVariable2() call
Reviewed-by: Isaac Oram
-Original Message-
From: mikub...@linux.microsoft.com
Sent: Friday, August 5, 2022 11:02 AM
To: devel@edk2.groups.io
Cc: Chiu, Chasel ; Desimone, Nathaniel L
; Oram, Isaac W ; Gao,
Liming ; Dong, Eric
Subject: [edk2-platforms][PATCH v1 1/1] MinPlatformPkg/TestPointCheckLib:
Remove unnecessary GetVariable2() call
From: Michael Kubacki
The data buffer returned from the GetVariable2() call in
TestPointCheckMemoryTypeInformation() is not actually used or freed.
This change removes the unnecessary function call.
Cc: Chasel Chiu
Cc: Nate DeSimone
Cc: Isaac Oram
Cc: Liming Gao
Cc: Eric Dong
Signed-off-by: Michael Kubacki
---
Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
| 8
1 file changed, 8 deletions(-)
diff --git
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
index 9ee9dd252c7e..0ff6789ac621 100644
---
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
+++
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
@@ -109,7 +109,6 @@ TestPointCheckMemoryTypeInformation (
EFI_HOB_GUID_TYPE *GuidHob;
VOID*CurrentMemoryTypeInformation;
VOID*PreviousMemoryTypeInformation;
- VOID*VariableMemoryTypeInformation;
DEBUG ((DEBUG_INFO, " TestPointCheckMemoryTypeInformation - Enter\n"));
CurrentMemoryTypeInformation = NULL;
@@ -128,13 +127,6 @@ TestPointCheckMemoryTypeInformation (
goto Done;
}
- GetVariable2 (
- EFI_MEMORY_TYPE_INFORMATION_VARIABLE_NAME,
- ,
- ,
- NULL
- );
-
if ((CurrentMemoryTypeInformation != NULL) && (PreviousMemoryTypeInformation
!= NULL)) {
DumpMemoryTypeInfoSummary(CurrentMemoryTypeInformation,
PreviousMemoryTypeInformation);
}
--
2.28.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92176): https://edk2.groups.io/g/devel/message/92176
Mute This Topic: https://groups.io/mt/92840556/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/1] MinPlatformPkg/TestPointCheckLib: Prevent modification of HOB data
Reviewed-by: Isaac Oram
-Original Message-
From: mikub...@linux.microsoft.com
Sent: Friday, August 5, 2022 10:16 AM
To: devel@edk2.groups.io
Cc: Chiu, Chasel ; Desimone, Nathaniel L
; Oram, Isaac W ; Gao,
Liming ; Dong, Eric
Subject: [edk2-platforms][PATCH v1 1/1] MinPlatformPkg/TestPointCheckLib:
Prevent modification of HOB data
From: Michael Kubacki
DumpMemoryTypeInfoSummary() is used to dump information about the
MemoryTypeInformation HOB. The dump function currently modifies the data which
can corrupt the data for later HOB consumers in the DXE phase.
This change makes DumpMemoryTypeInfoSummary() treat the data as read-only.
Cc: Chasel Chiu
Cc: Nate DeSimone
Cc: Isaac Oram
Cc: Liming Gao
Cc: Eric Dong
Signed-off-by: Michael Kubacki
---
Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
| 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
index 9ee9dd252c7e..a30b69dd787c 100644
---
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCh
+++ eckMemoryTypeInformation.c
@@ -22,8 +22,8 @@ ShortNameOfMemoryType(
VOID
DumpMemoryTypeInfoSummary (
- IN EFI_MEMORY_TYPE_INFORMATION *CurrentMemoryTypeInformation,
- IN EFI_MEMORY_TYPE_INFORMATION *PreviousMemoryTypeInformation
+ IN CONST EFI_MEMORY_TYPE_INFORMATION *CurrentMemoryTypeInformation,
+ IN CONST EFI_MEMORY_TYPE_INFORMATION *PreviousMemoryTypeInformation
)
{
UINTNIndex;
@@ -83,7 +83,6 @@ DumpMemoryTypeInfoSummary (
}
if (Next != Previous) {
- PreviousMemoryTypeInformation[Index].NumberOfPages = Next;
MemoryTypeInformationModified = TRUE;
}
@@ -110,7 +109,7 @@ TestPointCheckMemoryTypeInformation (
VOID*CurrentMemoryTypeInformation;
VOID*PreviousMemoryTypeInformation;
VOID*VariableMemoryTypeInformation;
-
+
DEBUG ((DEBUG_INFO, " TestPointCheckMemoryTypeInformation - Enter\n"));
CurrentMemoryTypeInformation = NULL;
PreviousMemoryTypeInformation = NULL;
--
2.28.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92175): https://edk2.groups.io/g/devel/message/92175
Mute This Topic: https://groups.io/mt/92839532/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 V2 1/1] MinPlatformPkg: AcpiTables: Add additional thread mapping in MADT
Generally, convention for "Pkg-Module" is "Pkg/Module: " not "Pkg: Module: ".
Kind of a nit, but using : as separator will make parsing tools harder to write.
Convention for comments is "no newline between comment block and code block" is
that the comment applies to that block. A blank line indicates the comment
applies to multiple code blocks.
Please fix the comments to match the new code. Prior comments made sense;
first, middle, last. Second, third, and fourth threads "in the middle" makes
less sense. I think explaining why we are grouping into the order we are is
perhaps important. There is nothing explaining why this ordering and why third
and fourth are being added when they appear to have been previously ignored.
That info may belong in the commit message if not appropriate for the comments.
Also note that your author name format settings need to be modified such that
the author field in the log is: Ankit Sinha
Regards,
Isaac
-Original Message-
From: Sinha, Ankit
Sent: Wednesday, July 27, 2022 12:13 PM
To: devel@edk2.groups.io
Cc: Desimone, Nathaniel L ; Oram, Isaac W
; Dong, Eric
Subject: [edk2-devel][edk2-platforms][PATCH V2 1/1] MinPlatformPkg: AcpiTables:
Add additional thread mapping in MADT
Adding second, third and fourth thread mapping to MADT
Cc: Nate DeSimone
Cc: Isaac Oram
Cc: Eric Dong
Signed-off-by: Ankit Sinha
---
Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 16
+++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
index c7e87cbd7d9d..524f9914b0b1 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
@@ -261,7 +261,7 @@ SortCpuLocalApicInTable (
}
//
- // 3. Sort and map the second threads to the middle of the
CpuApicIdOrderTable
+ // 3. Sort and map the second, third and fourth threads to the middle
+ of the CpuApicIdOrderTable
//
for (Index = 0; Index < mNumberOfCpus; Index++) {
if ((TempCpuApicIdOrderTable[Index].Thread) == 1) { //second thread @@
-270,6 +270,20 @@ SortCpuLocalApicInTable (
}
}
+ for (Index = 0; Index < mNumberOfCpus; Index++) {
+if ((TempCpuApicIdOrderTable[Index].Thread) == 2) { // third thread
+ CopyMem ([CurrProcessor],
[Index], sizeof (EFI_CPU_ID_ORDER_MAP));
+ CurrProcessor++;
+}
+ }
+
+ for (Index = 0; Index < mNumberOfCpus; Index++) {
+if ((TempCpuApicIdOrderTable[Index].Thread) == 3) { // fourth thread
+ CopyMem ([CurrProcessor],
[Index], sizeof (EFI_CPU_ID_ORDER_MAP));
+ CurrProcessor++;
+}
+ }
+
//
// 4. Sort and map the not enabled threads to the bottom of the
CpuApicIdOrderTable
//
--
2.27.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92099): https://edk2.groups.io/g/devel/message/92099
Mute This Topic: https://groups.io/mt/92656419/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 V2 1/1] MinPlatformPkg: Add and re-arrange PCDs to configure FADT and FACS
Pushed as d09dafd0b9..a6b7458972
(fixed author format and trailing whitespace)
-Original Message-
From: devel@edk2.groups.io On Behalf Of Oram, Isaac W
Sent: Wednesday, August 3, 2022 4:07 PM
To: devel@edk2.groups.io; Sinha, Ankit
Cc: Desimone, Nathaniel L ; Dong, Eric
Subject: Re: [edk2-devel][edk2-platforms][PATCH V2 1/1] MinPlatformPkg: Add and
re-arrange PCDs to configure FADT and FACS
Reviewed-by: Isaac Oram
Please run \edk2\BaseTools\Scripts\PatchCheck.py on commits to identify
whitespace and other simple issues. There are also typically editor settings
to clean these automatically.
I will clean up trailing whitespace on push.
Regards,
Isaac
-Original Message-
From: devel@edk2.groups.io On Behalf Of Sinha, Ankit
Sent: Wednesday, July 27, 2022 12:12 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W ; Desimone, Nathaniel L
; Dong, Eric
Subject: [edk2-devel][edk2-platforms][PATCH V2 1/1] MinPlatformPkg: Add and
re-arrange PCDs to configure FADT and FACS
1. Add the PCD for GPE 1 block register width control in FADT 2. Re-arrange PCD
category for some PCDs
Cc: Isaac Oram
Cc: Nate DeSimone
Cc: Eric Dong
Signed-off-by: Ankit Sinha
---
Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 1 +
Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf | 1 +
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 9 ++---
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
index c7e87cbd7d9d..e68b6070607f 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
@@ -1227,6 +1227,7 @@ PlatformUpdateTables (
FadtHeader->XPmTmrBlk.AccessSize = PcdGet8
(PcdAcpiXPmTmrBlkAccessSize);
FadtHeader->XGpe0Blk.AccessSize = PcdGet8
(PcdAcpiXGpe0BlkAccessSize);
FadtHeader->XGpe1Blk.AccessSize = PcdGet8
(PcdAcpiXGpe1BlkAccessSize);
+FadtHeader->XGpe1Blk.RegisterBitWidth = PcdGet8
(PcdAcpiXGpe1BlkRegisterBitWidth);
FadtHeader->SleepControlReg.AddressSpaceId= PcdGet8
(PcdAcpiSleepControlRegisterAddressSpaceId);
FadtHeader->SleepControlReg.RegisterBitWidth = PcdGet8
(PcdAcpiSleepControlRegisterBitWidth);
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
index 31b6c3be3cc1..1dc0683da650 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
@@ -93,6 +93,7 @@
gMinPlatformPkgTokenSpaceGuid.PcdAcpiXPmTmrBlkAccessSize
gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe0BlkAccessSize
gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe1BlkAccessSize
+ gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe1BlkRegisterBitWidth
gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterAddressSpaceId
gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterBitWidth
gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterBitOffset
diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
index 098bb50075d1..3a735b0e1917 100644
--- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
+++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
@@ -134,6 +134,7 @@
gMinPlatformPkgTokenSpaceGuid.PcdAcpiXPmTmrBlkAccessSize|0x00|UINT8|0x00010048
gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe0BlkAccessSize|0x00|UINT8|0x00010049
gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe1BlkAccessSize|0x00|UINT8|0x0001004A
+
+ gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe1BlkRegisterBitWidth|0x00|UIN
+ T8|0x00010056
gMinPlatformPkgTokenSpaceGuid.PcdAcpiS4BiosReq|0x|UINT8|0x00010055
#
@@ -266,9 +267,6 @@
[PcdsDynamic, PcdsDynamicEx]
gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicEnable|0x0|UINT32|0x9019
- gMinPlatformPkgTokenSpaceGuid.PcdFadtPreferredPmProfile|0x02|UINT8|0x9025
- gMinPlatformPkgTokenSpaceGuid.PcdFadtIaPcBootArch|0x0001|UINT16|0x9026
- gMinPlatformPkgTokenSpaceGuid.PcdFadtFlags|0x86A5|UINT32|0x9027
gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterAddressSpaceId|0x00|UINT8|0x0001004B
gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterBitWidth|0x00|UINT8|0x0001004C
gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterBitOffset|0x00|UINT8|0x0001004D
@@ -337,6 +335,11 @@
# //Header
# 0x7F, 0xFF, 0x04, 0x00}
gMinPlatformPkgTokenSpaceGuid.PcdTrustedStorageDevicePath|{0x02, 0x01, 0x0C,
0x00, 0xd0, 0x41, 0x03, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x06, 0x00,
0x00, 0x17, 0x7F, 0xFF, 0x04, 0x00}|VOID*|0x310
+
+ ## ACPI
+
+ gMinPlatformPkgTokenSpaceGuid.PcdFadtPreferredPmProfile|0x02|UINT8|0x9
+ 025
+
+ gMinPlatformPkgTokenSpaceGuid.PcdFadtIaPcBootArch|0x
Re: [edk2-devel][edk2-platforms][PATCH V2 1/1] MinPlatformPkg: Add and re-arrange PCDs to configure FADT and FACS
Reviewed-by: Isaac Oram
Please run \edk2\BaseTools\Scripts\PatchCheck.py on commits to identify
whitespace and other simple issues. There are also typically editor settings
to clean these automatically.
I will clean up trailing whitespace on push.
Regards,
Isaac
-Original Message-
From: devel@edk2.groups.io On Behalf Of Sinha, Ankit
Sent: Wednesday, July 27, 2022 12:12 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W ; Desimone, Nathaniel L
; Dong, Eric
Subject: [edk2-devel][edk2-platforms][PATCH V2 1/1] MinPlatformPkg: Add and
re-arrange PCDs to configure FADT and FACS
1. Add the PCD for GPE 1 block register width control in FADT 2. Re-arrange PCD
category for some PCDs
Cc: Isaac Oram
Cc: Nate DeSimone
Cc: Eric Dong
Signed-off-by: Ankit Sinha
---
Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 1 +
Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf | 1 +
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 9 ++---
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
index c7e87cbd7d9d..e68b6070607f 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
@@ -1227,6 +1227,7 @@ PlatformUpdateTables (
FadtHeader->XPmTmrBlk.AccessSize = PcdGet8
(PcdAcpiXPmTmrBlkAccessSize);
FadtHeader->XGpe0Blk.AccessSize = PcdGet8
(PcdAcpiXGpe0BlkAccessSize);
FadtHeader->XGpe1Blk.AccessSize = PcdGet8
(PcdAcpiXGpe1BlkAccessSize);
+FadtHeader->XGpe1Blk.RegisterBitWidth = PcdGet8
(PcdAcpiXGpe1BlkRegisterBitWidth);
FadtHeader->SleepControlReg.AddressSpaceId= PcdGet8
(PcdAcpiSleepControlRegisterAddressSpaceId);
FadtHeader->SleepControlReg.RegisterBitWidth = PcdGet8
(PcdAcpiSleepControlRegisterBitWidth);
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
index 31b6c3be3cc1..1dc0683da650 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
@@ -93,6 +93,7 @@
gMinPlatformPkgTokenSpaceGuid.PcdAcpiXPmTmrBlkAccessSize
gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe0BlkAccessSize
gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe1BlkAccessSize
+ gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe1BlkRegisterBitWidth
gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterAddressSpaceId
gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterBitWidth
gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterBitOffset
diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
index 098bb50075d1..3a735b0e1917 100644
--- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
+++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
@@ -134,6 +134,7 @@
gMinPlatformPkgTokenSpaceGuid.PcdAcpiXPmTmrBlkAccessSize|0x00|UINT8|0x00010048
gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe0BlkAccessSize|0x00|UINT8|0x00010049
gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe1BlkAccessSize|0x00|UINT8|0x0001004A
+
+ gMinPlatformPkgTokenSpaceGuid.PcdAcpiXGpe1BlkRegisterBitWidth|0x00|UIN
+ T8|0x00010056
gMinPlatformPkgTokenSpaceGuid.PcdAcpiS4BiosReq|0x|UINT8|0x00010055
#
@@ -266,9 +267,6 @@
[PcdsDynamic, PcdsDynamicEx]
gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicEnable|0x0|UINT32|0x9019
- gMinPlatformPkgTokenSpaceGuid.PcdFadtPreferredPmProfile|0x02|UINT8|0x9025
- gMinPlatformPkgTokenSpaceGuid.PcdFadtIaPcBootArch|0x0001|UINT16|0x9026
- gMinPlatformPkgTokenSpaceGuid.PcdFadtFlags|0x86A5|UINT32|0x9027
gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterAddressSpaceId|0x00|UINT8|0x0001004B
gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterBitWidth|0x00|UINT8|0x0001004C
gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterBitOffset|0x00|UINT8|0x0001004D
@@ -337,6 +335,11 @@
# //Header
# 0x7F, 0xFF, 0x04, 0x00}
gMinPlatformPkgTokenSpaceGuid.PcdTrustedStorageDevicePath|{0x02, 0x01, 0x0C,
0x00, 0xd0, 0x41, 0x03, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x06, 0x00,
0x00, 0x17, 0x7F, 0xFF, 0x04, 0x00}|VOID*|0x310
+
+ ## ACPI
+
+ gMinPlatformPkgTokenSpaceGuid.PcdFadtPreferredPmProfile|0x02|UINT8|0x9
+ 025
+
+ gMinPlatformPkgTokenSpaceGuid.PcdFadtIaPcBootArch|0x0001|UINT16|0x9000
+ 0026
+
+ gMinPlatformPkgTokenSpaceGuid.PcdFadtFlags|0x86A5|UINT32|0x902
+ 7
[PcdsFixedAtBuild]
--
2.27.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92097): https://edk2.groups.io/g/devel/message/92097
Mute This Topic: https://groups.io/mt/92656407/21656
Group Owner: devel+ow...@edk2.gro
[edk2-devel][edk2-platforms][PATCH V1 10/13] PurleyOpenBoardPkg/Build: Reduce unnecessary code
Leverage common includes to reduce duplicated or low value code. Cc: Chasel Chiu Cc: Nate DeSimone Signed-off-by: Isaac Oram --- .../BoardMtOlympus/PlatformPkgConfig.dsc | 46 +--- .../BoardMtOlympus/PlatformPkgPcd.dsc | 52 +-- .../BoardTiogaPass/PlatformPkgConfig.dsc | 48 + .../BoardTiogaPass/PlatformPkgPcd.dsc | 52 +-- 4 files changed, 49 insertions(+), 149 deletions(-) diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc index 2bd714c01e..2359243310 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc @@ -14,40 +14,18 @@ gMinPlatformPkgTokenSpaceGuid.PcdBootStage|4 [PcdsFeatureFlag] - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 1 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 2 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 3 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 4 - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 5 - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|TRUE -!endif - - !if $(TARGET) == DEBUG -gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE - !else -gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE - !endif + # + # MinPlatform common include for required feature PCD + # These PCD must be set before the core include files, CoreCommonLib, + # CorePeiLib, and CoreDxeLib. + # Optional MinPlatformPkg features should be enabled after this + # + !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc + + # + # Commonly used MinPlatform feature configuration logic that maps functionity to stage + # + !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|TRUE diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc index 050f9b6228..069f463d5e 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc @@ -61,42 +61,18 @@ ## # Platform Configuration ## - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|FALSE - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 1 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 2 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 3 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 4 - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 5 - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|TRUE -!endif - -!if $(TARGET) == DEBUG - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE -!else - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE -!endif + # + # MinPlatform common include for required feature PCD + # These PCD must be set before the core include files, CoreCommonLib, + # CorePeiLib, and CoreDxeLib. + # Optional MinPlatformPkg features should be enabled after this + # + !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc + + # + # Commonly used MinPlatform feature configuration logic that maps functionity to stage + # + !include
[edk2-devel][edk2-platforms][PATCH V1 11/13] KabylakeOpenBoardPkg/Build: Reduce unnecessary code
Leverage common includes to reduce duplicated or low value code. Cc: Chasel Chiu Cc: Nate DeSimone Signed-off-by: Isaac Oram --- .../AspireVn7Dash572G/OpenBoardPkgPcd.dsc | 52 +-- .../GalagoPro3/OpenBoardPkgPcd.dsc| 51 +- .../KabylakeRvp3/OpenBoardPkgPcd.dsc | 51 +- 3 files changed, 36 insertions(+), 118 deletions(-) diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkgPcd.dsc b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkgPcd.dsc index 02080aa864..da8f9a075c 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkgPcd.dsc @@ -195,43 +195,18 @@ ## # Platform Configuration ## - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE # FIXME: Define by PERFORMANCE_BUILD? - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|FALSE # FIXME: Define in build-system? - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 1 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 2 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 3 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 4 - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 5 - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|TRUE -!endif - -# TODO: Is TESTING setting, is not test point -!if $(TARGET) == DEBUG - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE -!else - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE -!endif + # + # MinPlatform common include for required feature PCD + # These PCD must be set before the core include files, CoreCommonLib, + # CorePeiLib, and CoreDxeLib. + # Optional MinPlatformPkg features should be enabled after this + # + !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc + + # + # Commonly used MinPlatform feature configuration logic that maps functionity to stage + # + !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc ## # Board Configuration @@ -285,9 +260,6 @@ !endif gEfiMdeModulePkgTokenSpaceGuid.PcdReclaimVariableSpaceAtEndOfDxe|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE -!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1 -!endif gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE !if $(TARGET) == RELEASE diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc index 26e2c16aae..2b9fbe81c0 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc @@ -163,42 +163,18 @@ ## # Platform Configuration ## - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|FALSE - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 1 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 2 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 3 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 4 - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 5 - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE -
[edk2-devel][edk2-platforms][PATCH V1 09/13] SimicsOpenBoardPkg/Build: Reduce unnecessary code
Leverage common includes to reduce duplicated or low value code. Cc: Nate DeSimone Signed-off-by: Isaac Oram --- .../BoardX58Ich10/OpenBoardPkgPcd.dsc | 51 +-- 1 file changed, 12 insertions(+), 39 deletions(-) diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc index 44b6a81277..e2171dd376 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc @@ -42,42 +42,18 @@ ## # Platform Configuration ## - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|FALSE - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 1 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 2 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 3 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 4 - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 5 - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|TRUE -!endif - -!if $(TARGET) == DEBUG - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE -!else - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE -!endif + # + # MinPlatform common include for required feature PCD + # These PCD must be set before the core include files, CoreCommonLib, + # CorePeiLib, and CoreDxeLib. + # Optional MinPlatformPkg features should be enabled after this + # + !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc + + # + # Commonly used MinPlatform feature configuration logic that maps functionity to stage + # + !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc ## # Silicon Configuration @@ -212,9 +188,6 @@ ## # Edk2 Configuration ## -!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1 -!endif gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable|TRUE gPcAtChipsetPkgTokenSpaceGuid.PcdHpetBaseAddress|0xFED0 -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91744): https://edk2.groups.io/g/devel/message/91744 Mute This Topic: https://groups.io/mt/92554238/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 13/13] MinPlatformPkg: Remove unnecessary feature controls
Remove SMI handler profile feature control. Disable handler profiling on RELEASE builds. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Isaac Oram --- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 1 - 1 file changed, 1 deletion(-) diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec index 098bb50075..5aaa4a9b92 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec @@ -383,6 +383,5 @@ gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly |FALSE|BOOLEAN|0xF0A3 gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE|BOOLEAN|0xF0A4 gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable |FALSE|BOOLEAN|0xF0A5 - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE|BOOLEAN|0xF0A6 gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE|BOOLEAN|0xF0A7 gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable |FALSE|BOOLEAN|0xF0B0 -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91746): https://edk2.groups.io/g/devel/message/91746 Mute This Topic: https://groups.io/mt/92554240/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 12/13] CometlakeOpenBoardPkg/Build: Reduce unnecessary code
Leverage common includes to reduce duplicated or low value code. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Rangasai V Chaganty Cc: Deepika Kethi Reddy Cc: Kathappan Esakkithevar Signed-off-by: Isaac Oram --- .../CometlakeURvp/OpenBoardPkgPcd.dsc | 51 +-- 1 file changed, 12 insertions(+), 39 deletions(-) diff --git a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkgPcd.dsc b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkgPcd.dsc index 68dd08423b..79924f1fda 100644 --- a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkgPcd.dsc @@ -125,42 +125,18 @@ ## # Platform Configuration ## - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|FALSE - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 1 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 2 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 3 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 4 - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 5 - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|TRUE -!endif - -!if $(TARGET) == DEBUG - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE -!else - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE -!endif + # + # MinPlatform common include for required feature PCD + # These PCD must be set before the core include files, CoreCommonLib, + # CorePeiLib, and CoreDxeLib. + # Optional MinPlatformPkg features should be enabled after this + # + !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc + + # + # Commonly used MinPlatform feature configuration logic that maps functionity to stage + # + !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc ## # Board Configuration @@ -195,9 +171,6 @@ !endif gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x5000 gEfiMdeModulePkgTokenSpaceGuid.PcdReclaimVariableSpaceAtEndOfDxe|TRUE -!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1 -!endif gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE !if $(TARGET) == DEBUG gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91745): https://edk2.groups.io/g/devel/message/91745 Mute This Topic: https://groups.io/mt/92554239/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 06/13] BoardModulePkg/Include: Add include for stage behavior logic
This is a commonly used set of settings modifications based on the boot stage targeted. Cc: Eric Dong Cc: Liming Gao Signed-off-by: Isaac Oram --- .../Include/Dsc/CommonStageConfig.dsc.inc | 37 +++ 1 file changed, 37 insertions(+) create mode 100644 Platform/Intel/BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc diff --git a/Platform/Intel/BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc b/Platform/Intel/BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc new file mode 100644 index 00..6927b5c9c2 --- /dev/null +++ b/Platform/Intel/BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc @@ -0,0 +1,37 @@ +## @file +# Commonly used stage configuration logic +# +# Copyright (C) 2022 Intel Corporation +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[PcdsFeatureFlag.Common] + !if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 1 +gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|TRUE + !endif + + !if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 2 +gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE +gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|TRUE + !endif + + !if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 3 +gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE +gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|TRUE + !endif + + !if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 4 +gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE + !endif + + !if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 5 +gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE +gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|TRUE + !endif + +[PcdsFixedAtBuild.Common] + !if $(TARGET) != RELEASE +gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1 + !endif -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91739): https://edk2.groups.io/g/devel/message/91739 Mute This Topic: https://groups.io/mt/92554233/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 05/13] MinPlatformPkg/Include: Simplify build logic
Removed the logic that doesn't build some things only if you are doing a
shell boot. Since they are built for stage 1 or 2, there is no porting
benefit to this logic. Build simplified to build both sets of drivers.
Switched from PcdSmiHandlerProfileEnable to using RELEASE build type to
disable SMI profiling.
Cc: Chasel Chiu
Cc: Nate DeSimone
Cc: Liming Gao
Cc: Eric Dong
Signed-off-by: Isaac Oram
---
.../Include/Dsc/CoreCommonLib.dsc | 6 ++---
.../Include/Dsc/CoreDxeInclude.dsc| 23 +--
.../Dsc/MinPlatformFeaturesPcd.dsc.inc| 1 -
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
index b77d55dfd5..3749199da7 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
@@ -122,10 +122,10 @@
DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
!endif
-!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE
-
SmiHandlerProfileLib|MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.inf
-!else
+!if $(TARGET) == RELEASE
SmiHandlerProfileLib|MdePkg/Library/SmiHandlerProfileLibNull/SmiHandlerProfileLibNull.inf
+!else
+
SmiHandlerProfileLib|MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.inf
!endif
PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
index c2ade240f3..21570afe3f 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
@@ -29,7 +29,17 @@
PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
-!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
+ #
+ # Emulated variables for stages 1-4
+ #
+ MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
+
+ gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE
+ }
+
+ #
+ # Real variables for stages 5+
+ #
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf {
@@ -38,12 +48,6 @@
NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
NULL|MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLib.inf
}
-!else
- MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
-
- gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE
- }
-!endif
MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
@@ -122,7 +126,6 @@
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
}
-!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
@@ -133,14 +136,11 @@
UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf
-!endif
-!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
-!endif
!if gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable == TRUE
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
@@ -162,4 +162,3 @@
!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
!endif
-
diff --git
a/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
b/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
index 842668a081..2d665c25c5 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
@@ -22,5 +22,4 @@
gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
- gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
--
2.36.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#91738): https://edk2.groups.io/g/devel/message/91738
Mute This Topic: https://groups.io/mt/92554232/21656
Group Owner:
[edk2-devel][edk2-platforms][PATCH V1 03/13] Features/Intel: Reduce duplicate code
Enable simpler initialation of the MinPlatformPkg feature selection PCD. Most features and boards don't benefit from initializing these. Cc: Sai Chaganty Cc: Nate DeSimone Cc: Liming Gao Signed-off-by: Isaac Oram --- .../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 13 ++--- .../AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc | 12 .../BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc | 15 +++ .../PostCodeDebugFeaturePkg.dsc | 15 +++ .../NetworkFeaturePkg/NetworkFeaturePkg.dsc | 13 ++--- .../IpmiFeaturePkg/IpmiFeaturePkg.dsc | 13 ++--- .../SpcrFeaturePkg/SpcrFeaturePkg.dsc | 13 ++--- .../PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc | 13 ++--- .../SmbiosFeaturePkg/SmbiosFeaturePkg.dsc | 13 ++--- .../TemplateFeaturePkg/TemplateFeaturePkg.dsc | 13 ++--- .../LogoFeaturePkg/LogoFeaturePkg.dsc | 12 ++-- .../UserAuthFeaturePkg/UserAuthFeaturePkg.dsc | 13 ++--- .../VirtualKeyboardFeaturePkg.dsc | 13 ++--- 13 files changed, 78 insertions(+), 93 deletions(-) diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc index 28530b8c67..b572f2eda8 100644 --- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc +++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc @@ -88,13 +88,12 @@ [PcdsFixedAtBuild] gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance|1 -[PcdsFeatureFlag] - # - # MinPlatform common include currently required PCD - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc # # Include common libraries diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc index 3b76d39ea8..306d8bce16 100644 --- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc +++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc @@ -28,15 +28,11 @@ MinPlatformPkg/MinPlatformPkg.dec # -# Since there are no 32b libraries or components in this package, these PCD are specified for 64b only +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. # -[PcdsFeatureFlag.X64] - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc # # Include common libraries diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc b/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc index 56cad020bf..cad4e30aa3 100644 --- a/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc +++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc @@ -28,17 +28,16 @@ MinPlatformPkg/MinPlatformPkg.dec BeepDebugFeaturePkg/BeepDebugFeaturePkg.dec -[PcdsFeatureFlag] - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE - [PcdsDynamicExDefault] gBeepDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUseBeep|TRUE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc + # # Include common libraries # diff --git a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.dsc b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.dsc index 349604098f..16642e6c59 100644 --- a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.dsc +++ b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.dsc @@ -27,20 +27,19 @@ [Packages] MinPlatformPkg/MinPlatformPkg.dec -[PcdsFeatureFlag] - # - # PCD needed for MinPlatform build includes - # - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable
[edk2-devel][edk2-platforms][PATCH V1 08/13] TigerLakeOpenBoardPkg/Build: Reduce unnecessary code
Leverage common includes to reduce duplicated or low value code. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Heng Luo Signed-off-by: Isaac Oram --- .../TigerlakeURvp/OpenBoardPkgPcd.dsc | 52 +-- 1 file changed, 12 insertions(+), 40 deletions(-) diff --git a/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkgPcd.dsc b/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkgPcd.dsc index aba3c8d6d0..2fd6d0c50e 100644 --- a/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkgPcd.dsc @@ -138,42 +138,18 @@ ## # Platform Configuration ## - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|TRUE - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 1 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 2 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 3 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 4 - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 5 - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|TRUE -!endif - -!if $(TARGET) == DEBUG - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE -!else - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE -!endif + # + # MinPlatform common include for required feature PCD + # These PCD must be set before the core include files, CoreCommonLib, + # CorePeiLib, and CoreDxeLib. + # Optional MinPlatformPkg features should be enabled after this + # + !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc + + # + # Commonly used MinPlatform feature configuration logic that maps functionity to stage + # + !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc ## # Board Configuration @@ -212,9 +188,6 @@ !endif gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x1 gEfiMdeModulePkgTokenSpaceGuid.PcdReclaimVariableSpaceAtEndOfDxe|TRUE -!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1 -!endif gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE !if $(TARGET) == DEBUG gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE @@ -396,4 +369,3 @@ # !include $(PLATFORM_FSP_BIN_PACKAGE)/TigerLakeFspPcds.dsc !endif - -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91741): https://edk2.groups.io/g/devel/message/91741 Mute This Topic: https://groups.io/mt/92554235/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 07/13] WhiskeyLakeOpenBoardPkg/Build: Reduce unnecessary code
Leverage common includes to reduce duplicated or low value code. Cc: Chasel Chiu Cc: Nate DeSimone Signed-off-by: Isaac Oram --- .../UpXtreme/OpenBoardPkgPcd.dsc | 51 +-- .../WhiskeylakeURvp/OpenBoardPkgPcd.dsc | 51 +-- 2 files changed, 24 insertions(+), 78 deletions(-) diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkgPcd.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkgPcd.dsc index 8f3cc6ba28..a7e9a41e2c 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkgPcd.dsc @@ -121,42 +121,18 @@ ## # Platform Configuration ## - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|TRUE - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 1 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 2 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 3 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 4 - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 5 - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|TRUE -!endif - -!if $(TARGET) == DEBUG - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE -!else - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE -!endif + # + # MinPlatform common include for required feature PCD + # These PCD must be set before the core include files, CoreCommonLib, + # CorePeiLib, and CoreDxeLib. + # Optional MinPlatformPkg features should be enabled after this + # + !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc + + # + # Commonly used MinPlatform feature configuration logic that maps functionity to stage + # + !include BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc ## # Board Configuration @@ -191,9 +167,6 @@ !endif gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x5000 gEfiMdeModulePkgTokenSpaceGuid.PcdReclaimVariableSpaceAtEndOfDxe|TRUE -!if gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable == TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask|0x1 -!endif gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE # diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPcd.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPcd.dsc index 4a5d5ef03b..daf5411ac3 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPcd.dsc @@ -121,42 +121,18 @@ ## # Platform Configuration ## - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|FALSE - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 1 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 2 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 3 - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit|FALSE - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|TRUE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 4 - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 5 - gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE - gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|TRUE -!endif - -!if $(TARGET) == DEBUG - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|TRUE -!else - gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE -!endif + # + # MinPlatform common include
[edk2-devel][edk2-platforms][PATCH V1 02/13] WhitleyOpenBoardPkg/Build: Reduce duplicate code
Leverage common includes for default feature values. Remove PERFORMANCE_ENABLE in favor of PcdPerformanceEnable. Use DpDynamicCommand instead of standalone DpApp. Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Isaac Oram --- ...blePerformanceMonitoringInfrastructure.dsc | 5 +-- ...anceMonitoringInfrastructurePostMemory.fdf | 5 +-- ...manceMonitoringInfrastructurePreMemory.fdf | 2 +- .../Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc | 45 ++- .../WhitleyOpenBoardPkg/PlatformPkgConfig.dsc | 2 - 5 files changed, 39 insertions(+), 20 deletions(-) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/EnablePerformanceMonitoringInfrastructure.dsc b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/EnablePerformanceMonitoringInfrastructure.dsc index c308e0df4f..7439b2fb36 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/EnablePerformanceMonitoringInfrastructure.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/EnablePerformanceMonitoringInfrastructure.dsc @@ -6,7 +6,7 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent ## -!if $(PERFORMANCE_ENABLE) == TRUE +!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE [PcdsFixedAtBuild] gEfiMdeModulePkgTokenSpaceGuid.PcdEdkiiFpdtStringRecordEnableOnly|TRUE @@ -34,7 +34,6 @@ [Components.X64] MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf - MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf - ShellPkg/DynamicCommand/DpDynamicCommand/DpApp.inf + ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf !endif diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePostMemory.fdf b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePostMemory.fdf index a3576bd7a8..52b79a31d0 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePostMemory.fdf +++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePostMemory.fdf @@ -6,9 +6,8 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent ## -!if $(PERFORMANCE_ENABLE) == TRUE +!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf - INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf - INF ShellPkg/DynamicCommand/DpDynamicCommand/DpApp.inf + INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf !endif diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePreMemory.fdf b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePreMemory.fdf index dbc98f6f1f..18574f67ef 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePreMemory.fdf +++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/EnablePerformanceMonitoringInfrastructurePreMemory.fdf @@ -6,6 +6,6 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent ## -!if $(PERFORMANCE_ENABLE) == TRUE +!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf !endif diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc index cefee8273b..5b5d84779e 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc @@ -39,12 +39,39 @@ DEFINE IIO_INSTANCE = UnknownCpu !endif +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# Optional MinPlatformPkg features should be enabled after this +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc + +# +# AdvancedFeature common include for feature enable/disable PCD +# +# !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc +# +# PCD required by advanced features +# [PcdsFixedAtBuild] gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance|1 +# +# Feature enable/disable flags +# [PcdsFeatureFlag] + # + # MinPlatform control flags + # + gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |TRUE + gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |TRUE + # # Debugging features # @@ -124,20 +151,16
[edk2-devel][edk2-platforms][PATCH V1 01/13] MinPlatformPkg/Include: Simplify board creation
Reduce the need for boards to initialize common MinPlatformPkg PCD used in build files. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Isaac Oram Cc: Liming Gao Cc: Eric Dong Signed-off-by: Isaac Oram --- .../Dsc/MinPlatformFeaturesPcd.dsc.inc| 26 +++ .../Intel/MinPlatformPkg/MinPlatformPkg.dsc | 14 +- 2 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc b/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc new file mode 100644 index 00..842668a081 --- /dev/null +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc @@ -0,0 +1,26 @@ +## @file +# DSC file for defining default PCD for MinPlatform features. +# +# This makes it easy for boards to initially configure their build. +# +# This initializes features to be disable by default. +# A board can enable a feature by configuring the PCD in the board DSC file +# after this file has been included. +# +# Copyright (C) 2022 Intel Corporation +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[PcdsFeatureFlag] + gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit|FALSE + gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable |FALSE + + gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE + + gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc index 09aa6fe4d5..90127c16b5 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc @@ -38,14 +38,12 @@ # -[PcdsFeatureFlag] - # configuration -gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE -gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE -gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE -gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable|FALSE -gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable|FALSE -gMinPlatformPkgTokenSpaceGuid.PcdSerialTerminalEnable|FALSE +# +# MinPlatform common include for required feature PCD +# These PCD must be set before the core include files, CoreCommonLib, +# CorePeiLib, and CoreDxeLib. +# +!include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc # -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91734): https://edk2.groups.io/g/devel/message/91734 Mute This Topic: https://groups.io/mt/92554227/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 04/13] WhitleyOpenBoardPkg/Build: Reduce unnecessary code
Use MinPlatformFeaturesPcd.dsc.inc to initialize feature PCD Move individual feature enabling examples to BoardPortTemplate Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Isaac Oram --- .../Aowanda/PlatformPkg.dsc | 3 -- .../BoardPortTemplate/PlatformPkg.dsc | 50 ++ .../JunctionCity/PlatformPkg.dsc | 3 -- .../Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc | 51 --- 4 files changed, 50 insertions(+), 57 deletions(-) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/PlatformPkg.dsc index 63648172da..8761f8b56a 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/PlatformPkg.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/PlatformPkg.dsc @@ -26,9 +26,6 @@ !if $(gMinPlatformPkgTokenSpaceGuid.PcdBootStage) >= 5 gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable|TRUE gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable |TRUE -!else - gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable|FALSE - gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable |FALSE !endif !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.dsc index e3e8ceb7ce..9bf5d02a3d 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.dsc @@ -15,6 +15,56 @@ !include $(RP_PKG)/PlatformPkg.dsc +# +# Feature enable/disable flags +# +[PcdsFeatureFlag] + # + # MinPlatform control flags + # + gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |TRUE + + # + # Debugging features + # + gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable |FALSE + gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable |FALSE + gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable |FALSE + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable |FALSE + + # + # Network features + # + gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable |FALSE + + # + # OutOfBandManagement features + # + gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable |FALSE + gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrFeatureEnable |FALSE + + # + # PowerManagement features + # + gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable |FALSE + + # + # SystemInformation features + # + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable |FALSE + + # + # UserInterface features + # + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable |FALSE + gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable |FALSE + gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnable |FALSE + +!include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc + [Defines] DEFINE BOARD_NAME = BoardPortTemplate PLATFORM_GUID = f3518dd4-5dec-4d2c-9ac9-561121e2628b diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc index 8cedbaccee..8e226c1552 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc @@ -26,9 +26,6 @@ !if $(gMinPlatformPkgTokenSpaceGuid.PcdBootStage) >= 5 gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable|TRUE gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable |TRUE -!else - gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable|FALSE - gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable |FALSE !endif !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc index 5b5d84779e..0ff9c00b94 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc @@ -59,57 +59,6 @@ [PcdsFixedAtBuild] gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance|1 -# -# Feature enable/disable flags -# -[PcdsFeatureFlag] - # - # MinPlatform control flags - # - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit |FALSE - gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly |FALSE
[edk2-devel][edk2-platforms][PATCH V1 00/13] Simplify board porting
These changes simplify the logic for board porting by creating common include files for initializing PCD and for some stage specific logic commonly implemented. Removes the PERFORMANCE_ENABLE flag and rely on the gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable only. Simplifies the WhitleyOpenBoardPkg performance monitoring infrastructure. Removes gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable and disable handler profiling on RELEASE builds. The net result is removal of unnecessary or duplicate options and the reduction in duplicate code with increases in comments. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Cc: Sai Chaganty Cc: Heng Luo Cc: Deepika Kethi Reddy Cc: Kathappan Esakkithevar Isaac Oram (13): MinPlatformPkg/Include: Simplify board creation WhitleyOpenBoardPkg/Build: Reduce duplicate code Features/Intel: Reduce duplicate code WhitleyOpenBoardPkg/Build: Reduce unnecessary code MinPlatformPkg/Include: Simplify build logic BoardModulePkg/Include: Add include for stage behavior logic WhiskeyLakeOpenBoardPkg/Build: Reduce unnecessary code TigerLakeOpenBoardPkg/Build: Reduce unnecessary code SimicsOpenBoardPkg/Build: Reduce unnecessary code PurleyOpenBoardPkg/Build: Reduce unnecessary code KabylakeOpenBoardPkg/Build: Reduce unnecessary code CometlakeOpenBoardPkg/Build: Reduce unnecessary code MinPlatformPkg: Remove unnecessary feature controls .../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 13 ++-- .../AcpiDebugFeaturePkg.dsc | 12 ++-- .../BeepDebugFeaturePkg.dsc | 15 ++-- .../PostCodeDebugFeaturePkg.dsc | 15 ++-- .../NetworkFeaturePkg/NetworkFeaturePkg.dsc | 13 ++-- .../IpmiFeaturePkg/IpmiFeaturePkg.dsc | 13 ++-- .../SpcrFeaturePkg/SpcrFeaturePkg.dsc | 13 ++-- .../S3FeaturePkg/S3FeaturePkg.dsc | 13 ++-- .../SmbiosFeaturePkg/SmbiosFeaturePkg.dsc | 13 ++-- .../TemplateFeaturePkg/TemplateFeaturePkg.dsc | 13 ++-- .../LogoFeaturePkg/LogoFeaturePkg.dsc | 12 ++-- .../UserAuthFeaturePkg/UserAuthFeaturePkg.dsc | 13 ++-- .../VirtualKeyboardFeaturePkg.dsc | 13 ++-- .../Include/Dsc/CommonStageConfig.dsc.inc | 37 ++ .../CometlakeURvp/OpenBoardPkgPcd.dsc | 51 - .../AspireVn7Dash572G/OpenBoardPkgPcd.dsc | 52 -- .../GalagoPro3/OpenBoardPkgPcd.dsc| 51 - .../KabylakeRvp3/OpenBoardPkgPcd.dsc | 51 - .../Include/Dsc/CoreCommonLib.dsc | 6 +- .../Include/Dsc/CoreDxeInclude.dsc| 23 +++--- .../Dsc/MinPlatformFeaturesPcd.dsc.inc| 25 +++ .../Intel/MinPlatformPkg/MinPlatformPkg.dec | 1 - .../Intel/MinPlatformPkg/MinPlatformPkg.dsc | 14 ++-- .../BoardMtOlympus/PlatformPkgConfig.dsc | 46 .../BoardMtOlympus/PlatformPkgPcd.dsc | 52 -- .../BoardTiogaPass/PlatformPkgConfig.dsc | 48 - .../BoardTiogaPass/PlatformPkgPcd.dsc | 52 -- .../BoardX58Ich10/OpenBoardPkgPcd.dsc | 51 - .../TigerlakeURvp/OpenBoardPkgPcd.dsc | 52 -- .../UpXtreme/OpenBoardPkgPcd.dsc | 51 - .../WhiskeylakeURvp/OpenBoardPkgPcd.dsc | 51 - .../Aowanda/PlatformPkg.dsc | 3 - .../BoardPortTemplate/PlatformPkg.dsc | 50 + ...blePerformanceMonitoringInfrastructure.dsc | 5 +- ...anceMonitoringInfrastructurePostMemory.fdf | 5 +- ...manceMonitoringInfrastructurePreMemory.fdf | 2 +- .../JunctionCity/PlatformPkg.dsc | 3 - .../Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc | 72 ++- .../WhitleyOpenBoardPkg/PlatformPkgConfig.dsc | 2 - 39 files changed, 382 insertions(+), 645 deletions(-) create mode 100644 Platform/Intel/BoardModulePkg/Include/Dsc/CommonStageConfig.dsc.inc create mode 100644 Platform/Intel/MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91733): https://edk2.groups.io/g/devel/message/91733 Mute This Topic: https://groups.io/mt/92554226/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 0/5] Resolve GCC compilation warnings
Pushed as a2763c425e..f5306c2b07 -Original Message- From: Desimone, Nathaniel L Sent: Wednesday, July 20, 2022 3:17 PM To: Oram, Isaac W ; devel@edk2.groups.io Cc: Gao, Liming ; Chiu, Chasel Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 0/5] Resolve GCC compilation warnings For the series... Reviewed-by: Nate DeSimone > -Original Message- > From: Oram, Isaac W > Sent: Thursday, June 30, 2022 5:14 PM > To: devel@edk2.groups.io > Cc: Oram, Isaac W ; Desimone, Nathaniel L > ; Gao, Liming > ; Chiu, Chasel > Subject: [edk2-devel][edk2-platforms][PATCH V1 0/5] Resolve GCC > compilation warnings > > Fix GCC warnings and remove the build flags to ignore them. > > Cc: Nate DeSimone > Cc: Liming Gao > Cc: Chasel Chiu > Signed-off-by: Isaac Oram > > Isaac Oram (5): > IpmiFeaturePkg/GenericIpmi: Fix GCC compilation warnings > WhitleyOpenBoardPkg: Fix GCC warnings > WhitleyOpenBoardPkg: Fix GCC unused variables warnings > WhitleyOpenBoardPkg: Fix GCC unused variables that are set warnings > WhitleyOpenBoardPkg: Remove unnecessary code > > .../GenericIpmi/Common/KcsBmc.c | 8 +-- > .../GenericIpmi/Pei/PeiGenericIpmi.c | 3 +- > .../IpmiPlatformHookLib/IpmiPlatformHookLib.c | 2 +- > .../PeiPlatformHookLib/PeiPlatformHooklib.c | 2 +- > .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +- > .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 6 +- > .../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +- > .../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 3 +- > .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +- > .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 3 +- > .../Uba/TypeAowanda/Pei/AcpiTablePcds.c | 2 - > .../Aowanda/Uba/TypeAowanda/Pei/KtiEparam.c | 3 - > .../Aowanda/Uba/TypeAowanda/Pei/PcdData.c | 2 +- > .../Uba/TypeAowanda/Pei/PchEarlyUpdate.c | 2 +- > .../Uba/TypeAowanda/Pei/PeiBoardInitLib.c | 2 +- > .../Uba/TypeAowanda/Pei/PeiBoardInitLib.inf | 11 > .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +- > .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 4 ++ > .../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +- > .../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 1 + > .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +- > .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 1 + > .../TypeBoardPortTemplate/Pei/AcpiTablePcds.c | 3 +- > .../TypeBoardPortTemplate/Pei/IioBifurInit.c | 8 +-- > .../Uba/TypeBoardPortTemplate/Pei/KtiEparam.c | 2 - > .../Pei/PchEarlyUpdate.c | 4 +- > .../Pei/PeiBoardInitLib.c | 2 +- > .../Pei/PeiBoardInitLib.inf | 11 > .../Dxe/PlatformCpuPolicy/PlatformCpuPolicy.c | 4 +- > .../Features/Acpi/AcpiPlatform/AcpiPlatform.c | 34 +-- > .../Acpi/AcpiPlatform/AcpiPlatformHooks.c | 16 +++--- > .../Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c | 37 ++-- > .../Pci/Dxe/PciHostBridge/PciHostBridge.c | 5 +- > .../Dxe/PciHostBridge/PciHostBridgeSupport.c | 2 +- > .../Pci/Dxe/PciHostBridge/PciRootBridgeIo.c | 11 +--- > .../Pci/Dxe/PciPlatform/PciPlatform.c | 35 ++-- > .../Pci/Dxe/PciPlatform/PciPlatform.inf | 1 + > .../Pci/Dxe/PciPlatform/PciPlatformHooks.c| 16 +++--- > .../WhitleyOpenBoardPkg/Include/Acpi/Fadt.h | 2 +- > .../Include/Dsc/BuildOptions.dsc | 5 +- > .../Include/Library/UbaAcpiUpdateLib.h| 2 - > .../Include/Library/UbaClkGenUpdateLib.h | 2 - > .../Include/Library/UbaGpioPlatformConfig.h | 4 -- > .../Include/Library/UbaGpioUpdateLib.h| 2 - > .../Library/UbaHsioPtssTableConfigLib.h | 3 - > .../Include/Library/UbaIioConfigLib.h | 10 > .../Library/UbaIioPortBifurcationInitLib.h| 3 - > .../Include/Library/UbaOpromUpdateLib.h | 6 -- > .../Include/Library/UbaPcdUpdateLib.h | 2 - > .../Include/Library/UbaPchEarlyUpdateLib.h| 3 - > .../Include/Library/UbaSlotUpdateLib.h| 12 > .../Include/Library/UbaSoftStrapUpdateLib.h | 2 - > .../Library/UbaSystemConfigUpdateLib.h| 3 - > .../Include/Library/UbaUsbOcUpdateLib.h | 2 - > .../IpmiPlatformHookLib/IpmiPlatformHookLib.c | 2 +- > .../PeiPlatformHookLib/PeiPlatformHooklib.c | 2 +- > .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +- > .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 6 +- > .../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +- > .../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 3 +- > .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +- > .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 3 +- > .../Uba/TypeJunctionCity/Pei/AcpiTablePcds.c | 4 +- > .../Uba/Type
Re: [edk2-devel][edk2-platforms][PATCH V2 1/1] MinPlatformPkg: Add missing FV PCD
Pushed as 773ac505b7..a2763c425e -Original Message- From: Desimone, Nathaniel L Sent: Tuesday, July 19, 2022 5:47 PM To: Oram, Isaac W ; devel@edk2.groups.io Cc: Chiu, Chasel ; Dong, Eric ; Gao, Liming Subject: RE: [edk2-devel][edk2-platforms][PATCH V2 1/1] MinPlatformPkg: Add missing FV PCD Reviewed-by: Nate DeSimone -Original Message- From: Oram, Isaac W Sent: Monday, July 18, 2022 5:15 PM To: devel@edk2.groups.io Cc: Oram, Isaac W ; Chiu, Chasel ; Desimone, Nathaniel L ; Dong, Eric ; Gao, Liming Subject: [edk2-devel][edk2-platforms][PATCH V2 1/1] MinPlatformPkg: Add missing FV PCD Add missing PCD for BSP FV Base/Size/Offsets. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Eric Dong Cc: Liming Gao Signed-off-by: Isaac Oram --- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 8 1 file changed, 8 insertions(+) diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec index 68ab1d702d..76da6f35ae 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec @@ -230,9 +230,17 @@ gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryBase|0x|UINT32|0x2004 gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemorySize|0x|UINT32|0x2005 gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryOffset|0x|UINT32|0x2006 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspPreMemorySize|0x|UINT32|0x2030 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspPreMemoryBase|0x|UINT32|0x2031 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspPreMemoryOffset|0x|UINT32|0x2032 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryBase|0x|UINT32|0x2007 gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize|0x|UINT32|0x2008 gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset|0x|UINT32|0x2009 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspSize|0x|UINT32|0x2033 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspBase|0x|UINT32|0x2034 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspOffset|0x|UINT32|0x2035 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootBase|0x|UINT32|0x200A gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize|0x|UINT32|0x200B gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset|0x|UINT32|0x200C -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91600): https://edk2.groups.io/g/devel/message/91600 Mute This Topic: https://groups.io/mt/92472900/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 V2 0/2] Add MinPlatformPkg NOOPT build option
Pushed as 0f836bd4e3..773ac505b7 -Original Message- From: Desimone, Nathaniel L Sent: Wednesday, July 20, 2022 2:07 PM To: Oram, Isaac W ; devel@edk2.groups.io Cc: Chiu, Chasel ; Gao, Liming ; Dong, Eric Subject: RE: [edk2-devel][edk2-platforms][PATCH V2 0/2] Add MinPlatformPkg NOOPT build option For the series... Reviewed-by: Nate DeSimone > -Original Message- > From: Oram, Isaac W > Sent: Tuesday, July 19, 2022 12:43 PM > To: devel@edk2.groups.io > Cc: Oram, Isaac W ; Chiu, Chasel > ; Desimone, Nathaniel L > ; Gao, Liming > ; Dong, Eric > Subject: [edk2-devel][edk2-platforms][PATCH V2 0/2] Add MinPlatformPkg > NOOPT build option > > V2: > Wrap DXE performance library with feature PCD > > V1: > Add the NOOPT build option. > Use the same libraries for DEBUG and NOOPT Clean up some duplication > and coding style issues with the include files. > > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Liming Gao > Cc: Eric Dong > Signed-off-by: Isaac Oram > > Isaac Oram (2): > MinPlatformPkg/Build: Add NOOPT build > MinPlatformPkg/Build: Reduce duplication > > .../MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 66 > ++- .../MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 29 > ++-- > .../Intel/MinPlatformPkg/MinPlatformPkg.dsc | 2 +- > 3 files changed, 27 insertions(+), 70 deletions(-) > > -- > 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91599): https://edk2.groups.io/g/devel/message/91599 Mute This Topic: https://groups.io/mt/92490676/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 V2 2/2] MinPlatformPkg/Build: Reduce duplication
Removed needless duplication between sections. Addes spaces after commas. Remove commented out code. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Isaac Oram --- .../MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 57 +-- .../MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 29 +++--- 2 files changed, 22 insertions(+), 64 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc index 9b3095d662..e48d4b06d8 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc @@ -8,14 +8,14 @@ ## - # - # Generic EDKII Lib - # +# +# Generic EDKII Lib +# - # - # DXE phase common - # -[LibraryClasses.common.DXE_CORE,LibraryClasses.common.DXE_SMM_DRIVER,LibraryClasses.common.SMM_CORE,LibraryClasses.common.DXE_DRIVER,LibraryClasses.common.DXE_RUNTIME_DRIVER,LibraryClasses.common.UEFI_DRIVER,LibraryClasses.common.UEFI_APPLICATION] +# +# DXE phase common +# +[LibraryClasses.common.DXE_CORE, LibraryClasses.common.DXE_SMM_DRIVER, LibraryClasses.common.SMM_CORE, LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION] HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf @@ -32,14 +32,8 @@ FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf -!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE - PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf -!endif - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf @@ -50,6 +44,11 @@ VariableReadLib|MinPlatformPkg/Library/DxeRuntimeVariableReadLib/DxeRuntimeVariableReadLib.inf VariableWriteLib|MinPlatformPkg/Library/DxeRuntimeVariableWriteLib/DxeRuntimeVariableWriteLib.inf +[LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION] +!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE + PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf +!endif + [LibraryClasses.common.DXE_CORE, LibraryClasses.common.SMM_CORE] !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf @@ -62,21 +61,15 @@ !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf -!endif !endif +[LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_DRIVER] + Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf + [LibraryClasses.common.DXE_DRIVER] - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf TpmPlatformHierarchyLib|MinPlatformPkg/Tcg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - -[LibraryClasses.common.UEFI_DRIVER] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf -# PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf [LibraryClasses.common.DXE_SMM_DRIVER] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf @@ -87,7 +80,6 @@ !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE PerformanceLib|MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf !endif SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf @@ -100,8 +92,6 @@ VariableWriteLib|MinPlatformPkg/Library/SmmVariableWriteLib/TraditionalMmVariableWriteLib.inf [LibraryClasses.common.SMM_CORE] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
[edk2-devel][edk2-platforms][PATCH V2 0/2] Add MinPlatformPkg NOOPT build option
V2: Wrap DXE performance library with feature PCD V1: Add the NOOPT build option. Use the same libraries for DEBUG and NOOPT Clean up some duplication and coding style issues with the include files. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Isaac Oram Isaac Oram (2): MinPlatformPkg/Build: Add NOOPT build MinPlatformPkg/Build: Reduce duplication .../MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 66 ++- .../MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 29 ++-- .../Intel/MinPlatformPkg/MinPlatformPkg.dsc | 2 +- 3 files changed, 27 insertions(+), 70 deletions(-) -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91548): https://edk2.groups.io/g/devel/message/91548 Mute This Topic: https://groups.io/mt/92490676/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 V2 1/2] MinPlatformPkg/Build: Add NOOPT build
Add NOOPT build support to enable easy debugging of unoptimized code. Generally the same libraries are desired for DEBUG and NOOPT. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Isaac Oram --- .../Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 11 +-- .../Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 4 ++-- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc index 209ccdaf54..9b3095d662 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc @@ -50,6 +50,11 @@ VariableReadLib|MinPlatformPkg/Library/DxeRuntimeVariableReadLib/DxeRuntimeVariableReadLib.inf VariableWriteLib|MinPlatformPkg/Library/DxeRuntimeVariableWriteLib/DxeRuntimeVariableWriteLib.inf +[LibraryClasses.common.DXE_CORE, LibraryClasses.common.SMM_CORE] +!if $(TARGET) != RELEASE + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf +!endif + [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf @@ -59,9 +64,6 @@ PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf !endif - -!if $(TARGET) == DEBUG - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif [LibraryClasses.common.DXE_DRIVER] @@ -109,9 +111,6 @@ PerformanceLib|MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf !endif - -!if $(TARGET) == DEBUG - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif [LibraryClasses.common.DXE_RUNTIME_DRIVER] diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc index c12189bd9a..1bf8338f95 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc @@ -37,7 +37,7 @@ [LibraryClasses.common.SEC] ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf -!if $(TARGET) == DEBUG +!if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf @@ -46,7 +46,7 @@ [LibraryClasses.common.PEI_CORE] TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf -!if $(TARGET) == DEBUG +!if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc index a8373a4ecb..09aa6fe4d5 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc @@ -20,7 +20,7 @@ DSC_SPECIFICATION = 0x00010005 OUTPUT_DIRECTORY= Build/MinPlatformPkg SUPPORTED_ARCHITECTURES = IA32|X64 - BUILD_TARGETS = DEBUG|RELEASE + BUILD_TARGETS = NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER= DEFAULT -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91549): https://edk2.groups.io/g/devel/message/91549 Mute This Topic: https://groups.io/mt/92490678/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 V2 1/1] MinPlatformPkg: Add missing FV PCD
Add missing PCD for BSP FV Base/Size/Offsets. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Eric Dong Cc: Liming Gao Signed-off-by: Isaac Oram --- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 8 1 file changed, 8 insertions(+) diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec index 68ab1d702d..76da6f35ae 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec @@ -230,9 +230,17 @@ gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryBase|0x|UINT32|0x2004 gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemorySize|0x|UINT32|0x2005 gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryOffset|0x|UINT32|0x2006 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspPreMemorySize|0x|UINT32|0x2030 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspPreMemoryBase|0x|UINT32|0x2031 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspPreMemoryOffset|0x|UINT32|0x2032 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryBase|0x|UINT32|0x2007 gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize|0x|UINT32|0x2008 gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset|0x|UINT32|0x2009 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspSize|0x|UINT32|0x2033 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspBase|0x|UINT32|0x2034 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspOffset|0x|UINT32|0x2035 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootBase|0x|UINT32|0x200A gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize|0x|UINT32|0x200B gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset|0x|UINT32|0x200C -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91496): https://edk2.groups.io/g/devel/message/91496 Mute This Topic: https://groups.io/mt/92472900/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] MinPlatformPkg: FspResetType support for X64 build.
Series Reviewed-by: Isaac Oram -Original Message- From: Chiu, Chasel Sent: Monday, July 18, 2022 3:13 PM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Desimone, Nathaniel L ; Oram, Isaac W ; Gao, Liming ; Dong, Eric Subject: [PATCH 0/2] MinPlatformPkg: FspResetType support for X64 build. FSP_STATUS_RESET_REQUIRED_* will be either 32bit or 64bit basing on the build and this patch series extended the support for 64bit build. Cc: Nate DeSimone Cc: Isaac Oram Cc: Liming Gao Cc: Eric Dong Signed-off-by: Chasel Chiu Chasel Chiu (2): MinPlatformPkg/FspWrapper: FspResetType support for X64 build. WhitleySiliconPkg: FspResetType support for X64 build. Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformResetLib.c | 4 ++-- Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformResetLib.c | 4 ++-- Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) -- 2.35.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91492): https://edk2.groups.io/g/devel/message/91492 Mute This Topic: https://groups.io/mt/92470479/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 v2 1/1] IntelSiliconPkg/SpiFvbService: Add support for VariableFlashInfoLib
Pushed as 9935472b19..bc93dea9b9
-Original Message-
From: Chaganty, Rangasai V
Sent: Wednesday, July 13, 2022 9:49 AM
To: devel@edk2.groups.io; mikub...@linux.microsoft.com
Cc: Ni, Ray ; Oram, Isaac W ;
Desimone, Nathaniel L
Subject: RE: [edk2-devel] [edk2-platforms][PATCH v2 1/1]
IntelSiliconPkg/SpiFvbService: Add support for VariableFlashInfoLib
Reviewed-by: Sai Chaganty
-Original Message-
From: Michael Kubacki
Sent: Tuesday, July 12, 2022 4:04 PM
To: devel@edk2.groups.io
Cc: Chaganty, Rangasai V ; Ni, Ray
; Oram, Isaac W ; Desimone, Nathaniel
L
Subject: Re: [edk2-devel] [edk2-platforms][PATCH v2 1/1]
IntelSiliconPkg/SpiFvbService: Add support for VariableFlashInfoLib
Reminder about this patch.
Thanks,
Michael
On 7/1/2022 10:39 AM, Michael Kubacki wrote:
> From: Michael Kubacki
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3478
>
> Adds support for getting the variable flash information from
> VariableFlashInfoLib. This library abstracts the source of flash
> information so platforms could expect the information to come from a
> different source in the library implementation than the PCDs
> previously used as the information source in this module.
>
> In particular, the library allows Standalone MM platforms to
> dynamically pass the information behind the library API.
>
> Cc: Rangasai V Chaganty
> Cc: Ray Ni
> Cc: Isaac Oram
> Cc: Nate DeSimone
> Signed-off-by: Michael Kubacki
> ---
>
> Notes:
> V2 changes:
>
> 1. Updated the buffer that is returned from
> GetFvbInfo() to be allocated from pool.
> 2. Updated calls to that function in FvbInitialize()
> to free the new buffer after usage.
> 3. Updated the multiplication operation to determine
> the FV length to use safe multiplication in
> GenerateNvStorageFvbMediaInfo().
>
> Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/FvbInfo.c
> | 128 +---
>
> Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceCommon.c
> | 93 --
> Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceMm.c
> | 49 ++--
>
> Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceCommon.h
> | 18 ++-
>
> Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> | 6 +-
>
> Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf
> | 6 +-
> Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dsc
> | 7 ++
> 7 files changed, 243 insertions(+), 64 deletions(-)
>
> diff --git
> a/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/FvbInfo.c
> b/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/FvbInfo.c
> index 7f2678fa9e5a..634a44218c7a 100644
> ---
> a/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/FvbInfo.c
> +++ b/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/FvbInf
> +++ o.c
> @@ -3,6 +3,7 @@
> These data is intent to decouple FVB driver with FV header.
>
> Copyright (c) 2017, Intel Corporation. All rights reserved.
> +Copyright (c) Microsoft Corporation.
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> @@ -11,51 +12,92 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>
> #define FIRMWARE_BLOCK_SIZE 0x1
> #define FVB_MEDIA_BLOCK_SIZEFIRMWARE_BLOCK_SIZE
> -
> -#define NV_STORAGE_BASE_ADDRESS
> FixedPcdGet32(PcdFlashNvStorageVariableBase)
> -#define SYSTEM_NV_BLOCK_NUM
> ((FixedPcdGet32(PcdFlashNvStorageVariableSize)+
> FixedPcdGet32(PcdFlashNvStorageFtwWorkingSize) +
> FixedPcdGet32(PcdFlashNvStorageFtwSpareSize))/ FVB_MEDIA_BLOCK_SIZE)
> -
> typedef struct {
> EFI_PHYSICAL_ADDRESSBaseAddress;
> EFI_FIRMWARE_VOLUME_HEADER FvbInfo;
> EFI_FV_BLOCK_MAP_ENTRY End[1];
> } EFI_FVB2_MEDIA_INFO;
>
> -//
> -// This data structure contains a template of all correct FV headers,
> which is used to restore -// Fv header if it's corrupted.
> -//
> -EFI_FVB2_MEDIA_INFO mPlatformFvbMediaInfo[] = {
> - //
> - // Systen NvStorage FVB
> - //
> - {
> -NV_STORAGE_BASE_ADDRESS,
> -{
> - {0,}, //ZeroVector[16]
> - EFI_SYSTEM_NV_DATA_FV_GUID,
> - FVB_MEDIA_BLOCK_SIZE * SYSTEM_NV_BLOCK_NUM,
> - EFI_FVH_SIGNATURE,
> - 0x0004feff, // check MdePkg/Include/Pi/PiFirmwareVolume.h for details
> on EFI_FVB_ATTRIBUTES_2
> - sizeof (EFI_FIRMWARE_VOLUME_HEADER) + sizeof (EFI_FV_BLOCK_MAP_ENTRY),
> - 0,//CheckSum which will be calucated dynamically.
Re: [edk2-devel] [edk2-platforms][PATCH v2 1/1] IntelSiliconPkg/SpiFvbService: Add support for VariableFlashInfoLib
Reviewed-by: Isaac Oram
-Original Message-
From: devel@edk2.groups.io On Behalf Of Michael Kubacki
Sent: Tuesday, July 12, 2022 4:04 PM
To: devel@edk2.groups.io
Cc: Chaganty, Rangasai V ; Ni, Ray
; Oram, Isaac W ; Desimone, Nathaniel
L
Subject: Re: [edk2-devel] [edk2-platforms][PATCH v2 1/1]
IntelSiliconPkg/SpiFvbService: Add support for VariableFlashInfoLib
Reminder about this patch.
Thanks,
Michael
On 7/1/2022 10:39 AM, Michael Kubacki wrote:
> From: Michael Kubacki
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3478
>
> Adds support for getting the variable flash information from
> VariableFlashInfoLib. This library abstracts the source of flash
> information so platforms could expect the information to come from a
> different source in the library implementation than the PCDs
> previously used as the information source in this module.
>
> In particular, the library allows Standalone MM platforms to
> dynamically pass the information behind the library API.
>
> Cc: Rangasai V Chaganty
> Cc: Ray Ni
> Cc: Isaac Oram
> Cc: Nate DeSimone
> Signed-off-by: Michael Kubacki
> ---
>
> Notes:
> V2 changes:
>
> 1. Updated the buffer that is returned from
> GetFvbInfo() to be allocated from pool.
> 2. Updated calls to that function in FvbInitialize()
> to free the new buffer after usage.
> 3. Updated the multiplication operation to determine
> the FV length to use safe multiplication in
> GenerateNvStorageFvbMediaInfo().
>
> Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/FvbInfo.c
> | 128 +---
>
> Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceCommon.c
> | 93 --
> Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceMm.c
> | 49 ++--
>
> Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceCommon.h
> | 18 ++-
>
> Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> | 6 +-
>
> Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf
> | 6 +-
> Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dsc
> | 7 ++
> 7 files changed, 243 insertions(+), 64 deletions(-)
>
> diff --git
> a/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/FvbInfo.c
> b/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/FvbInfo.c
> index 7f2678fa9e5a..634a44218c7a 100644
> ---
> a/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/FvbInfo.c
> +++ b/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/FvbInf
> +++ o.c
> @@ -3,6 +3,7 @@
> These data is intent to decouple FVB driver with FV header.
>
> Copyright (c) 2017, Intel Corporation. All rights reserved.
> +Copyright (c) Microsoft Corporation.
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> @@ -11,51 +12,92 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>
> #define FIRMWARE_BLOCK_SIZE 0x1
> #define FVB_MEDIA_BLOCK_SIZEFIRMWARE_BLOCK_SIZE
> -
> -#define NV_STORAGE_BASE_ADDRESS
> FixedPcdGet32(PcdFlashNvStorageVariableBase)
> -#define SYSTEM_NV_BLOCK_NUM
> ((FixedPcdGet32(PcdFlashNvStorageVariableSize)+
> FixedPcdGet32(PcdFlashNvStorageFtwWorkingSize) +
> FixedPcdGet32(PcdFlashNvStorageFtwSpareSize))/ FVB_MEDIA_BLOCK_SIZE)
> -
> typedef struct {
> EFI_PHYSICAL_ADDRESSBaseAddress;
> EFI_FIRMWARE_VOLUME_HEADER FvbInfo;
> EFI_FV_BLOCK_MAP_ENTRY End[1];
> } EFI_FVB2_MEDIA_INFO;
>
> -//
> -// This data structure contains a template of all correct FV headers,
> which is used to restore -// Fv header if it's corrupted.
> -//
> -EFI_FVB2_MEDIA_INFO mPlatformFvbMediaInfo[] = {
> - //
> - // Systen NvStorage FVB
> - //
> - {
> -NV_STORAGE_BASE_ADDRESS,
> -{
> - {0,}, //ZeroVector[16]
> - EFI_SYSTEM_NV_DATA_FV_GUID,
> - FVB_MEDIA_BLOCK_SIZE * SYSTEM_NV_BLOCK_NUM,
> - EFI_FVH_SIGNATURE,
> - 0x0004feff, // check MdePkg/Include/Pi/PiFirmwareVolume.h for details
> on EFI_FVB_ATTRIBUTES_2
> - sizeof (EFI_FIRMWARE_VOLUME_HEADER) + sizeof (EFI_FV_BLOCK_MAP_ENTRY),
> - 0,//CheckSum which will be calucated dynamically.
> - 0,//ExtHeaderOffset
> - {0,}, //Reserved[1]
> - 2,//Revision
> - {
> -{
> - SYSTEM_NV_BLOCK_NUM,
> - FVB_MEDIA_BLOCK_SIZE,
> -}
> - }
> -},
> -{
> - {
> -0,
> -0
> - }
> -}
Re: [edk2-devel] [edk2-platforms PATCH V1 0/6] Re-organizing ACPI FADT PCD categories
Pushed as 7447b92647..1e89913a47 Note that I fixed the author field. -Original Message- From: devel@edk2.groups.io On Behalf Of Oram, Isaac W Sent: Tuesday, July 12, 2022 9:18 AM To: devel@edk2.groups.io; Sinha, Ankit Subject: Re: [edk2-devel] [edk2-platforms PATCH V1 0/6] Re-organizing ACPI FADT PCD categories Series Reviewed-by: Isaac Oram -Original Message- From: devel@edk2.groups.io On Behalf Of Sinha, Ankit Sent: Thursday, July 7, 2022 10:33 AM To: devel@edk2.groups.io Subject: [edk2-devel] [edk2-platforms PATCH V1 0/6] Re-organizing ACPI FADT PCD categories Some ACPI FADT fields need to be update during boot time. This requires a few PCDs to be defined as Dynamic and not Fixed at build. This patch series also removes duplicate definition of some PCDs between MinPlatformPkg and respective board packages. Reference: https://github.com/ankit13s/edk2-platforms/tree/acpi_pcds Platform/Intel: Modifying PCD class for some ACPI related PCDs Platform/Intel: Removing ACPI FADT PCDs that are redefined Platform/Intel: Modifying PCD category based on MinPlatformPkg Platform/Intel: Updating PCD category based on MinPlatformPkg Platform/Intel: Removing ACPI FADT PCDs that are redefined Platform/Intel: Remove and re-categorize ACPI FADT PCDs Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c| 29 ++- Platform/Intel/CometlakeOpenBoardPkg/OpenBoardPkg.dec | 2 -- Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf | 24 +--- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec| 30 ++-- Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc | 8 +++--- Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgPcd.dsc | 8 +++--- Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc | 10 +-- Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec | 2 -- Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec | 16 --- Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc | 7 +++-- 10 files changed, 63 insertions(+), 73 deletions(-) -- 2.27.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91283): https://edk2.groups.io/g/devel/message/91283 Mute This Topic: https://groups.io/mt/92233702/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 0/6] Re-organizing ACPI FADT PCD categories
Series Reviewed-by: Isaac Oram -Original Message- From: devel@edk2.groups.io On Behalf Of Sinha, Ankit Sent: Thursday, July 7, 2022 10:33 AM To: devel@edk2.groups.io Subject: [edk2-devel] [edk2-platforms PATCH V1 0/6] Re-organizing ACPI FADT PCD categories Some ACPI FADT fields need to be update during boot time. This requires a few PCDs to be defined as Dynamic and not Fixed at build. This patch series also removes duplicate definition of some PCDs between MinPlatformPkg and respective board packages. Reference: https://github.com/ankit13s/edk2-platforms/tree/acpi_pcds Platform/Intel: Modifying PCD class for some ACPI related PCDs Platform/Intel: Removing ACPI FADT PCDs that are redefined Platform/Intel: Modifying PCD category based on MinPlatformPkg Platform/Intel: Updating PCD category based on MinPlatformPkg Platform/Intel: Removing ACPI FADT PCDs that are redefined Platform/Intel: Remove and re-categorize ACPI FADT PCDs Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c| 29 ++- Platform/Intel/CometlakeOpenBoardPkg/OpenBoardPkg.dec | 2 -- Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf | 24 +--- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec| 30 ++-- Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc | 8 +++--- Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgPcd.dsc | 8 +++--- Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc | 10 +-- Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec | 2 -- Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec | 16 --- Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc | 7 +++-- 10 files changed, 63 insertions(+), 73 deletions(-) -- 2.27.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91282): https://edk2.groups.io/g/devel/message/91282 Mute This Topic: https://groups.io/mt/92233702/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MinPlatformPkg: Resolve SecureBootVariableLib dependency
Pushed as 4775d4e4f8..a3f3f4bde7 -Original Message- From: devel@edk2.groups.io On Behalf Of Oram, Isaac W Sent: Friday, July 8, 2022 10:34 AM To: devel@edk2.groups.io; Liu, Zhiguang Cc: Kun Qin ; Chiu, Chasel ; Desimone, Nathaniel L ; Gao, Liming ; Dong, Eric Subject: Re: [edk2-devel] [PATCH] MinPlatformPkg: Resolve SecureBootVariableLib dependency Reviewed-by: Isaac Oram -Original Message- From: devel@edk2.groups.io On Behalf Of Zhiguang Liu Sent: Thursday, July 7, 2022 8:44 PM To: devel@edk2.groups.io Cc: Liu, Zhiguang ; Kun Qin ; Chiu, Chasel ; Desimone, Nathaniel L ; Oram, Isaac W ; Gao, Liming ; Dong, Eric Subject: [edk2-devel] [PATCH] MinPlatformPkg: Resolve SecureBootVariableLib dependency The new changes in SecureBootVariableLib brought in a new dependency of PlatformPKProtectionLib. This change added the new library instance from SecurityPkg to resolve MinPlatformPkg builds. Cc: Kun Qin Cc: Chasel Chiu Cc: Nate DeSimone Cc: Isaac Oram Cc: Liming Gao Cc: Eric Dong Signed-off-by: Zhiguang Liu --- 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 58a18fae6e..b77d55dfd5 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc @@ -141,6 +141,7 @@ AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf SecureBootVariableProvisionLib|SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.inf + + PlatformPKProtectionLib|SecurityPkg/Library/PlatformPKProtectionLibVar + Policy/PlatformPKProtectionLibVarPolicy.inf !endif SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf -- 2.16.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91188): https://edk2.groups.io/g/devel/message/91188 Mute This Topic: https://groups.io/mt/92244799/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MinPlatformPkg: Resolve SecureBootVariableLib dependency
Reviewed-by: Isaac Oram -Original Message- From: devel@edk2.groups.io On Behalf Of Zhiguang Liu Sent: Thursday, July 7, 2022 8:44 PM To: devel@edk2.groups.io Cc: Liu, Zhiguang ; Kun Qin ; Chiu, Chasel ; Desimone, Nathaniel L ; Oram, Isaac W ; Gao, Liming ; Dong, Eric Subject: [edk2-devel] [PATCH] MinPlatformPkg: Resolve SecureBootVariableLib dependency The new changes in SecureBootVariableLib brought in a new dependency of PlatformPKProtectionLib. This change added the new library instance from SecurityPkg to resolve MinPlatformPkg builds. Cc: Kun Qin Cc: Chasel Chiu Cc: Nate DeSimone Cc: Isaac Oram Cc: Liming Gao Cc: Eric Dong Signed-off-by: Zhiguang Liu --- 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 58a18fae6e..b77d55dfd5 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc @@ -141,6 +141,7 @@ AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf SecureBootVariableProvisionLib|SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.inf + + PlatformPKProtectionLib|SecurityPkg/Library/PlatformPKProtectionLibVar + Policy/PlatformPKProtectionLibVarPolicy.inf !endif SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf -- 2.16.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91187): https://edk2.groups.io/g/devel/message/91187 Mute This Topic: https://groups.io/mt/92244799/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 6/6] Platform/Intel: Remove and re-categorize ACPI FADT PCDs
Reviewed-by: Isaac Oram
-Original Message-
From: Sinha, Ankit
Sent: Thursday, July 7, 2022 10:34 AM
To: devel@edk2.groups.io
Cc: Chiu, Chasel ; Desimone, Nathaniel L
; Oram, Isaac W ; Dong,
Eric
Subject: [edk2-platforms PATCH V1 6/6] Platform/Intel: Remove and re-categorize
ACPI FADT PCDs
From: ankit13s
1. Removing ACPI PCDs that were re-defined in board package 2. Re-categorize
PCDs based on MinPlatformPkg definition
Cc: Chasel Chiu
Cc: Nate DeSimone
Cc: Isaac Oram
Cc: Eric Dong
Signed-off-by: Ankit Sinha
---
Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec | 16
Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc | 7 ---
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec
b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec
index 7d8e0f34a104..fa2d61c9a71b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec
+++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec
@@ -237,17 +237,11 @@
# is large enough to meet PEI requirement in the S3 phase.
# @Prompt Reserved S3 Boot ACPI Memory Size
gPlatformModuleTokenSpaceGuid.PcdS3AcpiReservedMemorySize|0x8000|UINT32|0x90010039
- gPlatformModuleTokenSpaceGuid.PcdAcpiEnableSwSmi|0xF0|UINT8|0x9012
- gPlatformModuleTokenSpaceGuid.PcdAcpiDisableSwSmi|0xF1|UINT8|0x9013
gPlatformModuleTokenSpaceGuid.PcdPcIoApicCount|0|UINT8|0x9015
gPlatformModuleTokenSpaceGuid.PcdPcIoApicIdBase|0x09|UINT8|0x9016
gPlatformModuleTokenSpaceGuid.PcdPcIoApicAddressBase|0xFEC01000|UINT32|0x9017
gPlatformModuleTokenSpaceGuid.PcdPcIoApicInterruptBase|24|UINT32|0x9018
-
- gPlatformModuleTokenSpaceGuid.PcdFadtPreferredPmProfile|0x02|UINT8|0x9025
- gPlatformModuleTokenSpaceGuid.PcdFadtIaPcBootArch|0x0001|UINT16|0x9026
- gPlatformModuleTokenSpaceGuid.PcdFadtFlags|0x86A5|UINT32|0x9027
gPlatformModuleTokenSpaceGuid.PcdLocalApicAddress|0xFEE0|UINT32|0x900B
gPlatformModuleTokenSpaceGuid.PcdIoApicAddress|0xFEC0|UINT32|0x900D
gPlatformModuleTokenSpaceGuid.PcdIoApicId|0x02|UINT8|0x9014
@@ -438,16 +432,6 @@
# 0x7F, 0xFF, 0x04, 0x00}
gPlatformModuleTokenSpaceGuid.PcdTrustedConsoleOutputDevicePath|{0x02, 0x01,
0x0C, 0x00, 0xd0, 0x41, 0x03, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x06,
0x00, 0x00, 0x02, 0x7F, 0xFF, 0x04, 0x00}|VOID*|0x30C
-
-
gPlatformModuleTokenSpaceGuid.PcdAcpiPm1AEventBlockAddress|0x1800|UINT16|0x00010035
-
gPlatformModuleTokenSpaceGuid.PcdAcpiPm1BEventBlockAddress|0x|UINT16|0x00010036
-
gPlatformModuleTokenSpaceGuid.PcdAcpiPm1AControlBlockAddress|0x1804|UINT16|0x0001037
-
gPlatformModuleTokenSpaceGuid.PcdAcpiPm1BControlBlockAddress|0x|UINT16|0x00010038
-
gPlatformModuleTokenSpaceGuid.PcdAcpiPm2ControlBlockAddress|0x1850|UINT16|0x00010039
-
gPlatformModuleTokenSpaceGuid.PcdAcpiPmTimerBlockAddress|0x1808|UINT16|0x0001003A
-
gPlatformModuleTokenSpaceGuid.PcdAcpiGpe0BlockAddress|0x1880|UINT16|0x0001003B
-
gPlatformModuleTokenSpaceGuid.PcdAcpiGpe1BlockAddress|0x|UINT16|0x0001003C
-
#
# UBA_START
#
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc
b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc
index 8c4b9cf6ce28..cefee8273b27 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc
+++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc
@@ -397,9 +397,6 @@
gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicAddressBase|0xFEC01000
gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicInterruptBase|24
- gMinPlatformPkgTokenSpaceGuid.PcdFadtPreferredPmProfile|0x04
- gMinPlatformPkgTokenSpaceGuid.PcdFadtIaPcBootArch|0x
- gMinPlatformPkgTokenSpaceGuid.PcdFadtFlags|0x04A5
gMinPlatformPkgTokenSpaceGuid.PcdLocalApicAddress|0xFEE0
gMinPlatformPkgTokenSpaceGuid.PcdIoApicAddress|0xFEC0
gMinPlatformPkgTokenSpaceGuid.PcdIoApicId|0x08
@@ -510,6 +507,10 @@
gPlatformTokenSpaceGuid.PcdBootMenuFile|{ 0xdc, 0x5b, 0xc2, 0xee, 0xf2,
0x67, 0x95, 0x4d, 0xb1, 0xd5, 0xf8, 0x1b, 0x20, 0x39, 0xd1, 0x1d }
gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicEnable|0x0
+ gMinPlatformPkgTokenSpaceGuid.PcdFadtPreferredPmProfile|0x04
+ gMinPlatformPkgTokenSpaceGuid.PcdFadtIaPcBootArch|0x
+ gMinPlatformPkgTokenSpaceGuid.PcdFadtFlags|0x04A5
+
[PcdsDynamicExDefault.X64]
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8
--
2.27.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#91168): https://edk2.groups.io/g/devel/message/91168
Mute This Topic: https://groups.io/mt/92233724/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 5/6] Platform/Intel: Removing ACPI FADT PCDs that are redefined
Reviewed-by: Isaac Oram -Original Message- From: devel@edk2.groups.io On Behalf Of Sinha, Ankit Sent: Thursday, July 7, 2022 10:33 AM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Desimone, Nathaniel L ; Oram, Isaac W ; Dong, Eric Subject: [edk2-devel] [edk2-platforms PATCH V1 5/6] Platform/Intel: Removing ACPI FADT PCDs that are redefined From: ankit13s Some PCDs are redefined in board package DEC file. Need to remove them. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Isaac Oram Cc: Eric Dong Signed-off-by: Ankit Sinha --- Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec | 2 -- 1 file changed, 2 deletions(-) diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec b/Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec index 196460e170b5..766dc5be4f6d 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec @@ -89,8 +89,6 @@ gPlatformModuleTokenSpaceGuid.PcdApicIoAddress|0xFEC0|UINT64|0x900D gPlatformModuleTokenSpaceGuid.PcdApicIoMmioSize|0x1000|UINT32|0x900E gPlatformModuleTokenSpaceGuid.PcdGttMmAddress|0xCF00|UINT64|0x900F gPlatformModuleTokenSpaceGuid.PcdGmAdrAddress|0xD000|UINT64|0x9010 -gPlatformModuleTokenSpaceGuid.PcdAcpiEnableSwSmi|0xF0|UINT8|0x9012 -gPlatformModuleTokenSpaceGuid.PcdAcpiDisableSwSmi|0xF1|UINT8|0x9013 gPlatformModuleTokenSpaceGuid.PcdPcieDockBridgeResourcePatchSmi|0x4D|UINT8|0x9014 gPlatformModuleTokenSpaceGuid.PcdCmosFastBootDefaultValue|0x01|UINT8|0x9016 gPlatformModuleTokenSpaceGuid.PcdCmosDebugPrintErrorLevelDefaultValue|0x8046|UINT32|0x9017 -- 2.27.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91167): https://edk2.groups.io/g/devel/message/91167 Mute This Topic: https://groups.io/mt/92233723/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 4/6] Platform/Intel: Updating PCD category based on MinPlatformPkg
Reviewed-by: Isaac Oram -Original Message- From: Sinha, Ankit Sent: Thursday, July 7, 2022 10:33 AM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Desimone, Nathaniel L ; Oram, Isaac W ; Dong, Eric Subject: [edk2-platforms PATCH V1 4/6] Platform/Intel: Updating PCD category based on MinPlatformPkg From: ankit13s ACPI PCDs need to be re-categorized based on MinPlatformPkg definition Cc: Chasel Chiu Cc: Nate DeSimone Cc: Isaac Oram Cc: Eric Dong Signed-off-by: Ankit Sinha --- Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc index 9b81726623dc..44b6a812772d 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc @@ -186,9 +186,6 @@ gMinPlatformPkgTokenSpaceGuid.PcdAcpiPm1BEventBlockAddress|0 gMinPlatformPkgTokenSpaceGuid.PcdAcpiPm2ControlBlockAddress|0x450 gMinPlatformPkgTokenSpaceGuid.PcdAcpiPmTimerBlockAddress|0x408 - gMinPlatformPkgTokenSpaceGuid.PcdFadtFlags|0x04A5 - gMinPlatformPkgTokenSpaceGuid.PcdFadtIaPcBootArch|0x0003 - gMinPlatformPkgTokenSpaceGuid.PcdFadtPreferredPmProfile|0x0 gMinPlatformPkgTokenSpaceGuid.PcdLocalApicAddress|0xFEE0 gMinPlatformPkgTokenSpaceGuid.PcdMaxCpuCoreCount|128 gMinPlatformPkgTokenSpaceGuid.PcdMaxCpuSocketCount|4 @@ -268,6 +265,13 @@ gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds|3 gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress|0 + ## + # Platform Configuration + ## + gMinPlatformPkgTokenSpaceGuid.PcdFadtFlags|0x04A5 + gMinPlatformPkgTokenSpaceGuid.PcdFadtIaPcBootArch|0x0003 + gMinPlatformPkgTokenSpaceGuid.PcdFadtPreferredPmProfile|0x0 + [PcdsDynamicExDefault.X64] ## # Edk2 Configuration -- 2.27.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91166): https://edk2.groups.io/g/devel/message/91166 Mute This Topic: https://groups.io/mt/92233720/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 3/6] Platform/Intel: Modifying PCD category based on MinPlatformPkg
Reviewed-by: Isaac Oram -Original Message- From: devel@edk2.groups.io On Behalf Of Sinha, Ankit Sent: Thursday, July 7, 2022 10:33 AM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Desimone, Nathaniel L ; Oram, Isaac W ; Dong, Eric Subject: [edk2-devel] [edk2-platforms PATCH V1 3/6] Platform/Intel: Modifying PCD category based on MinPlatformPkg From: ankit13s PCDs need to be re-categorized based on the changes in MinPlatformPkg definition Cc: Chasel Chiu Cc: Nate DeSimone Cc: Isaac Oram Cc: Eric Dong Signed-off-by: Ankit Sinha --- Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc | 8 Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgPcd.dsc | 8 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc index 6f6fb20d461c..050f9b6228ef 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.ds +++ c @@ -254,10 +254,6 @@ gEfiCpuTokenSpaceGuid.PcdCpuSmmCodeAccessCheckEnable |TRUE gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmCodeAccessCheckEnable |TRUE - gMinPlatformPkgTokenSpaceGuid.PcdFadtPreferredPmProfile|0x04 - gMinPlatformPkgTokenSpaceGuid.PcdFadtIaPcBootArch|0x - gMinPlatformPkgTokenSpaceGuid.PcdFadtFlags|0x04A5 - gMinPlatformPkgTokenSpaceGuid.PcdAcpiEnableSwSmi|0xA0 gMinPlatformPkgTokenSpaceGuid.PcdAcpiDisableSwSmi|0xA1 @@ -372,6 +368,10 @@ gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicEnable|0x0 + gMinPlatformPkgTokenSpaceGuid.PcdFadtPreferredPmProfile|0x04 + gMinPlatformPkgTokenSpaceGuid.PcdFadtIaPcBootArch|0x + gMinPlatformPkgTokenSpaceGuid.PcdFadtFlags|0x04A5 + [PcdsDynamicExDefault.X64] gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200 diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgPcd.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgPcd.dsc index bed0625df9ef..5940c40dfc9d 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgPcd.dsc +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/PlatformPkgPcd.ds +++ c @@ -257,10 +257,6 @@ gEfiCpuTokenSpaceGuid.PcdCpuSmmCodeAccessCheckEnable |TRUE gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmCodeAccessCheckEnable |TRUE - gMinPlatformPkgTokenSpaceGuid.PcdFadtPreferredPmProfile|0x04 - gMinPlatformPkgTokenSpaceGuid.PcdFadtIaPcBootArch|0x - gMinPlatformPkgTokenSpaceGuid.PcdFadtFlags|0x04A5 - gMinPlatformPkgTokenSpaceGuid.PcdAcpiEnableSwSmi|0xA0 gMinPlatformPkgTokenSpaceGuid.PcdAcpiDisableSwSmi|0xA1 @@ -375,6 +371,10 @@ gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicEnable|0x0 + gMinPlatformPkgTokenSpaceGuid.PcdFadtPreferredPmProfile|0x04 + gMinPlatformPkgTokenSpaceGuid.PcdFadtIaPcBootArch|0x + gMinPlatformPkgTokenSpaceGuid.PcdFadtFlags|0x04A5 + [PcdsDynamicExDefault.X64] gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200 -- 2.27.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91165): https://edk2.groups.io/g/devel/message/91165 Mute This Topic: https://groups.io/mt/92233719/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 2/6] Platform/Intel: Removing ACPI FADT PCDs that are redefined
Reviewed-by: Isaac Oram -Original Message- From: Sinha, Ankit Sent: Thursday, July 7, 2022 10:33 AM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Desimone, Nathaniel L ; Oram, Isaac W ; Dong, Eric Subject: [edk2-platforms PATCH V1 2/6] Platform/Intel: Removing ACPI FADT PCDs that are redefined From: ankit13s Some ACPI PCDs are redefined in board package DEC file. Removing those instances. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Isaac Oram Cc: Eric Dong Signed-off-by: Ankit Sinha --- Platform/Intel/CometlakeOpenBoardPkg/OpenBoardPkg.dec | 2 -- 1 file changed, 2 deletions(-) diff --git a/Platform/Intel/CometlakeOpenBoardPkg/OpenBoardPkg.dec b/Platform/Intel/CometlakeOpenBoardPkg/OpenBoardPkg.dec index 1f8322eaeb22..eca92392be14 100644 --- a/Platform/Intel/CometlakeOpenBoardPkg/OpenBoardPkg.dec +++ b/Platform/Intel/CometlakeOpenBoardPkg/OpenBoardPkg.dec @@ -89,8 +89,6 @@ gPlatformModuleTokenSpaceGuid.PcdApicIoAddress|0xFEC0|UINT64|0x900D gPlatformModuleTokenSpaceGuid.PcdApicIoMmioSize|0x1000|UINT32|0x900E gPlatformModuleTokenSpaceGuid.PcdGttMmAddress|0xCF00|UINT64|0x900F gPlatformModuleTokenSpaceGuid.PcdGmAdrAddress|0xD000|UINT64|0x9010 -gPlatformModuleTokenSpaceGuid.PcdAcpiEnableSwSmi|0xF0|UINT8|0x9012 -gPlatformModuleTokenSpaceGuid.PcdAcpiDisableSwSmi|0xF1|UINT8|0x9013 gPlatformModuleTokenSpaceGuid.PcdPcieDockBridgeResourcePatchSmi|0x4D|UINT8|0x9014 gPlatformModuleTokenSpaceGuid.PcdCmosFastBootDefaultValue|0x01|UINT8|0x9016 gPlatformModuleTokenSpaceGuid.PcdCmosDebugPrintErrorLevelDefaultValue|0x8046|UINT32|0x9017 -- 2.27.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91164): https://edk2.groups.io/g/devel/message/91164 Mute This Topic: https://groups.io/mt/92233717/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/6] Platform/Intel: Modifying PCD class for some ACPI related PCDs
Reviewed-by: Isaac Oram
-Original Message-
From: Sinha, Ankit
Sent: Thursday, July 7, 2022 10:33 AM
To: devel@edk2.groups.io
Cc: Chiu, Chasel ; Desimone, Nathaniel L
; Oram, Isaac W ; Dong,
Eric
Subject: [edk2-platforms PATCH V1 1/6] Platform/Intel: Modifying PCD class for
some ACPI related PCDs
From: ankit13s
Some PCDs related to FADT entries need to be defined as dynamic for boottime
customization and update.
Cc: Chasel Chiu
Cc: Nate DeSimone
Cc: Isaac Oram
Cc: Eric Dong
Signed-off-by: Ankit Sinha
---
Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 29
++-
Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf | 24
+---
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 30
++--
3 files changed, 44 insertions(+), 39 deletions(-)
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
index 3c9f79de5c6c..c7e87cbd7d9d 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
@@ -1068,7 +1068,7 @@ InstallMcfgFromScratch (
>Header,
EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE,
EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_REVISION,
- 0
+ FixedPcdGet32 (PcdAcpiDefaultOemRevision)
);
if (EFI_ERROR (Status)) {
return Status;
@@ -1195,6 +1195,7 @@ PlatformUpdateTables (
FadtHeader->PreferredPmProfile= PcdGet8
(PcdFadtPreferredPmProfile);
FadtHeader->IaPcBootArch = PcdGet16
(PcdFadtIaPcBootArch);
FadtHeader->Flags = PcdGet32 (PcdFadtFlags);
+FadtHeader->SmiCmd= PcdGet32 (PcdFadtSmiCmd);
FadtHeader->AcpiEnable= PcdGet8
(PcdAcpiEnableSwSmi);
FadtHeader->AcpiDisable = PcdGet8
(PcdAcpiDisableSwSmi);
FadtHeader->Pm1aEvtBlk= PcdGet16
(PcdAcpiPm1AEventBlockAddress);
@@ -1209,6 +1210,7 @@ PlatformUpdateTables (
FadtHeader->Gpe1Base = PcdGet8 (PcdAcpiGpe1Base);
FadtHeader->XPm1aEvtBlk.Address = PcdGet16
(PcdAcpiPm1AEventBlockAddress);
+FadtHeader->XPm1bEvtBlk.Address = PcdGet16
(PcdAcpiPm1BEventBlockAddress);
FadtHeader->XPm1aCntBlk.Address = PcdGet16
(PcdAcpiPm1AControlBlockAddress);
FadtHeader->XPm1bCntBlk.Address = PcdGet16
(PcdAcpiPm1BControlBlockAddress);
FadtHeader->XPm2CntBlk.Address= PcdGet16
(PcdAcpiPm2ControlBlockAddress);
@@ -1216,7 +1218,7 @@ PlatformUpdateTables (
FadtHeader->XGpe0Blk.Address = PcdGet16
(PcdAcpiGpe0BlockAddress);
FadtHeader->XGpe1Blk.Address = PcdGet16
(PcdAcpiGpe1BlockAddress);
-FadtHeader->ResetReg.AccessSize = PcdGet8
(PcdAcpiResetRegAccessSize);
+FadtHeader->ResetReg.AccessSize = PcdGet8
(PcdAcpiResetRegisterAccessSize);
FadtHeader->XPm1aEvtBlk.AccessSize= PcdGet8
(PcdAcpiXPm1aEvtBlkAccessSize);
FadtHeader->XPm1bEvtBlk.AccessSize= PcdGet8
(PcdAcpiXPm1bEvtBlkAccessSize);
FadtHeader->XPm1aCntBlk.AccessSize= PcdGet8
(PcdAcpiXPm1aCntBlkAccessSize);
@@ -1226,22 +1228,23 @@ PlatformUpdateTables (
FadtHeader->XGpe0Blk.AccessSize = PcdGet8
(PcdAcpiXGpe0BlkAccessSize);
FadtHeader->XGpe1Blk.AccessSize = PcdGet8
(PcdAcpiXGpe1BlkAccessSize);
-FadtHeader->SleepControlReg.AddressSpaceId= PcdGet8
(PcdAcpiSleepControlRegAddressSpaceId);
-FadtHeader->SleepControlReg.RegisterBitOffset = PcdGet8
(PcdAcpiSleepControlRegRegisterBitOffset);
-FadtHeader->SleepControlReg.AccessSize= PcdGet8
(PcdAcpiSleepControlRegAccessSize);
-FadtHeader->SleepControlReg.Address = PcdGet64
(PcdAcpiSleepControlRegAddress);
-FadtHeader->SleepStatusReg.AddressSpaceId = PcdGet8
(PcdAcpiSleepStatusRegAddressSpaceId);
-FadtHeader->SleepStatusReg.RegisterBitWidth = PcdGet8
(PcdAcpiSleepStatusRegRegisterBitWidth);
-FadtHeader->SleepStatusReg.RegisterBitOffset = PcdGet8
(PcdAcpiSleepStatusRegRegisterBitOffset);
-FadtHeader->SleepStatusReg.AccessSize = PcdGet8
(PcdAcpiSleepStatusRegAccessSize);
-FadtHeader->SleepStatusReg.Address= PcdGet64
(PcdAcpiSleepStatusRegAddress);
+FadtHeader->SleepControlReg.AddressSpaceId= PcdGet8
(PcdAcpiSleepControlRegisterAddressSpaceId);
+FadtHeader->SleepControlReg.RegisterBitWidth = PcdGet8
(PcdAcpiSleepControlRegisterBitWidth);
+FadtHeader
Re: [edk2-devel] [PATCH v3 3/3] [edk2-platforms] Silicon/Intel/FitGen: Support Startup ACM entries (Type 2) 0x200 Version
Reviewed-by: Isaac W Oram
-Original Message-
From: Lin, Jason1
Sent: Friday, July 1, 2022 8:10 AM
To: devel@edk2.groups.io
Cc: Lin, Jason1 ; Feng, Bob C ;
Gao, Liming ; Chen, Christine ;
Oram, Isaac W ; Chaganty, Rangasai V
; Chiang, Dakota
Subject: [PATCH v3 3/3] [edk2-platforms] Silicon/Intel/FitGen: Support Startup
ACM entries (Type 2) 0x200 Version
From: Jason1 Lin
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3959
As per FIT BIOS Specification 1.2 Rules, the size bytes (3 bytes) / reserved
byte (1 byte) / CheckSum byte (1 byte) in type 2 are must-be-zero (MBZ).
These bytes could be override for the other usages.
This change is used to support the Type 02 (ACM) Ver. 0x200.
Command:
[-S |] [-I ] [-V ]
Signed-off-by: Jason1 Lin
Cc: Bob Feng
Cc: Liming Gao
Cc: Yuwei Chen
Cc: Isaac W Oram
Cc: Rangasai V Chaganty
Cc: Dakota Chiang
---
Silicon/Intel/Tools/FitGen/FitGen.c | 183 ++--
Silicon/Intel/Tools/FitGen/FitGen.h | 2 +-
2 files changed, 165 insertions(+), 20 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c
b/Silicon/Intel/Tools/FitGen/FitGen.c
index 01b4f82518..577ce48b10 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -55,6 +55,7 @@ typedef struct {
#define ACM_MODULE_FLAG_PREPRODUCTION 0x4000 #define
ACM_MODULE_FLAG_DEBUG_SIGN 0x8000 +#define
NIBBLES_TO_BYTE(A, B) (UINT8)(((A & (0x0F)) << 4) | (B & 0x0F)) typedef
struct { UINT16 ModuleType;@@ -149,6 +150,20 @@ typedef struct {
ACM_PROCESSOR_ID ProcessorID[1]; } PROCESSOR_ID_LIST; +typedef union {+
struct {+UINT32 Stepping : 4;+UINT32 Model : 4;+
UINT32 Family: 4;+UINT32 Type : 2;+UINT32 Reserved1
: 2;+UINT32 ExtendedModel : 4;+UINT32 ExtendedFamily: 8;+
UINT32 Reserved2 : 4;+ } Bits;+ UINT32 Uint32;+} PROCESSOR_ID;+ #pragma
pack () @@ -210,6 +225,7 @@ typedef struct {
#define DEFAULT_FIT_TABLE_POINTER_OFFSET 0x40 #define
DEFAULT_FIT_ENTRY_VERSION 0x0100+#define
STARTUP_ACM_FIT_ENTRY_200_VERSION 0x0200 #define TOP_FLASH_ADDRESS
(gFitTableContext.TopFlashAddressRemapValue) @@ -247,6 +263,8 @@ typedef struct
{
UINT8 *Buffer; // Used by OptionalModule only UINT32 Size; UINT32
Version; // Used by OptionalModule and PortModule only+ UINT32 FMS; //
Used by Entry Type 02 (ACM) Ver. 0x200 only+ UINT32 FMSMask; // Used by Entry
Type 02 (ACM) Ver. 0x200 only } FIT_TABLE_CONTEXT_ENTRY; typedef struct {@@
-262,7 +280,7 @@ typedef struct {
UINT32 GlobalVersion; UINT32
FitHeaderVersion; FIT_TABLE_CONTEXT_ENTRY
StartupAcm[MAX_STARTUP_ACM_ENTRY];- UINT32
StartupAcmVersion;+ UINT32
StartupAcmVersion[MAX_STARTUP_ACM_ENTRY]; FIT_TABLE_CONTEXT_ENTRY
DiagnstAcm; UINT32 DiagnstAcmVersion;
FIT_TABLE_CONTEXT_ENTRYBiosModule[MAX_BIOS_MODULE_ENTRY];@@ -341,7 +359,7
@@ Returns:
"\t[-L ]\n" "\t[-LF
]\n" "\t[-I ]\n"- "\t[-S
|] [-V
]\n"+ "\t[-S |] [-I ] [-V
]\n" "\t[-U
|]\n" "\t[-B ] [-B ...] [-V ]\n" "\t[-M
] [-M ...]|[-U ||] [-V
]\n"@@ -356,8 +374,11 @@ Returns:
printf ("\tFitTablePointerOffset - FIT table pointer offset. 0x%x as
default. 0x18 for current soon to be obsoleted CPUs. User can set both.\n",
DEFAULT_FIT_TABLE_POINTER_OFFSET); printf ("\tBiosInfoGuid - Guid
of BiosInfo Module. If this module exists, StartupAcm/Bios/Microcode can be
optional.\n"); printf ("\tStartupAcmAddress - Address of
StartupAcm.\n");- printf ("\tStartupAcmSize - Size of
StartupAcm.\n");+ printf ("\tStartupAcmSize - The maximum size value
that could place the StartupAcm in.\n"); printf ("\tStartupAcmGuid -
Guid of StartupAcm Module, if StartupAcm is in a BiosModule, it will be
excluded form that.\n");+ printf ("\tStartupAcmFMS - Value of
PROCESSOR ID (Family/Model/Stepping value called \"FMS\") - see detail on FIT
spec (1.3).\n");+ printf ("\tStartupAcmFMSMask - Value use for uCode (if
it recognizes 0x200 Type2 entry) to do bitmask logic operation with CPU
processor ID.\n");+ printf ("\t If the result match to
StartupAcmFMS, corresponding ACM will be loaded - see detail on FIT spec
(1.3).\n"); printf ("\tDiagnstAcmAddress - Address of DiagnstAcm.\n");
printf ("\tDiagnstAcmGuid - Guid of DiagnstAcm Module, if DiagnstAcm is
in a BiosModule, it will be excluded from that.\n"); printf
("\tBiosModuleAddress - Address of BiosModule. User should ens
Re: [edk2-devel] [PATCH v3 2/3] [edk2-platforms] Silicon/Intel/FitGen: Reduce the typecasting and pointer usage
Reviewed-by: Isaac W Oram
-Original Message-
From: Lin, Jason1
Sent: Friday, July 1, 2022 8:10 AM
To: devel@edk2.groups.io
Cc: Lin, Jason1 ; Feng, Bob C ;
Gao, Liming ; Chen, Christine ;
Oram, Isaac W ; Chaganty, Rangasai V
; Chiang, Dakota
Subject: [PATCH v3 2/3] [edk2-platforms] Silicon/Intel/FitGen: Reduce the
typecasting and pointer usage
From: Jason1 Lin
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3958
FitGen tool exists lots of typecasting and pointer usage.
This code change is used to reduce these in FillFitTable () and GetFitEntryInfo
().
To make code more clearly and easy to read.
Signed-off-by: Jason1 Lin
Cc: Bob Feng
Cc: Liming Gao
Cc: Yuwei Chen
Cc: Isaac W Oram
Cc: Rangasai V Chaganty
Cc: Dakota Chiang
---
Silicon/Intel/Tools/FitGen/FitGen.c | 125
1 file changed, 78 insertions(+), 47 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c
b/Silicon/Intel/Tools/FitGen/FitGen.c
index eac8fa8715..01b4f82518 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -2768,6 +2768,7 @@ Returns:
{ FIRMWARE_INTERFACE_TABLE_ENTRY *FitEntry; UINT32
FitIndex;+ UINT32 FitEntrySizeValue; UINT32
Index; UINT8 Checksum; UINTN
SubIndex;@@ -2788,27 +2789,35 @@ Returns:
// // 2. FitHeader //- FitEntry[FitIndex].Address =
*(UINT64 *)"_FIT_ ";- *(UINT32 *)[FitIndex].Size[0] =
gFitTableContext.FitEntryNumber;- FitEntry[FitIndex].Version =
(UINT16)gFitTableContext.FitHeaderVersion;- FitEntry[FitIndex].Type
= FIT_TABLE_TYPE_HEADER;- FitEntry[FitIndex].C_V = 1;+
FitEntrySizeValue = gFitTableContext.FitEntryNumber;+
FitEntry[FitIndex].Address = *(UINT64 *)"_FIT_ ";+
FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;+
FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);+
FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);+
FitEntry[FitIndex].Rsvd = 0;+ FitEntry[FitIndex].Version =
(UINT16)gFitTableContext.FitHeaderVersion;+ FitEntry[FitIndex].Type =
FIT_TABLE_TYPE_HEADER;+ FitEntry[FitIndex].C_V = 1; // // Checksum
will be updated later... //- FitEntry[FitIndex].Checksum= 0;+
FitEntry[FitIndex].Checksum = 0;// // 3. Microcode // FitIndex++;
for (Index = 0; Index < gFitTableContext.MicrocodeNumber; Index++) {-
FitEntry[FitIndex].Address =
gFitTableContext.Microcode[Index].Address;-*(UINT32
*)[FitIndex].Size[0] = 0; //gFitTableContext.Microcode[Index].Size /
16;-FitEntry[FitIndex].Version =
(UINT16)gFitTableContext.MicrocodeVersion;-FitEntry[FitIndex].Type
= FIT_TABLE_TYPE_MICROCODE;-FitEntry[FitIndex].C_V =
0;-FitEntry[FitIndex].Checksum= 0;+FitEntrySizeValue
= 0; // gFitTableContext.Microcode[Index].Size / 16+
FitEntry[FitIndex].Address = gFitTableContext.Microcode[Index].Address;+
FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;+
FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);+
FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);+
FitEntry[FitIndex].Rsvd = 0;+FitEntry[FitIndex].Version =
(UINT16)gFitTableContext.MicrocodeVersion;+FitEntry[FitIndex].Type =
FIT_TABLE_TYPE_MICROCODE;+FitEntry[FitIndex].C_V = 0;+
FitEntry[FitIndex].Checksum = 0; FitIndex++; } @@ -2816,12 +2825,16 @@
Returns:
// 4. StartupAcm // for (Index = 0; Index <
gFitTableContext.StartupAcmNumber; Index++) {-FitEntry[FitIndex].Address
= gFitTableContext.StartupAcm[Index].Address;-*(UINT32
*)[FitIndex].Size[0] = 0; //gFitTableContext.StartupAcm.Size / 16;-
FitEntry[FitIndex].Version =
(UINT16)gFitTableContext.StartupAcmVersion;-FitEntry[FitIndex].Type
= FIT_TABLE_TYPE_STARTUP_ACM;-FitEntry[FitIndex].C_V
= 0;-FitEntry[FitIndex].Checksum= 0;+FitEntrySizeValue
= 0; // gFitTableContext.StartupAcm.Size / 16+
FitEntry[FitIndex].Address = gFitTableContext.StartupAcm[Index].Address;+
FitEntry[FitIndex].Size[0] = (UINT8)FitEntrySizeValue;+
FitEntry[FitIndex].Size[1] = (UINT8)(FitEntrySizeValue >> 8);+
FitEntry[FitIndex].Size[2] = (UINT8)(FitEntrySizeValue >> 16);+
FitEntry[FitIndex].Rsvd = 0;+FitEntry[FitIndex].Version =
(UINT16)gFitTableContext.StartupAcmVersion;+FitEntry[FitIndex].Type =
FIT_TABLE_TYPE_STARTUP_ACM;+FitEntry[FitIndex].C_V = 0;+
FitEntry[FitIndex].Checksum = 0; FitIndex++; } @@ -2829,19 +2842,23 @@
Returns:
// 4.5. DiagnosticAcm // if (gFitTableCont
Re: [edk2-devel] [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool
Reviewed-by: Isaac W Oram
-Original Message-
From: Lin, Jason1
Sent: Friday, July 1, 2022 8:10 AM
To: devel@edk2.groups.io
Cc: Lin, Jason1 ; Feng, Bob C ;
Gao, Liming ; Chen, Christine ;
Oram, Isaac W ; Chaganty, Rangasai V
; Chiang, Dakota
Subject: [PATCH v3 1/3] [edk2-platforms] Silicon/Intel/FitGen: Support multiple
Startup ACM Type 2 entries in FitGen tool
From: Jason1 Lin
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3958
Within current FitGen tool there had limitation only allow one S-ACM to
generate the Type 2 entry.
This code change is used to support multiple type 2 entries up to 0x20.
Signed-off-by: Jason1 Lin
Cc: Bob Feng
Cc: Liming Gao
Cc: Yuwei Chen
Cc: Isaac W Oram
Cc: Rangasai V Chaganty
Cc: Dakota Chiang
---
Silicon/Intel/Tools/FitGen/FitGen.c | 89 +++-
Silicon/Intel/Tools/FitGen/FitGen.h | 4 +-
2 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c
b/Silicon/Intel/Tools/FitGen/FitGen.c
index 4de72ea422..eac8fa8715 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -2,7 +2,7 @@
This utility is part of build process for IA32/X64 FD. It generates FIT table.
-Copyright (c) 2010-2021, Intel Corporation. All rights reserved.+Copyright
(c) 2010-2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/@@ -204,6 +204,7 @@ typedef
struct {
#define MAX_BIOS_MODULE_ENTRY 0x20 #define MAX_MICROCODE_ENTRY
0x20+#define MAX_STARTUP_ACM_ENTRY 0x20 #define MAX_OPTIONAL_ENTRY 0x20
#define MAX_PORT_ENTRY 0x20 @@ -255,11 +256,12 @@ typedef struct {
UINT32 FitEntryNumber; UINT32
BiosModuleNumber; UINT32 MicrocodeNumber;+ UINT32
StartupAcmNumber; UINT32
OptionalModuleNumber; UINT32 PortModuleNumber; UINT32
GlobalVersion; UINT32
FitHeaderVersion;- FIT_TABLE_CONTEXT_ENTRYStartupAcm;+
FIT_TABLE_CONTEXT_ENTRYStartupAcm[MAX_STARTUP_ACM_ENTRY]; UINT32
StartupAcmVersion; FIT_TABLE_CONTEXT_ENTRYDiagnstAcm; UINT32
DiagnstAcmVersion;@@ -1149,14 +1151,15 @@ Returns:
Error (NULL, 0, 0, "-I Parameter incorrect, Header Type
unsupported!", NULL); return 0; case
FIT_TABLE_TYPE_STARTUP_ACM:- if (gFitTableContext.StartupAcm.Type !=
0) {-Error (NULL, 0, 0, "-I Parameter incorrect, Duplicated
StartupAcm!", NULL);+ if (gFitTableContext.StartupAcmNumber >=
MAX_STARTUP_ACM_ENTRY) {+Error (NULL, 0, 0, "-I Parameter
incorrect, too many StartupAcm!", NULL); return 0; }-
gFitTableContext.StartupAcm.Type= FIT_TABLE_TYPE_STARTUP_ACM;-
gFitTableContext.StartupAcm.Address =
(UINT32)BiosInfoStruct[BiosInfoIndex].Address;-
gFitTableContext.StartupAcm.Size=
(UINT32)BiosInfoStruct[BiosInfoIndex].Size;-
gFitTableContext.StartupAcmVersion = BiosInfoStruct[BiosInfoIndex].Version;+
gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type=
FIT_TABLE_TYPE_STARTUP_ACM;+
gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address =
(UINT32)BiosInfoStruct[BiosInfoIndex].Address;+
gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size=
(UINT32)BiosInfoStruct[BiosInfoIndex].Size;+
gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Version =
BiosInfoStruct[BiosInfoIndex].Version;+
gFitTableContext.StartupAcmNumber ++; gFitTableContext.FitEntryNumber
++; break; case FIT_TABLE_TYPE_DIAGNST_ACM:@@ -1351,16
+1354,15 @@ Returns:
// // 1. StartupAcm //- do {+ while (TRUE) { if ((Index + 1 >=
argc) || ((strcmp (argv[Index], "-S") != 0) && (strcmp
(argv[Index], "-s") != 0)) ) {- if (BiosInfoExist &&
(gFitTableContext.StartupAcm.Type == FIT_TABLE_TYPE_STARTUP_ACM)) {-
break;+ if (gFitTableContext.StartupAcmNumber == 0) {+printf ("-S
not found. WARNING!\n"); } // Error (NULL, 0, 0, "-S Parameter
incorrect, expect -S!", NULL); // return 0;- printf ("-S not found.
WARNING!\n"); break; } if (IsGuidData (argv[Index + 1], ))
{@@ -1381,14 +1383,13 @@ Returns:
FileSize = xtoi (argv[Index + 2]); Index += 3; }-if
(gFitTableContext.StartupAcm.Type != 0) {- Error (NULL, 0, 0, "-S
Parameter incorrect, Duplicated StartupAcm!", NULL);+if
(gFitTableContext.StartupAcmNumber >= MAX_STARTUP_ACM_ENTRY) {+ Error
(NULL, 0, 0, "-S Parameter incorrect, too many StartupAcm!", NULL);
return 0
[edk2-devel][edk2-platforms][PATCH V1 1/1] BoardModulePkg/Include: Add include files for common debug scenarios
Add includable DSC files that make it easy for developers to increase the debug message level to moderately (reasonable speed) or maximally verbose (very slow). Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Isaac Oram --- .../Dsc/EnableAllDebugMessages.dsc.inc| 57 ++ .../Dsc/EnableRichDebugMessages.dsc.inc | 58 +++ .../BoardPortTemplate/PlatformPkg.dsc | 4 +- .../Include/Dsc/EnableRichDebugMessages.dsc | 50 4 files changed, 117 insertions(+), 52 deletions(-) create mode 100644 Platform/Intel/BoardModulePkg/Include/Dsc/EnableAllDebugMessages.dsc.inc create mode 100644 Platform/Intel/BoardModulePkg/Include/Dsc/EnableRichDebugMessages.dsc.inc delete mode 100644 Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/EnableRichDebugMessages.dsc diff --git a/Platform/Intel/BoardModulePkg/Include/Dsc/EnableAllDebugMessages.dsc.inc b/Platform/Intel/BoardModulePkg/Include/Dsc/EnableAllDebugMessages.dsc.inc new file mode 100644 index 00..dad4cb5db1 --- /dev/null +++ b/Platform/Intel/BoardModulePkg/Include/Dsc/EnableAllDebugMessages.dsc.inc @@ -0,0 +1,57 @@ +## @file EnableAllDebugMessages.dsc.inc +# +# This turns on all debug messages +# This also customizes cores to use BaseDebugLibSerialPort to reduce blackout periods. +# +# @copyright +# Copyright (C) 2020 Intel Corporation +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +# +# Customize debug messages +# +[PcdsFixedAtBuild] + ## The mask is used to control DebugLib behavior. + # BIT0 - Enable Debug Assert. + # BIT1 - Enable Debug Print. + # BIT2 - Enable Debug Code. + # BIT3 - Enable Clear Memory. + # BIT4 - Enable BreakPoint as ASSERT. + # BIT5 - Enable DeadLoop as ASSERT. + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F# Enable asserts, prints, code, clear memory, and deadloops on asserts. + + ## This flag is used to control the built in Debug messages. + # BIT0 - Initialization message. + # BIT1 - Warning message. + # BIT2 - Load Event message. + # BIT3 - File System message. + # BIT4 - Allocate or Free Pool message. + # BIT5 - Allocate or Free Page message. + # BIT6 - Information message. + # BIT7 - Dispatcher message. + # BIT8 - Variable message. + # BIT10 - Boot Manager message. + # BIT12 - BlockIo Driver message. + # BIT14 - Network Driver message. + # BIT16 - UNDI Driver message + # BIT17 - LoadFile message. + # BIT19 - Event message. + # BIT20 - Global Coherency Database changes message. + # BIT21 - Memory range cachability changes message. + # BIT22 - Detailed debug message. + # BIT31 - Error message. + gEfiMdePkgTokenSpaceGuid.PcdFixedDebugPrintErrorLevel|0x + +[PcdsPatchableInModule] + # + # This flag is used to control the displayed Debug messages. + # For simplification, we like to ensure both built in and enabled are in sync + # This is a patchable PCD so that it can be modified on a per component basis + # while debugging. + # + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid.PcdFixedDebugPrintErrorLevel + +[LibraryClasses.Common.SEC, LibraryClasses.Common.PEI_CORE, LibraryClasses.Common.PEIM, LibraryClasses.Common.DXE_CORE] + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf diff --git a/Platform/Intel/BoardModulePkg/Include/Dsc/EnableRichDebugMessages.dsc.inc b/Platform/Intel/BoardModulePkg/Include/Dsc/EnableRichDebugMessages.dsc.inc new file mode 100644 index 00..2004ee6339 --- /dev/null +++ b/Platform/Intel/BoardModulePkg/Include/Dsc/EnableRichDebugMessages.dsc.inc @@ -0,0 +1,58 @@ +## @file EnableRichDebugMessages.dsc.inc +# +# This takes care to turn on a higher level of debug messages that produces a +# balance between performance and greater levels of detail. +# This also customizes cores to use BaseDebugLibSerialPort to reduce blackout periods. +# +# @copyright +# Copyright 2020 (C) Intel Corporation +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +# +# Customize debug messages +# +[PcdsFixedAtBuild] + ## The mask is used to control DebugLib behavior. + # BIT0 - Enable Debug Assert. + # BIT1 - Enable Debug Print. + # BIT2 - Enable Debug Code. + # BIT3 - Enable Clear Memory. + # BIT4 - Enable BreakPoint as ASSERT. + # BIT5 - Enable DeadLoop as ASSERT. + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F# Enable asserts, prints, code, clear memory, and deadloops on asserts. + + ## This flag is used to control the built in Debug messages. + # BIT0 - Initialization message. + # BIT1 - Warning message. + # BIT2 - Load Event message. + # BIT3 - File System message. + # BIT4 - Allocate or Free Pool message. + # BIT5 - Allocate or Free Page message. + # BIT6 - Information message. + # BIT7 - Dispatcher message. + # BIT8 - Variable message. + # BIT10 - Boot Manager message. +
[edk2-devel][edk2-platforms][PATCH V1 2/5] WhitleyOpenBoardPkg: Fix GCC warnings
Remove build option to ignore no-incompatible-pointer-types. Remove build option to ignore no-overflow warnings. Fixed resulting warnings as errors. Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Isaac Oram --- .../IpmiPlatformHookLib/IpmiPlatformHookLib.c | 2 +- .../PeiPlatformHookLib/PeiPlatformHooklib.c | 2 +- .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +- .../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +- .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +- .../Aowanda/Uba/TypeAowanda/Pei/PcdData.c | 2 +- .../Uba/TypeAowanda/Pei/PchEarlyUpdate.c | 2 +- .../Uba/TypeAowanda/Pei/PeiBoardInitLib.c | 2 +- .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +- .../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +- .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +- .../Pei/PchEarlyUpdate.c | 4 +- .../Pei/PeiBoardInitLib.c | 2 +- .../Dxe/PlatformCpuPolicy/PlatformCpuPolicy.c | 4 +- .../Features/Acpi/AcpiPlatform/AcpiPlatform.c | 22 +- .../Acpi/AcpiPlatform/AcpiPlatformHooks.c | 14 +++ .../Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c | 30 ++--- .../Pci/Dxe/PciHostBridge/PciHostBridge.c | 5 +-- .../Dxe/PciHostBridge/PciHostBridgeSupport.c | 2 +- .../Pci/Dxe/PciHostBridge/PciRootBridgeIo.c | 5 +-- .../Pci/Dxe/PciPlatform/PciPlatform.c | 35 .../Pci/Dxe/PciPlatform/PciPlatformHooks.c| 16 +++ .../WhitleyOpenBoardPkg/Include/Acpi/Fadt.h | 2 +- .../Include/Dsc/BuildOptions.dsc | 2 +- .../IpmiPlatformHookLib/IpmiPlatformHookLib.c | 2 +- .../PeiPlatformHookLib/PeiPlatformHooklib.c | 2 +- .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +- .../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +- .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +- .../Uba/TypeJunctionCity/Pei/PchEarlyUpdate.c | 4 +- .../TypeJunctionCity/Pei/PeiBoardInitLib.c| 4 +- .../AcpiPlatformTableLib/AcpiPlatformLib.c| 16 +++ .../AcpiPlatformLibApic.c | 2 +- .../AcpiPlatformLibBdat.c | 12 +++--- .../AcpiPlatformLibHmat.c | 8 ++-- .../AcpiPlatformLibMsct.c | 2 +- .../AcpiPlatformLibNfit.c | 2 +- .../AcpiPlatformLibPcat.c | 2 +- .../AcpiPlatformLibPmtt.c | 4 +- .../AcpiPlatformLibSlit.c | 4 +- .../AcpiPlatformLibSrat.c | 4 +- .../AcpiPlatformLibSsdt.c | 2 +- .../BoardAcpiLib/SmmBoardAcpiEnableLib.c | 6 +-- .../Library/BoardInitLib/BoardInitDxeLib.c| 6 +-- .../Library/BoardInitLib/BoardInitPreMemLib.c | 8 ++-- .../MultiPlatSupportLib/MultiPlatSupportLib.c | 42 --- .../Library/PeiReportFvLib/PeiReportFvLib.c | 4 +- .../PeiUbaGpioPlatformConfigLib.c | 22 +- .../PeiUbaPlatLib/PeiUbaUsbOcUpdateLib.c | 2 +- .../PeiUbaPlatLib/UbaBoardSioInfoLib.c| 2 +- .../PeiUbaPlatLib/UbaClkGenUpdateLib.c| 6 +-- .../PeiUbaPlatLib/UbaClocksConfigLib.c| 2 +- .../Library/PeiUbaPlatLib/UbaGpioUpdateLib.c | 4 +- .../PeiUbaPlatLib/UbaHsioPtssTableConfigLib.c | 2 +- .../PeiUbaPlatLib/UbaIioConfigLibPei.c| 10 ++--- .../UbaIioPortBifurcationInitLib.c| 2 +- .../Library/PeiUbaPlatLib/UbaPcdUpdateLib.c | 3 +- .../PeiUbaPlatLib/UbaPchEarlyUpdateLib.c | 6 +-- .../PeiUbaPlatLib/UbaPchPcieBifurcationLib.c | 2 +- .../PeiUbaPlatLib/UbaSlotUpdateLibPei.c | 6 +-- .../PeiUbaPlatLib/UbaSoftStrapUpdateLib.c | 5 +-- .../PlatformClocksLib/Pei/PlatformClocksLib.c | 17 ++-- .../Pei/PlatformClocksLib.inf | 2 +- .../PlatformCmosAccessLib.c | 2 +- .../Library/SetCacheMtrrLib/SetCacheMtrrLib.c | 8 ++-- .../PchPolicyUpdateUsb.c | 2 +- .../SiliconPolicyUpdateLib.c | 2 +- .../SiliconPolicyUpdateLibFsp.c | 2 +- .../SmmSpiFlashCommonLib/SpiFlashCommon.c | 3 +- .../Library/UbaGpioInitLib/UbaGpioInitLib.c | 6 +-- .../UbaPlatLib/DxeUbaGpioPlatformConfigLib.c | 4 +- .../UbaPlatLib/DxeUbaSystemBoardInfoLib.c | 2 +- .../UbaPlatLib/DxeUbaSystemConfigUpdateLib.c | 2 +- .../Library/UbaPlatLib/DxeUbaUsbOcUpdateLib.c | 2 +- .../Library/UbaPlatLib/UbaAcpiUpdateLib.c | 2 +- .../Library/UbaPlatLib/UbaFpkConfigLib.c | 2 +- .../Library/UbaPlatLib/UbaIioConfigLib.c | 4 +- .../Library/UbaPlatLib/UbaOpromUpdateLib.c| 10 ++--- .../Library/UbaPlatLib/UbaSlotUpdateLib.c | 4 +- .../Library/UbaPlatLib/UbaSmbiosUpdateLib.c | 16 +++ .../Platform/Dxe/PlatformType/PlatformTypes.c | 5 +-- .../EmulationPlatformInit.c | 2 +- .../Platform/Pei/PlatformInfo/PlatformInfo.c | 16 +++ .../Uba/BoardInit/Dxe/BoardInitDxe.c | 2 +- .../SystemBoardInfoDxe/SystemBoardInfoDxe.c
[edk2-devel][edk2-platforms][PATCH V1 3/5] WhitleyOpenBoardPkg: Fix GCC unused variables warnings
Removed build options to ignore no-discarded-qualifiers warnings. Removed build option to ignore no-unused-variable warnings. Fixed resulting build issues. Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Isaac Oram --- .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 6 ++- .../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 3 +- .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 3 +- .../Uba/TypeAowanda/Pei/PeiBoardInitLib.inf | 11 .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 4 ++ .../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 1 + .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 1 + .../Pei/PeiBoardInitLib.inf | 11 .../Pci/Dxe/PciPlatform/PciPlatform.inf | 1 + .../Include/Dsc/BuildOptions.dsc | 2 +- .../Include/Library/UbaAcpiUpdateLib.h| 2 - .../Include/Library/UbaClkGenUpdateLib.h | 2 - .../Include/Library/UbaGpioPlatformConfig.h | 4 -- .../Include/Library/UbaGpioUpdateLib.h| 2 - .../Library/UbaHsioPtssTableConfigLib.h | 3 -- .../Include/Library/UbaIioConfigLib.h | 10 .../Library/UbaIioPortBifurcationInitLib.h| 3 -- .../Include/Library/UbaOpromUpdateLib.h | 6 --- .../Include/Library/UbaPcdUpdateLib.h | 2 - .../Include/Library/UbaPchEarlyUpdateLib.h| 3 -- .../Include/Library/UbaSlotUpdateLib.h| 12 - .../Include/Library/UbaSoftStrapUpdateLib.h | 2 - .../Library/UbaSystemConfigUpdateLib.h| 3 -- .../Include/Library/UbaUsbOcUpdateLib.h | 2 - .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 6 ++- .../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 3 +- .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 3 +- .../TypeJunctionCity/Pei/PeiBoardInitLib.inf | 11 .../AcpiPlatformLibApic.c | 52 --- .../MultiPlatSupportLib/MultiPlatSupportLib.c | 1 - .../Library/PeiUbaPlatLib/PeiUbaPlatLib.inf | 21 .../Library/UbaPlatLib/UbaPlatLib.inf | 12 + .../Intel/WhitleyOpenBoardPkg/PlatformPkg.dec | 29 +++ .../SystemConfigUpdateDxe.inf | 1 + .../Common/Pei/PeiCommonBoardInitLib.inf | 9 .../StaticSkuDataDxe/StaticSkuDataDxe.inf | 1 + .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 4 ++ .../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 2 + .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 1 + .../TypeCooperCityRP/Pei/PeiBoardInit.h | 11 ++-- .../TypeCooperCityRP/Pei/PeiBoardInitLib.c| 6 +++ .../TypeCooperCityRP/Pei/PeiBoardInitLib.inf | 11 .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 6 ++- .../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 3 +- .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 3 +- .../TypeWilsonCityRP/Pei/PeiBoardInitLib.inf | 11 .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 4 ++ .../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 1 + .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 1 + .../TypeWilsonCitySMT/Pei/PeiBoardInitLib.inf | 12 + 50 files changed, 197 insertions(+), 127 deletions(-) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf index b9019018cb..6a43d21bab 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf +++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf @@ -38,6 +38,10 @@ WhitleyOpenBoardPkg/PlatformPkg.dec [Guids] + gPlatformIioConfigDataDxeGuid + gPlatformIioConfigDataDxeGuid_1 + gPlatformIioConfigDataDxeGuid_2 + gPlatformIioConfigDataDxeGuid_3 [FixedPcd] gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount @@ -46,4 +50,4 @@ gUbaConfigDatabaseProtocolGuid [Depex] - gEfiPlatformTypeAowandaProtocolGuid \ No newline at end of file + gEfiPlatformTypeAowandaProtocolGuid diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf index 57b4647eab..2095b15434 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf +++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf @@ -38,6 +38,7 @@ WhitleyOpenBoardPkg/PlatformPkg.dec [Guids] + gPlatformSlotDataDxeGuid [FixedPcd] gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount @@ -46,4 +47,4 @@ gUbaConfigDatabaseProtocolGuid [Depex] - gEfiPlatformTypeAowandaProtocolGuid \ No newline at end of file + gEfiPlatformTypeAowandaProtocolGuid diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
[edk2-devel][edk2-platforms][PATCH V1 4/5] WhitleyOpenBoardPkg: Fix GCC unused variables that are set warnings
Fixed issues caused by variables initialized but not used.
Cc: Nate DeSimone
Cc: Chasel Chiu
Signed-off-by: Isaac Oram
---
.../Aowanda/Uba/TypeAowanda/Pei/AcpiTablePcds.c | 2 --
.../Aowanda/Uba/TypeAowanda/Pei/KtiEparam.c | 3 ---
.../Uba/TypeBoardPortTemplate/Pei/AcpiTablePcds.c| 3 +--
.../Uba/TypeBoardPortTemplate/Pei/IioBifurInit.c | 8 +++-
.../Uba/TypeBoardPortTemplate/Pei/KtiEparam.c| 2 --
.../Features/Acpi/AcpiPlatform/AcpiPlatform.c| 12
.../Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c | 2 --
.../Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c | 7 +--
.../Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c | 6 --
.../WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc | 2 +-
.../Uba/TypeJunctionCity/Pei/AcpiTablePcds.c | 4 +---
.../Uba/TypeJunctionCity/Pei/IioBifurInit.c | 3 ---
.../Uba/TypeJunctionCity/Pei/KtiEparam.c | 3 ---
.../Library/AcpiPlatformTableLib/AcpiPlatformLib.c | 3 ---
.../AcpiPlatformTableLib/AcpiPlatformLibApic.c | 2 --
.../AcpiPlatformTableLib/AcpiPlatformLibDsdt.c | 4
.../AcpiPlatformTableLib/AcpiPlatformLibSlit.c | 7 ---
.../AcpiPlatformTableLib/AcpiPlatformLibSsdt.c | 4 +---
.../Library/BoardInitLib/BoardInitPreMemLib.c| 10 --
.../MultiPlatSupportLib/MultiPlatSupportLib.c| 8 +---
.../Library/PeiPlatformHookLib/PeiPlatformHooklib.c | 6 ++
.../PlatformCmosAccessLib/PlatformCmosAccessLib.c| 2 --
.../Library/PlatformHooksLib/PlatformHooks.c | 8 +---
.../SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c | 7 ---
.../Platform/Pei/PlatformInfo/PlatformInfo.c | 3 +--
Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec | 4 ++--
.../WhitleyOpenBoardPkg/Uba/CfgDb/Dxe/CfgDbDxe.c | 10 --
.../WhitleyOpenBoardPkg/Uba/CfgDb/Pei/CfgDbPei.c | 5 -
.../Uba/UbaMain/StaticSkuDataDxe/AcpiStaticData.c| 2 --
.../Uba/UbaMain/StaticSkuDataDxe/DeviceDataInstall.c | 4
.../Uba/UbaMain/TypeCooperCityRP/Pei/AcpiTablePcds.c | 4 +---
.../Uba/UbaMain/TypeWilsonCityRP/Pei/AcpiTablePcds.c | 4 +---
.../Uba/UbaMain/TypeWilsonCityRP/Pei/IioBifurInit.c | 8 +++-
.../Uba/UbaMain/TypeWilsonCityRP/Pei/KtiEparam.c | 2 --
.../UbaMain/TypeWilsonCitySMT/Pei/AcpiTablePcds.c| 4 +---
.../Uba/UbaMain/TypeWilsonCitySMT/Pei/IioBifurInit.c | 8 +++-
.../Uba/UbaMain/TypeWilsonCitySMT/Pei/KtiEparam.c| 2 --
37 files changed, 28 insertions(+), 150 deletions(-)
diff --git
a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/AcpiTablePcds.c
b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/AcpiTablePcds.c
index d9f91a01e7..1810990b12 100644
---
a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/AcpiTablePcds.c
+++
b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/AcpiTablePcds.c
@@ -27,7 +27,6 @@ TypeAowandaPlatformUpdateAcpiTablePcds (
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
DEBUG ((DEBUG_INFO, "Uba Callback: PlatformAowandaUpdateAcpiTablePcds
entered\n"));
@@ -37,7 +36,6 @@ TypeAowandaPlatformUpdateAcpiTablePcds (
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
// #
// #ACPI items
// #
diff --git
a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/KtiEparam.c
b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/KtiEparam.c
index dd15bd3f88..4bdfe3d7e4 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/KtiEparam.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/KtiEparam.c
@@ -65,7 +65,6 @@ TypeAowandaInstallKtiEparamData (
{
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
GuidHob = GetFirstGuidHob ();
ASSERT (GuidHob != NULL);
@@ -73,8 +72,6 @@ TypeAowandaInstallKtiEparamData (
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
-
Status = UbaConfigPpi->AddData (
UbaConfigPpi,
,
diff --git
a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/AcpiTablePcds.c
b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/AcpiTablePcds.c
index d4601f610c..1fdb9c210f 100644
---
a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/AcpiTablePcds.c
+++
b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/AcpiTablePcds.c
@@ -26,7 +26,6 @@ TypeBoardPortTemplatePlatformUpdateAcpiTablePcds (
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
DEBUG ((DEBUG_INFO, "Uba Callback: PlatformUpdateAcpiTablePcds entered\n"));
@@ -35,7 +34,7 @@
[edk2-devel][edk2-platforms][PATCH V1 1/5] IpmiFeaturePkg/GenericIpmi: Fix GCC compilation warnings
Fix compiler warnings for unused variables.
Fix PeimIpmiInterfaceInit to return initialization status instead of
EFI_SUCCESS.
Cc: Nate DeSimone
Cc: Liming Gao
Signed-off-by: Isaac Oram
---
.../IpmiFeaturePkg/GenericIpmi/Common/KcsBmc.c| 8 +++-
.../IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.c | 3 +--
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Common/KcsBmc.c
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Common/KcsBmc.c
index 7243d37cc5..cf1929f399 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Common/KcsBmc.c
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Common/KcsBmc.c
@@ -36,7 +36,6 @@ Returns:
EFI_STATUS Status;
UINT8 KcsData;
KCS_STATUS KcsStatus;
- UINT8 BmcStatus;
UINT8 RetryCount;
UINT64 TimeOut;
@@ -101,7 +100,7 @@ Returns:
TimeOut++;
} while (!KcsStatus.Status.Obf);
- BmcStatus = IoRead8 (KcsPort);
+ IoRead8 (KcsPort);
KcsData = KCS_READ;
IoWrite8 (KcsPort, KcsData);
@@ -184,7 +183,6 @@ Returns:
{
EFI_STATUS Status;
KCS_STATUS KcsStatus;
- UINT8 KcsData;
UINT64 TimeOut;
if (Idle == NULL) {
@@ -205,7 +203,7 @@ Returns:
} while (KcsStatus.Status.Ibf);
if (KcsState == KcsWriteState) {
-KcsData = IoRead8 (KcsPort);
+IoRead8 (KcsPort);
}
if (KcsStatus.Status.State != KcsState) {
@@ -231,7 +229,7 @@ Returns:
}
if (KcsState == KcsWriteState || (*Idle == TRUE)) {
-KcsData = IoRead8 (KcsPort);
+IoRead8 (KcsPort);
}
return EFI_SUCCESS;
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.c
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.c
index 14040c089c..3efb772b68 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.c
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.c
@@ -167,13 +167,12 @@ PeimIpmiInterfaceInit (
{
EFI_STATUS Status;
-
//
// Performing Ipmi KCS physical layer initialization
//
Status = PeiInitializeIpmiKcsPhysicalLayer (PeiServices);
- return EFI_SUCCESS;
+ return Status;
} // PeimIpmiInterfaceInit()
--
2.36.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#90961): https://edk2.groups.io/g/devel/message/90961
Mute This Topic: https://groups.io/mt/92099075/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 0/5] Resolve GCC compilation warnings
Fix GCC warnings and remove the build flags to ignore them. Cc: Nate DeSimone Cc: Liming Gao Cc: Chasel Chiu Signed-off-by: Isaac Oram Isaac Oram (5): IpmiFeaturePkg/GenericIpmi: Fix GCC compilation warnings WhitleyOpenBoardPkg: Fix GCC warnings WhitleyOpenBoardPkg: Fix GCC unused variables warnings WhitleyOpenBoardPkg: Fix GCC unused variables that are set warnings WhitleyOpenBoardPkg: Remove unnecessary code .../GenericIpmi/Common/KcsBmc.c | 8 +-- .../GenericIpmi/Pei/PeiGenericIpmi.c | 3 +- .../IpmiPlatformHookLib/IpmiPlatformHookLib.c | 2 +- .../PeiPlatformHookLib/PeiPlatformHooklib.c | 2 +- .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +- .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 6 +- .../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +- .../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 3 +- .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +- .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 3 +- .../Uba/TypeAowanda/Pei/AcpiTablePcds.c | 2 - .../Aowanda/Uba/TypeAowanda/Pei/KtiEparam.c | 3 - .../Aowanda/Uba/TypeAowanda/Pei/PcdData.c | 2 +- .../Uba/TypeAowanda/Pei/PchEarlyUpdate.c | 2 +- .../Uba/TypeAowanda/Pei/PeiBoardInitLib.c | 2 +- .../Uba/TypeAowanda/Pei/PeiBoardInitLib.inf | 11 .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +- .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 4 ++ .../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +- .../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 1 + .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +- .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 1 + .../TypeBoardPortTemplate/Pei/AcpiTablePcds.c | 3 +- .../TypeBoardPortTemplate/Pei/IioBifurInit.c | 8 +-- .../Uba/TypeBoardPortTemplate/Pei/KtiEparam.c | 2 - .../Pei/PchEarlyUpdate.c | 4 +- .../Pei/PeiBoardInitLib.c | 2 +- .../Pei/PeiBoardInitLib.inf | 11 .../Dxe/PlatformCpuPolicy/PlatformCpuPolicy.c | 4 +- .../Features/Acpi/AcpiPlatform/AcpiPlatform.c | 34 +-- .../Acpi/AcpiPlatform/AcpiPlatformHooks.c | 16 +++--- .../Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c | 37 ++-- .../Pci/Dxe/PciHostBridge/PciHostBridge.c | 5 +- .../Dxe/PciHostBridge/PciHostBridgeSupport.c | 2 +- .../Pci/Dxe/PciHostBridge/PciRootBridgeIo.c | 11 +--- .../Pci/Dxe/PciPlatform/PciPlatform.c | 35 ++-- .../Pci/Dxe/PciPlatform/PciPlatform.inf | 1 + .../Pci/Dxe/PciPlatform/PciPlatformHooks.c| 16 +++--- .../WhitleyOpenBoardPkg/Include/Acpi/Fadt.h | 2 +- .../Include/Dsc/BuildOptions.dsc | 5 +- .../Include/Library/UbaAcpiUpdateLib.h| 2 - .../Include/Library/UbaClkGenUpdateLib.h | 2 - .../Include/Library/UbaGpioPlatformConfig.h | 4 -- .../Include/Library/UbaGpioUpdateLib.h| 2 - .../Library/UbaHsioPtssTableConfigLib.h | 3 - .../Include/Library/UbaIioConfigLib.h | 10 .../Library/UbaIioPortBifurcationInitLib.h| 3 - .../Include/Library/UbaOpromUpdateLib.h | 6 -- .../Include/Library/UbaPcdUpdateLib.h | 2 - .../Include/Library/UbaPchEarlyUpdateLib.h| 3 - .../Include/Library/UbaSlotUpdateLib.h| 12 .../Include/Library/UbaSoftStrapUpdateLib.h | 2 - .../Library/UbaSystemConfigUpdateLib.h| 3 - .../Include/Library/UbaUsbOcUpdateLib.h | 2 - .../IpmiPlatformHookLib/IpmiPlatformHookLib.c | 2 +- .../PeiPlatformHookLib/PeiPlatformHooklib.c | 2 +- .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +- .../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 6 +- .../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +- .../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 3 +- .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +- .../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 3 +- .../Uba/TypeJunctionCity/Pei/AcpiTablePcds.c | 4 +- .../Uba/TypeJunctionCity/Pei/IioBifurInit.c | 3 - .../Uba/TypeJunctionCity/Pei/KtiEparam.c | 3 - .../Uba/TypeJunctionCity/Pei/PchEarlyUpdate.c | 4 +- .../TypeJunctionCity/Pei/PeiBoardInitLib.c| 4 +- .../TypeJunctionCity/Pei/PeiBoardInitLib.inf | 11 .../AcpiPlatformTableLib/AcpiPlatformLib.c| 19 +++ .../AcpiPlatformLibApic.c | 56 +-- .../AcpiPlatformLibBdat.c | 12 ++-- .../AcpiPlatformLibDsdt.c | 4 -- .../AcpiPlatformLibHmat.c | 8 +-- .../AcpiPlatformLibMsct.c | 2 +- .../AcpiPlatformLibNfit.c | 2 +- .../AcpiPlatformLibPcat.c | 2 +- .../AcpiPlatformLibPmtt.c | 4 +- .../AcpiPlatformLibSlit.c | 11 +--- .../AcpiPlatformLibSrat.c | 4 +- .../AcpiPlatformLibSsdt.c | 6 +- .../BoardAcpiLib/SmmBoardAcpiEnableLib.c | 6 +- .../Library/BoardInitLib/BoardInitDxeLib.c| 6
[edk2-devel][edk2-platforms][PATCH V1 5/5] WhitleyOpenBoardPkg: Remove unnecessary code
Combine similar lines of code. Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Isaac Oram --- .../Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc index 0a07a54e5b..9213507b98 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc @@ -146,6 +146,5 @@ DEFINE EDKII_DSC_FEATURE_BUILD_OPTIONS = $(EDKII_DSC_FEATURE_BUILD_OPTIONS) $(ME [BuildOptions] GCC:*_GCC5_*_CC_FLAGS = -mabi=ms - GCC:*_GCC5_IA32_DLINK_FLAGS = -z common-page-size=0x20 -z muldefs - GCC:*_GCC5_X64_DLINK_FLAGS = -z common-page-size=0x20 -z muldefs + GCC:*_GCC5_*_DLINK_FLAGS = -z common-page-size=0x20 -z muldefs MSFT:*_*_*_CC_FLAGS = /FAsc -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90965): https://edk2.groups.io/g/devel/message/90965 Mute This Topic: https://groups.io/mt/92099079/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] MinPlatformPkg/Build: Reduce duplication
Removed needless duplication between sections. Addes spaces after commas. Remove commented out code. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Isaac Oram --- .../MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 55 +-- .../MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 29 +++--- 2 files changed, 20 insertions(+), 64 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc index 9b3095d662..6a4d586ddf 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc @@ -8,14 +8,14 @@ ## - # - # Generic EDKII Lib - # +# +# Generic EDKII Lib +# - # - # DXE phase common - # -[LibraryClasses.common.DXE_CORE,LibraryClasses.common.DXE_SMM_DRIVER,LibraryClasses.common.SMM_CORE,LibraryClasses.common.DXE_DRIVER,LibraryClasses.common.DXE_RUNTIME_DRIVER,LibraryClasses.common.UEFI_DRIVER,LibraryClasses.common.UEFI_APPLICATION] +# +# DXE phase common +# +[LibraryClasses.common.DXE_CORE, LibraryClasses.common.DXE_SMM_DRIVER, LibraryClasses.common.SMM_CORE, LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION] HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf @@ -32,14 +32,8 @@ FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf -!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE - PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf -!endif - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf @@ -50,6 +44,9 @@ VariableReadLib|MinPlatformPkg/Library/DxeRuntimeVariableReadLib/DxeRuntimeVariableReadLib.inf VariableWriteLib|MinPlatformPkg/Library/DxeRuntimeVariableWriteLib/DxeRuntimeVariableWriteLib.inf +[LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION] + PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf + [LibraryClasses.common.DXE_CORE, LibraryClasses.common.SMM_CORE] !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf @@ -62,21 +59,15 @@ !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf -!endif !endif +[LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_DRIVER] + Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf + [LibraryClasses.common.DXE_DRIVER] - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf TpmPlatformHierarchyLib|MinPlatformPkg/Tcg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - -[LibraryClasses.common.UEFI_DRIVER] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf -# PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf [LibraryClasses.common.DXE_SMM_DRIVER] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf @@ -87,7 +78,6 @@ !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE PerformanceLib|MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf !endif SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf @@ -100,8 +90,6 @@ VariableWriteLib|MinPlatformPkg/Library/SmmVariableWriteLib/TraditionalMmVariableWriteLib.inf [LibraryClasses.common.SMM_CORE] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
[edk2-devel][edk2-platforms][PATCH V1 1/2] MinPlatformPkg/Build: Add NOOPT build
Add NOOPT build support to enable easy debugging of unoptimized code. Generally the same libraries are desired for DEBUG and NOOPT. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Isaac Oram --- .../Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 11 +-- .../Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 4 ++-- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc index 209ccdaf54..9b3095d662 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc @@ -50,6 +50,11 @@ VariableReadLib|MinPlatformPkg/Library/DxeRuntimeVariableReadLib/DxeRuntimeVariableReadLib.inf VariableWriteLib|MinPlatformPkg/Library/DxeRuntimeVariableWriteLib/DxeRuntimeVariableWriteLib.inf +[LibraryClasses.common.DXE_CORE, LibraryClasses.common.SMM_CORE] +!if $(TARGET) != RELEASE + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf +!endif + [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf @@ -59,9 +64,6 @@ PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf !endif - -!if $(TARGET) == DEBUG - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif [LibraryClasses.common.DXE_DRIVER] @@ -109,9 +111,6 @@ PerformanceLib|MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf !endif - -!if $(TARGET) == DEBUG - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif [LibraryClasses.common.DXE_RUNTIME_DRIVER] diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc index c12189bd9a..1bf8338f95 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc @@ -37,7 +37,7 @@ [LibraryClasses.common.SEC] ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf -!if $(TARGET) == DEBUG +!if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf @@ -46,7 +46,7 @@ [LibraryClasses.common.PEI_CORE] TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf -!if $(TARGET) == DEBUG +!if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc index a8373a4ecb..09aa6fe4d5 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc @@ -20,7 +20,7 @@ DSC_SPECIFICATION = 0x00010005 OUTPUT_DIRECTORY= Build/MinPlatformPkg SUPPORTED_ARCHITECTURES = IA32|X64 - BUILD_TARGETS = DEBUG|RELEASE + BUILD_TARGETS = NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER= DEFAULT -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90914): https://edk2.groups.io/g/devel/message/90914 Mute This Topic: https://groups.io/mt/92075456/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 0/2] Add MinPlatformPkg NOOPT build option
Add the NOOPT build option. Use the same libraries for DEBUG and NOOPT Clean up some duplication and coding style issues with the include files. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Isaac Oram Isaac Oram (2): MinPlatformPkg/Build: Add NOOPT build MinPlatformPkg/Build: Reduce duplication .../MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 64 +-- .../MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 29 ++--- .../Intel/MinPlatformPkg/MinPlatformPkg.dsc | 2 +- 3 files changed, 25 insertions(+), 70 deletions(-) -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90913): https://edk2.groups.io/g/devel/message/90913 Mute This Topic: https://groups.io/mt/92075448/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel][edk2-platforms][PATCH V1 1/1] MinPlatformPkg: Add missing FV PCD
Add missing PCD for BSP FV Base/Size/Offsets. Cc: Eric Dong Cc: Liming Gao Signed-off-by: Isaac Oram --- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 8 1 file changed, 8 insertions(+) diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec index 68ab1d702d..76da6f35ae 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec @@ -230,9 +230,17 @@ gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryBase|0x|UINT32|0x2004 gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemorySize|0x|UINT32|0x2005 gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryOffset|0x|UINT32|0x2006 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspPreMemorySize|0x|UINT32|0x2030 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspPreMemoryBase|0x|UINT32|0x2031 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspPreMemoryOffset|0x|UINT32|0x2032 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryBase|0x|UINT32|0x2007 gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize|0x|UINT32|0x2008 gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset|0x|UINT32|0x2009 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspSize|0x|UINT32|0x2033 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspBase|0x|UINT32|0x2034 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspOffset|0x|UINT32|0x2035 + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootBase|0x|UINT32|0x200A gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize|0x|UINT32|0x200B gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset|0x|UINT32|0x200C -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90910): https://edk2.groups.io/g/devel/message/90910 Mute This Topic: https://groups.io/mt/92074372/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel][PATCH V1 1/1] UefiCpuPkg/SecCore: Add debug messages to illuminate data flow
Add debug messages to make it easier to verify PlatformSecLib
is passing the data properly.
Cc: Eric Dong
Cc: Ray Ni
Cc: Rahul Kumar
Cc: Debkumar De
Cc: Harry Han
Cc: Catharine West
Signed-off-by: Isaac Oram
---
UefiCpuPkg/SecCore/SecMain.c | 37
1 file changed, 37 insertions(+)
diff --git a/UefiCpuPkg/SecCore/SecMain.c b/UefiCpuPkg/SecCore/SecMain.c
index a7526be9dd..4edf0ce972 100644
--- a/UefiCpuPkg/SecCore/SecMain.c
+++ b/UefiCpuPkg/SecCore/SecMain.c
@@ -167,6 +167,15 @@ SecStartup (
EFI_SOFTWARE_SEC | EFI_SW_SEC_PC_ENTRY_POINT
);
+ DEBUG ((
+DEBUG_INFO,
+"%a() TempRAM Base: 0x%x, TempRAM Size: 0x%x, BootFirmwareVolume 0x%x\n",
+__FUNCTION__,
+TempRamBase,
+SizeOfRam,
+BootFirmwareVolume
+));
+
PeiStackSize = PcdGet32 (PcdPeiTemporaryRamStackSize);
if (PeiStackSize == 0) {
PeiStackSize = (SizeOfRam >> 1);
@@ -229,6 +238,20 @@ SecStartup (
SecCoreData.StackBase = (VOID *)(UINTN)(TempRamBase +
SecCoreData.PeiTemporaryRamSize);
SecCoreData.StackSize = PeiStackSize;
+ DEBUG ((
+DEBUG_INFO,
+"%a() BFV Base: 0x%x, BFV Size: 0x%x, TempRAM Base: 0x%x, TempRAM Size:
0x%x, PeiTempRamBase: 0x%x, PeiTempRamSize: 0x%x, StackBase: 0x%x, StackSize:
0x%x\n",
+__FUNCTION__,
+SecCoreData.BootFirmwareVolumeBase,
+SecCoreData.BootFirmwareVolumeSize,
+SecCoreData.TemporaryRamBase,
+SecCoreData.TemporaryRamSize,
+SecCoreData.PeiTemporaryRamBase,
+SecCoreData.PeiTemporaryRamSize,
+SecCoreData.StackBase,
+SecCoreData.StackSize
+));
+
//
// Initialize Debug Agent to support source level debug in SEC/PEI phases
before memory ready.
//
@@ -318,6 +341,13 @@ SecStartupPhase2 (
}
}
+ DEBUG ((
+DEBUG_INFO,
+"%a() PeiCoreEntryPoint: 0x%x\n",
+__FUNCTION__,
+PeiCoreEntryPoint
+));
+
if (PpiList != NULL) {
AllSecPpiList = (EFI_PEI_PPI_DESCRIPTOR *)SecCoreData->PeiTemporaryRamBase;
@@ -360,6 +390,13 @@ SecStartupPhase2 (
//
SecCoreData->PeiTemporaryRamBase = (VOID
*)(((UINTN)SecCoreData->PeiTemporaryRamBase + 7) & ~0x07);
SecCoreData->PeiTemporaryRamSize &= ~(UINTN)0x07;
+DEBUG ((
+ DEBUG_INFO,
+ "%a() PeiTemporaryRamBase: 0x%x, PeiTemporaryRamSize: 0x%x\n",
+ __FUNCTION__,
+ SecCoreData->PeiTemporaryRamBase,
+ SecCoreData->PeiTemporaryRamSize
+ ));
} else {
//
// No addition PPI, PpiList directly point to the common PPI list.
--
2.36.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#90793): https://edk2.groups.io/g/devel/message/90793
Mute This Topic: https://groups.io/mt/92033232/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 2/2] [edk2-platforms] Silicon/Intel/FitGen: Support to override the MBZ byte in Startup ACM entries for other usages
This code is gratuitous on typecasting and pointer use.
As this change is making the use of these fields more confusing, I would like
to see it simplified.
e.g. *(UINT32 *)[FitIndex].Size[0] =
This is introducing possible errors. More correct would be
FitEntry[FitIndex].Size[0] = (UINT8) gFitTableContext.FitEntryNumber;
FitEntry[FitIndex].Size[1] = (UINT8) (gFitTableContext.FitEntryNumber >> 8);
FitEntry[FitIndex].Size[2] = (UINT8) (gFitTableContext.FitEntryNumber >> 16);
FitEntry[FitIndex].Rsvd = 0;
But I think that we can do better by redefining the structs and using unions to
make the field use clear.
Or different structs for different entry types would be fine too.
Thanks,
Isaac
-Original Message-
From: Lin, Jason1
Sent: Thursday, June 23, 2022 7:49 AM
To: devel@edk2.groups.io
Cc: Lin, Jason1 ; Feng, Bob C ;
Gao, Liming ; Chen, Christine ;
Oram, Isaac W ; Chaganty, Rangasai V
; Chiang, Dakota
Subject: [PATCH v2 2/2] [edk2-platforms] Silicon/Intel/FitGen: Support to
override the MBZ byte in Startup ACM entries for other usages
From: Jason1 Lin
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3959
As per FIT BIOS Specification 1.2 Rules, the size bytes (3 bytes)/ reserved
byte (1 byte) / CheckSum byte (1 byte) in type 2 are must-be-zero (MBZ).
These bytes could be override for the other usages.
In the future, if these bytes field have other meanings, there would be no need
to change the FitGen.
Command:
[-S |] [-I
] [-V ]
With "-I" input the default Type 2 entry version would be 0x200.
Signed-off-by: Jason1 Lin
Cc: Bob Feng
Cc: Liming Gao
Cc: Yuwei Chen
Cc: Isaac W Oram
Cc: Rangasai V Chaganty
Cc: Dakota Chiang
---
Silicon/Intel/Tools/FitGen/FitGen.c | 105
Silicon/Intel/Tools/FitGen/FitGen.h | 2 +-
2 files changed, 88 insertions(+), 19 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c
b/Silicon/Intel/Tools/FitGen/FitGen.c
index eac8fa8715..bdda8dfd5a 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -210,6 +210,7 @@ typedef struct {
#define DEFAULT_FIT_TABLE_POINTER_OFFSET 0x40 #define
DEFAULT_FIT_ENTRY_VERSION 0x0100+#define
STARTUP_ACM_FIT_ENTRY_200_VERSION 0x0200 #define TOP_FLASH_ADDRESS
(gFitTableContext.TopFlashAddressRemapValue) @@ -247,6 +248,12 @@ typedef
struct {
UINT8 *Buffer; // Used by OptionalModule only UINT32 Size; UINT32
Version; // Used by OptionalModule and PortModule only+ UINT32 MaxSize;+
UINT8 SizeByte0; // Used by S-ACM only+ UINT8 SizeByte1; // Used by S-ACM
only+ UINT8 SizeByte2; // Used by S-ACM only+ UINT8 Rsvd; // Used by
S-ACM only+ UINT8 ChkSum;// Used by S-ACM only }
FIT_TABLE_CONTEXT_ENTRY; typedef struct {@@ -262,7 +269,7 @@ typedef struct {
UINT32 GlobalVersion; UINT32
FitHeaderVersion; FIT_TABLE_CONTEXT_ENTRY
StartupAcm[MAX_STARTUP_ACM_ENTRY];- UINT32
StartupAcmVersion;+ UINT32
StartupAcmVersion[MAX_STARTUP_ACM_ENTRY]; FIT_TABLE_CONTEXT_ENTRY
DiagnstAcm; UINT32 DiagnstAcmVersion;
FIT_TABLE_CONTEXT_ENTRYBiosModule[MAX_BIOS_MODULE_ENTRY];@@ -341,7 +348,7
@@ Returns:
"\t[-L ]\n" "\t[-LF
]\n" "\t[-I ]\n"- "\t[-S
|] [-V
]\n"+ "\t[-S |] [-I ] [-V
]\n" "\t[-U
|]\n" "\t[-B ] [-B ...] [-V ]\n" "\t[-M
] [-M ...]|[-U ||] [-V
]\n"@@ -357,7 +364,13 @@ Returns:
printf ("\tBiosInfoGuid - Guid of BiosInfo Module. If this module
exists, StartupAcm/Bios/Microcode can be optional.\n"); printf
("\tStartupAcmAddress - Address of StartupAcm.\n"); printf
("\tStartupAcmSize - Size of StartupAcm.\n");- printf
("\tStartupAcmGuid - Guid of StartupAcm Module, if StartupAcm is in a
BiosModule, it will be excluded form that.\n");+ printf ("\tStartupAcmGuid
- Guid of StartupAcm Module.\n");+ printf ("\tStartupAcmMaxSize - The
maximum size value that could place the StartupAcm in.\n");+ printf
("\tStartupAcmSizeByte0- The value for Size byte 0 (Override default
value).\n");+ printf ("\tStartupAcmSizeByte1- The value for Size byte 1
(Override default value).\n");+ printf ("\tStartupAcmSizeByte2- The value
for Size byte 2 (Override default value).\n");+ printf ("\tStartupAcmRsvd
- The value for Reserved byte (Override default value).\n");+ printf
("\tStartupAcmChkSum - The value for CheckSum byte (Override default
value).\n"); printf ("\tDiagnstAcmAddress - Address of DiagnstAcm.\n");
printf ("\tDiagnstAcmGuid - Guid of DiagnstAcm Module, if DiagnstAcm
is i
Re: [edk2-devel] [PATCH v2 1/2] [edk2-platforms] Silicon/Intel/FitGen: Support multiple Startup ACM Type 2 entries in FitGen tool
Reviewed-by: Isaac Oram
-Original Message-
From: Lin, Jason1
Sent: Thursday, June 23, 2022 7:45 AM
To: devel@edk2.groups.io
Cc: Lin, Jason1 ; Feng, Bob C ;
Gao, Liming ; Chen, Christine ;
Oram, Isaac W ; Chaganty, Rangasai V
; Chiang, Dakota
Subject: [PATCH v2 1/2] [edk2-platforms] Silicon/Intel/FitGen: Support multiple
Startup ACM Type 2 entries in FitGen tool
From: Jason1 Lin
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3958
Within current FitGen tool there had limitation only allow one S-ACM to
generate the Type 2 entry.
This code change is used to support multiple type 2 entries up to 0x20.
Signed-off-by: Jason1 Lin
Cc: Bob Feng
Cc: Liming Gao
Cc: Yuwei Chen
Cc: Isaac W Oram
Cc: Rangasai V Chaganty
Cc: Dakota Chiang
---
Silicon/Intel/Tools/FitGen/FitGen.c | 89 +++-
Silicon/Intel/Tools/FitGen/FitGen.h | 4 +-
2 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c
b/Silicon/Intel/Tools/FitGen/FitGen.c
index 4de72ea422..eac8fa8715 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -2,7 +2,7 @@
This utility is part of build process for IA32/X64 FD. It generates FIT table.
-Copyright (c) 2010-2021, Intel Corporation. All rights reserved.+Copyright
(c) 2010-2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/@@ -204,6 +204,7 @@ typedef
struct {
#define MAX_BIOS_MODULE_ENTRY 0x20 #define MAX_MICROCODE_ENTRY
0x20+#define MAX_STARTUP_ACM_ENTRY 0x20 #define MAX_OPTIONAL_ENTRY 0x20
#define MAX_PORT_ENTRY 0x20 @@ -255,11 +256,12 @@ typedef struct {
UINT32 FitEntryNumber; UINT32
BiosModuleNumber; UINT32 MicrocodeNumber;+ UINT32
StartupAcmNumber; UINT32
OptionalModuleNumber; UINT32 PortModuleNumber; UINT32
GlobalVersion; UINT32
FitHeaderVersion;- FIT_TABLE_CONTEXT_ENTRYStartupAcm;+
FIT_TABLE_CONTEXT_ENTRYStartupAcm[MAX_STARTUP_ACM_ENTRY]; UINT32
StartupAcmVersion; FIT_TABLE_CONTEXT_ENTRYDiagnstAcm; UINT32
DiagnstAcmVersion;@@ -1149,14 +1151,15 @@ Returns:
Error (NULL, 0, 0, "-I Parameter incorrect, Header Type
unsupported!", NULL); return 0; case
FIT_TABLE_TYPE_STARTUP_ACM:- if (gFitTableContext.StartupAcm.Type !=
0) {-Error (NULL, 0, 0, "-I Parameter incorrect, Duplicated
StartupAcm!", NULL);+ if (gFitTableContext.StartupAcmNumber >=
MAX_STARTUP_ACM_ENTRY) {+Error (NULL, 0, 0, "-I Parameter
incorrect, too many StartupAcm!", NULL); return 0; }-
gFitTableContext.StartupAcm.Type= FIT_TABLE_TYPE_STARTUP_ACM;-
gFitTableContext.StartupAcm.Address =
(UINT32)BiosInfoStruct[BiosInfoIndex].Address;-
gFitTableContext.StartupAcm.Size=
(UINT32)BiosInfoStruct[BiosInfoIndex].Size;-
gFitTableContext.StartupAcmVersion = BiosInfoStruct[BiosInfoIndex].Version;+
gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Type=
FIT_TABLE_TYPE_STARTUP_ACM;+
gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Address =
(UINT32)BiosInfoStruct[BiosInfoIndex].Address;+
gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Size=
(UINT32)BiosInfoStruct[BiosInfoIndex].Size;+
gFitTableContext.StartupAcm[gFitTableContext.StartupAcmNumber].Version =
BiosInfoStruct[BiosInfoIndex].Version;+
gFitTableContext.StartupAcmNumber ++; gFitTableContext.FitEntryNumber
++; break; case FIT_TABLE_TYPE_DIAGNST_ACM:@@ -1351,16
+1354,15 @@ Returns:
// // 1. StartupAcm //- do {+ while (TRUE) { if ((Index + 1 >=
argc) || ((strcmp (argv[Index], "-S") != 0) && (strcmp
(argv[Index], "-s") != 0)) ) {- if (BiosInfoExist &&
(gFitTableContext.StartupAcm.Type == FIT_TABLE_TYPE_STARTUP_ACM)) {-
break;+ if (gFitTableContext.StartupAcmNumber == 0) {+printf ("-S
not found. WARNING!\n"); } // Error (NULL, 0, 0, "-S Parameter
incorrect, expect -S!", NULL); // return 0;- printf ("-S not found.
WARNING!\n"); break; } if (IsGuidData (argv[Index + 1], ))
{@@ -1381,14 +1383,13 @@ Returns:
FileSize = xtoi (argv[Index + 2]); Index += 3; }-if
(gFitTableContext.StartupAcm.Type != 0) {- Error (NULL, 0, 0, "-S
Parameter incorrect, Duplicated StartupAcm!", NULL);+if
(gFitTableContext.StartupAcmNumber >= MAX_STARTUP_ACM_ENTRY) {+ Error
(NULL, 0, 0, "-S Parameter incorrect, too many StartupAcm!", NULL);
return 0
Re: [edk2-devel][edk2-platforms][PATCH V1 1/1] Maintainters.txt: Add Platform and Silicon Intel maintainers
Pushed as 9a3ff0e812..86119cb496 -Original Message- From: Desimone, Nathaniel L Sent: Wednesday, June 8, 2022 2:52 PM To: Oram, Isaac W ; devel@edk2.groups.io Cc: Leif Lindholm ; Kinney, Michael D ; Chaganty, Rangasai V Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 1/1] Maintainters.txt: Add Platform and Silicon Intel maintainers Reviewed-by: Nate DeSimone -Original Message- From: Oram, Isaac W Sent: Tuesday, June 7, 2022 7:33 PM To: devel@edk2.groups.io Cc: Oram, Isaac W ; Leif Lindholm ; Kinney, Michael D ; Chaganty, Rangasai V ; Desimone, Nathaniel L Subject: [edk2-devel][edk2-platforms][PATCH V1 1/1] Maintainters.txt: Add Platform and Silicon Intel maintainers Enable maintainers for Platform/Intel/ subtree. Enable maintainers for Silicon/Intel/ subtree. This is consistent with Features/Intel/ subtree. Cc: Leif Lindholm Cc: Michael D Kinney Cc: Sai Chaganty Cc: Nate DeSimone Signed-off-by: Isaac Oram --- Maintainers.txt | 12 1 file changed, 12 insertions(+) diff --git a/Maintainers.txt b/Maintainers.txt index da6abc7344..643e05b293 100644 --- a/Maintainers.txt +++ b/Maintainers.txt @@ -168,6 +168,12 @@ F: Features/Intel/UserInterface/ M: Dandan Bi R: Liming Gao +Platform/Intel +F: Platform/Intel/ +M: Sai Chaganty +M: Isaac Oram +M: Nate DeSimone + Platform/Intel/QuarkPlatformPkg F: Platform/Intel/QuarkPlatformPkg/ M: Michael D Kinney @@ -257,6 +263,12 @@ M: Abner Chang R: Gilbert Chen R: Daniel Schaefer +Silicon/Intel +F: Silicon/Intel/ +M: Rangasai V Chaganty +M: Isaac Oram +M: Nate DeSimone + Silicon/Intel/IntelSiliconPkg F: Silicon/Intel/IntelSiliconPkg/ M: Ray Ni -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90426): https://edk2.groups.io/g/devel/message/90426 Mute This Topic: https://groups.io/mt/91616083/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/1] Maintainters.txt: Add Isaac Oram to common Intel packages
Pushed as 499011f5c9..9a3ff0e812 -Original Message- From: Kinney, Michael D Sent: Wednesday, June 8, 2022 8:24 AM To: Oram, Isaac W ; devel@edk2.groups.io; Kinney, Michael D Cc: Leif Lindholm Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 1/1] Maintainters.txt: Add Isaac Oram to common Intel packages Reviewed-by: Michael D Kinney > -Original Message- > From: Oram, Isaac W > Sent: Tuesday, June 7, 2022 7:24 PM > To: devel@edk2.groups.io > Cc: Oram, Isaac W ; Leif Lindholm > ; Kinney, Michael D > > Subject: [edk2-devel][edk2-platforms][PATCH V1 1/1] Maintainters.txt: > Add Isaac Oram to common Intel packages > > Isaac Oram is actively maintaining Platform/Intel and Silicon/Intel > common packages. > > Cc: Leif Lindholm > Cc: Michael D Kinney > Signed-off-by: Isaac Oram > --- > Maintainers.txt | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/Maintainers.txt b/Maintainers.txt index > da6abc7344..a85bfcf2a5 100644 > --- a/Maintainers.txt > +++ b/Maintainers.txt > @@ -183,6 +183,7 @@ R: Nate DeSimone > Platform/Intel/BoardModulePkg > F: Platform/Intel/BoardModulePkg/ > M: Eric Dong > +M: Isaac Oram > R: Liming Gao > > Platform/Intel/KabylakeOpenBoardPkg > @@ -202,6 +203,7 @@ Platform/Intel/MinPlatformPkg > F: Platform/Intel/MinPlatformPkg/ > M: Chasel Chiu > M: Nate DeSimone > +M: Isaac Oram > R: Liming Gao > R: Eric Dong > > @@ -261,6 +263,7 @@ Silicon/Intel/IntelSiliconPkg > F: Silicon/Intel/IntelSiliconPkg/ > M: Ray Ni > M: Rangasai V Chaganty > +M: Isaac Oram > > Silicon/Intel/QuarkSocPkg > F: Silicon/Intel/QuarkSocPkg/ > -- > 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90425): https://edk2.groups.io/g/devel/message/90425 Mute This Topic: https://groups.io/mt/91616002/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 V2 1/1] WhitleySiliconPkg/PchPolicyPpi: Fix binary structure layout
Pushed as c546cc01f1..2a236ae742
-Original Message-
From: Desimone, Nathaniel L
Sent: Wednesday, June 8, 2022 2:53 PM
To: Oram, Isaac W ; devel@edk2.groups.io
Cc: Chiu, Chasel
Subject: RE: [edk2-devel][edk2-platforms][PATCH V2 1/1]
WhitleySiliconPkg/PchPolicyPpi: Fix binary structure layout
Reviewed-by: Nate DeSimone
-Original Message-
From: Oram, Isaac W
Sent: Tuesday, June 7, 2022 4:49 PM
To: devel@edk2.groups.io
Cc: Desimone, Nathaniel L ; Chiu, Chasel
Subject: [edk2-devel][edk2-platforms][PATCH V2 1/1]
WhitleySiliconPkg/PchPolicyPpi: Fix binary structure layout
V2:
Use UINT8 instead of BOOLEAN for DmiStopAndScreamEnable and Rsvdbits2
V1:
Disambiguate the PCH_DMI_CONFIG and PCH_TRACE_HUB_CONFIG structure definitions
such that compilers generate same binary layouts.
Cc: Nate DeSimone
Cc: Chasel Chiu
Signed-off-by: Isaac Oram
---
.../Pch/SouthClusterLbg/Include/PchPolicyCommon.h| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/Silicon/Intel/WhitleySiliconPkg/Pch/SouthClusterLbg/Include/PchPolicyCommon.h
b/Silicon/Intel/WhitleySiliconPkg/Pch/SouthClusterLbg/Include/PchPolicyCommon.h
index 0e10d0b8f0..11057a3ace 100644
---
a/Silicon/Intel/WhitleySiliconPkg/Pch/SouthClusterLbg/Include/PchPolicyCommon.h
+++ b/Silicon/Intel/WhitleySiliconPkg/Pch/SouthClusterLbg/Include/PchPol
+++ icyCommon.h
@@ -1351,7 +1351,9 @@ typedef struct {
**/
UINT32 DmiAspm : 1;
UINT32 PwrOptEnable : 1;///< 0: Disable; 1: Enable DMI
Power Optimizer on PCH side.
- BOOLEANDmiStopAndScreamEnable : 1;
+ UINT32 Rsvdbits1 : 30;
+ UINT8 DmiStopAndScreamEnable : 1;
+ UINT8 Rsvdbits2 : 7;
UINT32 DmiLinkDownHangBypass : 1;
UINT32 Rsvdbits : 29;
UINT32 Rsvd0[6]; ///< Reserved bytes
@@ -1447,6 +1449,7 @@ typedef struct {
TRACE_HUB_CONFIGTraceHub;
UINT32 AetEnableMode : 2;
UINT32 PchTraceHubHide: 1;
+ UINT32 Rsvdbits : 29;
} PCH_TRACE_HUB_CONFIG;
--
2.36.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#90420): https://edk2.groups.io/g/devel/message/90420
Mute This Topic: https://groups.io/mt/91613603/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel][edk2-platforms][PATCH V1 1/1] Maintainters.txt: Add Platform and Silicon Intel maintainers
Enable maintainers for Platform/Intel/ subtree. Enable maintainers for Silicon/Intel/ subtree. This is consistent with Features/Intel/ subtree. Cc: Leif Lindholm Cc: Michael D Kinney Cc: Sai Chaganty Cc: Nate DeSimone Signed-off-by: Isaac Oram --- Maintainers.txt | 12 1 file changed, 12 insertions(+) diff --git a/Maintainers.txt b/Maintainers.txt index da6abc7344..643e05b293 100644 --- a/Maintainers.txt +++ b/Maintainers.txt @@ -168,6 +168,12 @@ F: Features/Intel/UserInterface/ M: Dandan Bi R: Liming Gao +Platform/Intel +F: Platform/Intel/ +M: Sai Chaganty +M: Isaac Oram +M: Nate DeSimone + Platform/Intel/QuarkPlatformPkg F: Platform/Intel/QuarkPlatformPkg/ M: Michael D Kinney @@ -257,6 +263,12 @@ M: Abner Chang R: Gilbert Chen R: Daniel Schaefer +Silicon/Intel +F: Silicon/Intel/ +M: Rangasai V Chaganty +M: Isaac Oram +M: Nate DeSimone + Silicon/Intel/IntelSiliconPkg F: Silicon/Intel/IntelSiliconPkg/ M: Ray Ni -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90322): https://edk2.groups.io/g/devel/message/90322 Mute This Topic: https://groups.io/mt/91616083/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel][edk2-platforms][PATCH V1 1/1] Maintainters.txt: Add Isaac Oram to common Intel packages
Isaac Oram is actively maintaining Platform/Intel and Silicon/Intel common packages. Cc: Leif Lindholm Cc: Michael D Kinney Signed-off-by: Isaac Oram --- Maintainers.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Maintainers.txt b/Maintainers.txt index da6abc7344..a85bfcf2a5 100644 --- a/Maintainers.txt +++ b/Maintainers.txt @@ -183,6 +183,7 @@ R: Nate DeSimone Platform/Intel/BoardModulePkg F: Platform/Intel/BoardModulePkg/ M: Eric Dong +M: Isaac Oram R: Liming Gao Platform/Intel/KabylakeOpenBoardPkg @@ -202,6 +203,7 @@ Platform/Intel/MinPlatformPkg F: Platform/Intel/MinPlatformPkg/ M: Chasel Chiu M: Nate DeSimone +M: Isaac Oram R: Liming Gao R: Eric Dong @@ -261,6 +263,7 @@ Silicon/Intel/IntelSiliconPkg F: Silicon/Intel/IntelSiliconPkg/ M: Ray Ni M: Rangasai V Chaganty +M: Isaac Oram Silicon/Intel/QuarkSocPkg F: Silicon/Intel/QuarkSocPkg/ -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90321): https://edk2.groups.io/g/devel/message/90321 Mute This Topic: https://groups.io/mt/91616002/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 V2 1/1] WhitleySiliconPkg/PchPolicyPpi: Fix binary structure layout
V2:
Use UINT8 instead of BOOLEAN for DmiStopAndScreamEnable and Rsvdbits2
V1:
Disambiguate the PCH_DMI_CONFIG and PCH_TRACE_HUB_CONFIG structure
definitions such that compilers generate same binary layouts.
Cc: Nate DeSimone
Cc: Chasel Chiu
Signed-off-by: Isaac Oram
---
.../Pch/SouthClusterLbg/Include/PchPolicyCommon.h| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/Silicon/Intel/WhitleySiliconPkg/Pch/SouthClusterLbg/Include/PchPolicyCommon.h
b/Silicon/Intel/WhitleySiliconPkg/Pch/SouthClusterLbg/Include/PchPolicyCommon.h
index 0e10d0b8f0..11057a3ace 100644
---
a/Silicon/Intel/WhitleySiliconPkg/Pch/SouthClusterLbg/Include/PchPolicyCommon.h
+++
b/Silicon/Intel/WhitleySiliconPkg/Pch/SouthClusterLbg/Include/PchPolicyCommon.h
@@ -1351,7 +1351,9 @@ typedef struct {
**/
UINT32 DmiAspm : 1;
UINT32 PwrOptEnable : 1;///< 0: Disable; 1: Enable DMI
Power Optimizer on PCH side.
- BOOLEANDmiStopAndScreamEnable : 1;
+ UINT32 Rsvdbits1 : 30;
+ UINT8 DmiStopAndScreamEnable : 1;
+ UINT8 Rsvdbits2 : 7;
UINT32 DmiLinkDownHangBypass : 1;
UINT32 Rsvdbits : 29;
UINT32 Rsvd0[6]; ///< Reserved bytes
@@ -1447,6 +1449,7 @@ typedef struct {
TRACE_HUB_CONFIGTraceHub;
UINT32 AetEnableMode : 2;
UINT32 PchTraceHubHide: 1;
+ UINT32 Rsvdbits : 29;
} PCH_TRACE_HUB_CONFIG;
--
2.36.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#90308): https://edk2.groups.io/g/devel/message/90308
Mute This Topic: https://groups.io/mt/91613603/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 V2 1/1] WhitleyOpenBoardPkg/Build: Compress CpuMpPei.inf
Pushed as b98dfd5736..c546cc01f1
-Original Message-
From: Desimone, Nathaniel L
Sent: Tuesday, June 7, 2022 1:55 PM
To: Oram, Isaac W ; devel@edk2.groups.io
Cc: Chiu, Chasel
Subject: RE: [edk2-devel][edk2-platforms][PATCH V2 1/1]
WhitleyOpenBoardPkg/Build: Compress CpuMpPei.inf
Reviewed-by: Nate DeSimone
-Original Message-
From: Oram, Isaac W
Sent: Monday, May 23, 2022 4:05 PM
To: devel@edk2.groups.io
Cc: Desimone, Nathaniel L ; Chiu, Chasel
Subject: [edk2-devel][edk2-platforms][PATCH V2 1/1] WhitleyOpenBoardPkg/Build:
Compress CpuMpPei.inf
Compressing the CpuMpPei component results in it executing from cached memory
saving significant boot time.
Cc: Nate DeSimone
Cc: Chasel Chiu
Signed-off-by: Isaac Oram
---
.../Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.fdf | 2 +-
Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf | 2 +-
Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.fdf
b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.fdf
index ca5d135405..48992693ea 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.f
+++ df
@@ -449,7 +449,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize
= 0x0100
INF
WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.inf
- INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf
+ INF RuleOverride = LzmaCompress UefiCpuPkg/CpuMpPei/CpuMpPei.inf
!if $(FSP_MODE) == 0
FILE PEIM = 8F7F3D20-9823-42DD-9FF7-53DAC93EF407 { diff --git
a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
index b72aa2b688..c63442508b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
@@ -452,7 +452,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize
= 0x0100
INF
WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.inf
- INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf
+ INF RuleOverride = LzmaCompress UefiCpuPkg/CpuMpPei/CpuMpPei.inf
!if $(FSP_MODE) == 0
FILE PEIM = 8F7F3D20-9823-42DD-9FF7-53DAC93EF407 { diff --git
a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
index ab594ff409..280d55acc3 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
@@ -449,7 +449,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize
= 0x0100
INF
WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.inf
- INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf
+ INF RuleOverride = LzmaCompress UefiCpuPkg/CpuMpPei/CpuMpPei.inf
!if $(FSP_MODE) == 0
FILE PEIM = 8F7F3D20-9823-42DD-9FF7-53DAC93EF407 {
--
2.36.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#90303): https://edk2.groups.io/g/devel/message/90303
Mute This Topic: https://groups.io/mt/91300912/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-non-osi][PATCH V1] ASpeed/ASpeedGopBinPkg: Add X64 ASpeedAst2600Gop UEFI Driver
Pushed as 6996a45..3e68772
-Original Message-
From: devel@edk2.groups.io On Behalf Of Oram, Isaac W
Sent: Friday, June 3, 2022 1:07 PM
To: Ponnusamy, Suresh ; devel@edk2.groups.io
Cc: Desimone, Nathaniel L ; DOPPALAPUDI,
HARIKRISHNA ; KARPAGAVINAYAGAM, MANICKAVASAKAM
; Bobroff, Zachary
Subject: Re: [edk2-devel] [edk2-non-osi][PATCH V1] ASpeed/ASpeedGopBinPkg: Add
X64 ASpeedAst2600Gop UEFI Driver
Reviewed-by: Isaac Oram
-Original Message-
From: Sureshkumar Ponnusamy
Sent: Friday, June 3, 2022 11:30 AM
To: devel@edk2.groups.io
Cc: Desimone, Nathaniel L ; Oram, Isaac W
; DOPPALAPUDI, HARIKRISHNA ;
KARPAGAVINAYAGAM, MANICKAVASAKAM ; Bobroff, Zachary
Subject: [edk2-non-osi][PATCH V1] ASpeed/ASpeedGopBinPkg: Add X64
ASpeedAst2600Gop UEFI Driver
Added X64 ASpeedAst2600Gop UEFI Driver
Cc: Nate DeSimone
Cc: Isaac Oram
Cc: Harikrishna Doppalapudi
Cc: Manickavasakam Karpagavinayagam
Cc: Sureshkumar Ponnusamy
Cc: Zachary Bobroff
Signed-off-by: Sureshkumar Ponnusamy
---
Drivers/ASpeed/ASpeedGopBinPkg/X64/ASpeedAst2600Gop.efi | Bin 0 -> 32544 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/Drivers/ASpeed/ASpeedGopBinPkg/X64/ASpeedAst2600Gop.efi
b/Drivers/ASpeed/ASpeedGopBinPkg/X64/ASpeedAst2600Gop.efi
new file mode 100644
index
..3b5ec72f783a85a5c2378d808ad714d388aa5a38
GIT binary patch
literal 32544
zcmeIb3wTpi)<1mGB($`pCt(P6+{YEDHLoDByfTW7D}ZfpslopDzu$8L2$gJ
zrqw3LIDP%=4Ej1VyrTn*_gi>ZS;nIeS+#D6u(So-VgARCsqDa2q+UKNAOZmUf
zyx;SD&-XkNdUEzzd+oK?T6^ua*S?(KxQ+XlKY@R_Dl~VBqx+aNK>!Fs$LYoWT(OMc8%D
zsx?lOt%l4@R`s4p~quB)tYRsbkpi7#sFQR*GH_{Yp~;dpwX7OAxySFYaUaJrj0
zZsv7s6oLiNZ8-!ptM?1=8md;-EmLGC9k_u&_r#AG^hECxQ_3RIbHXS}--^;vIUg9J
zv{#O@`w_7vxb_lJ8ukYlz%9F-$)dEVJhq@-ly->H5>uY&*=f9E$G&~Nbn--LX1U$3
zUp|BA92LD;YpJMz*j>0;^LJA?F9>UypXRd1uLX|FA>1k{tTGaI<-D
zHUQcUX5UqyCg6$QVV|?iSw}>F*5i~R=@%0h-eK=Cv|(@J7HbnVly&4)sMt*kUSOAk
zDA88UangSIn`s;e!q4NW<0ZoM5Bmi%{bV8FP`f{Cxq`S)L2M$#r=U$B{t;<;B@j{b
zu|`IR_=VoP^c6^?a!EkT`b8;W+f8M?ybv4X6gGx}h6p}ZDda~J`4<)P^N9Q~MxHf)
zG4yA?o%AP4J4J7qLG;#VlQq@bC0nlDZ%$!Wb!r=RSy4LREenX=;!WVdLL5l?8Q?M2
zmQ7N&1lQDxev2v3BJCBu7L(Cm@}(#>o7^aB%@2xFI93efB8yyO%73?Adl`D)RN%YP
z+c~3>p6pB^7f*#|`rDH-NA|>+OZ4x!JjP=>V9BwHcZIci8<)O!YQtakforG}@#O
zd+k{CI!)Q4ccIBpx=2_k+$t;*r4x{Vdaw?d#OPvnsmfS9jDVM2=
zdPuKc_|`O{BMq_p9VZo42>xPStauGo()tBS(^PfR!09-?xtqxb)SI(`ntzz-O+nnH
zWWgAOb`DxXmhfi{`e2emYV9c0(J!|*i*IdZh4qjAl#I%)Xi8~Mo29&
zSFV3iis*NU^86_PAW_|A6_d1GRy(KBxaGyv{rsh3lt**OXJJpxLDvXTdK*-G{g`ZENWO!rKtdr
zSu4my^F;s6WpD|<1V8i)i=R~hHka2Eg<(bpMoWU_N@BT}SD0|2O?QVF093
zGJq6fkU9V;T>(m}9Y{SSnzxOyKLly#RKa~t!|YG4rxwq-1slFCA(yWaltqh1Kr{$k3xnQHtkCDmqm7}dtw
zidh9WL-La}G+rf2wiHUFic(f3VJr|K(QQb9L@{(Gwwzw87p2bV1E|PA%2t{#sHmCR
z4F#^D0{*PgsLxJSO9#+2y$v_ZV29(*i#IlN19l0v$l7j};UbNve`6J~u@_vBFJ`DXPQWecf5Iw;7
z4g=sEUNO_^6?3A~gf6pz>p@i0WzOuT4%B7Nrf@HsO*!32QBDr-ltWsAenWZ
zV6vyXNAQ}Bed8&5%?dWAirzIwfdUhw=>JJr`b;%vn{>(nI`3(fLyczE<$}Y@ptbEM`u=KY4G8OcalX0bs
z?eT6NooDmjB>HuK1QO_8Dr$G3p`>QdGkEsS)b-B-d_9AwNN?JuA@cL*W3l`o+(tVw
zgO6JYAffvL(mh(?KC}YjNdXZBH9sU@N#n5UGa!-yW6Zla!y*pdl-`Rx!o2yzhm
zH%QC1lZm;n(8IC|3mOv5?+VsmAM0j4|Jv8ouBzX97jtN$X9MMM(i49oc|ymNe~PqJXP3I9H{|;7V==pQYj4NTKa3tJ#2$A8S(*d2r~jw)
z#AD1vnGJciCx<@M@-J@ZUz`IAvKmG558whrs5t{-yM_Ro9ZeRsVbSZz?tGZphvFBY
z*p<{4PNgk+VT7yWC)NZeoF9)s;8^*iFP+A`)Ot{z<7
zVp9>doPgj+`qC~%oTFg0iP>3h$2TKatEaZKBE!WC{FY#Ks5`0J%K$dXnr)X>t+4W2K9WS8bV&3=!G4_^*CUYn
zAist4e5Y~EN4foic3)xm9utzgk^MOO`XfY68}?f3`7IBT8HnD}6@}r|`H5EhjA=dP
zcy^YvQEn;5x!afSK*<9N!8ee6J^Dvc(%-%UL4^Uxv0_AH@1p*bE${Npi-y3PL^XW#
zW;g+s_)jPRY_Z{K(qd@jm&{0qy^gf}%tVfhOhs4#wXArR+eiLF@krkqUCFN+0f?r1
zzBRNPkP>+d9D=nBv5b+c77BMYYQ?lu2>3VyS8Xjk)2OwjVYoWwG)YS#WH7c@yF*+j
zD%u0%yDZYG`dC;%-(D9T0fYfrkfF@ha?*JjaQDY{Lt^`~QzW~ZJ{wJe?oZ>23DQ%f
z!uFn6Eausfj3H|bTK<54W^xDTMh}x=qetY2;37jG8ai|US!h;yK&}G_*c~YV(eoX6
zhD--L(iK2jHV|bSpfHTG4g;XJP`3f7*0e5p5`!~q=*UdW>Xa`tV}BH*XS?@k$l_kb#>bc_w%0h$hS-PuYo%4
zQdJpH-xU5zA|urWZ5@FL$#!oki@}?}j?H0FdW5J{
zhmLEj(+*XmY*}AJ-
zuF=BjF0Cs^d7u3zX*f*n?>pd85!6gfMgk{LnW^c
z&=Yz#-%Lveo^OqO^Q(xw4dNn2E<{YBND|YDDkJ=Luh^Ie()@%4RsF<<0^Suc
zaV59(H0t2Du#N+R>;$K;+hB7rLQ(iJ_qvW2iM=gS{uW{Rt>jROT{eJ_F
z{*>b62lr~=axZytS?kd5CzjE~;5saYi0eb(I*0i(Khp?RjIK#8Efw^m6E|sG
z*&=+H-%*~BN3kb5wBG@qdkZkeAs$K1SSMABF$|-nnAd%w;ahHFzF7ap9b_Dild)oB
zelRlSOe_|kyE#n;WdYc~wzwk~m0;d<|5xO|v3e^MAO;0s<<|gs1v8SLf5VcZf9`vt
zr2iS{#){3DDy(tXrQ{A15s>ti0An~v@z3p6b0>-tpMO~LP*Zy~SUD*WrQ|NNE*3)p
z&$BG{?(|S3s)?1Dm0%P>s}r*W%n6h@)Q)uoOj0{B2i0J@Xj+HmH{qpCLcrbeH-u6m
zW_@Nkawg9(tI1A-afRa<3-r0>E!A=ZYO8i*OnmqTJOq?s3NORE)AFyHB
zo^CTj@6I1QVFD(^9q!lWfIRM|HuwurHu5jxA^$L|_RJ|-JAeZ4
zy_H%`0a$!6Iw7zwf!k}qEvqeFmk6dN!-(08*$i8^n30O8}Y}@T3sfk^tlh7}%Tuc?A=C
z;w>&;*hEjNaEXY210pjGdGong4649<)|BPMrE$Kw76{58IA_SgG;Oz2&
zoM{p`OGKOoM4Fy(Uv^mBaVA={jVU+)^2P5M_pEt
zlx+7_l#9|Si?^Z-QJ%M=Uhtj6!wReK9A=p#u`^}+Zx_!*!&a
Re: [edk2-devel] [edk2-non-osi][PATCH V1] ASpeed/ASpeedGopBinPkg: Add X64 ASpeedAst2600Gop UEFI Driver
Reviewed-by: Isaac Oram
-Original Message-
From: Sureshkumar Ponnusamy
Sent: Friday, June 3, 2022 11:30 AM
To: devel@edk2.groups.io
Cc: Desimone, Nathaniel L ; Oram, Isaac W
; DOPPALAPUDI, HARIKRISHNA ;
KARPAGAVINAYAGAM, MANICKAVASAKAM ; Bobroff, Zachary
Subject: [edk2-non-osi][PATCH V1] ASpeed/ASpeedGopBinPkg: Add X64
ASpeedAst2600Gop UEFI Driver
Added X64 ASpeedAst2600Gop UEFI Driver
Cc: Nate DeSimone
Cc: Isaac Oram
Cc: Harikrishna Doppalapudi
Cc: Manickavasakam Karpagavinayagam
Cc: Sureshkumar Ponnusamy
Cc: Zachary Bobroff
Signed-off-by: Sureshkumar Ponnusamy
---
Drivers/ASpeed/ASpeedGopBinPkg/X64/ASpeedAst2600Gop.efi | Bin 0 -> 32544 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/Drivers/ASpeed/ASpeedGopBinPkg/X64/ASpeedAst2600Gop.efi
b/Drivers/ASpeed/ASpeedGopBinPkg/X64/ASpeedAst2600Gop.efi
new file mode 100644
index
..3b5ec72f783a85a5c2378d808ad714d388aa5a38
GIT binary patch
literal 32544
zcmeIb3wTpi)<1mGB($`pCt(P6+{YEDHLoDByfTW7D}ZfpslopDzu$8L2$gJ
zrqw3LIDP%=4Ej1VyrTn*_gi>ZS;nIeS+#D6u(So-VgARCsqDa2q+UKNAOZmUf
zyx;SD&-XkNdUEzzd+oK?T6^ua*S?(KxQ+XlKY@R_Dl~VBqx+aNK>!Fs$LYoWT(OMc8%D
zsx?lOt%l4@R`s4p~quB)tYRsbkpi7#sFQR*GH_{Yp~;dpwX7OAxySFYaUaJrj0
zZsv7s6oLiNZ8-!ptM?1=8md;-EmLGC9k_u&_r#AG^hECxQ_3RIbHXS}--^;vIUg9J
zv{#O@`w_7vxb_lJ8ukYlz%9F-$)dEVJhq@-ly->H5>uY&*=f9E$G&~Nbn--LX1U$3
zUp|BA92LD;YpJMz*j>0;^LJA?F9>UypXRd1uLX|FA>1k{tTGaI<-D
zHUQcUX5UqyCg6$QVV|?iSw}>F*5i~R=@%0h-eK=Cv|(@J7HbnVly&4)sMt*kUSOAk
zDA88UangSIn`s;e!q4NW<0ZoM5Bmi%{bV8FP`f{Cxq`S)L2M$#r=U$B{t;<;B@j{b
zu|`IR_=VoP^c6^?a!EkT`b8;W+f8M?ybv4X6gGx}h6p}ZDda~J`4<)P^N9Q~MxHf)
zG4yA?o%AP4J4J7qLG;#VlQq@bC0nlDZ%$!Wb!r=RSy4LREenX=;!WVdLL5l?8Q?M2
zmQ7N&1lQDxev2v3BJCBu7L(Cm@}(#>o7^aB%@2xFI93efB8yyO%73?Adl`D)RN%YP
z+c~3>p6pB^7f*#|`rDH-NA|>+OZ4x!JjP=>V9BwHcZIci8<)O!YQtakforG}@#O
zd+k{CI!)Q4ccIBpx=2_k+$t;*r4x{Vdaw?d#OPvnsmfS9jDVM2=
zdPuKc_|`O{BMq_p9VZo42>xPStauGo()tBS(^PfR!09-?xtqxb)SI(`ntzz-O+nnH
zWWgAOb`DxXmhfi{`e2emYV9c0(J!|*i*IdZh4qjAl#I%)Xi8~Mo29&
zSFV3iis*NU^86_PAW_|A6_d1GRy(KBxaGyv{rsh3lt**OXJJpxLDvXTdK*-G{g`ZENWO!rKtdr
zSu4my^F;s6WpD|<1V8i)i=R~hHka2Eg<(bpMoWU_N@BT}SD0|2O?QVF093
zGJq6fkU9V;T>(m}9Y{SSnzxOyKLly#RKa~t!|YG4rxwq-1slFCA(yWaltqh1Kr{$k3xnQHtkCDmqm7}dtw
zidh9WL-La}G+rf2wiHUFic(f3VJr|K(QQb9L@{(Gwwzw87p2bV1E|PA%2t{#sHmCR
z4F#^D0{*PgsLxJSO9#+2y$v_ZV29(*i#IlN19l0v$l7j};UbNve`6J~u@_vBFJ`DXPQWecf5Iw;7
z4g=sEUNO_^6?3A~gf6pz>p@i0WzOuT4%B7Nrf@HsO*!32QBDr-ltWsAenWZ
zV6vyXNAQ}Bed8&5%?dWAirzIwfdUhw=>JJr`b;%vn{>(nI`3(fLyczE<$}Y@ptbEM`u=KY4G8OcalX0bs
z?eT6NooDmjB>HuK1QO_8Dr$G3p`>QdGkEsS)b-B-d_9AwNN?JuA@cL*W3l`o+(tVw
zgO6JYAffvL(mh(?KC}YjNdXZBH9sU@N#n5UGa!-yW6Zla!y*pdl-`Rx!o2yzhm
zH%QC1lZm;n(8IC|3mOv5?+VsmAM0j4|Jv8ouBzX97jtN$X9MMM(i49oc|ymNe~PqJXP3I9H{|;7V==pQYj4NTKa3tJ#2$A8S(*d2r~jw)
z#AD1vnGJciCx<@M@-J@ZUz`IAvKmG558whrs5t{-yM_Ro9ZeRsVbSZz?tGZphvFBY
z*p<{4PNgk+VT7yWC)NZeoF9)s;8^*iFP+A`)Ot{z<7
zVp9>doPgj+`qC~%oTFg0iP>3h$2TKatEaZKBE!WC{FY#Ks5`0J%K$dXnr)X>t+4W2K9WS8bV&3=!G4_^*CUYn
zAist4e5Y~EN4foic3)xm9utzgk^MOO`XfY68}?f3`7IBT8HnD}6@}r|`H5EhjA=dP
zcy^YvQEn;5x!afSK*<9N!8ee6J^Dvc(%-%UL4^Uxv0_AH@1p*bE${Npi-y3PL^XW#
zW;g+s_)jPRY_Z{K(qd@jm&{0qy^gf}%tVfhOhs4#wXArR+eiLF@krkqUCFN+0f?r1
zzBRNPkP>+d9D=nBv5b+c77BMYYQ?lu2>3VyS8Xjk)2OwjVYoWwG)YS#WH7c@yF*+j
zD%u0%yDZYG`dC;%-(D9T0fYfrkfF@ha?*JjaQDY{Lt^`~QzW~ZJ{wJe?oZ>23DQ%f
z!uFn6Eausfj3H|bTK<54W^xDTMh}x=qetY2;37jG8ai|US!h;yK&}G_*c~YV(eoX6
zhD--L(iK2jHV|bSpfHTG4g;XJP`3f7*0e5p5`!~q=*UdW>Xa`tV}BH*XS?@k$l_kb#>bc_w%0h$hS-PuYo%4
zQdJpH-xU5zA|urWZ5@FL$#!oki@}?}j?H0FdW5J{
zhmLEj(+*XmY*}AJ-
zuF=BjF0Cs^d7u3zX*f*n?>pd85!6gfMgk{LnW^c
z&=Yz#-%Lveo^OqO^Q(xw4dNn2E<{YBND|YDDkJ=Luh^Ie()@%4RsF<<0^Suc
zaV59(H0t2Du#N+R>;$K;+hB7rLQ(iJ_qvW2iM=gS{uW{Rt>jROT{eJ_F
z{*>b62lr~=axZytS?kd5CzjE~;5saYi0eb(I*0i(Khp?RjIK#8Efw^m6E|sG
z*&=+H-%*~BN3kb5wBG@qdkZkeAs$K1SSMABF$|-nnAd%w;ahHFzF7ap9b_Dild)oB
zelRlSOe_|kyE#n;WdYc~wzwk~m0;d<|5xO|v3e^MAO;0s<<|gs1v8SLf5VcZf9`vt
zr2iS{#){3DDy(tXrQ{A15s>ti0An~v@z3p6b0>-tpMO~LP*Zy~SUD*WrQ|NNE*3)p
z&$BG{?(|S3s)?1Dm0%P>s}r*W%n6h@)Q)uoOj0{B2i0J@Xj+HmH{qpCLcrbeH-u6m
zW_@Nkawg9(tI1A-afRa<3-r0>E!A=ZYO8i*OnmqTJOq?s3NORE)AFyHB
zo^CTj@6I1QVFD(^9q!lWfIRM|HuwurHu5jxA^$L|_RJ|-JAeZ4
zy_H%`0a$!6Iw7zwf!k}qEvqeFmk6dN!-(08*$i8^n30O8}Y}@T3sfk^tlh7}%Tuc?A=C
z;w>&;*hEjNaEXY210pjGdGong4649<)|BPMrE$Kw76{58IA_SgG;Oz2&
zoM{p`OGKOoM4Fy(Uv^mBaVA={jVU+)^2P5M_pEt
zlx+7_l#9|Si?^Z-QJ%M=Uhtj6!wReK9A=p#u`^}+Zx_!*!&~Dswtc+iCsB^lFQ@
z>Qt=Fj6OvUZMrDkipit3jGEkt)pt;}cB3wle64{{Mp~v;iLOf!A%9Kl+*_kl9`-qEPYI~!z=fEeHW7?`(6tII6pb1}|K
zd*zZJaolu_2iWp*Wh
zroLC4nGPjyC0AjUP9XR{By@1t#1(kU--K;O^fPa1F@_L+%gyJj3mx+6nSw7Ep-Cx=
zIjOgrm*7}+`PZgL=nVb_Ru
z+6V<1SBl^ZMTUT`Fzqbg@(QXErXAv2{(wY#8>V1{o!WjGm7A({9>^W$NY5
z^XRmpEws5xJ5FYblWRtS~(wa{)RLIR@{$82qPLo6yix4l52%Ol=P+Pp-*A
z;E-zg`(+bm`%-D~^)W@;s+vcK6fH+Zr4GbcGu%ngQSLn{{4x?-VTT;Tq2~W&am
[edk2-devel][edk2-platforms][PATCH V1 1/1] WhitleySiliconPkg/PchPolicyPpi: Fix binary structure layout
Disambiguate the PCH_DMI_CONFIG and PCH_TRACE_HUB_CONFIG structure
definitions such that compilers generate same binary layouts.
Cc: Nate DeSimone
Cc: Chasel Chiu
Signed-off-by: Isaac Oram
---
.../Pch/SouthClusterLbg/Include/PchPolicyCommon.h | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/Silicon/Intel/WhitleySiliconPkg/Pch/SouthClusterLbg/Include/PchPolicyCommon.h
b/Silicon/Intel/WhitleySiliconPkg/Pch/SouthClusterLbg/Include/PchPolicyCommon.h
index 0e10d0b8f0..c95481bf1d 100644
---
a/Silicon/Intel/WhitleySiliconPkg/Pch/SouthClusterLbg/Include/PchPolicyCommon.h
+++
b/Silicon/Intel/WhitleySiliconPkg/Pch/SouthClusterLbg/Include/PchPolicyCommon.h
@@ -1351,7 +1351,9 @@ typedef struct {
**/
UINT32 DmiAspm : 1;
UINT32 PwrOptEnable : 1;///< 0: Disable; 1: Enable DMI
Power Optimizer on PCH side.
+ UINT32 Rsvdbits1 : 30;
BOOLEANDmiStopAndScreamEnable : 1;
+ BOOLEANRsvdbits2 : 7;
UINT32 DmiLinkDownHangBypass : 1;
UINT32 Rsvdbits : 29;
UINT32 Rsvd0[6]; ///< Reserved bytes
@@ -1447,6 +1449,7 @@ typedef struct {
TRACE_HUB_CONFIGTraceHub;
UINT32 AetEnableMode : 2;
UINT32 PchTraceHubHide: 1;
+ UINT32 Rsvdbits : 29;
} PCH_TRACE_HUB_CONFIG;
--
2.36.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#90089): https://edk2.groups.io/g/devel/message/90089
Mute This Topic: https://groups.io/mt/91386455/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/JunctionCity : Enabled Network and IPMI features for JunctionCity
Reviewed-by: Isaac Oram -Original Message- From: Sureshkumar Ponnusamy Sent: Wednesday, May 25, 2022 8:32 PM To: devel@edk2.groups.io Cc: Oram, Isaac W ; Desimone, Nathaniel L ; DOPPALAPUDI, HARIKRISHNA ; KARPAGAVINAYAGAM, MANICKAVASAKAM Subject: [edk2-platforms] [PATCH V1] WhitleyOpenBoardPkg/JunctionCity : Enabled Network and IPMI features for JunctionCity Cc: Isaac Oram Cc: Nate DeSimone Cc: Harikrishna Doppalapudi Cc: Manickavasakam Karpagavinayagam Signed-off-by: Sureshkumar Ponnusamy --- Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc index 4a2a963c28..8cedbaccee 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.dsc @@ -3,7 +3,7 @@ # # @copyright # Copyright 2008 - 2021 Intel Corporation. -# Copyright (c) 2021, American Megatrends International LLC. +# Copyright (c) 2021 - 2022, American Megatrends International LLC. # # SPDX-License-Identifier: BSD-2-Clause-Patent ## @@ -17,7 +17,7 @@ PEI_ARCH= IA32 DXE_ARCH= X64 - !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc + !include WhitleyOpenBoardPkg/PlatformPkg.dsc [PcdsFixedAtBuild] gMinPlatformPkgTokenSpaceGuid.PcdBootStage|6 @@ -32,7 +32,6 @@ !endif !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc - !include WhitleyOpenBoardPkg/PlatformPkg.dsc [Defines] BOARD_NAME= JunctionCity -- 2.31.0.windows.1 Please consider the environment before printing this email. The information contained in this message may be confidential and proprietary to American Megatrends (AMI). This communication is intended to be read only by the individual or entity to whom it is addressed or by their designee. If the reader of this message is not the intended recipient, you are on notice that any distribution of this message, in any form, is strictly prohibited. Please promptly notify the sender by reply e-mail or by telephone at 770-246-8600, and then delete or destroy all copies of the transmission. -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90060): https://edk2.groups.io/g/devel/message/90060 Mute This Topic: https://groups.io/mt/91347881/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 V2 1/1] WhitleyOpenBoardPkg/Build: Compress CpuMpPei.inf
Compressing the CpuMpPei component results in it executing
from cached memory saving significant boot time.
Cc: Nate DeSimone
Cc: Chasel Chiu
Signed-off-by: Isaac Oram
---
.../Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.fdf | 2 +-
Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf | 2 +-
Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.fdf
b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.fdf
index ca5d135405..48992693ea 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/PlatformPkg.fdf
@@ -449,7 +449,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize
= 0x0100
INF
WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.inf
- INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf
+ INF RuleOverride = LzmaCompress UefiCpuPkg/CpuMpPei/CpuMpPei.inf
!if $(FSP_MODE) == 0
FILE PEIM = 8F7F3D20-9823-42DD-9FF7-53DAC93EF407 {
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
index b72aa2b688..c63442508b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
@@ -452,7 +452,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize
= 0x0100
INF
WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.inf
- INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf
+ INF RuleOverride = LzmaCompress UefiCpuPkg/CpuMpPei/CpuMpPei.inf
!if $(FSP_MODE) == 0
FILE PEIM = 8F7F3D20-9823-42DD-9FF7-53DAC93EF407 {
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
index ab594ff409..280d55acc3 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
@@ -449,7 +449,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize
= 0x0100
INF
WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.inf
- INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf
+ INF RuleOverride = LzmaCompress UefiCpuPkg/CpuMpPei/CpuMpPei.inf
!if $(FSP_MODE) == 0
FILE PEIM = 8F7F3D20-9823-42DD-9FF7-53DAC93EF407 {
--
2.36.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#89974): https://edk2.groups.io/g/devel/message/89974
Mute This Topic: https://groups.io/mt/91300912/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [GSoC 2022] Introducing myself & seeking for project ideas
Benjamin, Thanks for sharing, it is interesting that Simics gets that far. In looking at the QemuPkg, I note that they have QEMU drivers for all the DXE and SMM HW needs that likely explain . Timer, SMM access, SMM control, FVB services … I haven’t gotten to the next level of details yet, like what chipsets the QemuPkg supports. Readme says “The minimum required QEMU machine type is "pc-q35-2.5".” Also I note that there is a whole section on QEMU SMM and flash options. It seems promising to make the MinPlatform QEMU board port using the QemuPkg for all the “silicon” support needed. As Pedro indicated though, we have not yet had a chance to get into project details yet. As we get through GSoC community bonding period, we should get better understanding. Regards, Isaac From: devel@edk2.groups.io On Behalf Of Pedro Falcato Sent: Monday, May 23, 2022 10:34 AM To: edk2-devel-groups-io ; Benjamin Doron Cc: Desimone, Nathaniel L ; Gerd Hoffmann ; Oram, Isaac W Subject: Re: [edk2-devel] [GSoC 2022] Introducing myself & seeking for project ideas (CC Gerd, Isaac) Comments inline. On Mon, May 23, 2022 at 5:50 PM Benjamin Doron mailto:benjamin.doro...@gmail.com>> wrote: Hi Theo and Nate, I took a brief look at this myself, because having an emulated environment would help me with my project. I didn't know then that QemuOpenBoardPkg was an accepted project this year. OvmfPkg is large, I'm unfamiliar with QEMU's codebase and I'm only minimally familiar with Intel's old ICH chipsets (the platform some emulators expose), so I looked at porting QEMU's Q35 + ICH9 support into SimicsOpenBoardPkg. I don't know how you're preparing, but I'd recommend at least a look there: Q35's ICH9 and Simics' ICH10 are fairly similar. There are other QEMU machines, but I can't comment on those. We're still trying to figure everything out and since the GSoC projects were only announced Friday, we haven't discussed much. My idea was to try to get something relatively smaller and simpler than current OVMF, as the end result can be a lot more interesting than just repackaging OVMF or straight up copying SimicsOpenBoardPkg; we're also mostly aiming for Stage IV (Booting to an OS), so we can safely discard some of the advanced features of OVMF for now. Again, I'd like to give you more details but it's still too early and we're trying to introduce Theo to UEFI; hopefully we'll get a better idea of the project for the summer this week. SimicsOpenBoardPkg can partially boot QEMU with a minimum of changes. It makes it into the DXE phase (where we'd eventually get a shell), but fails to initialise SMM, so it can't load the variable driver in there. Many drivers depend on the variable protocol, including critical UEFI-architecture ones, so the DXE core will assert and hang after printing a bunch of "driver GUID discovered but not loaded" messages. To fix this, the SMM access, maybe SMM control drivers would need to be patched; some register definitions differ between chipsets. One issue with QEMU is that you currently have 3 machines worth supporting: the i440fx (i440fx + PIIX), which is the default, the Q35 (Q35 + ICH9), and the microvm (probably not going to be apart of the scope of this project, at least for now, even though OVMF supports it). I don't know much about Simics or SimicsOpenBoardPkg, but I imagine that taking way too much inspiration from them would possibly negatively impact the capability of supporting multiple platforms in one OpenBoardPkg. Anyways, I can send you my diff if you'd like, or you're welcome to approach this any way you'd like. SimicsOpenBoardPkg is not a true MinPlatform board because it implements a number of init steps itself rather than using some of MinPlatform's FSP-centric libraries. I'm probably going to skip to the step where I try Frankensteining enough MinPlatform code in to suffice my testing. Best regards, Benjamin -- Pedro Falcato -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89973): https://edk2.groups.io/g/devel/message/89973 Mute This Topic: https://groups.io/mt/90148141/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel][edk2-platforms][PATCH V1 1/1] WhitleyOpenBoardPkg/Build: Compress CpuMpPei.inf
Compressing the CpuMpPei component results in it executing
from cached memory saving significant boot time.
Cc: Nate DeSimone
Cc: Chasel Chiu
Signed-off-by: Isaac Oram
---
Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
index b72aa2b688..c63442508b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
@@ -452,7 +452,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize
= 0x0100
INF
WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.inf
- INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf
+ INF RuleOverride = LzmaCompress UefiCpuPkg/CpuMpPei/CpuMpPei.inf
!if $(FSP_MODE) == 0
FILE PEIM = 8F7F3D20-9823-42DD-9FF7-53DAC93EF407 {
--
2.36.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#89894): https://edk2.groups.io/g/devel/message/89894
Mute This Topic: https://groups.io/mt/91198366/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/1] WhitleyOpenBoardPkg/PeiUbaPlatLib: Add missing PPI consumed
Pushed as: 9997f9a1f2..fdaf4eb69a -Original Message- From: Desimone, Nathaniel L Sent: Wednesday, May 18, 2022 3:45 PM To: Oram, Isaac W ; devel@edk2.groups.io Cc: Chiu, Chasel Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 1/1] WhitleyOpenBoardPkg/PeiUbaPlatLib: Add missing PPI consumed Reviewed-by: Nate DeSimone -Original Message- From: Oram, Isaac W Sent: Thursday, May 12, 2022 11:26 AM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Chiu, Chasel Subject: [edk2-devel][edk2-platforms][PATCH V1 1/1] WhitleyOpenBoardPkg/PeiUbaPlatLib: Add missing PPI consumed gEfiPeiSmbus2PpiGuid used but missing GUID in the INF file Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Isaac Oram --- .../WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaPlatLib.inf | 1 + 1 file changed, 1 insertion(+) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaPlatLib.inf b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaPlatLib.inf index 5e911ba790..7154e72e73 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaPlatLib.inf +++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaPlatLib.inf @@ -54,6 +54,7 @@ [Ppis] gUbaConfigDatabasePpiGuid gDynamicSiLibraryPpiGuid ## ALWAYS_CONSUMES + gEfiPeiSmbus2PpiGuid ## ALWAYS_CONSUMES [Depex] gUbaConfigDatabasePpiGuid AND -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89893): https://edk2.groups.io/g/devel/message/89893 Mute This Topic: https://groups.io/mt/91064667/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: Removed unrecognized characters
Pushed as: 03d1c51272..9997f9a1f2 -Original Message- From: devel@edk2.groups.io On Behalf Of Oram, Isaac W Sent: Wednesday, May 18, 2022 3:17 PM To: Ponnusamy, Suresh ; devel@edk2.groups.io Cc: Desimone, Nathaniel L ; DOPPALAPUDI, HARIKRISHNA ; KARPAGAVINAYAGAM, MANICKAVASAKAM Subject: Re: [edk2-devel] [edk2-platforms][PATCH V1] WhitleyOpenBoardPkg: Removed unrecognized characters Reviewed-by: Isaac Oram -Original Message- From: Sureshkumar Ponnusamy Sent: Wednesday, May 11, 2022 10:18 AM To: devel@edk2.groups.io Cc: Oram, Isaac W ; Desimone, Nathaniel L ; DOPPALAPUDI, HARIKRISHNA ; KARPAGAVINAYAGAM, MANICKAVASAKAM Subject: [edk2-platforms][PATCH V1] WhitleyOpenBoardPkg: Removed unrecognized characters Unrecognized characters present in StructurePcd.dsc causes build issues in non-english machines Cc: Isaac Oram Cc: Nate DeSimone Cc: Harikrishna Doppalapudi Cc: Manickavasakam Karpagavinayagam Signed-off-by: Sureshkumar Ponnusamy --- Platform/Intel/WhitleyOpenBoardPkg/StructurePcd.dsc | 50 ++-- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/StructurePcd.dsc b/Platform/Intel/WhitleyOpenBoardPkg/StructurePcd.dsc index 0e00a72fcd..ec75bac06f 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/StructurePcd.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/StructurePcd.dsc @@ -5262,26 +5262,26 @@ gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PEXPHIDE[82]|0x0 gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PEXPHIDE[83]|0x0 # Hide Port? gStructPcdTokenSpaceGuid.PcdSocketIioConfig.Pci64BitResourceAllocation|0x1 # PCI 64-Bit Resource Allocation gStructPcdTokenSpaceGuid.PcdSocketIioConfig.Pcie10bitTag|0x2 # PCIe 10-bit Tag Enable -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[0]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack1 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[1]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack2 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[2]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack3 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[3]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack4 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[4]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack5 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[5]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack1 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[6]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack2 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[7]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack3 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[8]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack4 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[9]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack5 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[10]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack1 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[11]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack2 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[12]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack3 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[13]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack4 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[14]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack5 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[15]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack1 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[16]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack2 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[17]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack3 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[18]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack4 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[19]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack5 +gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[0]|0x0 # Intel AIC Retimer/AIC SSD HW at Stack1 +gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[1]|0x0 # Intel AIC Retimer
Re: [edk2-devel] [edk2-platforms][PATCH V1] WhitleyOpenBoardPkg: Removed unrecognized characters
Reviewed-by: Isaac Oram -Original Message- From: Sureshkumar Ponnusamy Sent: Wednesday, May 11, 2022 10:18 AM To: devel@edk2.groups.io Cc: Oram, Isaac W ; Desimone, Nathaniel L ; DOPPALAPUDI, HARIKRISHNA ; KARPAGAVINAYAGAM, MANICKAVASAKAM Subject: [edk2-platforms][PATCH V1] WhitleyOpenBoardPkg: Removed unrecognized characters Unrecognized characters present in StructurePcd.dsc causes build issues in non-english machines Cc: Isaac Oram Cc: Nate DeSimone Cc: Harikrishna Doppalapudi Cc: Manickavasakam Karpagavinayagam Signed-off-by: Sureshkumar Ponnusamy --- Platform/Intel/WhitleyOpenBoardPkg/StructurePcd.dsc | 50 ++-- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/StructurePcd.dsc b/Platform/Intel/WhitleyOpenBoardPkg/StructurePcd.dsc index 0e00a72fcd..ec75bac06f 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/StructurePcd.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/StructurePcd.dsc @@ -5262,26 +5262,26 @@ gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PEXPHIDE[82]|0x0 gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PEXPHIDE[83]|0x0 # Hide Port? gStructPcdTokenSpaceGuid.PcdSocketIioConfig.Pci64BitResourceAllocation|0x1 # PCI 64-Bit Resource Allocation gStructPcdTokenSpaceGuid.PcdSocketIioConfig.Pcie10bitTag|0x2 # PCIe 10-bit Tag Enable -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[0]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack1 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[1]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack2 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[2]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack3 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[3]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack4 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[4]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack5 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[5]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack1 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[6]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack2 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[7]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack3 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[8]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack4 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[9]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack5 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[10]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack1 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[11]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack2 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[12]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack3 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[13]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack4 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[14]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack5 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[15]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack1 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[16]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack2 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[17]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack3 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[18]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack4 -gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[19]|0x0 # Intel� AIC Retimer/AIC SSD HW at Stack5 +gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[0]|0x0 # Intel AIC Retimer/AIC SSD HW at Stack1 +gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[1]|0x0 # Intel AIC Retimer/AIC SSD HW at Stack2 +gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[2]|0x0 # Intel AIC Retimer/AIC SSD HW at Stack3 +gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[3]|0x0 # Intel AIC Retimer/AIC SSD HW at Stack4 +gStructPcdTokenSpaceGuid.PcdSocketIioConfig.PcieAICEnabled[4]|0x0
