From cfe8be0f32d945a6b3cdc9096bfe11f50bb09447 Mon Sep 17 00:00:00 2001 From: Jeff Fan Date: Wed, 2 Dec 2015 03:25:21 +0000 Subject: UefiCpuPkg/CpuMpPei: Set AP state to CpuStateIdle after initialization (Sync patch r19087 from main trunk.) Cc: Feng Tian Cc: Michael Kinney Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jeff Fan Reviewed-by: Feng Tian git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19093 6f19259b-4bc3-4df7-8a09-765794883524 --- UefiCpuPkg/CpuMpPei/CpuMpPei.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.c b/UefiCpuPkg/CpuMpPei/CpuMpPei.c index 7bedf64210..d058d143ce 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.c +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.c @@ -228,13 +228,14 @@ ApCFunction ( PeiCpuMpData = ExchangeInfo->PeiCpuMpData; if (PeiCpuMpData->InitFlag) { + ProcessorNumber = NumApsExecuting; // // This is first time AP wakeup, get BIST information from AP stack // - BistData = *(UINTN *) (PeiCpuMpData->Buffer + NumApsExecuting * PeiCpuMpData->CpuApStackSize - sizeof (UINTN)); - PeiCpuMpData->CpuData[NumApsExecuting].Health.Uint32 = (UINT32) BistData; - PeiCpuMpData->CpuData[NumApsExecuting].ApicId = GetInitialApicId (); - if (PeiCpuMpData->CpuData[NumApsExecuting].ApicId >= 0xFF) { + BistData = *(UINTN *) (PeiCpuMpData->Buffer + ProcessorNumber * PeiCpuMpData->CpuApStackSize - sizeof (UINTN)); + PeiCpuMpData->CpuData[ProcessorNumber].Health.Uint32 = (UINT32) BistData; + PeiCpuMpData->CpuData[ProcessorNumber].ApicId = GetInitialApicId (); + if (PeiCpuMpData->CpuData[ProcessorNumber].ApicId >= 0xFF) { // // Set x2APIC mode if there are any logical processor reporting // an APIC ID of 255 or greater. @@ -248,6 +249,7 @@ ApCFunction ( // MtrrSetAllMtrrs (&PeiCpuMpData->MtrrTable); MicrocodeDetect (); + PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateIdle; } else { // // Execute AP function if AP is not disabled -- cgit v1.2.3