This change is needed for proposed S3FeaturePkg additions.
Changes ensure standalone build for S3FeaturePkg and AdvancedFeaturePkg

Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Benjamin Doron <benjamin.doron00@gmail.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
 Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc     | 3 +++
 Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
index ce0eac7a56..18929589c5 100644
--- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
+++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
@@ -115,6 +115,9 @@
 [LibraryClasses.Common]
   PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf # Required by BeepDebugFeature
 
+[LibraryClasses.Common.PEIM]
+  SmmAccessLib|IntelSiliconPkg/Feature/SmmAccess/Library/PeiSmmAccessLib/PeiSmmAccessLib.inf # Required by S3Feature
+
 #
 # This package builds all advanced features.
 #
diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc b/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc
index cd4b1c4f19..d5efcf6b6d 100644
--- a/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc
+++ b/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc
@@ -41,6 +41,9 @@
 !include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
 !include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
 
+[LibraryClasses]
+  PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
+
 [LibraryClasses.common.PEIM]
   SmmAccessLib|IntelSiliconPkg/Feature/SmmAccess/Library/PeiSmmAccessLib/PeiSmmAccessLib.inf
 
-- 
2.36.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#93785): https://edk2.groups.io/g/devel/message/93785
Mute This Topic: https://groups.io/mt/93684405/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

This change fixes build warnings with type casts from some compilers.
Also changes type for ACPI_S3_MEMORY S3PeiMemBase to EFI_PHYSICAL_ADDRESS.
This generally makes code eaiser to understand as opposed to UINT64.

Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Benjamin Doron <benjamin.doron00@gmail.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
 .../Intel/PowerManagement/S3FeaturePkg/S3Dxe/S3Dxe.c   | 10 +++++-----
 .../Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.c   |  2 +-
 .../Intel/MinPlatformPkg/Include/AcpiS3MemoryNvData.h  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/S3Dxe/S3Dxe.c b/Features/Intel/PowerManagement/S3FeaturePkg/S3Dxe/S3Dxe.c
index 1a7ccb8eed..47b2cc27a5 100644
--- a/Features/Intel/PowerManagement/S3FeaturePkg/S3Dxe/S3Dxe.c
+++ b/Features/Intel/PowerManagement/S3FeaturePkg/S3Dxe/S3Dxe.c
@@ -124,19 +124,19 @@ S3DxeEntryPoint (
   IN EFI_SYSTEM_TABLE  *SystemTable
   )
 {
-  UINT64          S3PeiMemSize;
-  UINT64          S3PeiMemBase;
+  UINTN           S3PeiMemSize;
+  UINTN           S3PeiMemBase;
   ACPI_S3_MEMORY  S3MemoryInfo;
   EFI_STATUS      Status;
 
   DEBUG ((DEBUG_INFO, "%a() Start\n", __FUNCTION__));
 
-  S3PeiMemSize = GetPeiMemSize ();
+  S3PeiMemSize = (UINTN) GetPeiMemSize ();
   S3PeiMemBase = (UINTN) AllocateAcpiNvsMemoryBelow4G (S3PeiMemSize);
   ASSERT (S3PeiMemBase != 0);
 
-  S3MemoryInfo.S3PeiMemBase = S3PeiMemBase;
-  S3MemoryInfo.S3PeiMemSize = S3PeiMemSize;
+  S3MemoryInfo.S3PeiMemBase = (EFI_PHYSICAL_ADDRESS) S3PeiMemBase;
+  S3MemoryInfo.S3PeiMemSize = (UINT64) S3PeiMemSize;
 
   DEBUG ((DEBUG_INFO, "S3PeiMemBase: 0x%x\n", S3PeiMemBase));
   DEBUG ((DEBUG_INFO, "S3PeiMemSize: 0x%x\n", S3PeiMemSize));
diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.c b/Features/Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.c
index 6acb894b6f..388e0954bd 100644
--- a/Features/Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.c
+++ b/Features/Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.c
@@ -40,7 +40,7 @@ FspSiliconInitDoneNotify (
 {
   EFI_STATUS     Status;
   EFI_BOOT_MODE  BootMode;
-  UINT64         MchBaseAddress;
+  UINTN          MchBaseAddress;
 
   Status = PeiServicesGetBootMode (&BootMode);
   ASSERT_EFI_ERROR (Status);
diff --git a/Platform/Intel/MinPlatformPkg/Include/AcpiS3MemoryNvData.h b/Platform/Intel/MinPlatformPkg/Include/AcpiS3MemoryNvData.h
index 04eb1435ee..35943e2aa3 100644
--- a/Platform/Intel/MinPlatformPkg/Include/AcpiS3MemoryNvData.h
+++ b/Platform/Intel/MinPlatformPkg/Include/AcpiS3MemoryNvData.h
@@ -13,8 +13,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // NV data structure
 //
 typedef struct {
-  UINT64  S3PeiMemBase;
-  UINT64  S3PeiMemSize;
+  EFI_PHYSICAL_ADDRESS  S3PeiMemBase;
+  UINT64                S3PeiMemSize;
 } ACPI_S3_MEMORY;
 
 #define ACPI_S3_MEMORY_NV_NAME  L"S3MemoryInfo"
-- 
2.36.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#93786): https://edk2.groups.io/g/devel/message/93786
Mute This Topic: https://groups.io/mt/93684406/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-