* [edk2-platforms][PATCH V2 1/6] MinPlatformPkg: Clean up duplicated SmramMemoryReserve.h files
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
2019-09-03 9:12 ` Chiu, Chasel
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 2/6] QuarkPlatformPkg: " Marc W Chen
` (5 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Marc W Chen @ 2019-09-02 15:35 UTC (permalink / raw)
To: devel; +Cc: Michael Kubacki, Chasel Chiu, Nate DeSimone, Liming Gao
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
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [edk2-platforms][PATCH V2 1/6] MinPlatformPkg: Clean up duplicated SmramMemoryReserve.h files
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 1/6] MinPlatformPkg: Clean up duplicated SmramMemoryReserve.h files Marc W Chen
@ 2019-09-03 9:12 ` Chiu, Chasel
2019-09-04 7:00 ` [edk2-devel] " Kubacki, Michael A
0 siblings, 1 reply; 18+ messages in thread
From: Chiu, Chasel @ 2019-09-03 9:12 UTC (permalink / raw)
To: Chen, Marc W, devel@edk2.groups.io
Cc: Kubacki, Michael A, Desimone, Nathaniel L, Gao, Liming
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
> -----Original Message-----
> From: Chen, Marc W
> Sent: Monday, September 2, 2019 11:36 PM
> To: devel@edk2.groups.io
> Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Chiu, Chasel
> <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Gao, Liming <liming.gao@intel.com>
> Subject: [edk2-platforms][PATCH V2 1/6] MinPlatformPkg: Clean up
> duplicated SmramMemoryReserve.h files
>
> 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\SmramMemory
> Reserve.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/PlatformInitPo
> stMem.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> ostMem.c
> index 00877593bc..70e6b9a495 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPo
> stMem.c
> +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/Platfor
> +++ mInitPostMem.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/PlatformInitPo
> stMem.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> ostMem.inf
> index 32d67a0a34..0736c8d494 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPo
> stMem.inf
> +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/Platfor
> +++ mInitPostMem.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/PeiCheckS
> mmInfo.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckS
> mmInfo.c
> index d04baf7663..6fe08e22ed 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckS
> mmInfo.c
> +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCh
> +++ eckSmmInfo.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
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [edk2-devel] [edk2-platforms][PATCH V2 1/6] MinPlatformPkg: Clean up duplicated SmramMemoryReserve.h files
2019-09-03 9:12 ` Chiu, Chasel
@ 2019-09-04 7:00 ` Kubacki, Michael A
0 siblings, 0 replies; 18+ messages in thread
From: Kubacki, Michael A @ 2019-09-04 7:00 UTC (permalink / raw)
To: devel@edk2.groups.io, Chiu, Chasel, Chen, Marc W
Cc: Desimone, Nathaniel L, Gao, Liming
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Chiu, Chasel
> Sent: Tuesday, September 3, 2019 2:12 AM
> To: Chen, Marc W <marc.w.chen@intel.com>; devel@edk2.groups.io
> Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Gao, Liming <liming.gao@intel.com>
> Subject: Re: [edk2-devel] [edk2-platforms][PATCH V2 1/6] MinPlatformPkg:
> Clean up duplicated SmramMemoryReserve.h files
>
>
> Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
>
> > -----Original Message-----
> > From: Chen, Marc W
> > Sent: Monday, September 2, 2019 11:36 PM
> > To: devel@edk2.groups.io
> > Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Chiu, Chasel
> > <chasel.chiu@intel.com>; Desimone, Nathaniel L
> > <nathaniel.l.desimone@intel.com>; Gao, Liming <liming.gao@intel.com>
> > Subject: [edk2-platforms][PATCH V2 1/6] MinPlatformPkg: Clean up
> > duplicated SmramMemoryReserve.h files
> >
> > 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\SmramMemory
> > Reserve.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/PlatformI
> > nitPo
> > stMem.c
> > b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformI
> > nitP
> > ostMem.c
> > index 00877593bc..70e6b9a495 100644
> > ---
> > a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformI
> > nitPo
> > stMem.c
> > +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/Platf
> > +++ or
> > +++ mInitPostMem.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/PlatformI
> > nitPo
> > stMem.inf
> > b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformI
> > nitP
> > ostMem.inf
> > index 32d67a0a34..0736c8d494 100644
> > ---
> > a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformI
> > nitPo
> > stMem.inf
> > +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/Platf
> > +++ or
> > +++ mInitPostMem.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/PeiChec
> > kS
> > mmInfo.c
> > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiChec
> > kS
> > mmInfo.c
> > index d04baf7663..6fe08e22ed 100644
> > ---
> > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiChec
> > kS
> > mmInfo.c
> > +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/Pei
> > +++ Ch
> > +++ eckSmmInfo.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
>
>
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [edk2-platforms][PATCH V2 2/6] QuarkPlatformPkg: Clean up duplicated SmramMemoryReserve.h files
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 ` [edk2-platforms][PATCH V2 1/6] MinPlatformPkg: Clean up duplicated SmramMemoryReserve.h files Marc W Chen
@ 2019-09-02 15:35 ` 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
` (4 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Marc W Chen @ 2019-09-02 15:35 UTC (permalink / raw)
To: devel; +Cc: Michael D Kinney, Kelly Steele, Nate DeSimone
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 cleaned up.
Edk2Platforms\Silicon\Intel\QuarkSocPkg\QuarkNorthCluster\Include\Guid\SmramMemoryReserve.h
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Kelly Steele <kelly.steele@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>
---
.../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/AcpiSmmPlatform.c b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.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.
This is QNC Smm platform driver
-Copyright (c) 2013-2016 Intel Corporation.
+Copyright (c) 2013-2019 Intel Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -225,7 +225,7 @@ Returns:
//
// Get Hob list for SMRAM desc
//
- GuidHob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
+ GuidHob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
ASSERT (GuidHob);
DescriptorBlock = GET_GUID_HOB_DATA (GuidHob);
ASSERT (DescriptorBlock);
diff --git a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.inf b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.inf
index be80c73528..5301eccc6e 100644
--- a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.inf
+++ b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.inf
@@ -56,7 +56,7 @@
gEfiSmmSwDispatch2ProtocolGuid
[Guids]
- gEfiSmmPeiSmramMemoryReserveGuid
+ gEfiSmmSmramMemoryGuid
gQncS3CodeInLockBoxGuid
gQncS3ContextInLockBoxGuid
diff --git a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.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.
-Copyright (c) 2013 - 2016, Intel Corporation.
+Copyright (c) 2013 - 2019, Intel Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -836,7 +836,7 @@ InstallEfiMemory (
BufferSize += ((SmramRanges - 1) * sizeof (EFI_SMRAM_DESCRIPTOR));
Hob.Raw = BuildGuidHob (
- &gEfiSmmPeiSmramMemoryReserveGuid,
+ &gEfiSmmSmramMemoryGuid,
BufferSize
);
ASSERT (Hob.Raw);
@@ -958,7 +958,7 @@ InstallS3Memory (
}
Hob.Raw = BuildGuidHob (
- &gEfiSmmPeiSmramMemoryReserveGuid,
+ &gEfiSmmSmramMemoryGuid,
BufferSize
);
ASSERT (Hob.Raw);
@@ -1546,7 +1546,7 @@ InfoPostInstallMemory (
}
}
} else if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION) {
- if (CompareGuid (&(Hob.Guid->Name), &gEfiSmmPeiSmramMemoryReserveGuid)) {
+ if (CompareGuid (&(Hob.Guid->Name), &gEfiSmmSmramMemoryGuid)) {
SmramHobDescriptorBlock = (VOID*) (Hob.Raw + sizeof (EFI_HOB_GUID_TYPE));
if (SmramDescriptorPtr != NULL) {
*SmramDescriptorPtr = SmramHobDescriptorBlock->Descriptor;
diff --git a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf
index adec9e20eb..7910446402 100644
--- a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf
+++ b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf
@@ -108,7 +108,7 @@
gEfiAcpiVariableGuid # ALWAYS_CONSUMED L"AcpiGlobalVariab"
gEfiMemoryTypeInformationGuid # ALWAYS_CONSUMED L"MemoryTypeInformation"
gEfiMemoryConfigDataGuid # SOMETIMES_PRODUCED Hob: GUID_EXTENSION
- gEfiSmmPeiSmramMemoryReserveGuid # ALWAYS_PRODUCED Hob: GUID_EXTENSION
+ gEfiSmmSmramMemoryGuid # ALWAYS_PRODUCED Hob: GUID_EXTENSION
gEfiFirmwareFileSystem2Guid # ALWAYS_CONSUMED
gPeiCapsuleOnDataCDGuid
gPeiCapsuleOnFatIdeDiskGuid
--
2.17.1.windows.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [edk2-platforms][PATCH V2 2/6] QuarkPlatformPkg: Clean up duplicated SmramMemoryReserve.h files
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 2/6] QuarkPlatformPkg: " Marc W Chen
@ 2019-09-03 14:59 ` Steele, Kelly
0 siblings, 0 replies; 18+ messages in thread
From: Steele, Kelly @ 2019-09-03 14:59 UTC (permalink / raw)
To: Chen, Marc W, devel@edk2.groups.io
Cc: Kinney, Michael D, Desimone, Nathaniel L
Reviewed-by: Kelly Steele <kelly.steele@intel.com>
Thanks,
Kelly
> -----Original Message-----
> From: Chen, Marc W
> Sent: September 02, 2019 08:36
> To: devel@edk2.groups.io
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Steele, Kelly
> <kelly.steele@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>
> Subject: [edk2-platforms][PATCH V2 2/6] QuarkPlatformPkg: Clean up
> duplicated SmramMemoryReserve.h files
>
> 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 cleaned up.
> Edk2Platforms\Silicon\Intel\QuarkSocPkg\QuarkNorthCluster\Include\Guid\
> SmramMemoryReserve.h
>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Kelly Steele <kelly.steele@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>
> ---
> .../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/AcpiSmmPlatf
> orm.c
> b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf
> orm.c
> index f7f7ca3196..479459b801 100644
> ---
> a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf
> orm.c
> +++
> b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf
> orm.c
> @@ -3,7 +3,7 @@ ACPISMM Driver implementation file.
>
> This is QNC Smm platform driver
>
> -Copyright (c) 2013-2016 Intel Corporation.
> +Copyright (c) 2013-2019 Intel Corporation.
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -225,7 +225,7 @@ Returns:
> //
> // Get Hob list for SMRAM desc
> //
> - GuidHob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
> + GuidHob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
> ASSERT (GuidHob);
> DescriptorBlock = GET_GUID_HOB_DATA (GuidHob);
> ASSERT (DescriptorBlock);
> diff --git
> a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf
> orm.inf
> b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf
> orm.inf
> index be80c73528..5301eccc6e 100644
> ---
> a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf
> orm.inf
> +++
> b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatf
> orm.inf
> @@ -56,7 +56,7 @@
> gEfiSmmSwDispatch2ProtocolGuid
>
> [Guids]
> - gEfiSmmPeiSmramMemoryReserveGuid
> + gEfiSmmSmramMemoryGuid
> gQncS3CodeInLockBoxGuid
> gQncS3ContextInLockBoxGuid
>
> diff --git
> a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.
> c
> b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.
> 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.
>
> -Copyright (c) 2013 - 2016, Intel Corporation.
> +Copyright (c) 2013 - 2019, Intel Corporation.
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -836,7 +836,7 @@ InstallEfiMemory (
> BufferSize += ((SmramRanges - 1) * sizeof (EFI_SMRAM_DESCRIPTOR));
>
> Hob.Raw = BuildGuidHob (
> - &gEfiSmmPeiSmramMemoryReserveGuid,
> + &gEfiSmmSmramMemoryGuid,
> BufferSize
> );
> ASSERT (Hob.Raw);
> @@ -958,7 +958,7 @@ InstallS3Memory (
> }
>
> Hob.Raw = BuildGuidHob (
> - &gEfiSmmPeiSmramMemoryReserveGuid,
> + &gEfiSmmSmramMemoryGuid,
> BufferSize
> );
> ASSERT (Hob.Raw);
> @@ -1546,7 +1546,7 @@ InfoPostInstallMemory (
> }
> }
> } else if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION) {
> - if (CompareGuid (&(Hob.Guid->Name),
> &gEfiSmmPeiSmramMemoryReserveGuid)) {
> + if (CompareGuid (&(Hob.Guid->Name), &gEfiSmmSmramMemoryGuid))
> {
> SmramHobDescriptorBlock = (VOID*) (Hob.Raw + sizeof
> (EFI_HOB_GUID_TYPE));
> if (SmramDescriptorPtr != NULL) {
> *SmramDescriptorPtr = SmramHobDescriptorBlock->Descriptor;
> diff --git
> a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarly
> Init.inf
> b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarly
> Init.inf
> index adec9e20eb..7910446402 100644
> ---
> a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarly
> Init.inf
> +++
> b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarly
> Init.inf
> @@ -108,7 +108,7 @@
> gEfiAcpiVariableGuid # ALWAYS_CONSUMED
> L"AcpiGlobalVariab"
> gEfiMemoryTypeInformationGuid # ALWAYS_CONSUMED
> L"MemoryTypeInformation"
> gEfiMemoryConfigDataGuid # SOMETIMES_PRODUCED Hob:
> GUID_EXTENSION
> - gEfiSmmPeiSmramMemoryReserveGuid # ALWAYS_PRODUCED
> Hob: GUID_EXTENSION
> + gEfiSmmSmramMemoryGuid # ALWAYS_PRODUCED Hob:
> GUID_EXTENSION
> gEfiFirmwareFileSystem2Guid # ALWAYS_CONSUMED
> gPeiCapsuleOnDataCDGuid
> gPeiCapsuleOnFatIdeDiskGuid
> --
> 2.17.1.windows.2
^ permalink raw reply [flat|nested] 18+ messages in thread
* [edk2-platforms][PATCH V2 3/6] CoffeelakeSiliconPkg: Clean up duplicated SmramMemoryReserve.h files
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 ` [edk2-platforms][PATCH V2 1/6] MinPlatformPkg: Clean up duplicated SmramMemoryReserve.h files Marc W Chen
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 2/6] QuarkPlatformPkg: " Marc W Chen
@ 2019-09-02 15:35 ` 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
` (3 subsequent siblings)
6 siblings, 2 replies; 18+ messages in thread
From: Marc W Chen @ 2019-09-02 15:35 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Michael Kubacki, Sai Chaganty, Nate DeSimone
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 cleaned up.
Edk2Platforms\Silicon\Intel\CoffeelakeSiliconPkg\SampleCode\IntelFrameworkPkg\Include\Guid\SmramMemoryReserve.h
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@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 | 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/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h b/Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
deleted file mode 100644
index 862a7c8aea..0000000000
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/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 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) 2019 Intel Corporation. All rights reserved. <BR>
-
- 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_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/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec b/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
index fa8c11e93d..6cf894498d 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
@@ -54,11 +54,6 @@ gEfiMemoryTypeInformationGuid = {0x4c19049f, 0x4137, 0x4dd3, {0x9c, 0x10, 0x8b
gEfiCapsuleVendorGuid = {0x711c703f, 0xc285, 0x4b10, {0xa3, 0xb0, 0x36, 0xec, 0xbd, 0x3c, 0x8b, 0xe2}}
gEfiConsoleOutDeviceGuid = { 0xd3b36f2c, 0xd551, 0x11d4, { 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d}}
-##
-## IntelFrameworkPkg
-##
-gEfiSmmPeiSmramMemoryReserveGuid = {0x6dadf1d1, 0xd4cc, 0x4910, {0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d}}
-
##
## Common
##
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.inf b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.inf
index 9356781c9e..bb1944c9ec 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.inf
@@ -41,7 +41,7 @@ gEfiSmmAccess2ProtocolGuid ## PRODUCES
[Guids]
-gEfiSmmPeiSmramMemoryReserveGuid
+gEfiSmmSmramMemoryGuid
[Depex]
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
index 08fd9266c6..17855d3942 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
@@ -49,7 +49,7 @@ SmmAccessDriverEntryPoint (
///
/// Get Hob list
///
- Hob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
+ Hob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
if (Hob == NULL) {
DEBUG ((DEBUG_WARN, "SmramMemoryReserve HOB not found\n"));
return EFI_NOT_FOUND;
--
2.17.1.windows.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [edk2-platforms][PATCH V2 3/6] CoffeelakeSiliconPkg: Clean up duplicated SmramMemoryReserve.h files
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
1 sibling, 0 replies; 18+ messages in thread
From: Chiu, Chasel @ 2019-09-03 9:13 UTC (permalink / raw)
To: Chen, Marc W, devel@edk2.groups.io
Cc: Kubacki, Michael A, Chaganty, Rangasai V, Desimone, Nathaniel L
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
> -----Original Message-----
> From: Chen, Marc W
> Sent: Monday, September 2, 2019 11:36 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaganty@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>
> Subject: [edk2-platforms][PATCH V2 3/6] CoffeelakeSiliconPkg: Clean up
> duplicated SmramMemoryReserve.h files
>
> 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 cleaned up.
> Edk2Platforms\Silicon\Intel\CoffeelakeSiliconPkg\SampleCode\IntelFramewor
> kPkg\Include\Guid\SmramMemoryReserve.h
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@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 | 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/IntelFrameworkPkg/Include/
> Guid/SmramMemoryReserve.h
>
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include
> /Guid/SmramMemoryReserve.h
> b/Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPkg/Includ
> e/Guid/SmramMemoryReserve.h
> deleted file mode 100644
> index 862a7c8aea..0000000000
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include
> /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
> 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) 2019 Intel Corporation. All rights reserved. <BR>
> -
> - 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_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/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
> b/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
> index fa8c11e93d..6cf894498d 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
> @@ -54,11 +54,6 @@ gEfiMemoryTypeInformationGuid = {0x4c19049f,
> 0x4137, 0x4dd3, {0x9c, 0x10, 0x8b gEfiCapsuleVendorGuid =
> {0x711c703f, 0xc285, 0x4b10, {0xa3, 0xb0, 0x36, 0xec, 0xbd, 0x3c, 0x8b, 0xe2}}
> gEfiConsoleOutDeviceGuid = { 0xd3b36f2c, 0xd551, 0x11d4, { 0x9a, 0x46, 0x0,
> 0x90, 0x27, 0x3f, 0xc1, 0x4d}}
>
> -##
> -## IntelFrameworkPkg
> -##
> -gEfiSmmPeiSmramMemoryReserveGuid = {0x6dadf1d1, 0xd4cc, 0x4910,
> {0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d}}
> -
> ##
> ## Common
> ##
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcce
> ss.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcce
> ss.inf
> index 9356781c9e..bb1944c9ec 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcce
> ss.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAc
> +++ cess.inf
> @@ -41,7 +41,7 @@ gEfiSmmAccess2ProtocolGuid ## PRODUCES
>
>
> [Guids]
> -gEfiSmmPeiSmramMemoryReserveGuid
> +gEfiSmmSmramMemoryGuid
>
>
> [Depex]
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcce
> ssDriver.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcce
> ssDriver.c
> index 08fd9266c6..17855d3942 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcce
> ssDriver.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAc
> +++ cessDriver.c
> @@ -49,7 +49,7 @@ SmmAccessDriverEntryPoint (
> ///
> /// Get Hob list
> ///
> - Hob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
> + Hob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
> if (Hob == NULL) {
> DEBUG ((DEBUG_WARN, "SmramMemoryReserve HOB not found\n"));
> return EFI_NOT_FOUND;
> --
> 2.17.1.windows.2
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [edk2-platforms][PATCH V2 3/6] CoffeelakeSiliconPkg: Clean up duplicated SmramMemoryReserve.h files
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
1 sibling, 0 replies; 18+ messages in thread
From: Kubacki, Michael A @ 2019-09-04 7:00 UTC (permalink / raw)
To: Chen, Marc W, devel@edk2.groups.io
Cc: Chiu, Chasel, Chaganty, Rangasai V, Desimone, Nathaniel L
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
> -----Original Message-----
> From: Chen, Marc W
> Sent: Monday, September 2, 2019 8:36 AM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaganty@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>
> Subject: [edk2-platforms][PATCH V2 3/6] CoffeelakeSiliconPkg: Clean up
> duplicated SmramMemoryReserve.h files
>
> 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 cleaned up.
> Edk2Platforms\Silicon\Intel\CoffeelakeSiliconPkg\SampleCode\IntelFramework
> Pkg\Include\Guid\SmramMemoryReserve.h
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@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 | 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/IntelFrameworkPkg/Include/Gui
> d/SmramMemoryReserve.h
>
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/G
> uid/SmramMemoryReserve.h
> b/Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/G
> uid/SmramMemoryReserve.h
> deleted file mode 100644
> index 862a7c8aea..0000000000
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/G
> uid/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
> 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) 2019 Intel Corporation. All rights reserved. <BR>
> -
> - 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_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/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
> b/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
> index fa8c11e93d..6cf894498d 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec
> @@ -54,11 +54,6 @@ gEfiMemoryTypeInformationGuid = {0x4c19049f,
> 0x4137, 0x4dd3, {0x9c, 0x10, 0x8b gEfiCapsuleVendorGuid = {0x711c703f,
> 0xc285, 0x4b10, {0xa3, 0xb0, 0x36, 0xec, 0xbd, 0x3c, 0x8b, 0xe2}}
> gEfiConsoleOutDeviceGuid = { 0xd3b36f2c, 0xd551, 0x11d4, { 0x9a, 0x46, 0x0,
> 0x90, 0x27, 0x3f, 0xc1, 0x4d}}
>
> -##
> -## IntelFrameworkPkg
> -##
> -gEfiSmmPeiSmramMemoryReserveGuid = {0x6dadf1d1, 0xd4cc, 0x4910, {0xbb,
> 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d}}
> -
> ##
> ## Common
> ##
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> .inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> .inf
> index 9356781c9e..bb1944c9ec 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> .inf
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAc
> +++ cess.inf
> @@ -41,7 +41,7 @@ gEfiSmmAccess2ProtocolGuid ## PRODUCES
>
>
> [Guids]
> -gEfiSmmPeiSmramMemoryReserveGuid
> +gEfiSmmSmramMemoryGuid
>
>
> [Depex]
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> Driver.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> Driver.c
> index 08fd9266c6..17855d3942 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> Driver.c
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAc
> +++ cessDriver.c
> @@ -49,7 +49,7 @@ SmmAccessDriverEntryPoint (
> ///
> /// Get Hob list
> ///
> - Hob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
> + Hob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
> if (Hob == NULL) {
> DEBUG ((DEBUG_WARN, "SmramMemoryReserve HOB not found\n"));
> return EFI_NOT_FOUND;
> --
> 2.17.1.windows.2
^ permalink raw reply [flat|nested] 18+ messages in thread
* [edk2-platforms][PATCH V2 4/6] KabylakeSiliconPkg: Clean up duplicated SmramMemoryReserve.h files
2019-09-02 15:35 [edk2-platforms][PATCH V2 0/6] clean up duplicated files in edk2-platforms Marc W Chen
` (2 preceding siblings ...)
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 3/6] CoffeelakeSiliconPkg: " Marc W Chen
@ 2019-09-02 15:35 ` 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
` (2 subsequent siblings)
6 siblings, 2 replies; 18+ messages in thread
From: Marc W Chen @ 2019-09-02 15:35 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Michael Kubacki, Sai Chaganty, Nate DeSimone
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 cleaned up.
Edk2Platforms\Silicon\Intel\KabylakeSiliconPkg\SampleCode\IntelFrameworkPkg\Include\Guid\SmramMemoryReserve.h
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@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 -------------------
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/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/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 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/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
index a9f1c0f092..3881671757 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
@@ -63,10 +63,6 @@ gEfiMemoryTypeInformationGuid = {0x4c19049f, 0x4137, 0x4dd3, {0x9c, 0x10, 0x8b
gEfiCapsuleVendorGuid = {0x711c703f, 0xc285, 0x4b10, {0xa3, 0xb0, 0x36, 0xec, 0xbd, 0x3c, 0x8b, 0xe2}}
gEfiConsoleOutDeviceGuid = {0xd3b36f2c, 0xd551, 0x11d4, {0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d}}
##
-## IntelFrameworkPkg
-##
-gEfiSmmPeiSmramMemoryReserveGuid = {0x6dadf1d1, 0xd4cc, 0x4910, {0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d}}
-##
##
##
gSmbiosProcessorInfoHobGuid = {0xe6d73d92, 0xff56, 0x4146, {0xaf, 0xac, 0x1c, 0x18, 0x81, 0x7d, 0x68, 0x71}}
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.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.<BR>
+# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -42,7 +42,7 @@ gEfiSmmAccess2ProtocolGuid ## PRODUCES
[Guids]
-gEfiSmmPeiSmramMemoryReserveGuid
+gEfiSmmSmramMemoryGuid
[Depex]
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
index f03dbe3d27..77f465fd25 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
@@ -2,7 +2,7 @@
This is the driver that publishes the SMM Access Protocol
instance for System Agent.
-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
**/
@@ -61,7 +61,7 @@ SmmAccessDriverEntryPoint (
///
/// Get Hob list
///
- Hob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
+ Hob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
if (Hob == NULL) {
DEBUG ((DEBUG_ERROR, "SmramMemoryReserve HOB not found\n"));
return EFI_NOT_FOUND;
--
2.17.1.windows.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [edk2-platforms][PATCH V2 4/6] KabylakeSiliconPkg: Clean up duplicated SmramMemoryReserve.h files
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
1 sibling, 0 replies; 18+ messages in thread
From: Chiu, Chasel @ 2019-09-03 9:15 UTC (permalink / raw)
To: Chen, Marc W, devel@edk2.groups.io
Cc: Kubacki, Michael A, Chaganty, Rangasai V, Desimone, Nathaniel L
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
> -----Original Message-----
> From: Chen, Marc W
> Sent: Monday, September 2, 2019 11:36 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaganty@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>
> Subject: [edk2-platforms][PATCH V2 4/6] KabylakeSiliconPkg: Clean up
> duplicated SmramMemoryReserve.h files
>
> 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 cleaned up.
> Edk2Platforms\Silicon\Intel\KabylakeSiliconPkg\SampleCode\IntelFramework
> Pkg\Include\Guid\SmramMemoryReserve.h
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@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 -------------------
> 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/IntelFrameworkPkg/Include/Gu
> id/SmramMemoryReserve.h
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Guid/SmramMemoryReserve.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/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
> 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/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> index a9f1c0f092..3881671757 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> @@ -63,10 +63,6 @@ gEfiMemoryTypeInformationGuid = {0x4c19049f,
> 0x4137, 0x4dd3, {0x9c, 0x10, 0x8b
> gEfiCapsuleVendorGuid = {0x711c703f, 0xc285, 0x4b10, {0xa3,
> 0xb0, 0x36, 0xec, 0xbd, 0x3c, 0x8b, 0xe2}}
> gEfiConsoleOutDeviceGuid = {0xd3b36f2c, 0xd551, 0x11d4, {0x9a,
> 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d}}
> ##
> -## IntelFrameworkPkg
> -##
> -gEfiSmmPeiSmramMemoryReserveGuid = {0x6dadf1d1, 0xd4cc, 0x4910,
> {0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d}} -## ## ##
> gSmbiosProcessorInfoHobGuid = {0xe6d73d92, 0xff56, 0x4146, {0xaf, 0xac,
> 0x1c, 0x18, 0x81, 0x7d, 0x68, 0x71}} diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> .inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> .inf
> index 93ab408206..287e631689 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> .inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcce
> +++ ss.inf
> @@ -3,7 +3,7 @@
> #
> # {1323C7F8-DAD5-4126-A54B-7A05FBF4151}
> #
> -# 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 #
> @@ -42,7 +42,7 @@ gEfiSmmAccess2ProtocolGuid ## PRODUCES
>
>
> [Guids]
> -gEfiSmmPeiSmramMemoryReserveGuid
> +gEfiSmmSmramMemoryGuid
>
>
> [Depex]
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> Driver.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> Driver.c
> index f03dbe3d27..77f465fd25 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> Driver.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcce
> +++ ssDriver.c
> @@ -2,7 +2,7 @@
> This is the driver that publishes the SMM Access Protocol
> instance for System Agent.
>
> -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
>
> **/
> @@ -61,7 +61,7 @@ SmmAccessDriverEntryPoint (
> ///
> /// Get Hob list
> ///
> - Hob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
> + Hob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
> if (Hob == NULL) {
> DEBUG ((DEBUG_ERROR, "SmramMemoryReserve HOB not found\n"));
> return EFI_NOT_FOUND;
> --
> 2.17.1.windows.2
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [edk2-platforms][PATCH V2 4/6] KabylakeSiliconPkg: Clean up duplicated SmramMemoryReserve.h files
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
1 sibling, 0 replies; 18+ messages in thread
From: Kubacki, Michael A @ 2019-09-04 7:00 UTC (permalink / raw)
To: Chen, Marc W, devel@edk2.groups.io
Cc: Chiu, Chasel, Chaganty, Rangasai V, Desimone, Nathaniel L
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
> -----Original Message-----
> From: Chen, Marc W
> Sent: Monday, September 2, 2019 8:36 AM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaganty@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>
> Subject: [edk2-platforms][PATCH V2 4/6] KabylakeSiliconPkg: Clean up
> duplicated SmramMemoryReserve.h files
>
> 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 cleaned up.
> Edk2Platforms\Silicon\Intel\KabylakeSiliconPkg\SampleCode\IntelFrameworkPk
> g\Include\Guid\SmramMemoryReserve.h
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@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 -------------------
> 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/IntelFrameworkPkg/Include/Guid/
> SmramMemoryReserve.h
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Gui
> d/SmramMemoryReserve.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Gui
> d/SmramMemoryReserve.h
> deleted file mode 100644
> index 9918c768ba..0000000000
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Gui
> d/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/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> index a9f1c0f092..3881671757 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> @@ -63,10 +63,6 @@ gEfiMemoryTypeInformationGuid = {0x4c19049f,
> 0x4137, 0x4dd3, {0x9c, 0x10, 0x8b
> gEfiCapsuleVendorGuid = {0x711c703f, 0xc285, 0x4b10, {0xa3, 0xb0,
> 0x36, 0xec, 0xbd, 0x3c, 0x8b, 0xe2}}
> gEfiConsoleOutDeviceGuid = {0xd3b36f2c, 0xd551, 0x11d4, {0x9a, 0x46,
> 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d}}
> ##
> -## IntelFrameworkPkg
> -##
> -gEfiSmmPeiSmramMemoryReserveGuid = {0x6dadf1d1, 0xd4cc, 0x4910, {0xbb,
> 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d}} -## ## ##
> gSmbiosProcessorInfoHobGuid = {0xe6d73d92, 0xff56, 0x4146, {0xaf, 0xac,
> 0x1c, 0x18, 0x81, 0x7d, 0x68, 0x71}} diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.in
> f
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.in
> f
> index 93ab408206..287e631689 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.in
> f
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcce
> +++ ss.inf
> @@ -3,7 +3,7 @@
> #
> # {1323C7F8-DAD5-4126-A54B-7A05FBF4151}
> #
> -# 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 #
> @@ -42,7 +42,7 @@ gEfiSmmAccess2ProtocolGuid ## PRODUCES
>
>
> [Guids]
> -gEfiSmmPeiSmramMemoryReserveGuid
> +gEfiSmmSmramMemoryGuid
>
>
> [Depex]
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDr
> iver.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDr
> iver.c
> index f03dbe3d27..77f465fd25 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDr
> iver.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcce
> +++ ssDriver.c
> @@ -2,7 +2,7 @@
> This is the driver that publishes the SMM Access Protocol
> instance for System Agent.
>
> -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
>
> **/
> @@ -61,7 +61,7 @@ SmmAccessDriverEntryPoint (
> ///
> /// Get Hob list
> ///
> - Hob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
> + Hob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
> if (Hob == NULL) {
> DEBUG ((DEBUG_ERROR, "SmramMemoryReserve HOB not found\n"));
> return EFI_NOT_FOUND;
> --
> 2.17.1.windows.2
^ permalink raw reply [flat|nested] 18+ messages in thread
* [edk2-platforms][PATCH V2 5/6] PurleySktPkg: Clean up duplicated SmramMemoryReserve.h files
2019-09-02 15:35 [edk2-platforms][PATCH V2 0/6] clean up duplicated files in edk2-platforms Marc W Chen
` (3 preceding siblings ...)
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 4/6] KabylakeSiliconPkg: " Marc W Chen
@ 2019-09-02 15:35 ` Marc W Chen
2019-09-11 2:43 ` Oram, Isaac W
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 6/6] QuarkSocPkg: " Marc W Chen
2019-09-12 2:23 ` [edk2-platforms][PATCH V2 0/6] clean up duplicated files in edk2-platforms Nate DeSimone
6 siblings, 1 reply; 18+ messages in thread
From: Marc W Chen @ 2019-09-02 15:35 UTC (permalink / raw)
To: devel; +Cc: Thad Gillispie, Daocheng Bu, Isaac W Oram, Nate DeSimone
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 cleaned up.
Edk2Platforms\Silicon\Intel\PurleySktPkg\Include\Guid\SmramMemoryReserve.h
Cc: Thad Gillispie <thad.gillispie@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@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 | 43 -------------------
Silicon/Intel/PurleySktPkg/SocketPkg.dec | 3 +-
2 files changed, 1 insertion(+), 45 deletions(-)
delete mode 100644 Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.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.<BR>
-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_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/Silicon/Intel/PurleySktPkg/SocketPkg.dec b/Silicon/Intel/PurleySktPkg/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.<BR>
+# Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -51,7 +51,6 @@
gEfiRasClvTesterGuid = { 0x9bd36f4f, 0x08dc, 0x4eab, { 0x86, 0x37, 0x2b, 0xc1, 0xbd, 0x5e, 0x0d, 0x95 } }
gSocketPkgFpgaGuid = { 0x624b948f, 0x6eba, 0x4dfd, { 0x9d, 0xda, 0x10, 0xb0, 0x07, 0x3a, 0x37, 0x35 } } # {624B948F-6EBA-4DFD-9DDA-10B0073A3735}
gIioPolicyHobGuid = { 0xcabb327, 0x11fe, 0x416b, { 0xae, 0x80, 0x2d, 0xe5, 0xdf, 0x60, 0xf7, 0x7d } }
- gEfiSmmPeiSmramMemoryReserveGuid = { 0x6dadf1d1, 0xd4cc, 0x4910, { 0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d } }
[Ppis]
gPeiBaseMemoryTestPpiGuid = { 0xb6ec423c, 0x21d2, 0x490d, { 0x85, 0xc6, 0xdd, 0x58, 0x64, 0xea, 0xa6, 0x74 } }
--
2.17.1.windows.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [edk2-platforms][PATCH V2 5/6] PurleySktPkg: Clean up duplicated SmramMemoryReserve.h files
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
0 siblings, 1 reply; 18+ messages in thread
From: Oram, Isaac W @ 2019-09-11 2:43 UTC (permalink / raw)
To: Chen, Marc W, devel@edk2.groups.io
Cc: Gillispie, Thad, Bu, Daocheng, Desimone, Nathaniel L
Reviewed-by: Isaac Oram <isaac.w.oram@intel.com>
-----Original Message-----
From: Chen, Marc W
Sent: Monday, September 2, 2019 8:36 AM
To: devel@edk2.groups.io
Cc: Gillispie, Thad <thad.gillispie@intel.com>; Bu, Daocheng <daocheng.bu@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
Subject: [edk2-platforms][PATCH V2 5/6] PurleySktPkg: Clean up duplicated SmramMemoryReserve.h files
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 cleaned up.
Edk2Platforms\Silicon\Intel\PurleySktPkg\Include\Guid\SmramMemoryReserve.h
Cc: Thad Gillispie <thad.gillispie@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@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 | 43 -------------------
Silicon/Intel/PurleySktPkg/SocketPkg.dec | 3 +-
2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.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.<BR>
-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_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/Silicon/Intel/PurleySktPkg/SocketPkg.dec b/Silicon/Intel/PurleySktPkg/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.<BR>
+# Copyright (c) 2018 - 2019, Intel Corporation. All rights
+reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -51,7 +51,6 @@
gEfiRasClvTesterGuid = { 0x9bd36f4f, 0x08dc, 0x4eab, { 0x86, 0x37, 0x2b, 0xc1, 0xbd, 0x5e, 0x0d, 0x95 } }
gSocketPkgFpgaGuid = { 0x624b948f, 0x6eba, 0x4dfd, { 0x9d, 0xda, 0x10, 0xb0, 0x07, 0x3a, 0x37, 0x35 } } # {624B948F-6EBA-4DFD-9DDA-10B0073A3735}
gIioPolicyHobGuid = { 0xcabb327, 0x11fe, 0x416b, { 0xae, 0x80, 0x2d, 0xe5, 0xdf, 0x60, 0xf7, 0x7d } }
- gEfiSmmPeiSmramMemoryReserveGuid = { 0x6dadf1d1, 0xd4cc, 0x4910, { 0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d } }
[Ppis]
gPeiBaseMemoryTestPpiGuid = { 0xb6ec423c, 0x21d2, 0x490d, { 0x85, 0xc6, 0xdd, 0x58, 0x64, 0xea, 0xa6, 0x74 } }
--
2.17.1.windows.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [edk2-platforms][PATCH V2 5/6] PurleySktPkg: Clean up duplicated SmramMemoryReserve.h files
2019-09-11 2:43 ` Oram, Isaac W
@ 2019-09-11 3:44 ` daocheng.bu
0 siblings, 0 replies; 18+ messages in thread
From: daocheng.bu @ 2019-09-11 3:44 UTC (permalink / raw)
To: Oram, Isaac W, Chen, Marc W, devel@edk2.groups.io
Cc: Gillispie, Thad, Desimone, Nathaniel L
Reviewed-by: Daocheng Bu <daocheng.bu@intel.com>
Thanks,
Amos
UEFI FW, IAFW or System Firmware is more generic & accurate
it's not BIOS anymore!
-----Original Message-----
From: Oram, Isaac W
Sent: Wednesday, September 11, 2019 10:44 AM
To: Chen, Marc W <marc.w.chen@intel.com>; devel@edk2.groups.io
Cc: Gillispie, Thad <thad.gillispie@intel.com>; Bu, Daocheng <daocheng.bu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
Subject: RE: [edk2-platforms][PATCH V2 5/6] PurleySktPkg: Clean up duplicated SmramMemoryReserve.h files
Reviewed-by: Isaac Oram <isaac.w.oram@intel.com>
-----Original Message-----
From: Chen, Marc W
Sent: Monday, September 2, 2019 8:36 AM
To: devel@edk2.groups.io
Cc: Gillispie, Thad <thad.gillispie@intel.com>; Bu, Daocheng <daocheng.bu@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
Subject: [edk2-platforms][PATCH V2 5/6] PurleySktPkg: Clean up duplicated SmramMemoryReserve.h files
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 cleaned up.
Edk2Platforms\Silicon\Intel\PurleySktPkg\Include\Guid\SmramMemoryReserve.h
Cc: Thad Gillispie <thad.gillispie@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@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 | 43 -------------------
Silicon/Intel/PurleySktPkg/SocketPkg.dec | 3 +-
2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.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.<BR>
-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_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/Silicon/Intel/PurleySktPkg/SocketPkg.dec b/Silicon/Intel/PurleySktPkg/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.<BR>
+# Copyright (c) 2018 - 2019, Intel Corporation. All rights
+reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -51,7 +51,6 @@
gEfiRasClvTesterGuid = { 0x9bd36f4f, 0x08dc, 0x4eab, { 0x86, 0x37, 0x2b, 0xc1, 0xbd, 0x5e, 0x0d, 0x95 } }
gSocketPkgFpgaGuid = { 0x624b948f, 0x6eba, 0x4dfd, { 0x9d, 0xda, 0x10, 0xb0, 0x07, 0x3a, 0x37, 0x35 } } # {624B948F-6EBA-4DFD-9DDA-10B0073A3735}
gIioPolicyHobGuid = { 0xcabb327, 0x11fe, 0x416b, { 0xae, 0x80, 0x2d, 0xe5, 0xdf, 0x60, 0xf7, 0x7d } }
- gEfiSmmPeiSmramMemoryReserveGuid = { 0x6dadf1d1, 0xd4cc, 0x4910, { 0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d } }
[Ppis]
gPeiBaseMemoryTestPpiGuid = { 0xb6ec423c, 0x21d2, 0x490d, { 0x85, 0xc6, 0xdd, 0x58, 0x64, 0xea, 0xa6, 0x74 } }
--
2.17.1.windows.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [edk2-platforms][PATCH V2 6/6] QuarkSocPkg: Clean up duplicated SmramMemoryReserve.h files
2019-09-02 15:35 [edk2-platforms][PATCH V2 0/6] clean up duplicated files in edk2-platforms Marc W Chen
` (4 preceding siblings ...)
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 5/6] PurleySktPkg: " Marc W Chen
@ 2019-09-02 15:35 ` 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
6 siblings, 1 reply; 18+ messages in thread
From: Marc W Chen @ 2019-09-02 15:35 UTC (permalink / raw)
To: devel; +Cc: Michael D Kinney, Kelly Steele, Nate DeSimone
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 cleaned up.
Edk2Platforms\Silicon\Intel\QuarkSocPkg\QuarkNorthCluster\Include\Guid\SmramMemoryReserve.h
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Kelly Steele <kelly.steele@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 -------------------
.../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/Guid/SmramMemoryReserve.h
diff --git a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Include/Guid/SmramMemoryReserve.h b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Include/Guid/SmramMemoryReserve.h
deleted file mode 100644
index d57dfbebf3..0000000000
--- a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/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 - 2018, 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/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccess.inf b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccess.inf
index bb555b4a2e..cf579efd02 100644
--- a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccess.inf
+++ b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccess.inf
@@ -42,7 +42,7 @@
gEfiSmmAccess2ProtocolGuid
[Guids]
- gEfiSmmPeiSmramMemoryReserveGuid
+ gEfiSmmSmramMemoryGuid
[Depex]
gEfiPciRootBridgeIoProtocolGuid
diff --git a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccessDriver.c b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccessDriver.c
index 830f8b83c3..7992ef7ded 100644
--- a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccessDriver.c
+++ b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccessDriver.c
@@ -75,7 +75,7 @@ Returns:
//
// Get Hob list
//
- GuidHob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
+ GuidHob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
DescriptorBlock = GET_GUID_HOB_DATA (GuidHob);
ASSERT (DescriptorBlock);
diff --git a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.c b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.c
index 637792d147..d03cadbde5 100644
--- a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.c
+++ b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.c
@@ -2,7 +2,7 @@
This is the driver that publishes the SMM Access Ppi
instance for the Quark SOC.
-Copyright (c) 2013-2015 Intel Corporation.
+Copyright (c) 2013-2019 Intel Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -325,7 +325,7 @@ Returns:
//
// Get Hob list
//
- GuidHob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
+ GuidHob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
DescriptorBlock = GET_GUID_HOB_DATA (GuidHob);
ASSERT (DescriptorBlock);
diff --git a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.inf b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.inf
index 60b5fbab0f..5f78f72859 100644
--- a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.inf
+++ b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.inf
@@ -34,7 +34,7 @@ ENTRY_POINT = SmmAccessPeiEntryPoint
SmmLib
[Guids]
- gEfiSmmPeiSmramMemoryReserveGuid # ALWAYS_CONSUMED
+ gEfiSmmSmramMemoryGuid # ALWAYS_CONSUMED
[Ppis]
gPeiSmmAccessPpiGuid # ALWAYS_PRODUCED
diff --git a/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dec b/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dec
index 32f57e0c5e..94e7d8c60b 100644
--- a/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dec
+++ b/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dec
@@ -72,7 +72,6 @@
gEfiQuarkNcSocIdTokenSpaceGuid = { 0xca452c6a, 0xdf0c, 0x4dc9, { 0x82, 0xfb, 0xea, 0xe2, 0xab, 0x31, 0x29, 0x46 }}
gQncS3CodeInLockBoxGuid = { 0x1f18c5b3, 0x29ed, 0x4d9e, {0xa5, 0x4, 0x6d, 0x97, 0x8e, 0x7e, 0xd5, 0x69}}
gQncS3ContextInLockBoxGuid = { 0xe5769ea9, 0xe706, 0x454b, {0x95, 0x7f, 0xaf, 0xc6, 0xdb, 0x4b, 0x8a, 0xd}}
- gEfiSmmPeiSmramMemoryReserveGuid = { 0x6dadf1d1, 0xd4cc, 0x4910, { 0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d }}
#
# South Cluster
--
2.17.1.windows.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [edk2-platforms][PATCH V2 6/6] QuarkSocPkg: Clean up duplicated SmramMemoryReserve.h files
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 6/6] QuarkSocPkg: " Marc W Chen
@ 2019-09-03 14:59 ` Steele, Kelly
0 siblings, 0 replies; 18+ messages in thread
From: Steele, Kelly @ 2019-09-03 14:59 UTC (permalink / raw)
To: Chen, Marc W, devel@edk2.groups.io
Cc: Kinney, Michael D, Desimone, Nathaniel L
Reviewed-by: Kelly Steele <kelly.steele@intel.com>
Thanks,
Kelly
> -----Original Message-----
> From: Chen, Marc W
> Sent: September 02, 2019 08:36
> To: devel@edk2.groups.io
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Steele, Kelly
> <kelly.steele@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>
> Subject: [edk2-platforms][PATCH V2 6/6] QuarkSocPkg: Clean up duplicated
> SmramMemoryReserve.h files
>
> 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 cleaned up.
> Edk2Platforms\Silicon\Intel\QuarkSocPkg\QuarkNorthCluster\Include\Guid\
> SmramMemoryReserve.h
>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Kelly Steele <kelly.steele@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 -------------------
> .../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/Guid/SmramMemory
> Reserve.h
>
> diff --git
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Include/Guid/SmramMemo
> ryReserve.h
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Include/Guid/SmramMemo
> ryReserve.h
> deleted file mode 100644
> index d57dfbebf3..0000000000
> ---
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Include/Guid/SmramMemo
> ryReserve.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 - 2018, 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/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccess.inf
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccess.inf
> index bb555b4a2e..cf579efd02 100644
> ---
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccess.inf
> +++
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccess.inf
> @@ -42,7 +42,7 @@
> gEfiSmmAccess2ProtocolGuid
>
> [Guids]
> - gEfiSmmPeiSmramMemoryReserveGuid
> + gEfiSmmSmramMemoryGuid
>
> [Depex]
> gEfiPciRootBridgeIoProtocolGuid
> diff --git
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccessDriver.c
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccessDriver.c
> index 830f8b83c3..7992ef7ded 100644
> ---
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccessDriver.c
> +++
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/
> SmmAccessDriver.c
> @@ -75,7 +75,7 @@ Returns:
> //
> // Get Hob list
> //
> - GuidHob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
> + GuidHob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
> DescriptorBlock = GET_GUID_HOB_DATA (GuidHob);
> ASSERT (DescriptorBlock);
>
> diff --git
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.c
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.c
> index 637792d147..d03cadbde5 100644
> ---
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.c
> +++
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.c
> @@ -2,7 +2,7 @@
> This is the driver that publishes the SMM Access Ppi
> instance for the Quark SOC.
>
> -Copyright (c) 2013-2015 Intel Corporation.
> +Copyright (c) 2013-2019 Intel Corporation.
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -325,7 +325,7 @@ Returns:
> //
> // Get Hob list
> //
> - GuidHob = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
> + GuidHob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
> DescriptorBlock = GET_GUID_HOB_DATA (GuidHob);
> ASSERT (DescriptorBlock);
>
> diff --git
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.inf
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.inf
> index 60b5fbab0f..5f78f72859 100644
> ---
> a/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.inf
> +++
> b/Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/S
> mmAccessPei.inf
> @@ -34,7 +34,7 @@ ENTRY_POINT = SmmAccessPeiEntryPoint
> SmmLib
>
> [Guids]
> - gEfiSmmPeiSmramMemoryReserveGuid # ALWAYS_CONSUMED
> + gEfiSmmSmramMemoryGuid # ALWAYS_CONSUMED
>
> [Ppis]
> gPeiSmmAccessPpiGuid # ALWAYS_PRODUCED
> diff --git a/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dec
> b/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dec
> index 32f57e0c5e..94e7d8c60b 100644
> --- a/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dec
> +++ b/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dec
> @@ -72,7 +72,6 @@
> gEfiQuarkNcSocIdTokenSpaceGuid = { 0xca452c6a, 0xdf0c, 0x4dc9, { 0x82,
> 0xfb, 0xea, 0xe2, 0xab, 0x31, 0x29, 0x46 }}
> gQncS3CodeInLockBoxGuid = { 0x1f18c5b3, 0x29ed, 0x4d9e, {0xa5, 0x4,
> 0x6d, 0x97, 0x8e, 0x7e, 0xd5, 0x69}}
> gQncS3ContextInLockBoxGuid = { 0xe5769ea9, 0xe706, 0x454b, {0x95, 0x7f,
> 0xaf, 0xc6, 0xdb, 0x4b, 0x8a, 0xd}}
> - gEfiSmmPeiSmramMemoryReserveGuid = { 0x6dadf1d1, 0xd4cc, 0x4910, {
> 0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d }}
>
> #
> # South Cluster
> --
> 2.17.1.windows.2
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [edk2-platforms][PATCH V2 0/6] clean up duplicated files in edk2-platforms
2019-09-02 15:35 [edk2-platforms][PATCH V2 0/6] clean up duplicated files in edk2-platforms Marc W Chen
` (5 preceding siblings ...)
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 6/6] QuarkSocPkg: " Marc W Chen
@ 2019-09-12 2:23 ` Nate DeSimone
6 siblings, 0 replies; 18+ messages in thread
From: Nate DeSimone @ 2019-09-12 2:23 UTC (permalink / raw)
To: Chen, Marc W, devel@edk2.groups.io
Cc: Kubacki, Michael A, Chaganty, Rangasai V, Chiu, Chasel,
Gao, Liming, Steele, Kelly, Gillispie, Thad, Bu, Daocheng,
Oram, Isaac W
The patch series has been pushed as de0fb79a14..8bda7e434b
-----Original Message-----
From: Chen, Marc W
Sent: Monday, September 2, 2019 8:36 AM
To: devel@edk2.groups.io
Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; Gao, Liming <liming.gao@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Steele, Kelly <kelly.steele@intel.com>; Gillispie, Thad <thad.gillispie@intel.com>; Bu, Daocheng <daocheng.bu@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>
Subject: [edk2-platforms][PATCH V2 0/6] clean up duplicated files in edk2-platforms
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2108
SmramMemoryReserve.h has been added into Edk2\MdePkg\Include\Guid\SmramMemoryReserve.h.
The following duplicated header file can be clean up.
edk2-platforms\Platform\Intel\MinPlatformPkg\Include\Guid\SmramMemoryReserve.h
edk2-platforms\Silicon\Intel\KabylakeSiliconPkg\SampleCode\IntelFrameworkPkg\Include\Guid\SmramMemoryReserve.h
edk2-platforms\Silicon\Intel\PurleySktPkg\Include\Guid\SmramMemoryReserve.h
edk2-platforms\Silicon\Intel\QuarkSocPkg\QuarkNorthCluster\Include\Guid\SmramMemoryReserve.h
edk2-platforms\Silicon\Intel\CoffeelakeSiliconPkg\SampleCode\IntelFrameworkPkg\Include\Guid\SmramMemoryReserve.h
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Kelly Steele <kelly.steele@intel.com>
Cc: Thad Gillispie <thad.gillispie@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@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>
Marc W Chen (6):
MinPlatformPkg: Clean up duplicated SmramMemoryReserve.h files
QuarkPlatformPkg: Clean up duplicated SmramMemoryReserve.h files
CoffeelakeSiliconPkg: Clean up duplicated SmramMemoryReserve.h files
KabylakeSiliconPkg: Clean up duplicated SmramMemoryReserve.h files
PurleySktPkg: Clean up duplicated SmramMemoryReserve.h files
QuarkSocPkg: Clean up duplicated SmramMemoryReserve.h files
.../Include/Guid/SmramMemoryReserve.h | 54 -------------------
.../Intel/MinPlatformPkg/MinPlatformPkg.dec | 5 --
.../PlatformInitPei/PlatformInitPostMem.c | 4 +-
.../PlatformInitPei/PlatformInitPostMem.inf | 4 +-
.../TestPointCheckLib/PeiCheckSmmInfo.c | 6 +--
.../Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.c | 4 +-
.../Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.inf | 2 +-
.../Platform/Pei/PlatformInit/MrcWrapper.c | 8 +--
.../Pei/PlatformInit/PlatformEarlyInit.inf | 2 +-
.../Include/Guid/SmramMemoryReserve.h | 51 ------------------
Silicon/Intel/CoffeelakeSiliconPkg/SiPkg.dec | 5 --
.../SystemAgent/SmmAccess/Dxe/SmmAccess.inf | 2 +-
.../SmmAccess/Dxe/SmmAccessDriver.c | 2 +-
.../Include/Guid/SmramMemoryReserve.h | 54 -------------------
Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec | 4 --
.../SystemAgent/SmmAccess/Dxe/SmmAccess.inf | 4 +-
.../SmmAccess/Dxe/SmmAccessDriver.c | 4 +-
.../Include/Guid/SmramMemoryReserve.h | 43 ---------------
Silicon/Intel/PurleySktPkg/SocketPkg.dec | 3 +-
.../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 -
25 files changed, 27 insertions(+), 299 deletions(-) delete mode 100644 Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
delete mode 100644 Silicon/Intel/CoffeelakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
delete mode 100644 Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
delete mode 100644 Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h
delete mode 100644 Silicon/Intel/QuarkSocPkg/QuarkNorthCluster/Include/Guid/SmramMemoryReserve.h
--
2.17.1.windows.2
^ permalink raw reply [flat|nested] 18+ messages in thread