Reviewed-by: Nate DeSimone <nathaniel.l.desim...@intel.com> > -----Original Message----- > From: Chiu, Chasel <chasel.c...@intel.com> > Sent: Thursday, October 7, 2021 11:43 PM > To: devel@edk2.groups.io > Cc: Chiu, Chasel <chasel.c...@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desim...@intel.com>; Chaganty, Rangasai V > <rangasai.v.chaga...@intel.com>; Kethi Reddy, Deepika > <deepika.kethi.re...@intel.com>; Esakkithevar, Kathappan > <kathappan.esakkithe...@intel.com> > Subject: [edk2-platforms: PATCH v3 2/9] CometlakeOpenBoardPkg: Use > same variable name for FspNvsHob. > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3678 > > To simplify the implementation the variable Name/GUID has been changed > to "FspNvsBuffer" and gFspNvsBufferVariableGuid regardless it stores the > data from FSP_NON_VOLATILE_STORAGE_HOB2 or > FSP_NON_VOLATILE_STORAGE_HOB. > > Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> > Cc: Rangasai V Chaganty <rangasai.v.chaga...@intel.com> > Cc: Deepika Kethi Reddy <deepika.kethi.re...@intel.com> > Cc: Kathappan Esakkithevar <kathappan.esakkithe...@intel.com> > Signed-off-by: Chasel Chiu <chasel.c...@intel.com> > --- > > Platform/Intel/CometlakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolic > yUpdateLibFsp/PeiFspMiscUpdUpdateLib.c | 63 ++++++++++++++-------- > ----------------------------------------- > > Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.d > sc | 3 +++ > > Platform/Intel/CometlakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolic > yUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf | 5 ++--- > 3 files changed, 19 insertions(+), 52 deletions(-) > > diff --git > a/Platform/Intel/CometlakeOpenBoardPkg/FspWrapper/Library/PeiSiliconP > olicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c > b/Platform/Intel/CometlakeOpenBoardPkg/FspWrapper/Library/PeiSiliconP > olicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c > index 7dbdfa7c16..9e8606ada9 100644 > --- > a/Platform/Intel/CometlakeOpenBoardPkg/FspWrapper/Library/PeiSiliconP > olicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c > +++ > b/Platform/Intel/CometlakeOpenBoardPkg/FspWrapper/Library/PeiSilicon > +++ PolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c > @@ -2,7 +2,7 @@ > Implementation of Fsp Misc UPD Initialization. - Copyright (c) 2020, > Intel > Corporation. All rights reserved.<BR>+ Copyright (c) 2020 - 2021, Intel > Corporation. All rights reserved.<BR> SPDX-License-Identifier: BSD-2- > Clause-Patent **/ @@ -17,7 +17,6 @@ > #include <FspmUpd.h> #include <FspsUpd.h> -#include > <Library/MemoryAllocationLib.h> #include <Library/DebugLib.h> #include > <Library/DebugPrintErrorLevelLib.h> #include <Library/PciLib.h>@@ -44,55 > +43,21 @@ PeiFspMiscUpdUpdatePreMem ( > ) { EFI_STATUS Status;- > EFI_PEI_READ_ONLY_VARIABLE2_PPI > *VariableServices;- UINTN VariableSize;- VOID > *MemorySavedData;-- Status = PeiServicesLocatePpi (- > &gEfiPeiReadOnlyVariable2PpiGuid,- 0,- NULL,- > (VOID **) > &VariableServices- );- if (EFI_ERROR (Status)) {- > ASSERT_EFI_ERROR > (Status);- return Status;+ UINTN > FspNvsBufferSize;+ VOID > *FspNvsBufferPtr;++ //+ // Initialize S3 Data variable (S3DataPtr). It may > be > used for warm and fast boot paths.+ //+ FspNvsBufferPtr = NULL;+ > FspNvsBufferSize = 0;+ Status = PeiGetLargeVariable (L"FspNvsBuffer", > &gFspNvsBufferVariableGuid, &FspNvsBufferPtr, &FspNvsBufferSize);+ if > (Status == EFI_SUCCESS) {+ DEBUG ((DEBUG_INFO, "Get L\"FspNvsBuffer\" > gFspNvsBufferVariableGuid - %r\n", Status));+ DEBUG ((DEBUG_INFO, > "FspNvsBuffer Size - 0x%x\n", FspNvsBufferSize));+ FspmUpd- > >FspmArchUpd.NvsBufferPtr = FspNvsBufferPtr; } - VariableSize = 0;- > MemorySavedData = NULL;- Status = VariableServices->GetVariable (- > VariableServices,- L"MemoryConfig",- > &gFspNonVolatileStorageHobGuid,- NULL,- > &VariableSize,- MemorySavedData- > );- if > (Status == EFI_BUFFER_TOO_SMALL) {- MemorySavedData = AllocatePool > (VariableSize);- if (MemorySavedData == NULL) {- ASSERT > (MemorySavedData != NULL);- return EFI_OUT_OF_RESOURCES;- }-- > DEBUG ((DEBUG_INFO, "VariableSize is 0x%x\n", VariableSize));- Status = > VariableServices->GetVariable (- > VariableServices,- > L"MemoryConfig",- > &gFspNonVolatileStorageHobGuid,- > NULL,- &VariableSize,- > MemorySavedData- > );- if (Status == EFI_SUCCESS) {- FspmUpd->FspmArchUpd.NvsBufferPtr > = MemorySavedData;- } else {- DEBUG ((DEBUG_ERROR, "Fail to retrieve > Variable:\"MemoryConfig\" gMemoryConfigVariableGuid, Status = %r\n", > Status));- ASSERT_EFI_ERROR (Status);- }- }- FspmUpd- > >FspmArchUpd.NvsBufferPtr = MemorySavedData; return EFI_SUCCESS; > }diff --git > a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg > .dsc > b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg > .dsc > index 44a1bd54d6..d63ff263c1 100644 > --- > a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg > .dsc > +++ > b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg > .ds > +++ c > @@ -142,6 +142,9 @@ > ####################################### > PlatformHookLib|$(PROJECT)/Library/BasePlatformHookLib/BasePlatformHo > okLib.inf +[LibraryClasses.Common.SEC]+ > VariableReadLib|MinPlatformPkg/Library/BaseVariableReadLibNull/BaseVari > ableReadLibNull.inf+ [LibraryClasses.IA32.SEC] > ####################################### # Platform Packagediff - > -git > a/Platform/Intel/CometlakeOpenBoardPkg/FspWrapper/Library/PeiSiliconP > olicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf > b/Platform/Intel/CometlakeOpenBoardPkg/FspWrapper/Library/PeiSiliconP > olicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf > index c842b7eef6..94776603c4 100644 > --- > a/Platform/Intel/CometlakeOpenBoardPkg/FspWrapper/Library/PeiSiliconP > olicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf > +++ > b/Platform/Intel/CometlakeOpenBoardPkg/FspWrapper/Library/PeiSilicon > +++ PolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf > @@ -2,7 +2,7 @@ > # Provide FSP wrapper platform related function. # #-# Copyright (c) 2020, > Intel Corporation. All rights reserved.<BR>+# Copyright (c) 2020 - 2021, > Intel > Corporation. All rights reserved.<BR> # # SPDX-License-Identifier: BSD-2- > Clause-Patent #@@ -82,7 +82,6 @@ > PchInfoLib PchHsioLib PchPcieRpLib- MemoryAllocationLib > DebugPrintErrorLevelLib SiPolicyLib PchGbeLib@@ -132,7 +131,7 @@ > gCometlakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3 > [Guids]- gFspNonVolatileStorageHobGuid ## CONSUMES+ > gFspNvsBufferVariableGuid ## CONSUMES gTianoLogoGuid > ## CONSUMES gEfiMemoryOverwriteControlDataGuid -- > 2.28.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81768): https://edk2.groups.io/g/devel/message/81768 Mute This Topic: https://groups.io/mt/86164706/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
