Update all references to the SMM PPIs from MdeModulePkg to rather use
MdePkg's MM PPI declarations.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marvin Haeuser <marvin.haeu...@outlook.com>
---
UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c | 40
++++++++++----------
UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf | 4 +-
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
index 28e53ac5d334..8039e8cb200e 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
@@ -27,10 +27,10 @@
#include <Guid/S3SmmInitDone.h>
#include <Ppi/ReadOnlyVariable2.h>
#include <Ppi/S3Resume2.h>
-#include <Ppi/SmmAccess.h>
+#include <Ppi/MmAccess.h>
#include <Ppi/PostBootScriptTable.h>
#include <Ppi/EndOfPeiPhase.h>
-#include <Ppi/SmmCommunication.h>
+#include <Ppi/MmCommunication.h>
#include <Library/DebugLib.h>
#include <Library/BaseLib.h>
@@ -340,7 +340,7 @@ SignalToSmmByCommunication (
)
{
EFI_STATUS Status;
- EFI_PEI_SMM_COMMUNICATION_PPI *SmmCommunicationPpi;
+ EFI_PEI_MM_COMMUNICATION_PPI *MmCommunicationPpi;
UINTN CommSize;
SMM_COMMUNICATE_HEADER_32 Header32;
SMM_COMMUNICATE_HEADER_64 Header64;
@@ -366,23 +366,23 @@ SignalToSmmByCommunication (
CopyGuid (CommBuffer, HandlerType);
Status = PeiServicesLocatePpi (
- &gEfiPeiSmmCommunicationPpiGuid,
+ &gEfiPeiMmCommunicationPpiGuid,
0,
NULL,
- (VOID **)&SmmCommunicationPpi
+ (VOID **)&MmCommunicationPpi
);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "Locate Smm Communicate Ppi failed (%r)!\n", Status));
return;
}
- Status = SmmCommunicationPpi->Communicate (
- SmmCommunicationPpi,
- (VOID *)CommBuffer,
- &CommSize
- );
+ Status = MmCommunicationPpi->Communicate (
+ MmCommunicationPpi,
+ (VOID *)CommBuffer,
+ &CommSize
+ );
if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "SmmCommunicationPpi->Communicate return failure
(%r)!\n", Status));
+ DEBUG ((DEBUG_ERROR, "MmCommunicationPpi->Communicate return failure
(%r)!\n", Status));
}
DEBUG ((DEBUG_INFO, "Signal %g to SMM - Exit (%r)\n", HandlerType, Status));
@@ -749,7 +749,7 @@ S3ResumeExecuteBootScript (
)
{
EFI_STATUS Status;
- PEI_SMM_ACCESS_PPI *SmmAccess;
+ EFI_PEI_MM_ACCESS_PPI *MmAccess;
UINTN Index;
VOID *GuidHob;
IA32_DESCRIPTOR *IdtDescriptor;
@@ -778,22 +778,22 @@ S3ResumeExecuteBootScript (
SendSmiIpi (GetApicId ());
Status = PeiServicesLocatePpi (
- &gPeiSmmAccessPpiGuid,
+ &gEfiPeiMmAccessPpiGuid,
0,
NULL,
- (VOID **) &SmmAccess
+ (VOID **) &MmAccess
);
if (!EFI_ERROR (Status)) {
DEBUG ((DEBUG_INFO, "Close all SMRAM regions before executing boot
script\n"));
for (Index = 0, Status = EFI_SUCCESS; !EFI_ERROR (Status); Index++) {
- Status = SmmAccess->Close ((EFI_PEI_SERVICES
**)GetPeiServicesTablePointer (), SmmAccess, Index);
+ Status = MmAccess->Close ((EFI_PEI_SERVICES
**)GetPeiServicesTablePointer (), MmAccess, Index);
}
DEBUG ((DEBUG_INFO, "Lock all SMRAM regions before executing boot
script\n"));
for (Index = 0, Status = EFI_SUCCESS; !EFI_ERROR (Status); Index++) {
- Status = SmmAccess->Lock ((EFI_PEI_SERVICES
**)GetPeiServicesTablePointer (), SmmAccess, Index);
+ Status = MmAccess->Lock ((EFI_PEI_SERVICES
**)GetPeiServicesTablePointer (), MmAccess, Index);
}
}
@@ -954,7 +954,7 @@ S3RestoreConfig2 (
)
{
EFI_STATUS Status;
- PEI_SMM_ACCESS_PPI *SmmAccess;
+ EFI_PEI_MM_ACCESS_PPI *MmAccess;
UINTN Index;
ACPI_S3_CONTEXT *AcpiS3Context;
EFI_PHYSICAL_ADDRESS
TempEfiBootScriptExecutorVariable;
@@ -1048,13 +1048,13 @@ S3RestoreConfig2 (
GuidHob = GetFirstGuidHob (&gEfiAcpiVariableGuid);
if (GuidHob != NULL) {
Status = PeiServicesLocatePpi (
- &gPeiSmmAccessPpiGuid,
+ &gEfiPeiMmAccessPpiGuid,
0,
NULL,
- (VOID **) &SmmAccess
+ (VOID **) &MmAccess
);
for (Index = 0; !EFI_ERROR (Status); Index++) {
- Status = SmmAccess->Open ((EFI_PEI_SERVICES
**)GetPeiServicesTablePointer (), SmmAccess, Index);
+ Status = MmAccess->Open ((EFI_PEI_SERVICES **)GetPeiServicesTablePointer
(), MmAccess, Index);
}
SmramDescriptor = (EFI_SMRAM_DESCRIPTOR *) GET_GUID_HOB_DATA (GuidHob);
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
index 407aab67350b..e8ffaab7d789 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
@@ -81,10 +81,10 @@ [Guids]
[Ppis]
gEfiPeiReadOnlyVariable2PpiGuid ## CONSUMES
gEfiPeiS3Resume2PpiGuid ## PRODUCES
- gPeiSmmAccessPpiGuid ## SOMETIMES_CONSUMES
+ gEfiPeiMmAccessPpiGuid ## SOMETIMES_CONSUMES
gPeiPostScriptTablePpiGuid ## SOMETIMES_PRODUCES
gEfiEndOfPeiSignalPpiGuid ## SOMETIMES_PRODUCES
- gEfiPeiSmmCommunicationPpiGuid ## SOMETIMES_CONSUMES
+ gEfiPeiMmCommunicationPpiGuid ## SOMETIMES_CONSUMES
[FeaturePcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode ## CONSUMES
--
2.18.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
