From: "Marvin Häuser" <Marvin.Haeuser@outlook.com>
To: "edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: "michael.d.kinney@intel.com" <michael.d.kinney@intel.com>,
"liming.gao@intel.com" <liming.gao@intel.com>,
"star.zeng@intel.com" <star.zeng@intel.com>,
"eric.dong@intel.com" <eric.dong@intel.com>,
"ruiyu.ni@intel.com" <ruiyu.ni@intel.com>,
"lersek@redhat.com" <lersek@redhat.com>,
"kelly.steele@intel.com" <kelly.steele@intel.com>,
"jordan.l.justen@intel.com" <jordan.l.justen@intel.com>,
"ard.biesheuvel@linaro.org" <ard.biesheuvel@linaro.org>
Subject: [PATCH 4/8] UefiCpuPkg/S3Resume2Pei: Update MM PPI usages.
Date: Tue, 24 Jul 2018 01:40:37 +0000 [thread overview]
Message-ID: <VI1PR0801MB1790E84D8EE9AEC13786513180550@VI1PR0801MB1790.eurprd08.prod.outlook.com> (raw)
In-Reply-To: <d625966ce7c0ac98b65f1e946b2cf833f6801706.1532395896.git.Marvin.Haeuser@outlook.com>
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.Haeuser@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
next prev parent reply other threads:[~2018-07-24 1:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <d625966ce7c0ac98b65f1e946b2cf833f6801706.1532395896.git.Marvin.Haeuser@outlook.com>
2018-07-24 1:40 ` [PATCH 2/8] MdeModulePkg/SmmLockBoxPeiLib: Update MM PPI usages Marvin Häuser
2018-07-24 1:40 ` [PATCH 3/8] UefiCpuPkg/PiSmmCommunicationPei: " Marvin Häuser
2018-07-24 1:40 ` Marvin Häuser [this message]
2018-07-24 1:40 ` [PATCH 5/8] QuarkSocPkg/SmmAccessPei: " Marvin Häuser
2018-07-24 1:40 ` [PATCH 6/8] QuarkSocPkg/SmmControlPei: " Marvin Häuser
2018-07-24 1:40 ` [PATCH 7/8] OvmfPkg/SmmAccessPei: " Marvin Häuser
2018-07-24 9:20 ` Laszlo Ersek
2018-07-24 12:16 ` Marvin Häuser
2018-07-24 12:39 ` Laszlo Ersek
2018-07-24 1:40 ` [PATCH 8/8] MdeModulePkg: Deprecate Smm* PPIs Marvin Häuser
2018-07-24 6:38 ` Gao, Liming
2018-07-24 10:04 ` Zeng, Star
2018-07-24 10:28 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=VI1PR0801MB1790E84D8EE9AEC13786513180550@VI1PR0801MB1790.eurprd08.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox