[edk2-devel] [edk2-platforms][PATCH V2 6/6] QuarkSocPkg: Clean up duplicated SmramMemoryReserve.h files
Steele, Kelly
kelly.steele at intel.com
Tue Sep 3 14:59:55 UTC 2019
Reviewed-by: Kelly Steele <kelly.steele at intel.com>
Thanks,
Kelly
> -----Original Message-----
> From: Chen, Marc W
> Sent: September 02, 2019 08:36
> To: devel at edk2.groups.io
> Cc: Kinney, Michael D <michael.d.kinney at intel.com>; Steele, Kelly
> <kelly.steele at intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone at intel.com>
> Subject: [edk2-platforms][PATCH V2 6/6] QuarkSocPkg: 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\QuarkSocPkg\QuarkNorthCluster\Include\Guid\
> SmramMemoryReserve.h
>
> Cc: Michael D Kinney <michael.d.kinney at intel.com>
> Cc: Kelly Steele <kelly.steele at intel.com>
>
> Co-authored-by: Nate DeSimone <nathaniel.l.desimone at intel.com>
> Signed-off-by: Marc W Chen <marc.w.chen at intel.com>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone at intel.com>
> ---
> .../Include/Guid/SmramMemoryReserve.h | 54 -------------------
> .../Smm/Dxe/SmmAccessDxe/SmmAccess.inf | 2 +-
> .../Smm/Dxe/SmmAccessDxe/SmmAccessDriver.c | 2 +-
> .../Smm/Pei/SmmAccessPei/SmmAccessPei.c | 4 +-
> .../Smm/Pei/SmmAccessPei/SmmAccessPei.inf | 2 +-
> Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dec | 1 -
> 6 files changed, 5 insertions(+), 60 deletions(-)
> delete mode 100644
> Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Include/Guid/SmramMemory
> Reserve.h
>
> diff --git
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Include/Guid/SmramMemo
> ryReserve.h
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Include/Guid/SmramMemo
> ryReserve.h
> deleted file mode 100644
> index d57dfbebf3..0000000000
> ---
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Include/Guid/SmramMemo
> ryReserve.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 - 2018, 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/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccess.inf
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccess.inf
> index bb555b4a2e..cf579efd02 100644
> ---
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccess.inf
> +++
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccess.inf
> @@ -42,7 +42,7 @@
> gEfiSmmAccess2ProtocolGuid
>
> [Guids]
> - gEfiSmmPeiSmramMemoryReserveGuid
> + gEfiSmmSmramMemoryGuid
>
> [Depex]
> gEfiPciRootBridgeIoProtocolGuid
> diff --git
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccessDriver.c
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccessDriver.c
> index 830f8b83c3..7992ef7ded 100644
> ---
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccessDriver.c
> +++
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccessDriver.c
> @@ -75,7 +75,7 @@ Returns:
> //
> // Get Hob list
> //
> - GuidHob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
> + GuidHob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
> DescriptorBlock = GET_GUID_HOB_DATA (GuidHob);
> ASSERT (DescriptorBlock);
>
> diff --git
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.c
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.c
> index 637792d147..d03cadbde5 100644
> ---
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.c
> +++
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.c
> @@ -2,7 +2,7 @@
> This is the driver that publishes the SMM Access Ppi
> instance for the Quark SOC.
>
> -Copyright (c) 2013-2015 Intel Corporation.
> +Copyright (c) 2013-2019 Intel Corporation.
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -325,7 +325,7 @@ Returns:
> //
> // Get Hob list
> //
> - GuidHob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
> + GuidHob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
> DescriptorBlock = GET_GUID_HOB_DATA (GuidHob);
> ASSERT (DescriptorBlock);
>
> diff --git
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.inf
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.inf
> index 60b5fbab0f..5f78f72859 100644
> ---
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.inf
> +++
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.inf
> @@ -34,7 +34,7 @@ ENTRY_POINT = SmmAccessPeiEntryPoint
> SmmLib
>
> [Guids]
> - gEfiSmmPeiSmramMemoryReserveGuid # ALWAYS_CONSUMED
> + gEfiSmmSmramMemoryGuid # ALWAYS_CONSUMED
>
> [Ppis]
> gPeiSmmAccessPpiGuid # ALWAYS_PRODUCED
> diff --git a/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dec
> b/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dec
> index 32f57e0c5e..94e7d8c60b 100644
> --- a/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dec
> +++ b/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dec
> @@ -72,7 +72,6 @@
> gEfiQuarkNcSocIdTokenSpaceGuid = { 0xca452c6a, 0xdf0c, 0x4dc9, { 0x82,
> 0xfb, 0xea, 0xe2, 0xab, 0x31, 0x29, 0x46 }}
> gQncS3CodeInLockBoxGuid = { 0x1f18c5b3, 0x29ed, 0x4d9e, {0xa5, 0x4,
> 0x6d, 0x97, 0x8e, 0x7e, 0xd5, 0x69}}
> gQncS3ContextInLockBoxGuid = { 0xe5769ea9, 0xe706, 0x454b, {0x95, 0x7f,
> 0xaf, 0xc6, 0xdb, 0x4b, 0x8a, 0xd}}
> - gEfiSmmPeiSmramMemoryReserveGuid = { 0x6dadf1d1, 0xd4cc, 0x4910, {
> 0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d }}
>
> #
> # South Cluster
> --
> 2.17.1.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#46717): https://edk2.groups.io/g/devel/message/46717
Mute This Topic: https://groups.io/mt/33112759/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list