diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2023-05-23 10:25:51 +0200 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-05-29 11:19:51 +0000 |
| commit | 098c55702318fd907de6fad7b43b5e9a6ad9ff7f (patch) | |
| tree | d5493512d6dde55eeef2365da78c043062960875 | |
| parent | c0bce66068c76b5d46f901027daf1074316031ac (diff) | |
| download | edk2-098c55702318fd907de6fad7b43b5e9a6ad9ff7f.tar.gz edk2-098c55702318fd907de6fad7b43b5e9a6ad9ff7f.tar.bz2 edk2-098c55702318fd907de6fad7b43b5e9a6ad9ff7f.zip | |
OvmfPkg/PlatformPei: drop S3Verification()
Not needed any more, SMM + 64-bit PEI + S3 suspend works now.
Fixed by commits:
- 8bd2028f9ac3 ("MdeModulePkg: Supporting S3 in 64bit PEI")
- 6acf72901a2e ("UefiCpuPkg: Supporting S3 in 64bit PEI")
See also https://bugzilla.tianocore.org/show_bug.cgi?id=4195
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
| -rw-r--r-- | OvmfPkg/PlatformPei/Platform.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index c56247e294..f5dc41c3a8 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -232,36 +232,6 @@ ReserveEmuVariableNvStore ( STATIC
VOID
-S3Verification (
- IN EFI_HOB_PLATFORM_INFO *PlatformInfoHob
- )
-{
- #if defined (MDE_CPU_X64)
- if (PlatformInfoHob->SmmSmramRequire && PlatformInfoHob->S3Supported) {
- DEBUG ((
- DEBUG_ERROR,
- "%a: S3Resume2Pei doesn't support X64 PEI + SMM yet.\n",
- __func__
- ));
- DEBUG ((
- DEBUG_ERROR,
- "%a: Please disable S3 on the QEMU command line (see the README),\n",
- __func__
- ));
- DEBUG ((
- DEBUG_ERROR,
- "%a: or build OVMF with \"OvmfPkgIa32X64.dsc\".\n",
- __func__
- ));
- ASSERT (FALSE);
- CpuDeadLoop ();
- }
-
- #endif
-}
-
-STATIC
-VOID
Q35BoardVerification (
IN EFI_HOB_PLATFORM_INFO *PlatformInfoHob
)
@@ -354,7 +324,6 @@ InitializePlatform ( ASSERT_EFI_ERROR (Status);
}
- S3Verification (PlatformInfoHob);
BootModeInitialization (PlatformInfoHob);
//
|