ca2a749250
This PR backports 3 commits: 020cc9e2e705 OvmfPkg: Disable PcdFirstTimeWakeUpAPsBySipi 8b66f9df1bb0 OvmfPkg/AmdSev: Disable PcdFirstTimeWakeUpAPsBySipi f008890ae559 OvmfPkg/AmdSev: fix BdsPlatform.c assertion failure during boot from upstream to fix the regression of boot failure on OvmfPkg/AmdSev Signed-off-by: hanliyang <hanliyang@hygon.cn>
86 lines
3.4 KiB
Diff
86 lines
3.4 KiB
Diff
From 65516ad2e063622e06e2f0857f0847d5ad0824b3 Mon Sep 17 00:00:00 2001
|
|
From: YuanhaoXie <yuanhao.xie@intel.com>
|
|
Date: Tue, 22 Aug 2023 09:52:14 +0800
|
|
Subject: [PATCH 1/3] OvmfPkg: Disable PcdFirstTimeWakeUpAPsBySipi
|
|
|
|
commit 020cc9e2e7053bb62247b0babbbe80cb855592e5 upstream.
|
|
|
|
Disable PcdFirstTimeWakeUpAPsBySipi for IntelTdx, Microvm, and Xen to
|
|
preserve the original execution of INIT-SIPI-SIPI.
|
|
|
|
Cc: Eric Dong <eric.dong@intel.com>
|
|
Cc: Ray Ni <ray.ni@intel.com>
|
|
Cc: Rahul Kumar <rahul1.kumar@intel.com>
|
|
Cc: Gerd Hoffmann <kraxel@redhat.com>
|
|
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
|
|
Cc: Jiewen Yao <jiewen.yao@intel.com>
|
|
Cc: Jordan Justen <jordan.l.justen@intel.com>
|
|
Signed-off-by: Yuanhao Xie <yuanhao.xie@intel.com>
|
|
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
---
|
|
OvmfPkg/IntelTdx/IntelTdxX64.dsc | 8 ++++++++
|
|
OvmfPkg/Microvm/MicrovmX64.dsc | 8 ++++++++
|
|
OvmfPkg/OvmfXen.dsc | 8 ++++++++
|
|
3 files changed, 24 insertions(+)
|
|
|
|
diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
|
|
index e9cdd70f..020d12e2 100644
|
|
--- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
|
|
+++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
|
|
@@ -464,6 +464,14 @@
|
|
# Point to the MdeModulePkg/Application/UiApp/UiApp.inf
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
|
|
|
|
+ #
|
|
+ # PcdFirstTimeWakeUpAPsBySipi determines whether to employ
|
|
+ # SIPI instead of the INIT-SIPI-SIPI sequence during APs
|
|
+ # initialization. Deactivate this parameter to preserve
|
|
+ # the original execution of INIT-SIPI-SIPI.
|
|
+ #
|
|
+ gUefiCpuPkgTokenSpaceGuid.PcdFirstTimeWakeUpAPsBySipi|FALSE
|
|
+
|
|
################################################################################
|
|
#
|
|
# Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Platform
|
|
diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
|
|
index 2f758563..d2ef1e00 100644
|
|
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
|
|
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
|
|
@@ -566,6 +566,14 @@
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialPciDeviceInfo|{0xFF}
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x3f8
|
|
|
|
+ #
|
|
+ # PcdFirstTimeWakeUpAPsBySipi determines whether to employ
|
|
+ # SIPI instead of the INIT-SIPI-SIPI sequence during APs
|
|
+ # initialization. Deactivate this parameter to preserve
|
|
+ # the original execution of INIT-SIPI-SIPI.
|
|
+ #
|
|
+ gUefiCpuPkgTokenSpaceGuid.PcdFirstTimeWakeUpAPsBySipi|FALSE
|
|
+
|
|
################################################################################
|
|
#
|
|
# Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Platform
|
|
diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
|
|
index 210578c1..dcb99d1f 100644
|
|
--- a/OvmfPkg/OvmfXen.dsc
|
|
+++ b/OvmfPkg/OvmfXen.dsc
|
|
@@ -458,6 +458,14 @@
|
|
# We populate DXE IPL tables with 1G pages preferably on Xen
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable|TRUE
|
|
|
|
+ #
|
|
+ # PcdFirstTimeWakeUpAPsBySipi determines whether to employ
|
|
+ # SIPI instead of the INIT-SIPI-SIPI sequence during APs
|
|
+ # initialization. Deactivate this parameter to preserve
|
|
+ # the original execution of INIT-SIPI-SIPI.
|
|
+ #
|
|
+ gUefiCpuPkgTokenSpaceGuid.PcdFirstTimeWakeUpAPsBySipi|FALSE
|
|
+
|
|
################################################################################
|
|
#
|
|
# Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Platform
|
|
--
|
|
2.25.1
|
|
|