UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / UefiCpuPkg / Universal / Acpi / S3Resume2Pei / S3Resume2Pei.inf

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
index 943f114e6932217c03247e21166c4740cd6db08e..aae984d138baceacde54ccbe8069dbd9481bcacf 100644 (file)
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
@@ -5,16 +5,10 @@
 # This module will excute the boot script saved during last boot and after that,\r
 # control is passed to OS waking up handler.\r
 #\r
-# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>\r
 # Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 #\r
-# This program and the accompanying materials are\r
-# licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution.  The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 ##\r
 \r
@@ -33,18 +27,24 @@
 #  VALID_ARCHITECTURES           = IA32 X64\r
 #\r
 \r
+#\r
+# This module is not always workable in IA32 and X64 mode. It has below result:\r
+# when it works with SMM mode:\r
+# ===============================\r
+#           SMM:used  SMM:unused\r
+# PEI:IA32   works      works\r
+# PEI:X64    fails      works\r
+# ===============================\r
+#\r
+\r
 [Sources]\r
   S3Resume.c\r
 \r
 [Sources.IA32]\r
-  Ia32/AsmFuncs.asm\r
   Ia32/AsmFuncs.nasm\r
-  Ia32/AsmFuncs.S\r
 \r
 [Sources.X64]\r
-  X64/AsmFuncs.asm\r
   X64/AsmFuncs.nasm\r
-  X64/AsmFuncs.S\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
@@ -57,7 +57,6 @@
   HobLib\r
   PeiServicesLib\r
   PeimEntryPoint\r
-  TimerLib\r
   BaseLib\r
   DebugLib\r
   PcdLib\r
@@ -68,31 +67,28 @@
   LocalApicLib\r
   ReportStatusCodeLib\r
   LockBoxLib\r
-  PrintLib\r
 \r
 [Guids]\r
   gEfiBootScriptExecutorVariableGuid            ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox\r
   gEfiBootScriptExecutorContextGuid             ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox\r
-  gPerformanceProtocolGuid                      ## SOMETIMES_CONSUMES ## Variable:L"PerfDataMemAddr"\r
   ## SOMETIMES_CONSUMES ## HOB\r
   ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox\r
   gEfiAcpiVariableGuid\r
   gEfiAcpiS3ContextGuid                         ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox\r
+  gEdkiiEndOfS3ResumeGuid                       ## SOMETIMES_CONSUMES ## UNDEFINED # Used to do smm communication\r
+  ## SOMETIMES_PRODUCES ## UNDEFINED # Install PPI\r
+  ## SOMETIMES_CONSUMES ## UNDEFINED # Used to do smm communication\r
+  gEdkiiS3SmmInitDoneGuid\r
 \r
 [Ppis]\r
-  gEfiPeiReadOnlyVariable2PpiGuid               ## CONSUMES\r
   gEfiPeiS3Resume2PpiGuid                       ## PRODUCES\r
   gPeiSmmAccessPpiGuid                          ## SOMETIMES_CONSUMES\r
   gPeiPostScriptTablePpiGuid                    ## SOMETIMES_PRODUCES\r
   gEfiEndOfPeiSignalPpiGuid                     ## SOMETIMES_PRODUCES\r
   gEfiPeiSmmCommunicationPpiGuid                ## SOMETIMES_CONSUMES\r
 \r
-[Protocols]\r
-  gEdkiiSmmEndOfS3ResumeProtocolGuid            ## SOMETIMES_CONSUMES\r
-\r
 [FeaturePcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode         ## CONSUMES\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport  ## CONSUMES\r
 \r
 [Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable  ## SOMETIMES_CONSUMES\r