From: "Marc W Chen" <marc.w.chen@intel.com>
To: devel@edk2.groups.io
Cc: Michael Kubacki <michael.a.kubacki@intel.com>,
Chasel Chiu <chasel.chiu@intel.com>,
Nate DeSimone <nathaniel.l.desimone@intel.com>,
Liming Gao <liming.gao@intel.com>
Subject: [edk2-platforms][PATCH V2 1/6] MinPlatformPkg: Clean up duplicated SmramMemoryReserve.h files
Date: Mon, 2 Sep 2019 23:35:48 +0800 [thread overview]
Message-ID: <20190902153553.3256-2-marc.w.chen@intel.com> (raw)
In-Reply-To: <20190902153553.3256-1-marc.w.chen@intel.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2108
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 <michael.a.kubacki@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Co-authored-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
Signed-off-by: Marc W Chen <marc.w.chen@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
.../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/SmramMemoryReserve.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 regions
- * 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 reservation and H-SEG usage
-
-Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
-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_DESCRIPTOR_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 as UINTN.
- /// However, HOBs are supposed to be CPU neutral, so UINT32 should be used 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/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
index a642f9f3a3..d79f5ec1bd 100644
--- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
+++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
@@ -42,11 +42,6 @@ gBoardNotificationInitGuid = {0x78dbcabf, 0xc544, 0x4e6f, {0xaf, 0x3a, 0x71, 0x1
gBoardAcpiTableGuid = {0xd70e9f57, 0x69f, 0x4bef, {0x96, 0xc0, 0x84, 0x74, 0xf4, 0xa2, 0x5f, 0x3a}}
gBoardAcpiEnableGuid = {0x9727b610, 0xf645, 0x4429, {0x89, 0x21, 0x2c, 0x2b, 0x58, 0xdc, 0xbb, 0xa}}
-##
-## IntelFrameworkPkg
-##
-gEfiSmmPeiSmramMemoryReserveGuid = {0x6dadf1d1, 0xd4cc, 0x4910, {0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d}}
-
gDefaultDataFileGuid = { 0x1ae42876, 0x008f, 0x4161, { 0xb2, 0xb7, 0x1c, 0x0d, 0x15, 0xc5, 0xef, 0x43 }}
gDefaultDataOptSizeFileGuid = { 0x003e7b41, 0x98a2, 0x4be2, { 0xb2, 0x7a, 0x6c, 0x30, 0xc7, 0x65, 0x52, 0x25 }}
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.c b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.c
index 00877593bc..70e6b9a495 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.c
@@ -1,7 +1,7 @@
/** @file
Source code file for Platform Init PEI module
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -113,7 +113,7 @@ SetCacheMtrrAfterEndOfPei (
Status = PeiServicesGetHobList ((VOID **) &Hob.Raw);
while (!END_OF_HOB_LIST (Hob)) {
if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION) {
- if (CompareGuid (&Hob.Guid->Name, &gEfiSmmPeiSmramMemoryReserveGuid)) {
+ if (CompareGuid (&Hob.Guid->Name, &gEfiSmmSmramMemoryGuid)) {
SmramHobDescriptorBlock = (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *) (Hob.Guid + 1);
for (Index = 0; Index < SmramHobDescriptorBlock->NumberOfSmmReservedRegions; Index++) {
if (SmramHobDescriptorBlock->Descriptor[Index].PhysicalStart > 0x100000) {
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf
index 32d67a0a34..0736c8d494 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf
@@ -1,7 +1,7 @@
### @file
# Component information file for the Platform Init PEI module.
#
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -45,7 +45,7 @@
[Protocols]
[Guids]
- gEfiSmmPeiSmramMemoryReserveGuid ## CONSUMES
+ gEfiSmmSmramMemoryGuid ## CONSUMES
[Depex]
gEfiPeiMemoryDiscoveredPpiGuid
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c
index d04baf7663..6fe08e22ed 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c
@@ -1,6 +1,6 @@
/** @file
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -123,7 +123,7 @@ TestPointCheckSmramHob (
DEBUG ((DEBUG_INFO, "SMRAM HOB\n"));
while (!END_OF_HOB_LIST (Hob)) {
if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION) {
- if (CompareGuid (&Hob.Guid->Name, &gEfiSmmPeiSmramMemoryReserveGuid)) {
+ if (CompareGuid (&Hob.Guid->Name, &gEfiSmmSmramMemoryGuid)) {
SmramHobDescriptorBlock = (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *) (Hob.Guid + 1);
DumpSmramDescriptor (SmramHobDescriptorBlock->NumberOfSmmReservedRegions, SmramHobDescriptorBlock->Descriptor);
break;
@@ -138,7 +138,7 @@ TestPointCheckSmramHob (
Hob.Raw = GetHobList ();
while (!END_OF_HOB_LIST (Hob)) {
if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION) {
- if (CompareGuid (&Hob.Guid->Name, &gEfiSmmPeiSmramMemoryReserveGuid)) {
+ if (CompareGuid (&Hob.Guid->Name, &gEfiSmmSmramMemoryGuid)) {
SmramHobDescriptorBlock = (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *) (Hob.Guid + 1);
for (Index = 0; Index < SmramHobDescriptorBlock->NumberOfSmmReservedRegions; Index++) {
if (Base == 0) {
--
2.17.1.windows.2
next prev parent reply other threads:[~2019-09-02 15:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-02 15:35 [edk2-platforms][PATCH V2 0/6] clean up duplicated files in edk2-platforms Marc W Chen
2019-09-02 15:35 ` Marc W Chen [this message]
2019-09-03 9:12 ` [edk2-platforms][PATCH V2 1/6] MinPlatformPkg: Clean up duplicated SmramMemoryReserve.h files Chiu, Chasel
2019-09-04 7:00 ` [edk2-devel] " Kubacki, Michael A
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 2/6] QuarkPlatformPkg: " Marc W Chen
2019-09-03 14:59 ` Steele, Kelly
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 3/6] CoffeelakeSiliconPkg: " Marc W Chen
2019-09-03 9:13 ` Chiu, Chasel
2019-09-04 7:00 ` Kubacki, Michael A
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 4/6] KabylakeSiliconPkg: " Marc W Chen
2019-09-03 9:15 ` Chiu, Chasel
2019-09-04 7:00 ` Kubacki, Michael A
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 5/6] PurleySktPkg: " Marc W Chen
2019-09-11 2:43 ` Oram, Isaac W
2019-09-11 3:44 ` daocheng.bu
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 6/6] QuarkSocPkg: " Marc W Chen
2019-09-03 14:59 ` Steele, Kelly
2019-09-12 2:23 ` [edk2-platforms][PATCH V2 0/6] clean up duplicated files in edk2-platforms Nate DeSimone
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190902153553.3256-2-marc.w.chen@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox