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.31, mailfrom: kelly.steele@intel.com) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by groups.io with SMTP; Tue, 03 Sep 2019 07:59:33 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Sep 2019 07:59:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,463,1559545200"; d="scan'208";a="383106831" Received: from orsmsx105.amr.corp.intel.com ([10.22.225.132]) by fmsmga006.fm.intel.com with ESMTP; 03 Sep 2019 07:59:32 -0700 Received: from orsmsx111.amr.corp.intel.com (10.22.240.12) by ORSMSX105.amr.corp.intel.com (10.22.225.132) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 3 Sep 2019 07:59:32 -0700 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.225]) by ORSMSX111.amr.corp.intel.com ([169.254.12.153]) with mapi id 14.03.0439.000; Tue, 3 Sep 2019 07:59:32 -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 2/6] QuarkPlatformPkg: Clean up duplicated SmramMemoryReserve.h files Thread-Topic: [edk2-platforms][PATCH V2 2/6] QuarkPlatformPkg: Clean up duplicated SmramMemoryReserve.h files Thread-Index: AQHVYaRsaCWMk1pkD0qPiFSsmIW2wacaDQdw Date: Tue, 3 Sep 2019 14:59:31 +0000 Message-ID: References: <20190902153553.3256-1-marc.w.chen@intel.com> <20190902153553.3256-3-marc.w.chen@intel.com> In-Reply-To: <20190902153553.3256-3-marc.w.chen@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNTMwYjk0OGYtOGU0ZC00OTQ0LTliNWItOWFkYmU0MmIyM2ExIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiblc4RTRsK0pTQzhjcEpRaVJUbnZwbkg2Y0ZCZlpKajhkWDg3RFwvNmJrZ0FEWWkrbHJ4bUhjTzJ3QmlvN1RMZUYifQ== 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 Return-Path: kelly.steele@intel.com 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 2/6] QuarkPlatformPkg: 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 > --- > .../Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.c | 4 ++-- > .../Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.inf | 2 +- > .../Platform/Pei/PlatformInit/MrcWrapper.c | 8 ++++---- > .../Platform/Pei/PlatformInit/PlatformEarlyInit.inf | 2 +- > 4 files changed, 8 insertions(+), 8 deletions(-) >=20 > diff --git > a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf > orm.c > b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf > orm.c > index f7f7ca3196..479459b801 100644 > --- > a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf > orm.c > +++ > b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf > orm.c > @@ -3,7 +3,7 @@ ACPISMM Driver implementation file. >=20 > This is QNC Smm platform driver >=20 > -Copyright (c) 2013-2016 Intel Corporation. > +Copyright (c) 2013-2019 Intel Corporation. >=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > @@ -225,7 +225,7 @@ Returns: > // > // Get Hob list for SMRAM desc > // > - GuidHob =3D GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid); > + GuidHob =3D GetFirstGuidHob (&gEfiSmmSmramMemoryGuid); > ASSERT (GuidHob); > DescriptorBlock =3D GET_GUID_HOB_DATA (GuidHob); > ASSERT (DescriptorBlock); > diff --git > a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf > orm.inf > b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf > orm.inf > index be80c73528..5301eccc6e 100644 > --- > a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf > orm.inf > +++ > b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf > orm.inf > @@ -56,7 +56,7 @@ > gEfiSmmSwDispatch2ProtocolGuid >=20 > [Guids] > - gEfiSmmPeiSmramMemoryReserveGuid > + gEfiSmmSmramMemoryGuid > gQncS3CodeInLockBoxGuid > gQncS3ContextInLockBoxGuid >=20 > diff --git > a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper. > c > b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper. > c > index fcb5c79aaf..1bb532acfd 100644 > --- > a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper. > c > +++ > b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper. > c > @@ -1,7 +1,7 @@ > /** @file > Framework PEIM to initialize memory on a Quark Memory Controller. >=20 > -Copyright (c) 2013 - 2016, Intel Corporation. > +Copyright (c) 2013 - 2019, Intel Corporation. >=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > @@ -836,7 +836,7 @@ InstallEfiMemory ( > BufferSize +=3D ((SmramRanges - 1) * sizeof (EFI_SMRAM_DESCRIPTOR)); >=20 > Hob.Raw =3D BuildGuidHob ( > - &gEfiSmmPeiSmramMemoryReserveGuid, > + &gEfiSmmSmramMemoryGuid, > BufferSize > ); > ASSERT (Hob.Raw); > @@ -958,7 +958,7 @@ InstallS3Memory ( > } >=20 > Hob.Raw =3D BuildGuidHob ( > - &gEfiSmmPeiSmramMemoryReserveGuid, > + &gEfiSmmSmramMemoryGuid, > BufferSize > ); > ASSERT (Hob.Raw); > @@ -1546,7 +1546,7 @@ InfoPostInstallMemory ( > } > } > } else if (Hob.Header->HobType =3D=3D EFI_HOB_TYPE_GUID_EXTENSION) { > - if (CompareGuid (&(Hob.Guid->Name), > &gEfiSmmPeiSmramMemoryReserveGuid)) { > + if (CompareGuid (&(Hob.Guid->Name), &gEfiSmmSmramMemoryGuid)) > { > SmramHobDescriptorBlock =3D (VOID*) (Hob.Raw + sizeof > (EFI_HOB_GUID_TYPE)); > if (SmramDescriptorPtr !=3D NULL) { > *SmramDescriptorPtr =3D SmramHobDescriptorBlock->Descriptor; > diff --git > a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarly > Init.inf > b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarly > Init.inf > index adec9e20eb..7910446402 100644 > --- > a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarly > Init.inf > +++ > b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarly > Init.inf > @@ -108,7 +108,7 @@ > gEfiAcpiVariableGuid # ALWAYS_CONSUMED > L"AcpiGlobalVariab" > gEfiMemoryTypeInformationGuid # ALWAYS_CONSUMED > L"MemoryTypeInformation" > gEfiMemoryConfigDataGuid # SOMETIMES_PRODUCED Ho= b: > GUID_EXTENSION > - gEfiSmmPeiSmramMemoryReserveGuid # ALWAYS_PRODUCED > Hob: GUID_EXTENSION > + gEfiSmmSmramMemoryGuid # ALWAYS_PRODUCED Hob: > GUID_EXTENSION > gEfiFirmwareFileSystem2Guid # ALWAYS_CONSUMED > gPeiCapsuleOnDataCDGuid > gPeiCapsuleOnFatIdeDiskGuid > -- > 2.17.1.windows.2