public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH v2 1/2] UefiCpuPkg/MpInitLib: Restore IDT context for APs.
@ 2020-04-22  9:01 Dong, Eric
  2020-04-22  9:01 ` [PATCH v2 2/2] UefiCpuPkg/MpInitLib: Avoid ApInitReconfig in PEI Dong, Eric
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: Dong, Eric @ 2020-04-22  9:01 UTC (permalink / raw)
  To: devel; +Cc: Ray Ni, Laszlo Ersek, Chandana Kumar

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2683

This patch fixes an assertion because AP can't find the CpuMpData.
When AP is waken up through Init-Sipi-Sipi, AP's IDT should
be restored to pre-allocated buffer so AP can get the CpuMpData
through the IDT base address.
Current code already has logic to handle this when CpuMpData->
InitFlag is ApInitConfig but misses the logic
when CpuMpData->InitFlag is ApInitReconfig.
This patch fixes this gap.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Chandana Kumar <chandana.c.kumar@intel.com>
Signed-off-by: Eric Dong <eric.dong@intel.com>
---
V2:
1. Enhance code comments.

 UefiCpuPkg/Library/MpInitLib/MpLib.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index 64a4c3546e..2e87aa1f06 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -692,6 +692,16 @@ ApWakeupFunction (
         //
         RestoreVolatileRegisters (&CpuMpData->CpuData[ProcessorNumber].VolatileRegisters, TRUE);
       } else {
+        if (CpuMpData->InitFlag == ApInitReconfig) {
+          //
+          // Initialize AP volatile registers in ApInitReconfig path.
+          // ApInitReconfig happens when:
+          // 1. AP is re-enabled after it's disabled, in either PEI or DXE phase.
+          // 2. AP is initialized in DXE phase.
+          //
+          RestoreVolatileRegisters (&CpuMpData->CpuData[0].VolatileRegisters, FALSE);
+        }
+
         //
         // The CPU driver might not flush TLB for APs on spot after updating
         // page attributes. AP in mwait loop mode needs to take care of it when
-- 
2.23.0.windows.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH v2 0/2] UefiCpuPkg/MpInitLib: Fix ASSERT in AP procedure
@ 2020-04-22  8:45 Dong, Eric
  2020-04-22  8:45 ` [PATCH v2 1/2] UefiCpuPkg/MpInitLib: Restore IDT context for APs Dong, Eric
  0 siblings, 1 reply; 10+ messages in thread
From: Dong, Eric @ 2020-04-22  8:45 UTC (permalink / raw)
  Cc: Ray Ni, Laszlo Ersek, Chandana Kumar

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2683 

This patch serial used to fix an ASSERT issue. Because AP can't find 
the CpuMpData through IDT, it raised the ASSERT.

V2:
1. Enhance code comments.
2. Enhance code to remove CpuMpData->ApLoopMode == ApInHltLoop check.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Chandana Kumar <chandana.c.kumar@intel.com>

Eric Dong (2):
  UefiCpuPkg/MpInitLib: Restore IDT context for APs.
  UefiCpuPkg/MpInitLib: Avoid ApInitReconfig in PEI.

 UefiCpuPkg/Library/MpInitLib/MpLib.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

-- 
2.23.0.windows.1


^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-04-24 16:39 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-22  9:01 [PATCH v2 1/2] UefiCpuPkg/MpInitLib: Restore IDT context for APs Dong, Eric
2020-04-22  9:01 ` [PATCH v2 2/2] UefiCpuPkg/MpInitLib: Avoid ApInitReconfig in PEI Dong, Eric
2020-04-22 11:23   ` Ni, Ray
2020-04-24 16:39   ` [edk2-devel] " Laszlo Ersek
2020-04-22 11:47 ` [PATCH v2 1/2] UefiCpuPkg/MpInitLib: Restore IDT context for APs Ni, Ray
2020-04-24 16:37   ` [edk2-devel] " Laszlo Ersek
2020-04-22 21:41 ` Laszlo Ersek
2020-04-23  0:58   ` Dong, Eric
2020-04-24 16:37 ` Laszlo Ersek
  -- strict thread matches above, loose matches on Subject: below --
2020-04-22  8:45 [PATCH v2 0/2] UefiCpuPkg/MpInitLib: Fix ASSERT in AP procedure Dong, Eric
2020-04-22  8:45 ` [PATCH v2 1/2] UefiCpuPkg/MpInitLib: Restore IDT context for APs Dong, Eric

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox