From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: michael.a.kubacki@intel.com) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by groups.io with SMTP; Wed, 04 Sep 2019 00:00:36 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Sep 2019 00:00:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,465,1559545200"; d="scan'208";a="187527047" Received: from orsmsx101.amr.corp.intel.com ([10.22.225.128]) by orsmga006.jf.intel.com with ESMTP; 04 Sep 2019 00:00:35 -0700 Received: from orsmsx152.amr.corp.intel.com (10.22.226.39) by ORSMSX101.amr.corp.intel.com (10.22.225.128) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 4 Sep 2019 00:00:35 -0700 Received: from orsmsx121.amr.corp.intel.com ([169.254.10.57]) by ORSMSX152.amr.corp.intel.com ([169.254.8.159]) with mapi id 14.03.0439.000; Wed, 4 Sep 2019 00:00:35 -0700 From: "Kubacki, Michael A" To: "Chen, Marc W" , "devel@edk2.groups.io" CC: "Chiu, Chasel" , "Chaganty, Rangasai V" , "Desimone, Nathaniel L" Subject: Re: [edk2-platforms][PATCH V2 4/6] KabylakeSiliconPkg: Clean up duplicated SmramMemoryReserve.h files Thread-Topic: [edk2-platforms][PATCH V2 4/6] KabylakeSiliconPkg: Clean up duplicated SmramMemoryReserve.h files Thread-Index: AQHVYaRwiPmIy/aP90m3EKd0XH0wIqcbGKCA Date: Wed, 4 Sep 2019 07:00:34 +0000 Message-ID: <49AB4ACB9627B8468F29D589A27B745588AA0397@ORSMSX121.amr.corp.intel.com> References: <20190902153553.3256-1-marc.w.chen@intel.com> <20190902153553.3256-5-marc.w.chen@intel.com> In-Reply-To: <20190902153553.3256-5-marc.w.chen@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZjJiYTQ2OTAtNTNlNC00YTk4LWI2YTktMDMyYjJmYjQ5ZGU2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoibDBvbkl6V1k4OENuTG0rTzV6NHZNOTl5Z21uUmtyS3BcL2JWbGQrKzJwRGZPcXRoVVhiaFFCbjRjWnNiNHZ3ODMifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Return-Path: michael.a.kubacki@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Michael Kubacki > -----Original Message----- > From: Chen, Marc W > Sent: Monday, September 2, 2019 8:36 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Kubacki, Michael A > ; Chaganty, Rangasai V > ; Desimone, Nathaniel L > > Subject: [edk2-platforms][PATCH V2 4/6] KabylakeSiliconPkg: 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\KabylakeSiliconPkg\SampleCode\IntelFrameworkP= k > g\Include\Guid\SmramMemoryReserve.h >=20 > Cc: Chasel Chiu > Cc: Michael Kubacki > Cc: Sai Chaganty >=20 > Co-authored-by: Nate DeSimone > Signed-off-by: Marc W Chen > Signed-off-by: Nate DeSimone > --- > .../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/Gui= d/ > SmramMemoryReserve.h >=20 > diff --git > a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/G= ui > d/SmramMemoryReserve.h > b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/G= ui > d/SmramMemoryReserve.h > deleted file mode 100644 > index 9918c768ba..0000000000 > --- > a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/G= ui > 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.
> -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/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 =3D {0x4c19049f, > 0x4137, 0x4dd3, {0x9c, 0x10, 0x8b > gEfiCapsuleVendorGuid =3D {0x711c703f, 0xc285, 0x4b10, {0xa3, = 0xb0, > 0x36, 0xec, 0xbd, 0x3c, 0x8b, 0xe2}} > gEfiConsoleOutDeviceGuid =3D {0xd3b36f2c, 0xd551, 0x11d4, {0x9a, = 0x46, > 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d}} > ## > -## IntelFrameworkPkg > -## > -gEfiSmmPeiSmramMemoryReserveGuid =3D {0x6dadf1d1, 0xd4cc, 0x4910, {0xbb= , > 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d}} -## ## ## > gSmbiosProcessorInfoHobGuid =3D {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.
> +# Copyright (c) 2017 - 2019, Intel Corporation. All rights > +reserved.
> # > # SPDX-License-Identifier: BSD-2-Clause-Patent # > @@ -42,7 +42,7 @@ gEfiSmmAccess2ProtocolGuid ## PRODUCES >=20 >=20 > [Guids] > -gEfiSmmPeiSmramMemoryReserveGuid > +gEfiSmmSmramMemoryGuid >=20 >=20 > [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. >=20 > -Copyright (c) 2017, Intel Corporation. All rights reserved.
> +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -61,7 +61,7 @@ SmmAccessDriverEntryPoint ( > /// > /// Get Hob list > /// > - Hob =3D GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid); > + Hob =3D GetFirstGuidHob (&gEfiSmmSmramMemoryGuid); > if (Hob =3D=3D NULL) { > DEBUG ((DEBUG_ERROR, "SmramMemoryReserve HOB not found\n")); > return EFI_NOT_FOUND; > -- > 2.17.1.windows.2