From nobody Sun Feb 8 14:52:58 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+46685+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+46685+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1567438697; cv=none; d=zoho.com; s=zohoarc; b=dDwqgviTI9kCNfwWd3tKBCgF29aA0w/pTNbvXJWV/Ck5osQuYqm+QcHnYFrDhbvGe/KEYCk1lIavgW2BpUJzNltcJbNPcoM+0g8iwGpzHFjod89E01qP/2fhTUjYIM0OOGeCQoMJwI4q7Uw1pgdB+TMeM+QuLNSPyAIXRxUSRQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567438697; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=w+cwO6ktkMMl+rRIy1xp0x6HI9oUkxSL5DXOdFjlwf8=; b=b3mjbGLthZxPFadoDQKp6yviPq9i91k4j5o9vxcdOIdVs+yjQMMdgaK/0arHSlVLZoFPBzIiYyoOq1QXcWOtLw2mlIrtt4NcwD8u6P7xyEmdmAN/JTyvrfx7+8iN+HBbU9tAA6RdyKosFTUgeXTV96oQOb+BkJRBxLdl2XD5XqU= 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+46685+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 15674386973280.7534720492725455; Mon, 2 Sep 2019 08:38:17 -0700 (PDT) Return-Path: X-Received: from mga14.intel.com (mga14.intel.com []) by groups.io with SMTP; Mon, 02 Sep 2019 08:38:16 -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:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,459,1559545200"; d="scan'208";a="176344519" 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:12 -0700 From: "Marc W Chen" To: devel@edk2.groups.io Cc: Chasel Chiu , Michael Kubacki , Sai Chaganty , Nate DeSimone Subject: [edk2-devel] [edk2-platforms][PATCH V2 4/6] KabylakeSiliconPkg: Clean up duplicated SmramMemoryReserve.h files Date: Mon, 2 Sep 2019 23:35:51 +0800 Message-Id: <20190902153553.3256-5-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=1567438697; bh=npyRN9v49Nm2Khm+6Wh34rJxAxXGXWKL35/9rIZdOVs=; h=Cc:Date:From:Reply-To:Subject:To; b=FjrQkS0UNw+gh97GEod2r2Eu4wjt+vgT2DkXyTKfgIOVrej5I5/8umVK+/tlG2YiQed ahTOyiplSucwHuzqeXc+tOBwFqSwV9IAJ5HF0xnpibZI7Pd2ybacchRUMRqkUOujWYPZd R69hb2Uk/I9ki46IdZD82TYmVQmTMxqzIy0= 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\KabylakeSiliconPkg\SampleCode\IntelFrameworkPkg= \Include\Guid\SmramMemoryReserve.h Cc: Chasel Chiu Cc: Michael Kubacki Cc: Sai Chaganty Co-authored-by: Nate DeSimone Signed-off-by: Marc W Chen Signed-off-by: Nate DeSimone Reviewed-by: Chasel Chiu Reviewed-by: Michael Kubacki --- .../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/IntelFramew= orkPkg/Include/Guid/SmramMemoryReserve.h diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/= Include/Guid/SmramMemoryReserve.h b/Silicon/Intel/KabylakeSiliconPkg/Sample= Code/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h deleted file mode 100644 index 9918c768ba..0000000000 --- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include= /Guid/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 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 - 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, 0xff,= 0x3d } \ - } - -/** -* GUID specific data structure of HOB for reserving SMRAM regions. -* -* Inconsistent with specification here:=20 -* 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.=20 - /// - /// Inconsistent with specification here: =20 - /// 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.=20 - /// - 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/Kab= ylakeSiliconPkg/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, 0x= b0, 0x36, 0xec, 0xbd, 0x3c, 0x8b, 0xe2}} gEfiConsoleOutDeviceGuid =3D {0xd3b36f2c, 0xd551, 0x11d4, {0x9a, 0x= 46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d}} ## -## IntelFrameworkPkg -## -gEfiSmmPeiSmramMemoryReserveGuid =3D {0x6dadf1d1, 0xd4cc, 0x4910, {0xbb, = 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d}} -## ##=20 ## gSmbiosProcessorInfoHobGuid =3D {0xe6d73d92, 0xff56, 0x4146, {0xaf, 0xac,= 0x1c, 0x18, 0x81, 0x7d, 0x68, 0x71}} diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/Smm= Access.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/Smm= Access.inf index 93ab408206..287e631689 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.= inf +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.= 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/Smm= AccessDriver.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe= /SmmAccessDriver.c index f03dbe3d27..77f465fd25 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessD= river.c +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessD= river.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; --=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 (#46685): https://edk2.groups.io/g/devel/message/46685 Mute This Topic: https://groups.io/mt/33112755/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-