Re: [edk2-devel] [edk2-platforms][PATCH V2 2/6] QuarkPlatformPkg: Clean up duplicated SmramMemoryReserve.h files
Reviewed-by: Kelly Steele
Thanks,
Kelly
> -Original Message-
> From: Chen, Marc W
> Sent: September 02, 2019 08:36
> To: devel@edk2.groups.io
> Cc: Kinney, Michael D ; Steele, Kelly
> ; Desimone, Nathaniel L
>
> 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
> Cc: Kelly Steele
>
> Co-authored-by: Nate DeSimone
> Signed-off-by: Marc W Chen
> Signed-off-by: Nate DeSimone
> ---
> .../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 ();
> + GuidHob= GetFirstGuidHob ();
>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 (
> - ,
> + ,
>BufferSize
>);
>ASSERT (Hob.Raw);
> @@ -958,7 +958,7 @@ InstallS3Memory (
>}
>
>Hob.Raw = BuildGuidHob (
> - ,
> + ,
>BufferSize
>);
>ASSERT (Hob.Raw);
> @@ -1546,7 +1546,7 @@ InfoPostInstallMemory (
> }
>}
> } else if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION) {
> - if (CompareGuid (&(Hob.Guid->Name),
> )) {
> + if (CompareGuid (&(Hob.Guid->Name), ))
> {
> 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:
>
[edk2-devel] [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
Cc: Kelly Steele
Co-authored-by: Nate DeSimone
Signed-off-by: Marc W Chen
Signed-off-by: Nate DeSimone
---
.../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 ();
+ GuidHob= GetFirstGuidHob ();
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 (
- ,
+ ,
BufferSize
);
ASSERT (Hob.Raw);
@@ -958,7 +958,7 @@ InstallS3Memory (
}
Hob.Raw = BuildGuidHob (
- ,
+ ,
BufferSize
);
ASSERT (Hob.Raw);
@@ -1546,7 +1546,7 @@ InfoPostInstallMemory (
}
}
} else if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION) {
- if (CompareGuid (&(Hob.Guid->Name), )) {
+ if (CompareGuid (&(Hob.Guid->Name), )) {
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
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#46683): https://edk2.groups.io/g/devel/message/46683
Mute This Topic: https://groups.io/mt/33112753/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
