From nobody Mon Apr 29 20:01:35 2024 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- From nobody Mon Apr 29 20:01:35 2024 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+46683+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+46683+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=FVYcx7hFwCZ/DLziKCXhB1eApRUSgFmqF5cFWLHlm2Lscy1myXARRThIKdFxlk+OAljApA2GkwcjnMsid6t9iLxXsz4kkkEHf7EkERHcZaAwQ+Uq266MDBwRc1rjOgj2ThSZd+/x7Qv0WDki7l4ebVM5sikYIQdb01GnTw+fhvM= 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=fEoAsvwcC78RbQ4ahjPvN83ajw6fN8ACIDiFvUhBGW4=; b=EMb6VJNId4chK7WM1XU6Rov0psU88sGMuPEaS8AJoXIsF1nSBemtdrsjJwNeWEYHGnU1qkwPlz1wEC7Rx3ebbrDHja4aK/mxAAL0DVISxm0fa0VQNVH09kK4rN3shnPQR5zC9kz4bv77+Wmo7r5ndMgCZLjKV0TeaJK+rVEHujw= 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+46683+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 1567438696795207.07108472764924; Mon, 2 Sep 2019 08:38:16 -0700 (PDT) Return-Path: X-Received: from mga14.intel.com (mga14.intel.com []) 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:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,459,1559545200"; d="scan'208";a="176344496" 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:06 -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 2/6] QuarkPlatformPkg: Clean up duplicated SmramMemoryReserve.h files Date: Mon, 2 Sep 2019 23:35:49 +0800 Message-Id: <20190902153553.3256-3-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=f5ExAk/4CDHPrSMC/ZCjXcvLW+0ajNZb3Ljr9LYNNPM=; h=Cc:Date:From:Reply-To:Subject:To; b=mt5SxX8k4I5m1SsmdXmpC3nRYZnH+NPY/p/xonuJnha1IUE8iPmaH5/OvKCKqgNA9Bq HUXE+UfmFsbe3Y3cIi//XmHqjAbrd2XtYzVFNPVYxKa7xivDvE8eWZJtvnDzUqAuG8U5h BN2557gwyE5wt3k8p/XaKIWiHDR8BQcLYuc= 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 --- .../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(-) diff --git a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPla= tform.c b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatfo= rm.c index f7f7ca3196..479459b801 100644 --- a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.c +++ b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.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/AcpiSmmPla= tform.inf b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlat= form.inf index be80c73528..5301eccc6e 100644 --- a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.i= nf +++ b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.i= nf @@ -56,7 +56,7 @@ gEfiSmmSwDispatch2ProtocolGuid =20 [Guids] - gEfiSmmPeiSmramMemoryReserveGuid + gEfiSmmSmramMemoryGuid gQncS3CodeInLockBoxGuid gQncS3ContextInLockBoxGuid =20 diff --git a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcW= rapper.c b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWra= pper.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), &gEfiSmmPeiSmramMemoryReserveGui= d)) { + if (CompareGuid (&(Hob.Guid->Name), &gEfiSmmSmramMemoryGuid)) { SmramHobDescriptorBlock =3D (VOID*) (Hob.Raw + sizeof (EFI_HOB_GUI= D_TYPE)); if (SmramDescriptorPtr !=3D NULL) { *SmramDescriptorPtr =3D SmramHobDescriptorBlock->Descriptor; diff --git a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/Plat= formEarlyInit.inf b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformIn= it/PlatformEarlyInit.inf index adec9e20eb..7910446402 100644 --- a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEar= lyInit.inf +++ b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEar= lyInit.inf @@ -108,7 +108,7 @@ gEfiAcpiVariableGuid # ALWAYS_CONSUMED L"AcpiGl= obalVariab" gEfiMemoryTypeInformationGuid # ALWAYS_CONSUMED L"Memory= TypeInformation" gEfiMemoryConfigDataGuid # SOMETIMES_PRODUCED Hob:= GUID_EXTENSION - gEfiSmmPeiSmramMemoryReserveGuid # ALWAYS_PRODUCED Hob: GU= ID_EXTENSION + gEfiSmmSmramMemoryGuid # ALWAYS_PRODUCED Hob: GU= ID_EXTENSION gEfiFirmwareFileSystem2Guid # ALWAYS_CONSUMED gPeiCapsuleOnDataCDGuid gPeiCapsuleOnFatIdeDiskGuid --=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 (#46683): https://edk2.groups.io/g/devel/message/46683 Mute This Topic: https://groups.io/mt/33112753/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- From nobody Mon Apr 29 20:01:35 2024 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+46684+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+46684+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=V60I1Ob7VrMLjIhi+hnAvbHEfnkaFiK9hqxtbeauu1Ai4LAHAErl21sceJ14OHQ+PJGBV32V3hcgaAxi9a7MmTbujulaiMpZiB07hqPfZylFQPppZSRvZ+iY+mjWDeBJjDRTcb1bYyjb2lfea7hZkg8l5Js4DVGccV/t2BOTkDw= 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=b/6v58yWQuDlxaI4KWA7f4PGCIlMg+vKST9CPwQM/xw=; b=jDL1RcfKNLidzVSHN9//9rALDgrHHnQTKrxbNHBE31hDLvacThFhlJFUK1mGQ617g/8wrMo4ouSlIQ2q5T32Q2gxkqcNF236o+clzbVSBht15JY8b4gawiXovTBwwv7EHnxHX2A8vLQs7KRd13ccAQtz7mapXhRkrN3dTA3ja0Q= 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+46684+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 1567438696926197.72517125942466; Mon, 2 Sep 2019 08:38:16 -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:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,459,1559545200"; d="scan'208";a="176344505" 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:09 -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 3/6] CoffeelakeSiliconPkg: Clean up duplicated SmramMemoryReserve.h files Date: Mon, 2 Sep 2019 23:35:50 +0800 Message-Id: <20190902153553.3256-4-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=KuR3aYqxQJ0V2jevHhOJHyI2/ub1jAWZCJTsO04PsQA=; h=Cc:Date:From:Reply-To:Subject:To; b=fUx5gYUmEXgo1eAwtVylJq2Qa62eSSxhTCtrobw7w5YWlL38Bu4Ii7K+sKIskAkaqlh E7lGNDlxBvh0wVdUQYSEldoMUeh5NOkqoDVGEhobbeOrxiu1Bo8n+6FTMRxJPSup0XwW7 wbyo3gPOaUx29MmmYgtsV4Xxbdcyu5tgjq4= 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\CoffeelakeSiliconPkg\SampleCode\IntelFrameworkP= kg\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 | 51 ------------------- Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec | 5 -- .../SystemAgent/SmmAccess/Dxe/SmmAccess.inf | 2 +- .../SmmAccess/Dxe/SmmAccessDriver.c | 2 +- 4 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFram= eworkPkg/Include/Guid/SmramMemoryReserve.h diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPk= g/Include/Guid/SmramMemoryReserve.h b/Silicon/Intel/CoffeelakeSiliconPkg/Sa= mpleCode/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h deleted file mode 100644 index 862a7c8aea..0000000000 --- a/Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPkg/Inclu= de/Guid/SmramMemoryReserve.h @@ -1,51 +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) 2019 Intel Corporation. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent -**/ - -#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/CoffeelakeSiliconPkg/SiPkg.dec b/Silicon/Intel/C= offeelakeSiliconPkg/SiPkg.dec index fa8c11e93d..6cf894498d 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec +++ b/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec @@ -54,11 +54,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, 0= x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d}} =20 -## -## IntelFrameworkPkg -## -gEfiSmmPeiSmramMemoryReserveGuid =3D {0x6dadf1d1, 0xd4cc, 0x4910, {0xbb, = 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d}} - ## ## Common ## diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/S= mmAccess.inf b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe= /SmmAccess.inf index 9356781c9e..bb1944c9ec 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces= s.inf +++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces= s.inf @@ -41,7 +41,7 @@ gEfiSmmAccess2ProtocolGuid ## PRODUCES =20 =20 [Guids] -gEfiSmmPeiSmramMemoryReserveGuid +gEfiSmmSmramMemoryGuid =20 =20 [Depex] diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/S= mmAccessDriver.c b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess= /Dxe/SmmAccessDriver.c index 08fd9266c6..17855d3942 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces= sDriver.c +++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces= sDriver.c @@ -49,7 +49,7 @@ SmmAccessDriverEntryPoint ( /// /// Get Hob list /// - Hob =3D GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid); + Hob =3D GetFirstGuidHob (&gEfiSmmSmramMemoryGuid); if (Hob =3D=3D NULL) { DEBUG ((DEBUG_WARN, "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 (#46684): https://edk2.groups.io/g/devel/message/46684 Mute This Topic: https://groups.io/mt/33112754/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- From nobody Mon Apr 29 20:01:35 2024 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- From nobody Mon Apr 29 20:01:35 2024 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+46686+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+46686+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1567438698; cv=none; d=zoho.com; s=zohoarc; b=GZMGZxQbb4OC54Yykw7AkDvesXdyb+4yC3kcFQMSsfaH25IHq4M+l4rvHKOv0OWVbZkIqy0IILo7k5QIr2Bdowd2lA3YyYnpj/d8m5fJ7D10C/HXMGECeK0tcX0ONAnIieXhJuhjRc4nRz1rQvWpVvQ2bPO9KtTVdC/xzB8LHA8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567438698; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=adNF2HMGnopZIIncVPrRT5OAX7T6tYBK3cGpoNREHk0=; b=WvyaXA0DGPl+/8AdwE3zanE8zc0T2DdlxE048AnQLpTr9XcaDifAhNa1N6HP3BFPAx6AF+G0ouihis3fomXSLKj1kkYzGU1bzAc5CEN7wbMvUg9fm7lwkTlnH353MCuyNOcBtLeIFyPMsP/HgBmj1IY1hgMjBIxpEppnOdMriXA= 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+46686+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 1567438698401965.9080904067467; Mon, 2 Sep 2019 08:38:18 -0700 (PDT) Return-Path: X-Received: from mga14.intel.com (mga14.intel.com []) by groups.io with SMTP; Mon, 02 Sep 2019 08:38:17 -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:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,459,1559545200"; d="scan'208";a="176344545" 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:14 -0700 From: "Marc W Chen" To: devel@edk2.groups.io Cc: Thad Gillispie , Daocheng Bu , Isaac W Oram , Nate DeSimone Subject: [edk2-devel] [edk2-platforms][PATCH V2 5/6] PurleySktPkg: Clean up duplicated SmramMemoryReserve.h files Date: Mon, 2 Sep 2019 23:35:52 +0800 Message-Id: <20190902153553.3256-6-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=1567438698; bh=21zdI5tnUmMMQBJulh8Zmiy2Po/qYhC/BC4HFjJ9hxM=; h=Cc:Date:From:Reply-To:Subject:To; b=TOsMpXhiW9GEDDGGPYMmD5/jSLOIybYsy4Fy0IXFmFJL1OtC/ywSBlSTTjvaOH1K4U8 IuBGdjFHqIxcPiPtxKzWQPcUYbEYXWNU6j8armMKfVsWnQFNZrVixoch+EmcJFQCxEqOh e2FB/cW1U6Nj0w+3mga3d1PJG2KFqwRgW3M= 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\PurleySktPkg\Include\Guid\SmramMemoryReserve.h Cc: Thad Gillispie Cc: Daocheng Bu Cc: Isaac W Oram Co-authored-by: Nate DeSimone Signed-off-by: Marc W Chen Signed-off-by: Nate DeSimone Reviewed-by: Daocheng Bu Reviewed-by: Isaac Oram --- .../Include/Guid/SmramMemoryReserve.h | 43 ------------------- Silicon/Intel/PurleySktPkg/SocketPkg.dec | 3 +- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryRese= rve.h diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h b= /Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h deleted file mode 100644 index 46e8198f00..0000000000 --- a/Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h @@ -1,43 +0,0 @@ -/** @file - -Copyright (c) 2018, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#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/PurleySktPkg/SocketPkg.dec b/Silicon/Intel/Purle= ySktPkg/SocketPkg.dec index 2ff937f5d8..e554a9555d 100644 --- a/Silicon/Intel/PurleySktPkg/SocketPkg.dec +++ b/Silicon/Intel/PurleySktPkg/SocketPkg.dec @@ -1,6 +1,6 @@ ### @file # -# Copyright (c) 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -51,7 +51,6 @@ gEfiRasClvTesterGuid =3D { 0x9bd36f4f, 0x= 08dc, 0x4eab, { 0x86, 0x37, 0x2b, 0xc1, 0xbd, 0x5e, 0x0d, 0x95 } } gSocketPkgFpgaGuid =3D { 0x624b948f, 0x= 6eba, 0x4dfd, { 0x9d, 0xda, 0x10, 0xb0, 0x07, 0x3a, 0x37, 0x35 } } # {624B= 948F-6EBA-4DFD-9DDA-10B0073A3735} gIioPolicyHobGuid =3D { 0xcabb327, 0x= 11fe, 0x416b, { 0xae, 0x80, 0x2d, 0xe5, 0xdf, 0x60, 0xf7, 0x7d } } - gEfiSmmPeiSmramMemoryReserveGuid =3D { 0x6dadf1d1, 0x= d4cc, 0x4910, { 0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d } } =20 [Ppis] gPeiBaseMemoryTestPpiGuid =3D { 0xb6ec423c, 0x= 21d2, 0x490d, { 0x85, 0xc6, 0xdd, 0x58, 0x64, 0xea, 0xa6, 0x74 } } --=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 (#46686): https://edk2.groups.io/g/devel/message/46686 Mute This Topic: https://groups.io/mt/33112756/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- From nobody Mon Apr 29 20:01:35 2024 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-