OvmfPkg: Call CcProbe in SecMain.c instead of TsIsEnabled
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3902 TdIsEnabled() uses the CPUID instruction. At this point, exception handling is not established and a CPUID instruction will generate a #VC and cause the booting guest to crash. CcProbe() checks Ovmf work area to return the guest type. So call of CcProbe() instead of TdIsEnabled() to fix the above issue. Cc: James Bottomley <jejb@linux.ibm.com> Cc: Jiewen Yao <jiewen.yao@intel.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Brijesh Singh <brijesh.singh@amd.com> Cc: Erdem Aktas <erdemaktas@google.com> Cc: Tom Lendacky <thomas.lendacky@amd.com> Reviewed-by: Jiewen Yao <jiewen.yao@intel.com> Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: Min Xu <min.m.xu@intel.com>
This commit is contained in:
@@ -28,6 +28,7 @@
|
||||
#include <Library/CpuExceptionHandlerLib.h>
|
||||
#include <Ppi/TemporaryRamSupport.h>
|
||||
#include <Library/PlatformInitLib.h>
|
||||
#include <Library/CcProbeLib.h>
|
||||
#include "AmdSev.h"
|
||||
|
||||
#define SEC_IDT_ENTRY_COUNT 34
|
||||
@@ -738,7 +739,7 @@ SecCoreStartupWithStack (
|
||||
volatile UINT8 *Table;
|
||||
|
||||
#if defined (TDX_GUEST_SUPPORTED)
|
||||
if (TdIsEnabled ()) {
|
||||
if (CcProbe () == CcGuestTypeIntelTdx) {
|
||||
//
|
||||
// For Td guests, the memory map info is in TdHobLib. It should be processed
|
||||
// first so that the memory is accepted. Otherwise access to the unaccepted
|
||||
@@ -828,7 +829,7 @@ SecCoreStartupWithStack (
|
||||
}
|
||||
|
||||
#if defined (TDX_GUEST_SUPPORTED)
|
||||
if (TdIsEnabled ()) {
|
||||
if (CcProbe () == CcGuestTypeIntelTdx) {
|
||||
//
|
||||
// InitializeCpuExceptionHandlers () should be called in Td guests so that
|
||||
// #VE exceptions can be handled correctly.
|
||||
|
Reference in New Issue
Block a user