From nobody Sun Feb 8 12:58:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+46687+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+46687+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1567438700; cv=none; d=zoho.com; s=zohoarc; b=PbsLJWCK7SfcSNjnykWan+p0W5AD0CNhk1NA0fZB1F16I3JGJrN7JCCdjc6t3dDkK3sMw+a7B1Y8CVQeyIlP94iJqo4v4YY/glEch47UaE47RkbUqX6wkjfCVxtCPw7xLNkHjc5zMzC5kyDeSV9N6k4NJBWrfdFlyq2jRRcR1Wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567438700; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=mZ/QXwn9vHYWqWs5e73NkypfNAeOvrAnBRfqWFC955I=; b=Nz0fqbrGGt4wc+KFRXs2vwxd9nOI4iQWyIcJNPs2zUmc8iej9E2ed0eq+rAfKXOBZH8hBY4BAM89ftcLAw/OoTEIIIAkT2JdlcI0oMEo/JP5wDPFcNJgxNhSXTkbYCg/4oDNdGH2w5fWVPO5vpdXRBsmuSiyo+kfeAycIftDJZw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+46687+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1567438700611487.7920359097227; Mon, 2 Sep 2019 08:38:20 -0700 (PDT) Return-Path: X-Received: from mga14.intel.com (mga14.intel.com []) by groups.io with SMTP; Mon, 02 Sep 2019 08:38:19 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Sep 2019 08:38:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,459,1559545200"; d="scan'208";a="176344591" X-Received: from chenmarc-mobl.gar.corp.intel.com ([10.255.160.178]) by orsmga008.jf.intel.com with ESMTP; 02 Sep 2019 08:38:17 -0700 From: "Marc W Chen" To: devel@edk2.groups.io Cc: Michael D Kinney , Kelly Steele , Nate DeSimone Subject: [edk2-devel] [edk2-platforms][PATCH V2 6/6] QuarkSocPkg: Clean up duplicated SmramMemoryReserve.h files Date: Mon, 2 Sep 2019 23:35:53 +0800 Message-Id: <20190902153553.3256-7-marc.w.chen@intel.com> In-Reply-To: <20190902153553.3256-1-marc.w.chen@intel.com> References: <20190902153553.3256-1-marc.w.chen@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,marc.w.chen@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1567438700; bh=CEECywwREnadrJHYUMYJGYBUYxmZf293ku+P89Z1C80=; h=Cc:Date:From:Reply-To:Subject:To; b=o9ApT5Tmni4iXCk+XphHzqC2ppVKngMVDEHxyKeSJdr1yi0AqHZ3sdM4RFtdN2fuI+F HAc88RpWU3SgRkTTRfT97IwYYgRRDP5Iy0yppU4B+TaxSsVTwbQVjoX8s2wwk9AJP8Yjx XOPQkrjqn33fk1lLd1sJTt1stw9qLlGXdm0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2108 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\Smra= mMemoryReserve.h Cc: Michael D Kinney Cc: Kelly Steele Co-authored-by: Nate DeSimone Signed-off-by: Marc W Chen Signed-off-by: Nate DeSimone Reviewed-by: Kelly Steele --- .../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/Gui= d/SmramMemoryReserve.h diff --git a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Include/Guid/Smram= MemoryReserve.h b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Include/Guid/= SmramMemoryReserve.h deleted file mode 100644 index d57dfbebf3..0000000000 --- a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Include/Guid/SmramMemoryR= eserve.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 reg= ions - * 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 reserva= tion 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, 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_DESCRIP= TOR_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 a= s UINTN. - /// However, HOBs are supposed to be CPU neutral, so UINT32 should be us= ed 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/SmmAccessD= xe/SmmAccess.inf b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmA= ccessDxe/SmmAccess.inf index bb555b4a2e..cf579efd02 100644 --- a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmA= ccess.inf +++ b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmA= ccess.inf @@ -42,7 +42,7 @@ gEfiSmmAccess2ProtocolGuid =20 [Guids] - gEfiSmmPeiSmramMemoryReserveGuid + gEfiSmmSmramMemoryGuid =20 [Depex] gEfiPciRootBridgeIoProtocolGuid diff --git a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessD= xe/SmmAccessDriver.c b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/= SmmAccessDxe/SmmAccessDriver.c index 830f8b83c3..7992ef7ded 100644 --- a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmA= ccessDriver.c +++ b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmA= ccessDriver.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/SmmAccessP= ei/SmmAccessPei.c b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/Smm= AccessPei/SmmAccessPei.c index 637792d147..d03cadbde5 100644 --- a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmA= ccessPei.c +++ b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmA= ccessPei.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/SmmAccessP= ei/SmmAccessPei.inf b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/S= mmAccessPei/SmmAccessPei.inf index 60b5fbab0f..5f78f72859 100644 --- a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmA= ccessPei.inf +++ b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmA= ccessPei.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/Quar= kSocPkg/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, { 0x82= , 0xfb, 0xea, 0xe2, 0xab, 0x31, 0x29, 0x46 }} gQncS3CodeInLockBoxGuid =3D { 0x1f18c5b3, 0x29ed, 0x4d9e, {0xa5, 0x4,= 0x6d, 0x97, 0x8e, 0x7e, 0xd5, 0x69}} gQncS3ContextInLockBoxGuid =3D { 0xe5769ea9, 0xe706, 0x454b, {0x95, 0x7f= , 0xaf, 0xc6, 0xdb, 0x4b, 0x8a, 0xd}} - gEfiSmmPeiSmramMemoryReserveGuid =3D { 0x6dadf1d1, 0xd4cc, 0x4910, { 0xb= b, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d }} =20 # # South Cluster --=20 2.17.1.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#46687): https://edk2.groups.io/g/devel/message/46687 Mute This Topic: https://groups.io/mt/33112759/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-