diff options
| author | Wu, Jiaxin <jiaxin.wu@intel.com> | 2023-03-13 15:03:57 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-03-14 01:29:52 +0000 |
| commit | a1386bb252066262c0b6664af9a6143306d88512 (patch) | |
| tree | cd2aa39aaf3fd4464cb8aa3b57380a2af3857017 | |
| parent | e4c1d8d2317984bd9cb447eba916956841063ec4 (diff) | |
| download | edk2-a1386bb252066262c0b6664af9a6143306d88512.tar.gz edk2-a1386bb252066262c0b6664af9a6143306d88512.tar.bz2 edk2-a1386bb252066262c0b6664af9a6143306d88512.zip | |
UefiCpuPkg/PiSmmCpuDxeSmm: Fix S3 failure in SmmRestoreCpu
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4368
This issue is caused by the commit:
ec07fd0e35d90dbcc36be300a9ceeac29c5de2ad
GetFirstGuidHob() should not be used after exit boot service.
Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zeng Star <star.zeng@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c index d408b3f9f7..240eee6a7d 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c @@ -823,19 +823,7 @@ SmmRestoreCpu ( InitializeCpuBeforeRebase ();
}
- //
- // Make sure the gSmmBaseHobGuid existence status is the same between normal and S3 boot.
- //
- ASSERT (mSmmRelocated == (BOOLEAN)(GetFirstGuidHob (&gSmmBaseHobGuid) != NULL));
- if (mSmmRelocated != (BOOLEAN)(GetFirstGuidHob (&gSmmBaseHobGuid) != NULL)) {
- DEBUG ((
- DEBUG_ERROR,
- "gSmmBaseHobGuid %a produced in normal boot but %a in S3 boot!",
- mSmmRelocated ? "is" : "is not",
- mSmmRelocated ? "is not" : "is"
- ));
- CpuDeadLoop ();
- }
+ DEBUG ((DEBUG_INFO, "SmmRestoreCpu: mSmmRelocated is %d\n", mSmmRelocated));
//
// Check whether Smm Relocation is done or not.
|