Re: [edk2-platforms][PATCH V2 4/6] KabylakeSiliconPkg: Clean up duplicated SmramMemoryReserve.h files

["Kubacki, Michael A" <michael.a.kubacki@intel.com>]

Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>

> -----Original Message-----
> From: Chen, Marc W
> Sent: Monday, September 2, 2019 8:36 AM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaganty@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>
> Subject: [edk2-platforms][PATCH V2 4/6] KabylakeSiliconPkg: 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\KabylakeSiliconPkg\SampleCode\IntelFrameworkPk
> g\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>
> ---
>  .../Include/Guid/SmramMemoryReserve.h         | 54 -------------------
>  Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec    |  4 --
>  .../SystemAgent/SmmAccess/Dxe/SmmAccess.inf   |  4 +-
>  .../SmmAccess/Dxe/SmmAccessDriver.c           |  4 +-
>  4 files changed, 4 insertions(+), 62 deletions(-)  delete mode 100644
> Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Guid/
> SmramMemoryReserve.h
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Gui
> d/SmramMemoryReserve.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Gui
> d/SmramMemoryReserve.h
> deleted file mode 100644
> index 9918c768ba..0000000000
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Gui
> d/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/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> index a9f1c0f092..3881671757 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> @@ -63,10 +63,6 @@ gEfiMemoryTypeInformationGuid  =  {0x4c19049f,
> 0x4137, 0x4dd3, {0x9c, 0x10, 0x8b
>  gEfiCapsuleVendorGuid          =  {0x711c703f, 0xc285, 0x4b10, {0xa3, 0xb0,
> 0x36, 0xec, 0xbd, 0x3c, 0x8b, 0xe2}}
>  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}} -##  ##  ##
> gSmbiosProcessorInfoHobGuid =  {0xe6d73d92, 0xff56, 0x4146, {0xaf, 0xac,
> 0x1c, 0x18, 0x81, 0x7d, 0x68, 0x71}} diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.in
> f
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.in
> f
> index 93ab408206..287e631689 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.in
> f
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcce
> +++ ss.inf
> @@ -3,7 +3,7 @@
>  #
>  # {1323C7F8-DAD5-4126-A54B-7A05FBF4151}
>  #
> -# 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  #
> @@ -42,7 +42,7 @@ gEfiSmmAccess2ProtocolGuid       ## PRODUCES
> 
> 
>  [Guids]
> -gEfiSmmPeiSmramMemoryReserveGuid
> +gEfiSmmSmramMemoryGuid
> 
> 
>  [Depex]
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDr
> iver.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDr
> iver.c
> index f03dbe3d27..77f465fd25 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDr
> iver.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcce
> +++ ssDriver.c
> @@ -2,7 +2,7 @@
>    This is the driver that publishes the SMM Access Protocol
>    instance for System Agent.
> 
> -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
> 
>  **/
> @@ -61,7 +61,7 @@ SmmAccessDriverEntryPoint (
>    ///
>    /// Get Hob list
>    ///
> -  Hob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
> +  Hob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
>    if (Hob == NULL) {
>      DEBUG ((DEBUG_ERROR, "SmramMemoryReserve HOB not found\n"));
>      return EFI_NOT_FOUND;
> --
> 2.17.1.windows.2