From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: kelly.steele@intel.com) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by groups.io with SMTP; Tue, 03 Sep 2019 07:59:57 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Sep 2019 07:59:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,463,1559545200"; d="scan'208";a="266313049" Received: from orsmsx102.amr.corp.intel.com ([10.22.225.129]) by orsmga001.jf.intel.com with ESMTP; 03 Sep 2019 07:59:57 -0700 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.225]) by ORSMSX102.amr.corp.intel.com ([169.254.3.129]) with mapi id 14.03.0439.000; Tue, 3 Sep 2019 07:59:56 -0700 From: "Steele, Kelly" To: "Chen, Marc W" , "devel@edk2.groups.io" CC: "Kinney, Michael D" , "Desimone, Nathaniel L" Subject: Re: [edk2-platforms][PATCH V2 6/6] QuarkSocPkg: Clean up duplicated SmramMemoryReserve.h files Thread-Topic: [edk2-platforms][PATCH V2 6/6] QuarkSocPkg: Clean up duplicated SmramMemoryReserve.h files Thread-Index: AQHVYaRyycRDTi57p0ektbYVr/GIcacaDSBw Date: Tue, 3 Sep 2019 14:59:55 +0000 Message-ID: References: <20190902153553.3256-1-marc.w.chen@intel.com> <20190902153553.3256-7-marc.w.chen@intel.com> In-Reply-To: <20190902153553.3256-7-marc.w.chen@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZmRmZTY4NzktNjE5MC00Mjc3LWIzYTItYWU2ZTJkNGMwZTViIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiU3F6QVM2djdNeUpwZ2hwbDFwNUZ2b1VHTHRaY3Bjd3FuQWFxME1nS285WG85NXk2Q2pvR0RFR1VCVXdpMHdvdiJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Kelly Steele Thanks, Kelly > -----Original Message----- > From: Chen, Marc W > Sent: September 02, 2019 08:36 > To: devel@edk2.groups.io > Cc: Kinney, Michael D ; Steele, Kelly > ; Desimone, Nathaniel L > > Subject: [edk2-platforms][PATCH V2 6/6] QuarkSocPkg: Clean up duplicated > SmramMemoryReserve.h files >=20 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2108 >=20 > SmramMemoryReserve.h has been added into > Edk2\MdePkg\Include\Guid\SmramMemoryReserve.h. >=20 > The duplicated header file can be cleaned up. > Edk2Platforms\Silicon\Intel\QuarkSocPkg\QuarkNorthCluster\Include\Guid\ > SmramMemoryReserve.h >=20 > Cc: Michael D Kinney > Cc: Kelly Steele >=20 > Co-authored-by: Nate DeSimone > Signed-off-by: Marc W Chen > Signed-off-by: Nate DeSimone > --- > .../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 >=20 > 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.
> -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, 0xf= f, 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 >=20 > [Guids] > - gEfiSmmPeiSmramMemoryReserveGuid > + gEfiSmmSmramMemoryGuid >=20 > [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 =3D GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid); > + GuidHob =3D GetFirstGuidHob (&gEfiSmmSmramMemoryGuid); > DescriptorBlock =3D GET_GUID_HOB_DATA (GuidHob); > ASSERT (DescriptorBlock); >=20 > 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. >=20 > -Copyright (c) 2013-2015 Intel Corporation. > +Copyright (c) 2013-2019 Intel Corporation. >=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > @@ -325,7 +325,7 @@ Returns: > // > // Get Hob list > // > - GuidHob =3D GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid); > + GuidHob =3D GetFirstGuidHob (&gEfiSmmSmramMemoryGuid); > DescriptorBlock =3D GET_GUID_HOB_DATA (GuidHob); > ASSERT (DescriptorBlock); >=20 > 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 =3D SmmAccessPeiEntryPoint > SmmLib >=20 > [Guids] > - gEfiSmmPeiSmramMemoryReserveGuid # ALWAYS_CONSUMED > + gEfiSmmSmramMemoryGuid # ALWAYS_CONSUMED >=20 > [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 =3D { 0xca452c6a, 0xdf0c, 0x4dc9, { 0x= 82, > 0xfb, 0xea, 0xe2, 0xab, 0x31, 0x29, 0x46 }} > gQncS3CodeInLockBoxGuid =3D { 0x1f18c5b3, 0x29ed, 0x4d9e, {0xa5, 0x= 4, > 0x6d, 0x97, 0x8e, 0x7e, 0xd5, 0x69}} > gQncS3ContextInLockBoxGuid =3D { 0xe5769ea9, 0xe706, 0x454b, {0x95, 0x= 7f, > 0xaf, 0xc6, 0xdb, 0x4b, 0x8a, 0xd}} > - gEfiSmmPeiSmramMemoryReserveGuid =3D { 0x6dadf1d1, 0xd4cc, 0x4910, { > 0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d }} >=20 > # > # South Cluster > -- > 2.17.1.windows.2