diff options
| author | Eric Dong <eric.dong@intel.com> | 2017-10-12 16:31:58 +0800 |
|---|---|---|
| committer | Eric Dong <eric.dong@intel.com> | 2017-10-13 13:12:00 +0800 |
| commit | 152e8d7670d5e6d2f9e5ca936eaf1568a7a53c4d (patch) | |
| tree | f15fa285afa16a696081ffa1227038f7d4f9beee /UefiCpuPkg | |
| parent | d76c2da8d50d29a1f38e01ce896ddfce47890c09 (diff) | |
| download | edk2-152e8d7670d5e6d2f9e5ca936eaf1568a7a53c4d.tar.gz edk2-152e8d7670d5e6d2f9e5ca936eaf1568a7a53c4d.tar.bz2 edk2-152e8d7670d5e6d2f9e5ca936eaf1568a7a53c4d.zip | |
UefiCpuPkg/S3Resume2Pei: Handle Communicate Ppi not exist issue.
Current code assume Communicate Ppi always existed, so it adds
ASSERT to confirm it. Ovmf platform happened not has this Ppi, so
the ASSERT been trig. This patch handle Ppi not existed case.
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.dong@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'UefiCpuPkg')
| -rw-r--r-- | UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c index c2171cbd46..e0c2d366cd 100644 --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c @@ -465,7 +465,7 @@ SignalEndOfS3Resume ( SMM_COMMUNICATE_HEADER_64 Header64;
VOID *CommBuffer;
- DEBUG ((EFI_D_INFO, "SignalEndOfS3Resume - Enter\n"));
+ DEBUG ((DEBUG_INFO, "SignalEndOfS3Resume - Enter\n"));
//
// This buffer consumed in DXE phase, so base on DXE mode to prepare communicate buffer.
@@ -484,29 +484,27 @@ SignalEndOfS3Resume ( }
CopyGuid (CommBuffer, &gEdkiiSmmEndOfS3ResumeProtocolGuid);
- //
- // Get needed resource
- //
Status = PeiServicesLocatePpi (
&gEfiPeiSmmCommunicationPpiGuid,
0,
NULL,
(VOID **)&SmmCommunicationPpi
);
- ASSERT_EFI_ERROR (Status);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "Locate Smm Communicate Ppi failed (%r)!\n", Status));
+ return Status;
+ }
- //
- // Send command
- //
Status = SmmCommunicationPpi->Communicate (
SmmCommunicationPpi,
(VOID *)CommBuffer,
&CommSize
);
- ASSERT_EFI_ERROR (Status);
-
- DEBUG ((EFI_D_INFO, "SignalEndOfS3Resume - Exit (%r)\n", Status));
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "SmmCommunicationPpi->Communicate return failure (%r)!\n", Status));
+ }
+ DEBUG ((DEBUG_INFO, "SignalEndOfS3Resume - Exit (%r)\n", Status));
return Status;
}
@@ -587,8 +585,7 @@ S3ResumeBootOs ( //
// Signal EndOfS3Resume event.
//
- Status = SignalEndOfS3Resume ();
- ASSERT_EFI_ERROR (Status);
+ SignalEndOfS3Resume ();
//
// report status code on S3 resume
|