CoffeelakeSiliconPkg: 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 cleaned up.
Edk2Platforms\Silicon\Intel\CoffeelakeSiliconPkg\SampleCode\IntelFrameworkPkg\Include\Guid\SmramMemoryReserve.h

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>

Co-authored-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
Signed-off-by: Marc W Chen <marc.w.chen@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>

4 files changed, 2 insertions, 58 deletions

diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h b/Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
deleted file mode 100644
index 862a7c8a..00000000
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
+++ /dev/null
@@ -1,51 +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) 2019 Intel Corporation. All rights reserved. <BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-**/

-

-#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/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec b/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
index fa8c11e9..6cf89449 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
@@ -55,11 +55,6 @@ gEfiCapsuleVendorGuid  =  {0x711c703f, 0xc285, 0x4b10, {0xa3, 0xb0, 0x36, 0xec,
 gEfiConsoleOutDeviceGuid = { 0xd3b36f2c, 0xd551, 0x11d4, { 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d}}

 

 ##

-## IntelFrameworkPkg

-##

-gEfiSmmPeiSmramMemoryReserveGuid =  {0x6dadf1d1, 0xd4cc, 0x4910, {0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d}}

-

-##

 ## Common

 ##

 ## Include/ConfigBlock/SiConfig.h

diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.inf b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.inf
index 9356781c..bb1944c9 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.inf
@@ -41,7 +41,7 @@ gEfiSmmAccess2ProtocolGuid       ## PRODUCES
 

 

 [Guids]

-gEfiSmmPeiSmramMemoryReserveGuid

+gEfiSmmSmramMemoryGuid

 

 

 [Depex]

diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
index 08fd9266..17855d39 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
@@ -49,7 +49,7 @@ SmmAccessDriverEntryPoint (
   ///

   /// Get Hob list

   ///

-  Hob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);

+  Hob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);

   if (Hob == NULL) {

     DEBUG ((DEBUG_WARN, "SmramMemoryReserve HOB not found\n"));

     return EFI_NOT_FOUND;