Reviewed-by: Chasel Chiu <chasel.c...@intel.com>
> -----Original Message----- > From: Chen, Marc W > Sent: Monday, September 2, 2019 11:36 PM > To: devel@edk2.groups.io > Cc: Kubacki, Michael A <michael.a.kuba...@intel.com>; Chiu, Chasel > <chasel.c...@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desim...@intel.com>; Gao, Liming <liming....@intel.com> > Subject: [edk2-platforms][PATCH V2 1/6] MinPlatformPkg: Clean up > duplicated SmramMemoryReserve.h files > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2108 > > SmramMemoryReserve.h has been added into > Edk2\MdePkg\Include\Guid\SmramMemoryReserve.h. > > The duplicated header file can be clean up. > Edk2Platforms\Platform\Intel\MinPlatformPkg\Include\Guid\SmramMemory > Reserve.h > > Cc: Michael Kubacki <michael.a.kuba...@intel.com> > Cc: Chasel Chiu <chasel.c...@intel.com> > Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> > Cc: Liming Gao <liming....@intel.com> > > Co-authored-by: Nate DeSimone <nathaniel.l.desim...@intel.com> > Signed-off-by: Marc W Chen <marc.w.c...@intel.com> > Signed-off-by: Nate DeSimone <nathaniel.l.desim...@intel.com> > --- > .../Include/Guid/SmramMemoryReserve.h | 54 ------------------- > .../Intel/MinPlatformPkg/MinPlatformPkg.dec | 5 -- > .../PlatformInitPei/PlatformInitPostMem.c | 4 +- > .../PlatformInitPei/PlatformInitPostMem.inf | 4 +- > .../TestPointCheckLib/PeiCheckSmmInfo.c | 6 +-- > 5 files changed, 7 insertions(+), 66 deletions(-) delete mode 100644 > Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h > > diff --git > a/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h > b/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h > deleted file mode 100644 > index 9918c768ba..0000000000 > --- a/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h > @@ -1,54 +0,0 @@ > -/** @file > - Definition of GUIDed HOB for reserving SMRAM regions. > - > - This file defines: > - * the GUID used to identify the GUID HOB for reserving SMRAM regions. > - * the data structure of SMRAM descriptor to describe SMRAM candidate > regions > - * values of state of SMRAM candidate regions > - * the GUID specific data structure of HOB for reserving SMRAM regions. > - This GUIDed HOB can be used to convey the existence of the T-SEG > reservation and H-SEG usage > - > -Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR> > -SPDX-License-Identifier: BSD-2-Clause-Patent > - > - @par Revision Reference: > - GUIDs defined in SmmCis spec version 0.9. > - > -**/ > - > -#ifndef _EFI_SMM_PEI_SMRAM_MEMORY_RESERVE_H_ > -#define _EFI_SMM_PEI_SMRAM_MEMORY_RESERVE_H_ > - > -#define EFI_SMM_PEI_SMRAM_MEMORY_RESERVE \ > - { \ > - 0x6dadf1d1, 0xd4cc, 0x4910, {0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, > 0x3d } \ > - } > - > -/** > -* GUID specific data structure of HOB for reserving SMRAM regions. > -* > -* Inconsistent with specification here: > -* EFI_HOB_SMRAM_DESCRIPTOR_BLOCK has been changed to > EFI_SMRAM_HOB_DESCRIPTOR_BLOCK. > -* This inconsistency is kept in code in order for backward compatibility. > -**/ > -typedef struct { > - /// > - /// Designates the number of possible regions in the system > - /// that can be usable for SMRAM. > - /// > - /// Inconsistent with specification here: > - /// In Framework SMM CIS 0.91 specification, it defines the field type as > UINTN. > - /// However, HOBs are supposed to be CPU neutral, so UINT32 should be > used instead. > - /// > - UINT32 NumberOfSmmReservedRegions; > - /// > - /// Used throughout this protocol to describe the candidate > - /// regions for SMRAM that are supported by this platform. > - /// > - EFI_SMRAM_DESCRIPTOR Descriptor[1]; > -} EFI_SMRAM_HOB_DESCRIPTOR_BLOCK; > - > -extern EFI_GUID gEfiSmmPeiSmramMemoryReserveGuid; > - > -#endif > - > diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > index a642f9f3a3..d79f5ec1bd 100644 > --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > @@ -42,11 +42,6 @@ gBoardNotificationInitGuid = {0x78dbcabf, 0xc544, > 0x4e6f, {0xaf, 0x3a, 0x71, 0x1 > gBoardAcpiTableGuid = {0xd70e9f57, 0x69f, 0x4bef, {0x96, 0xc0, > 0x84, 0x74, 0xf4, 0xa2, 0x5f, 0x3a}} > gBoardAcpiEnableGuid = {0x9727b610, 0xf645, 0x4429, {0x89, 0x21, > 0x2c, 0x2b, 0x58, 0xdc, 0xbb, 0xa}} > > -## > -## IntelFrameworkPkg > -## > -gEfiSmmPeiSmramMemoryReserveGuid = {0x6dadf1d1, 0xd4cc, 0x4910, > {0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d}} > - > gDefaultDataFileGuid = { 0x1ae42876, 0x008f, > 0x4161, { 0xb2, 0xb7, 0x1c, 0x0d, 0x15, 0xc5, 0xef, 0x43 }} > gDefaultDataOptSizeFileGuid = { 0x003e7b41, 0x98a2, > 0x4be2, { 0xb2, 0x7a, 0x6c, 0x30, 0xc7, 0x65, 0x52, 0x25 }} > > diff --git > a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPo > stMem.c > b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP > ostMem.c > index 00877593bc..70e6b9a495 100644 > --- > a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPo > stMem.c > +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/Platfor > +++ mInitPostMem.c > @@ -1,7 +1,7 @@ > /** @file > Source code file for Platform Init PEI module > > -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR> > +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR> > SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > @@ -113,7 +113,7 @@ SetCacheMtrrAfterEndOfPei ( > Status = PeiServicesGetHobList ((VOID **) &Hob.Raw); > while (!END_OF_HOB_LIST (Hob)) { > if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION) { > - if (CompareGuid (&Hob.Guid->Name, > &gEfiSmmPeiSmramMemoryReserveGuid)) { > + if (CompareGuid (&Hob.Guid->Name, > &gEfiSmmSmramMemoryGuid)) { > SmramHobDescriptorBlock = > (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *) (Hob.Guid + 1); > for (Index = 0; Index < > SmramHobDescriptorBlock->NumberOfSmmReservedRegions; Index++) { > if (SmramHobDescriptorBlock->Descriptor[Index].PhysicalStart > > 0x100000) { diff --git > a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPo > stMem.inf > b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP > ostMem.inf > index 32d67a0a34..0736c8d494 100644 > --- > a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPo > stMem.inf > +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/Platfor > +++ mInitPostMem.inf > @@ -1,7 +1,7 @@ > ### @file > # Component information file for the Platform Init PEI module. > # > -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2017 - 2019, Intel Corporation. All rights > +reserved.<BR> > # > # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -45,7 +45,7 @@ > [Protocols] > > [Guids] > - gEfiSmmPeiSmramMemoryReserveGuid ## CONSUMES > + gEfiSmmSmramMemoryGuid ## CONSUMES > > [Depex] > gEfiPeiMemoryDiscoveredPpiGuid > diff --git > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckS > mmInfo.c > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckS > mmInfo.c > index d04baf7663..6fe08e22ed 100644 > --- > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckS > mmInfo.c > +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCh > +++ eckSmmInfo.c > @@ -1,6 +1,6 @@ > /** @file > > -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR> > +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR> > SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > @@ -123,7 +123,7 @@ TestPointCheckSmramHob ( > DEBUG ((DEBUG_INFO, "SMRAM HOB\n")); > while (!END_OF_HOB_LIST (Hob)) { > if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION) { > - if (CompareGuid (&Hob.Guid->Name, > &gEfiSmmPeiSmramMemoryReserveGuid)) { > + if (CompareGuid (&Hob.Guid->Name, > &gEfiSmmSmramMemoryGuid)) { > SmramHobDescriptorBlock = > (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *) (Hob.Guid + 1); > DumpSmramDescriptor > (SmramHobDescriptorBlock->NumberOfSmmReservedRegions, > SmramHobDescriptorBlock->Descriptor); > break; > @@ -138,7 +138,7 @@ TestPointCheckSmramHob ( > Hob.Raw = GetHobList (); > while (!END_OF_HOB_LIST (Hob)) { > if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION) { > - if (CompareGuid (&Hob.Guid->Name, > &gEfiSmmPeiSmramMemoryReserveGuid)) { > + if (CompareGuid (&Hob.Guid->Name, > &gEfiSmmSmramMemoryGuid)) { > SmramHobDescriptorBlock = > (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *) (Hob.Guid + 1); > for (Index = 0; Index < > SmramHobDescriptorBlock->NumberOfSmmReservedRegions; Index++) { > if (Base == 0) { > -- > 2.17.1.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#46703): https://edk2.groups.io/g/devel/message/46703 Mute This Topic: https://groups.io/mt/33112752/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
