From nobody Sun Feb 8 12:38:42 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+46682+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+46682+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1567438696; cv=none; d=zoho.com; s=zohoarc; b=mM1TtYxf3QATSE/qnInpQwWxVfi0hmIX58R9ucuQfN2sgH+oPCTsvcHN2NBPkPyK7NchCNQkTzVLHjDO6khFMkq2P2L738g7ov7wPGdHxvWPlSCLUdJWVAVj5ZKb0dwaxarJwuZEHJthxRz9DL1NOZELv3bW9P0M+xjHmoQX450= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567438696; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=+fBsHL6UH7ohTHM3uieL+9D180OKgAC3CFYXkvtwZEM=; b=c3iy9SxflktPUZtAI5vJ76fFVh3RSjPwzHsntw9w/ebl9C9aHPp6W1vfEOB1w1vycJge+3L6zfzrQkviwBPXOg5Z9S0+jTR3RxMVR9FTWNSJJHWArTrLStcdzNTFoPHgAaIL2flinfSdUlRWTuPsvs0TsHMbX8tyKZuoBsFZxCs= 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+46682+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 1567438696476307.77256690406557; Mon, 2 Sep 2019 08:38:16 -0700 (PDT) Return-Path: X-Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by groups.io with SMTP; Mon, 02 Sep 2019 08:38:15 -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:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,459,1559545200"; d="scan'208";a="176344487" 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:04 -0700 From: "Marc W Chen" To: devel@edk2.groups.io Cc: Michael Kubacki , Chasel Chiu , Nate DeSimone , Liming Gao Subject: [edk2-devel] [edk2-platforms][PATCH V2 1/6] MinPlatformPkg: Clean up duplicated SmramMemoryReserve.h files Date: Mon, 2 Sep 2019 23:35:48 +0800 Message-Id: <20190902153553.3256-2-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=1567438696; bh=ctKBQxvqDs+ZoVMrNnIq478zU6EpN6m6+Gkny/tG6xQ=; h=Cc:Date:From:Reply-To:Subject:To; b=k2iUt5LF0+2hSGi8Gv/Ncf6STsf/ImxOutGw4+71HBjElXDD7fDsrmklidlUC9/O7tg zhUIUj0SCgj/BZJbkrcQ/Ie+nxbv+x/oncqjThU9ohL1HNnnnKQP1u7bOcutcW8cq39pe coV/cPrteK4Vapuffz6RQcKJGmkdbxcrRWs= 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 clean up. Edk2Platforms\Platform\Intel\MinPlatformPkg\Include\Guid\SmramMemoryReserve= .h Cc: Michael Kubacki Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao 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 ------------------- .../Intel/MinPlatformPkg/MinPlatformPkg.dec | 5 -- .../PlatformInitPei/PlatformInitPostMem.c | 4 +- .../PlatformInitPei/PlatformInitPostMem.inf | 4 +- .../TestPointCheckLib/PeiCheckSmmInfo.c | 6 +-- 5 files changed, 7 insertions(+), 66 deletions(-) delete mode 100644 Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryR= eserve.h diff --git a/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.= h b/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h deleted file mode 100644 index 9918c768ba..0000000000 --- a/Platform/Intel/MinPlatformPkg/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/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/In= tel/MinPlatformPkg/MinPlatformPkg.dec index a642f9f3a3..d79f5ec1bd 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec @@ -42,11 +42,6 @@ gBoardNotificationInitGuid =3D {0x78dbcabf, 0xc544, 0x4e= 6f, {0xaf, 0x3a, 0x71, 0x1 gBoardAcpiTableGuid =3D {0xd70e9f57, 0x69f, 0x4bef, {0x96, 0xc0, 0= x84, 0x74, 0xf4, 0xa2, 0x5f, 0x3a}} gBoardAcpiEnableGuid =3D {0x9727b610, 0xf645, 0x4429, {0x89, 0x21, 0= x2c, 0x2b, 0x58, 0xdc, 0xbb, 0xa}} =20 -## -## IntelFrameworkPkg -## -gEfiSmmPeiSmramMemoryReserveGuid =3D {0x6dadf1d1, 0xd4cc, 0x4910, {0xbb, = 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d}} - gDefaultDataFileGuid =3D { 0x1ae42876, 0x008f, 0x41= 61, { 0xb2, 0xb7, 0x1c, 0x0d, 0x15, 0xc5, 0xef, 0x43 }} gDefaultDataOptSizeFileGuid =3D { 0x003e7b41, 0x98a2, 0x4b= e2, { 0xb2, 0x7a, 0x6c, 0x30, 0xc7, 0x65, 0x52, 0x25 }} =20 diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/Pla= tformInitPostMem.c b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformIni= tPei/PlatformInitPostMem.c index 00877593bc..70e6b9a495 100644 --- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformIn= itPostMem.c +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformIn= itPostMem.c @@ -1,7 +1,7 @@ /** @file Source code file for Platform Init PEI module =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 **/ @@ -113,7 +113,7 @@ SetCacheMtrrAfterEndOfPei ( Status =3D PeiServicesGetHobList ((VOID **) &Hob.Raw); while (!END_OF_HOB_LIST (Hob)) { 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 (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *) (Ho= b.Guid + 1); for (Index =3D 0; Index < SmramHobDescriptorBlock->NumberOfSmmRese= rvedRegions; Index++) { if (SmramHobDescriptorBlock->Descriptor[Index].PhysicalStart > 0= x100000) { diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/Pla= tformInitPostMem.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformI= nitPei/PlatformInitPostMem.inf index 32d67a0a34..0736c8d494 100644 --- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformIn= itPostMem.inf +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformIn= itPostMem.inf @@ -1,7 +1,7 @@ ### @file # Component information file for the Platform Init PEI module. # -# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -45,7 +45,7 @@ [Protocols] =20 [Guids] - gEfiSmmPeiSmramMemoryReserveGuid ## CONSUMES + gEfiSmmSmramMemoryGuid ## CONSUMES =20 [Depex] gEfiPeiMemoryDiscoveredPpiGuid diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/P= eiCheckSmmInfo.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointChec= kLib/PeiCheckSmmInfo.c index d04baf7663..6fe08e22ed 100644 --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck= SmmInfo.c +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck= SmmInfo.c @@ -1,6 +1,6 @@ /** @file =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 **/ @@ -123,7 +123,7 @@ TestPointCheckSmramHob ( DEBUG ((DEBUG_INFO, "SMRAM HOB\n")); while (!END_OF_HOB_LIST (Hob)) { 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 (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *) (Ho= b.Guid + 1); DumpSmramDescriptor (SmramHobDescriptorBlock->NumberOfSmmReservedR= egions, SmramHobDescriptorBlock->Descriptor); break; @@ -138,7 +138,7 @@ TestPointCheckSmramHob ( Hob.Raw =3D GetHobList (); while (!END_OF_HOB_LIST (Hob)) { 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 (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *) (Ho= b.Guid + 1); for (Index =3D 0; Index < SmramHobDescriptorBlock->NumberOfSmmRese= rvedRegions; Index++) { if (Base =3D=3D 0) { --=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 (#46682): https://edk2.groups.io/g/devel/message/46682 Mute This Topic: https://groups.io/mt/33112752/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-