/** @file\r
CPU MP Initialize Library common functions.\r
\r
- Copyright (c) 2016 - 2020, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2016 - 2021, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2020, AMD Inc. All rights reserved.<BR>\r
+\r
SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
\r
#include "MpLib.h"\r
+#include <Library/VmgExitLib.h>\r
+#include <Register/Amd/Fam17Msr.h>\r
+#include <Register/Amd/Ghcb.h>\r
\r
-EFI_GUID mCpuInitMpLibHobGuid = CPU_INIT_MP_LIB_HOB_GUID;\r
+EFI_GUID mCpuInitMpLibHobGuid = CPU_INIT_MP_LIB_HOB_GUID;\r
\r
/**\r
The function will check if BSP Execute Disable is enabled.\r
BOOLEAN Enabled;\r
IA32_CR0 Cr0;\r
\r
- Enabled = FALSE;\r
+ Enabled = FALSE;\r
Cr0.UintN = AsmReadCr0 ();\r
if (Cr0.Bits.PG != 0) {\r
//\r
VOID\r
EFIAPI\r
FutureBSPProc (\r
- IN VOID *Buffer\r
+ IN VOID *Buffer\r
)\r
{\r
- CPU_MP_DATA *DataInHob;\r
+ CPU_MP_DATA *DataInHob;\r
\r
- DataInHob = (CPU_MP_DATA *) Buffer;\r
+ DataInHob = (CPU_MP_DATA *)Buffer;\r
AsmExchangeRole (&DataInHob->APInfo, &DataInHob->BSPInfo);\r
}\r
\r
**/\r
CPU_STATE\r
GetApState (\r
- IN CPU_AP_DATA *CpuData\r
+ IN CPU_AP_DATA *CpuData\r
)\r
{\r
return CpuData->State;\r
**/\r
VOID\r
SetApState (\r
- IN CPU_AP_DATA *CpuData,\r
- IN CPU_STATE State\r
+ IN CPU_AP_DATA *CpuData,\r
+ IN CPU_STATE State\r
)\r
{\r
AcquireSpinLock (&CpuData->ApLock);\r
**/\r
VOID\r
SaveLocalApicTimerSetting (\r
- IN CPU_MP_DATA *CpuMpData\r
+ IN CPU_MP_DATA *CpuMpData\r
)\r
{\r
//\r
**/\r
VOID\r
SyncLocalApicTimerSetting (\r
- IN CPU_MP_DATA *CpuMpData\r
+ IN CPU_MP_DATA *CpuMpData\r
)\r
{\r
//\r
**/\r
VOID\r
SaveVolatileRegisters (\r
- OUT CPU_VOLATILE_REGISTERS *VolatileRegisters\r
+ OUT CPU_VOLATILE_REGISTERS *VolatileRegisters\r
)\r
{\r
- CPUID_VERSION_INFO_EDX VersionInfoEdx;\r
+ CPUID_VERSION_INFO_EDX VersionInfoEdx;\r
\r
VolatileRegisters->Cr0 = AsmReadCr0 ();\r
VolatileRegisters->Cr3 = AsmReadCr3 ();\r
**/\r
VOID\r
RestoreVolatileRegisters (\r
- IN CPU_VOLATILE_REGISTERS *VolatileRegisters,\r
- IN BOOLEAN IsRestoreDr\r
+ IN CPU_VOLATILE_REGISTERS *VolatileRegisters,\r
+ IN BOOLEAN IsRestoreDr\r
)\r
{\r
- CPUID_VERSION_INFO_EDX VersionInfoEdx;\r
- IA32_TSS_DESCRIPTOR *Tss;\r
+ CPUID_VERSION_INFO_EDX VersionInfoEdx;\r
+ IA32_TSS_DESCRIPTOR *Tss;\r
\r
AsmWriteCr3 (VolatileRegisters->Cr3);\r
AsmWriteCr4 (VolatileRegisters->Cr4);\r
\r
AsmWriteGdtr (&VolatileRegisters->Gdtr);\r
AsmWriteIdtr (&VolatileRegisters->Idtr);\r
- if (VolatileRegisters->Tr != 0 &&\r
- VolatileRegisters->Tr < VolatileRegisters->Gdtr.Limit) {\r
+ if ((VolatileRegisters->Tr != 0) &&\r
+ (VolatileRegisters->Tr < VolatileRegisters->Gdtr.Limit))\r
+ {\r
Tss = (IA32_TSS_DESCRIPTOR *)(VolatileRegisters->Gdtr.Base +\r
VolatileRegisters->Tr);\r
if (Tss->Bits.P == 1) {\r
VOID\r
)\r
{\r
- CPUID_VERSION_INFO_ECX VersionInfoEcx;\r
+ CPUID_VERSION_INFO_ECX VersionInfoEcx;\r
\r
AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, &VersionInfoEcx.Uint32, NULL);\r
return (VersionInfoEcx.Bits.MONITOR == 1) ? TRUE : FALSE;\r
**/\r
UINT8\r
GetApLoopMode (\r
- OUT UINT32 *MonitorFilterSize\r
+ OUT UINT32 *MonitorFilterSize\r
)\r
{\r
- UINT8 ApLoopMode;\r
- CPUID_MONITOR_MWAIT_EBX MonitorMwaitEbx;\r
+ UINT8 ApLoopMode;\r
+ CPUID_MONITOR_MWAIT_EBX MonitorMwaitEbx;\r
\r
ASSERT (MonitorFilterSize != NULL);\r
\r
//\r
ApLoopMode = ApInHltLoop;\r
}\r
+\r
+ if (PcdGetBool (PcdSevEsIsEnabled)) {\r
+ //\r
+ // For SEV-ES, force AP in Hlt-loop mode in order to use the GHCB\r
+ // protocol for starting APs\r
+ //\r
+ ApLoopMode = ApInHltLoop;\r
+ }\r
}\r
\r
if (ApLoopMode != ApInMwaitLoop) {\r
**/\r
VOID\r
SortApicId (\r
- IN CPU_MP_DATA *CpuMpData\r
+ IN CPU_MP_DATA *CpuMpData\r
)\r
{\r
- UINTN Index1;\r
- UINTN Index2;\r
- UINTN Index3;\r
- UINT32 ApicId;\r
- CPU_INFO_IN_HOB CpuInfo;\r
- UINT32 ApCount;\r
- CPU_INFO_IN_HOB *CpuInfoInHob;\r
- volatile UINT32 *StartupApSignal;\r
-\r
- ApCount = CpuMpData->CpuCount - 1;\r
- CpuInfoInHob = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;\r
+ UINTN Index1;\r
+ UINTN Index2;\r
+ UINTN Index3;\r
+ UINT32 ApicId;\r
+ CPU_INFO_IN_HOB CpuInfo;\r
+ UINT32 ApCount;\r
+ CPU_INFO_IN_HOB *CpuInfoInHob;\r
+ volatile UINT32 *StartupApSignal;\r
+\r
+ ApCount = CpuMpData->CpuCount - 1;\r
+ CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob;\r
if (ApCount != 0) {\r
for (Index1 = 0; Index1 < ApCount; Index1++) {\r
Index3 = Index1;\r
ApicId = CpuInfoInHob[Index2].ApicId;\r
}\r
}\r
+\r
if (Index3 != Index1) {\r
CopyMem (&CpuInfo, &CpuInfoInHob[Index3], sizeof (CPU_INFO_IN_HOB));\r
CopyMem (\r
//\r
// Also exchange the StartupApSignal.\r
//\r
- StartupApSignal = CpuMpData->CpuData[Index3].StartupApSignal;\r
+ StartupApSignal = CpuMpData->CpuData[Index3].StartupApSignal;\r
CpuMpData->CpuData[Index3].StartupApSignal =\r
CpuMpData->CpuData[Index1].StartupApSignal;\r
CpuMpData->CpuData[Index1].StartupApSignal = StartupApSignal;\r
ApicId = GetInitialApicId ();\r
for (Index1 = 0; Index1 < CpuMpData->CpuCount; Index1++) {\r
if (CpuInfoInHob[Index1].ApicId == ApicId) {\r
- CpuMpData->BspNumber = (UINT32) Index1;\r
+ CpuMpData->BspNumber = (UINT32)Index1;\r
break;\r
}\r
}\r
UINTN ProcessorNumber;\r
EFI_STATUS Status;\r
\r
- CpuMpData = (CPU_MP_DATA *) Buffer;\r
- Status = GetProcessorNumber (CpuMpData, &ProcessorNumber);\r
+ CpuMpData = (CPU_MP_DATA *)Buffer;\r
+ Status = GetProcessorNumber (CpuMpData, &ProcessorNumber);\r
ASSERT_EFI_ERROR (Status);\r
//\r
// Load microcode on AP\r
**/\r
EFI_STATUS\r
GetProcessorNumber (\r
- IN CPU_MP_DATA *CpuMpData,\r
- OUT UINTN *ProcessorNumber\r
+ IN CPU_MP_DATA *CpuMpData,\r
+ OUT UINTN *ProcessorNumber\r
)\r
{\r
- UINTN TotalProcessorNumber;\r
- UINTN Index;\r
- CPU_INFO_IN_HOB *CpuInfoInHob;\r
- UINT32 CurrentApicId;\r
+ UINTN TotalProcessorNumber;\r
+ UINTN Index;\r
+ CPU_INFO_IN_HOB *CpuInfoInHob;\r
+ UINT32 CurrentApicId;\r
\r
- CpuInfoInHob = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;\r
+ CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob;\r
\r
TotalProcessorNumber = CpuMpData->CpuCount;\r
- CurrentApicId = GetApicId ();\r
- for (Index = 0; Index < TotalProcessorNumber; Index ++) {\r
+ CurrentApicId = GetApicId ();\r
+ for (Index = 0; Index < TotalProcessorNumber; Index++) {\r
if (CpuInfoInHob[Index].ApicId == CurrentApicId) {\r
*ProcessorNumber = Index;\r
return EFI_SUCCESS;\r
**/\r
UINTN\r
CollectProcessorCount (\r
- IN CPU_MP_DATA *CpuMpData\r
+ IN CPU_MP_DATA *CpuMpData\r
)\r
{\r
- UINTN Index;\r
- CPU_INFO_IN_HOB *CpuInfoInHob;\r
- BOOLEAN X2Apic;\r
+ UINTN Index;\r
+ CPU_INFO_IN_HOB *CpuInfoInHob;\r
+ BOOLEAN X2Apic;\r
\r
//\r
// Send 1st broadcast IPI to APs to wakeup APs\r
CpuMpData->InitFlag = ApInitConfig;\r
WakeUpAP (CpuMpData, TRUE, 0, NULL, NULL, TRUE);\r
CpuMpData->InitFlag = ApInitDone;\r
- ASSERT (CpuMpData->CpuCount <= PcdGet32 (PcdCpuMaxLogicalProcessorNumber));\r
//\r
- // Wait for all APs finished the initialization\r
+ // When InitFlag == ApInitConfig, WakeUpAP () guarantees all APs are checked in.\r
+ // FinishedCount is the number of check-in APs.\r
//\r
- while (CpuMpData->FinishedCount < (CpuMpData->CpuCount - 1)) {\r
- CpuPause ();\r
- }\r
-\r
+ CpuMpData->CpuCount = CpuMpData->FinishedCount + 1;\r
+ ASSERT (CpuMpData->CpuCount <= PcdGet32 (PcdCpuMaxLogicalProcessorNumber));\r
\r
//\r
// Enable x2APIC mode if\r
//\r
X2Apic = TRUE;\r
} else {\r
- CpuInfoInHob = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;\r
+ CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob;\r
for (Index = 0; Index < CpuMpData->CpuCount; Index++) {\r
if (CpuInfoInHob[Index].InitialApicId >= 0xFF) {\r
X2Apic = TRUE;\r
while (CpuMpData->FinishedCount < (CpuMpData->CpuCount - 1)) {\r
CpuPause ();\r
}\r
+\r
//\r
// Enable x2APIC on BSP\r
//\r
SetApState (&CpuMpData->CpuData[Index], CpuStateIdle);\r
}\r
}\r
+\r
DEBUG ((DEBUG_INFO, "APIC MODE is %d\n", GetApicMode ()));\r
//\r
// Sort BSP/Aps by CPU APIC ID in ascending order\r
**/\r
VOID\r
InitializeApData (\r
- IN OUT CPU_MP_DATA *CpuMpData,\r
- IN UINTN ProcessorNumber,\r
- IN UINT32 BistData,\r
- IN UINT64 ApTopOfStack\r
+ IN OUT CPU_MP_DATA *CpuMpData,\r
+ IN UINTN ProcessorNumber,\r
+ IN UINT32 BistData,\r
+ IN UINT64 ApTopOfStack\r
)\r
{\r
- CPU_INFO_IN_HOB *CpuInfoInHob;\r
- MSR_IA32_PLATFORM_ID_REGISTER PlatformIdMsr;\r
+ CPU_INFO_IN_HOB *CpuInfoInHob;\r
+ MSR_IA32_PLATFORM_ID_REGISTER PlatformIdMsr;\r
\r
- CpuInfoInHob = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;\r
+ CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob;\r
CpuInfoInHob[ProcessorNumber].InitialApicId = GetInitialApicId ();\r
CpuInfoInHob[ProcessorNumber].ApicId = GetApicId ();\r
CpuInfoInHob[ProcessorNumber].Health = BistData;\r
CpuMpData->CpuData[ProcessorNumber].Waiting = FALSE;\r
CpuMpData->CpuData[ProcessorNumber].CpuHealthy = (BistData == 0) ? TRUE : FALSE;\r
\r
- PlatformIdMsr.Uint64 = AsmReadMsr64 (MSR_IA32_PLATFORM_ID);\r
- CpuMpData->CpuData[ProcessorNumber].PlatformId = (UINT8) PlatformIdMsr.Bits.PlatformId;\r
+ //\r
+ // NOTE: PlatformId is not relevant on AMD platforms.\r
+ //\r
+ if (!StandardSignatureIsAuthenticAMD ()) {\r
+ PlatformIdMsr.Uint64 = AsmReadMsr64 (MSR_IA32_PLATFORM_ID);\r
+ CpuMpData->CpuData[ProcessorNumber].PlatformId = (UINT8)PlatformIdMsr.Bits.PlatformId;\r
+ }\r
\r
AsmCpuid (\r
CPUID_VERSION_INFO,\r
NULL\r
);\r
\r
- InitializeSpinLock(&CpuMpData->CpuData[ProcessorNumber].ApLock);\r
+ InitializeSpinLock (&CpuMpData->CpuData[ProcessorNumber].ApLock);\r
SetApState (&CpuMpData->CpuData[ProcessorNumber], CpuStateIdle);\r
}\r
\r
+/**\r
+ Get Protected mode code segment with 16-bit default addressing\r
+ from current GDT table.\r
+\r
+ @return Protected mode 16-bit code segment value.\r
+**/\r
+STATIC\r
+UINT16\r
+GetProtectedMode16CS (\r
+ VOID\r
+ )\r
+{\r
+ IA32_DESCRIPTOR GdtrDesc;\r
+ IA32_SEGMENT_DESCRIPTOR *GdtEntry;\r
+ UINTN GdtEntryCount;\r
+ UINT16 Index;\r
+\r
+ Index = (UINT16)-1;\r
+ AsmReadGdtr (&GdtrDesc);\r
+ GdtEntryCount = (GdtrDesc.Limit + 1) / sizeof (IA32_SEGMENT_DESCRIPTOR);\r
+ GdtEntry = (IA32_SEGMENT_DESCRIPTOR *)GdtrDesc.Base;\r
+ for (Index = 0; Index < GdtEntryCount; Index++) {\r
+ if ((GdtEntry->Bits.L == 0) &&\r
+ (GdtEntry->Bits.DB == 0) &&\r
+ (GdtEntry->Bits.Type > 8))\r
+ {\r
+ break;\r
+ }\r
+\r
+ GdtEntry++;\r
+ }\r
+\r
+ ASSERT (Index != GdtEntryCount);\r
+ return Index * 8;\r
+}\r
+\r
+/**\r
+ Get Protected mode code segment with 32-bit default addressing\r
+ from current GDT table.\r
+\r
+ @return Protected mode 32-bit code segment value.\r
+**/\r
+STATIC\r
+UINT16\r
+GetProtectedMode32CS (\r
+ VOID\r
+ )\r
+{\r
+ IA32_DESCRIPTOR GdtrDesc;\r
+ IA32_SEGMENT_DESCRIPTOR *GdtEntry;\r
+ UINTN GdtEntryCount;\r
+ UINT16 Index;\r
+\r
+ Index = (UINT16)-1;\r
+ AsmReadGdtr (&GdtrDesc);\r
+ GdtEntryCount = (GdtrDesc.Limit + 1) / sizeof (IA32_SEGMENT_DESCRIPTOR);\r
+ GdtEntry = (IA32_SEGMENT_DESCRIPTOR *)GdtrDesc.Base;\r
+ for (Index = 0; Index < GdtEntryCount; Index++) {\r
+ if ((GdtEntry->Bits.L == 0) &&\r
+ (GdtEntry->Bits.DB == 1) &&\r
+ (GdtEntry->Bits.Type > 8))\r
+ {\r
+ break;\r
+ }\r
+\r
+ GdtEntry++;\r
+ }\r
+\r
+ ASSERT (Index != GdtEntryCount);\r
+ return Index * 8;\r
+}\r
+\r
+/**\r
+ Reset an AP when in SEV-ES mode.\r
+\r
+ If successful, this function never returns.\r
+\r
+ @param[in] Ghcb Pointer to the GHCB\r
+ @param[in] CpuMpData Pointer to CPU MP Data\r
+\r
+**/\r
+STATIC\r
+VOID\r
+MpInitLibSevEsAPReset (\r
+ IN GHCB *Ghcb,\r
+ IN CPU_MP_DATA *CpuMpData\r
+ )\r
+{\r
+ EFI_STATUS Status;\r
+ UINTN ProcessorNumber;\r
+ UINT16 Code16, Code32;\r
+ AP_RESET *APResetFn;\r
+ UINTN BufferStart;\r
+ UINTN StackStart;\r
+\r
+ Status = GetProcessorNumber (CpuMpData, &ProcessorNumber);\r
+ ASSERT_EFI_ERROR (Status);\r
+\r
+ Code16 = GetProtectedMode16CS ();\r
+ Code32 = GetProtectedMode32CS ();\r
+\r
+ if (CpuMpData->WakeupBufferHigh != 0) {\r
+ APResetFn = (AP_RESET *)(CpuMpData->WakeupBufferHigh + CpuMpData->AddressMap.SwitchToRealNoNxOffset);\r
+ } else {\r
+ APResetFn = (AP_RESET *)(CpuMpData->MpCpuExchangeInfo->BufferStart + CpuMpData->AddressMap.SwitchToRealOffset);\r
+ }\r
+\r
+ BufferStart = CpuMpData->MpCpuExchangeInfo->BufferStart;\r
+ StackStart = CpuMpData->SevEsAPResetStackStart -\r
+ (AP_RESET_STACK_SIZE * ProcessorNumber);\r
+\r
+ //\r
+ // This call never returns.\r
+ //\r
+ APResetFn (BufferStart, Code16, Code32, StackStart);\r
+}\r
+\r
/**\r
This function will be called from AP reset code if BSP uses WakeUpAP.\r
\r
VOID\r
EFIAPI\r
ApWakeupFunction (\r
- IN MP_CPU_EXCHANGE_INFO *ExchangeInfo,\r
- IN UINTN ApIndex\r
+ IN MP_CPU_EXCHANGE_INFO *ExchangeInfo,\r
+ IN UINTN ApIndex\r
)\r
{\r
- CPU_MP_DATA *CpuMpData;\r
- UINTN ProcessorNumber;\r
- EFI_AP_PROCEDURE Procedure;\r
- VOID *Parameter;\r
- UINT32 BistData;\r
- volatile UINT32 *ApStartupSignalBuffer;\r
- CPU_INFO_IN_HOB *CpuInfoInHob;\r
- UINT64 ApTopOfStack;\r
- UINTN CurrentApicMode;\r
+ CPU_MP_DATA *CpuMpData;\r
+ UINTN ProcessorNumber;\r
+ EFI_AP_PROCEDURE Procedure;\r
+ VOID *Parameter;\r
+ UINT32 BistData;\r
+ volatile UINT32 *ApStartupSignalBuffer;\r
+ CPU_INFO_IN_HOB *CpuInfoInHob;\r
+ UINT64 ApTopOfStack;\r
+ UINTN CurrentApicMode;\r
\r
//\r
// AP finished assembly code and begin to execute C code\r
CurrentApicMode = GetApicMode ();\r
while (TRUE) {\r
if (CpuMpData->InitFlag == ApInitConfig) {\r
- //\r
- // Add CPU number\r
- //\r
- InterlockedIncrement ((UINT32 *) &CpuMpData->CpuCount);\r
ProcessorNumber = ApIndex;\r
//\r
// This is first time AP wakeup, get BIST information from AP stack\r
//\r
- ApTopOfStack = CpuMpData->Buffer + (ProcessorNumber + 1) * CpuMpData->CpuApStackSize;\r
- BistData = *(UINT32 *) ((UINTN) ApTopOfStack - sizeof (UINTN));\r
+ ApTopOfStack = CpuMpData->Buffer + (ProcessorNumber + 1) * CpuMpData->CpuApStackSize;\r
+ BistData = *(UINT32 *)((UINTN)ApTopOfStack - sizeof (UINTN));\r
//\r
// CpuMpData->CpuData[0].VolatileRegisters is initialized based on BSP environment,\r
// to initialize AP in InitConfig path.\r
RestoreVolatileRegisters (&CpuMpData->CpuData[0].VolatileRegisters, FALSE);\r
InitializeApData (CpuMpData, ProcessorNumber, BistData, ApTopOfStack);\r
ApStartupSignalBuffer = CpuMpData->CpuData[ProcessorNumber].StartupApSignal;\r
-\r
- InterlockedDecrement ((UINT32 *) &CpuMpData->MpCpuExchangeInfo->NumApsExecuting);\r
} else {\r
//\r
// Execute AP function if AP is ready\r
//\r
ApStartupSignalBuffer = CpuMpData->CpuData[ProcessorNumber].StartupApSignal;\r
InterlockedCompareExchange32 (\r
- (UINT32 *) ApStartupSignalBuffer,\r
+ (UINT32 *)ApStartupSignalBuffer,\r
WAKEUP_AP_SIGNAL,\r
0\r
);\r
- if (CpuMpData->ApLoopMode == ApInHltLoop) {\r
+\r
+ if (CpuMpData->InitFlag == ApInitReconfig) {\r
//\r
- // Restore AP's volatile registers saved\r
+ // ApInitReconfig happens when:\r
+ // 1. AP is re-enabled after it's disabled, in either PEI or DXE phase.\r
+ // 2. AP is initialized in DXE phase.\r
+ // In either case, use the volatile registers value derived from BSP.\r
+ // NOTE: IDTR.BASE stored in CpuMpData->CpuData[0].VolatileRegisters points to a\r
+ // different IDT shared by all APs.\r
//\r
- RestoreVolatileRegisters (&CpuMpData->CpuData[ProcessorNumber].VolatileRegisters, TRUE);\r
+ RestoreVolatileRegisters (&CpuMpData->CpuData[0].VolatileRegisters, FALSE);\r
} else {\r
- //\r
- // The CPU driver might not flush TLB for APs on spot after updating\r
- // page attributes. AP in mwait loop mode needs to take care of it when\r
- // woken up.\r
- //\r
- CpuFlushTlb ();\r
+ if (CpuMpData->ApLoopMode == ApInHltLoop) {\r
+ //\r
+ // Restore AP's volatile registers saved before AP is halted\r
+ //\r
+ RestoreVolatileRegisters (&CpuMpData->CpuData[ProcessorNumber].VolatileRegisters, TRUE);\r
+ } else {\r
+ //\r
+ // The CPU driver might not flush TLB for APs on spot after updating\r
+ // page attributes. AP in mwait loop mode needs to take care of it when\r
+ // woken up.\r
+ //\r
+ CpuFlushTlb ();\r
+ }\r
}\r
\r
if (GetApState (&CpuMpData->CpuData[ProcessorNumber]) == CpuStateReady) {\r
Procedure = (EFI_AP_PROCEDURE)CpuMpData->CpuData[ProcessorNumber].ApFunction;\r
- Parameter = (VOID *) CpuMpData->CpuData[ProcessorNumber].ApFunctionArgument;\r
+ Parameter = (VOID *)CpuMpData->CpuData[ProcessorNumber].ApFunctionArgument;\r
if (Procedure != NULL) {\r
SetApState (&CpuMpData->CpuData[ProcessorNumber], CpuStateBusy);\r
//\r
// Invoke AP function here\r
//\r
Procedure (Parameter);\r
- CpuInfoInHob = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;\r
+ CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob;\r
if (CpuMpData->SwitchBspFlag) {\r
//\r
// Re-get the processor number due to BSP/AP maybe exchange in AP function\r
//\r
GetProcessorNumber (CpuMpData, &ProcessorNumber);\r
- CpuMpData->CpuData[ProcessorNumber].ApFunction = 0;\r
+ CpuMpData->CpuData[ProcessorNumber].ApFunction = 0;\r
CpuMpData->CpuData[ProcessorNumber].ApFunctionArgument = 0;\r
- ApStartupSignalBuffer = CpuMpData->CpuData[ProcessorNumber].StartupApSignal;\r
- CpuInfoInHob[ProcessorNumber].ApTopOfStack = CpuInfoInHob[CpuMpData->NewBspNumber].ApTopOfStack;\r
+ ApStartupSignalBuffer = CpuMpData->CpuData[ProcessorNumber].StartupApSignal;\r
+ CpuInfoInHob[ProcessorNumber].ApTopOfStack = CpuInfoInHob[CpuMpData->NewBspNumber].ApTopOfStack;\r
} else {\r
- if (CpuInfoInHob[ProcessorNumber].ApicId != GetApicId () ||\r
- CpuInfoInHob[ProcessorNumber].InitialApicId != GetInitialApicId ()) {\r
+ if ((CpuInfoInHob[ProcessorNumber].ApicId != GetApicId ()) ||\r
+ (CpuInfoInHob[ProcessorNumber].InitialApicId != GetInitialApicId ()))\r
+ {\r
if (CurrentApicMode != GetApicMode ()) {\r
//\r
// If APIC mode change happened during AP function execution,\r
}\r
}\r
}\r
+\r
SetApState (&CpuMpData->CpuData[ProcessorNumber], CpuStateFinished);\r
}\r
}\r
\r
+ if (CpuMpData->ApLoopMode == ApInHltLoop) {\r
+ //\r
+ // Save AP volatile registers\r
+ //\r
+ SaveVolatileRegisters (&CpuMpData->CpuData[ProcessorNumber].VolatileRegisters);\r
+ }\r
+\r
//\r
// AP finished executing C code\r
//\r
- InterlockedIncrement ((UINT32 *) &CpuMpData->FinishedCount);\r
+ InterlockedIncrement ((UINT32 *)&CpuMpData->FinishedCount);\r
+\r
+ if (CpuMpData->InitFlag == ApInitConfig) {\r
+ //\r
+ // Delay decrementing the APs executing count when SEV-ES is enabled\r
+ // to allow the APs to issue an AP_RESET_HOLD before the BSP possibly\r
+ // performs another INIT-SIPI-SIPI sequence.\r
+ //\r
+ if (!CpuMpData->SevEsIsEnabled) {\r
+ InterlockedDecrement ((UINT32 *)&CpuMpData->MpCpuExchangeInfo->NumApsExecuting);\r
+ }\r
+ }\r
\r
//\r
// Place AP is specified loop mode\r
//\r
if (CpuMpData->ApLoopMode == ApInHltLoop) {\r
- //\r
- // Save AP volatile registers\r
- //\r
- SaveVolatileRegisters (&CpuMpData->CpuData[ProcessorNumber].VolatileRegisters);\r
//\r
// Place AP in HLT-loop\r
//\r
while (TRUE) {\r
DisableInterrupts ();\r
- CpuSleep ();\r
+ if (CpuMpData->SevEsIsEnabled) {\r
+ MSR_SEV_ES_GHCB_REGISTER Msr;\r
+ GHCB *Ghcb;\r
+ UINT64 Status;\r
+ BOOLEAN DoDecrement;\r
+ BOOLEAN InterruptState;\r
+\r
+ DoDecrement = (BOOLEAN)(CpuMpData->InitFlag == ApInitConfig);\r
+\r
+ while (TRUE) {\r
+ Msr.GhcbPhysicalAddress = AsmReadMsr64 (MSR_SEV_ES_GHCB);\r
+ Ghcb = Msr.Ghcb;\r
+\r
+ VmgInit (Ghcb, &InterruptState);\r
+\r
+ if (DoDecrement) {\r
+ DoDecrement = FALSE;\r
+\r
+ //\r
+ // Perform the delayed decrement just before issuing the first\r
+ // VMGEXIT with AP_RESET_HOLD.\r
+ //\r
+ InterlockedDecrement ((UINT32 *)&CpuMpData->MpCpuExchangeInfo->NumApsExecuting);\r
+ }\r
+\r
+ Status = VmgExit (Ghcb, SVM_EXIT_AP_RESET_HOLD, 0, 0);\r
+ if ((Status == 0) && (Ghcb->SaveArea.SwExitInfo2 != 0)) {\r
+ VmgDone (Ghcb, InterruptState);\r
+ break;\r
+ }\r
+\r
+ VmgDone (Ghcb, InterruptState);\r
+ }\r
+\r
+ //\r
+ // Awakened in a new phase? Use the new CpuMpData\r
+ //\r
+ if (CpuMpData->NewCpuMpData != NULL) {\r
+ CpuMpData = CpuMpData->NewCpuMpData;\r
+ }\r
+\r
+ MpInitLibSevEsAPReset (Ghcb, CpuMpData);\r
+ } else {\r
+ CpuSleep ();\r
+ }\r
+\r
CpuPause ();\r
}\r
}\r
+\r
while (TRUE) {\r
DisableInterrupts ();\r
if (CpuMpData->ApLoopMode == ApInMwaitLoop) {\r
//\r
// Place AP in MWAIT-loop\r
//\r
- AsmMonitor ((UINTN) ApStartupSignalBuffer, 0, 0);\r
+ AsmMonitor ((UINTN)ApStartupSignalBuffer, 0, 0);\r
if (*ApStartupSignalBuffer != WAKEUP_AP_SIGNAL) {\r
//\r
// Check AP start-up signal again.\r
**/\r
VOID\r
WaitApWakeup (\r
- IN volatile UINT32 *ApStartupSignalBuffer\r
+ IN volatile UINT32 *ApStartupSignalBuffer\r
)\r
{\r
//\r
// Otherwise, write StartupApSignal again till AP waken up.\r
//\r
while (InterlockedCompareExchange32 (\r
- (UINT32 *) ApStartupSignalBuffer,\r
- WAKEUP_AP_SIGNAL,\r
- WAKEUP_AP_SIGNAL\r
- ) != 0) {\r
+ (UINT32 *)ApStartupSignalBuffer,\r
+ WAKEUP_AP_SIGNAL,\r
+ WAKEUP_AP_SIGNAL\r
+ ) != 0)\r
+ {\r
CpuPause ();\r
}\r
}\r
**/\r
VOID\r
FillExchangeInfoData (\r
- IN CPU_MP_DATA *CpuMpData\r
+ IN CPU_MP_DATA *CpuMpData\r
)\r
{\r
- volatile MP_CPU_EXCHANGE_INFO *ExchangeInfo;\r
- UINTN Size;\r
- IA32_SEGMENT_DESCRIPTOR *Selector;\r
- IA32_CR4 Cr4;\r
+ volatile MP_CPU_EXCHANGE_INFO *ExchangeInfo;\r
+ UINTN Size;\r
+ IA32_SEGMENT_DESCRIPTOR *Selector;\r
+ IA32_CR4 Cr4;\r
\r
- ExchangeInfo = CpuMpData->MpCpuExchangeInfo;\r
- ExchangeInfo->Lock = 0;\r
- ExchangeInfo->StackStart = CpuMpData->Buffer;\r
- ExchangeInfo->StackSize = CpuMpData->CpuApStackSize;\r
- ExchangeInfo->BufferStart = CpuMpData->WakeupBuffer;\r
- ExchangeInfo->ModeOffset = CpuMpData->AddressMap.ModeEntryOffset;\r
+ ExchangeInfo = CpuMpData->MpCpuExchangeInfo;\r
+ ExchangeInfo->StackStart = CpuMpData->Buffer;\r
+ ExchangeInfo->StackSize = CpuMpData->CpuApStackSize;\r
+ ExchangeInfo->BufferStart = CpuMpData->WakeupBuffer;\r
+ ExchangeInfo->ModeOffset = CpuMpData->AddressMap.ModeEntryOffset;\r
\r
- ExchangeInfo->CodeSegment = AsmReadCs ();\r
- ExchangeInfo->DataSegment = AsmReadDs ();\r
+ ExchangeInfo->CodeSegment = AsmReadCs ();\r
+ ExchangeInfo->DataSegment = AsmReadDs ();\r
\r
- ExchangeInfo->Cr3 = AsmReadCr3 ();\r
+ ExchangeInfo->Cr3 = AsmReadCr3 ();\r
\r
- ExchangeInfo->CFunction = (UINTN) ApWakeupFunction;\r
+ ExchangeInfo->CFunction = (UINTN)ApWakeupFunction;\r
ExchangeInfo->ApIndex = 0;\r
ExchangeInfo->NumApsExecuting = 0;\r
- ExchangeInfo->InitFlag = (UINTN) CpuMpData->InitFlag;\r
- ExchangeInfo->CpuInfo = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;\r
+ ExchangeInfo->InitFlag = (UINTN)CpuMpData->InitFlag;\r
+ ExchangeInfo->CpuInfo = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob;\r
ExchangeInfo->CpuMpData = CpuMpData;\r
\r
ExchangeInfo->EnableExecuteDisable = IsBspExecuteDisableEnabled ();\r
// Using latter way is simpler because it also eliminates the needs to\r
// check whether platform wants to enable it.\r
//\r
- Cr4.UintN = AsmReadCr4 ();\r
- ExchangeInfo->Enable5LevelPaging = (BOOLEAN) (Cr4.Bits.LA57 == 1);\r
+ Cr4.UintN = AsmReadCr4 ();\r
+ ExchangeInfo->Enable5LevelPaging = (BOOLEAN)(Cr4.Bits.LA57 == 1);\r
DEBUG ((DEBUG_INFO, "%a: 5-Level Paging = %d\n", gEfiCallerBaseName, ExchangeInfo->Enable5LevelPaging));\r
\r
+ ExchangeInfo->SevEsIsEnabled = CpuMpData->SevEsIsEnabled;\r
+ ExchangeInfo->GhcbBase = (UINTN)CpuMpData->GhcbBase;\r
+\r
//\r
// Get the BSP's data of GDT and IDT\r
//\r
- AsmReadGdtr ((IA32_DESCRIPTOR *) &ExchangeInfo->GdtrProfile);\r
- AsmReadIdtr ((IA32_DESCRIPTOR *) &ExchangeInfo->IdtrProfile);\r
+ AsmReadGdtr ((IA32_DESCRIPTOR *)&ExchangeInfo->GdtrProfile);\r
+ AsmReadIdtr ((IA32_DESCRIPTOR *)&ExchangeInfo->IdtrProfile);\r
\r
//\r
// Find a 32-bit code segment\r
//\r
Selector = (IA32_SEGMENT_DESCRIPTOR *)ExchangeInfo->GdtrProfile.Base;\r
- Size = ExchangeInfo->GdtrProfile.Limit + 1;\r
+ Size = ExchangeInfo->GdtrProfile.Limit + 1;\r
while (Size > 0) {\r
- if (Selector->Bits.L == 0 && Selector->Bits.Type >= 8) {\r
+ if ((Selector->Bits.L == 0) && (Selector->Bits.Type >= 8)) {\r
ExchangeInfo->ModeTransitionSegment =\r
(UINT16)((UINTN)Selector - ExchangeInfo->GdtrProfile.Base);\r
break;\r
}\r
+\r
Selector += 1;\r
- Size -= sizeof (IA32_SEGMENT_DESCRIPTOR);\r
+ Size -= sizeof (IA32_SEGMENT_DESCRIPTOR);\r
}\r
\r
//\r
// EfiBootServicesCode to avoid page fault if NX memory protection is enabled.\r
//\r
if (CpuMpData->WakeupBufferHigh != 0) {\r
- Size = CpuMpData->AddressMap.RendezvousFunnelSize -\r
+ Size = CpuMpData->AddressMap.RendezvousFunnelSize +\r
+ CpuMpData->AddressMap.SwitchToRealSize -\r
CpuMpData->AddressMap.ModeTransitionOffset;\r
CopyMem (\r
(VOID *)CpuMpData->WakeupBufferHigh,\r
ExchangeInfo->ModeTransitionMemory = (UINT32)CpuMpData->WakeupBufferHigh;\r
} else {\r
ExchangeInfo->ModeTransitionMemory = (UINT32)\r
- (ExchangeInfo->BufferStart + CpuMpData->AddressMap.ModeTransitionOffset);\r
+ (ExchangeInfo->BufferStart + CpuMpData->AddressMap.ModeTransitionOffset);\r
}\r
\r
ExchangeInfo->ModeHighMemory = ExchangeInfo->ModeTransitionMemory +\r
- (UINT32)ExchangeInfo->ModeOffset -\r
- (UINT32)CpuMpData->AddressMap.ModeTransitionOffset;\r
+ (UINT32)ExchangeInfo->ModeOffset -\r
+ (UINT32)CpuMpData->AddressMap.ModeTransitionOffset;\r
ExchangeInfo->ModeHighSegment = (UINT16)ExchangeInfo->CodeSegment;\r
}\r
\r
**/\r
VOID\r
TimedWaitForApFinish (\r
- IN CPU_MP_DATA *CpuMpData,\r
- IN UINT32 FinishedApLimit,\r
- IN UINT32 TimeLimit\r
+ IN CPU_MP_DATA *CpuMpData,\r
+ IN UINT32 FinishedApLimit,\r
+ IN UINT32 TimeLimit\r
);\r
\r
/**\r
@param[in] CpuMpData The pointer to CPU MP Data structure.\r
**/\r
VOID\r
-BackupAndPrepareWakeupBuffer(\r
- IN CPU_MP_DATA *CpuMpData\r
+BackupAndPrepareWakeupBuffer (\r
+ IN CPU_MP_DATA *CpuMpData\r
)\r
{\r
CopyMem (\r
- (VOID *) CpuMpData->BackupBuffer,\r
- (VOID *) CpuMpData->WakeupBuffer,\r
+ (VOID *)CpuMpData->BackupBuffer,\r
+ (VOID *)CpuMpData->WakeupBuffer,\r
CpuMpData->BackupBufferSize\r
);\r
CopyMem (\r
- (VOID *) CpuMpData->WakeupBuffer,\r
- (VOID *) CpuMpData->AddressMap.RendezvousFunnelAddress,\r
- CpuMpData->AddressMap.RendezvousFunnelSize\r
+ (VOID *)CpuMpData->WakeupBuffer,\r
+ (VOID *)CpuMpData->AddressMap.RendezvousFunnelAddress,\r
+ CpuMpData->AddressMap.RendezvousFunnelSize +\r
+ CpuMpData->AddressMap.SwitchToRealSize\r
);\r
}\r
\r
@param[in] CpuMpData The pointer to CPU MP Data structure.\r
**/\r
VOID\r
-RestoreWakeupBuffer(\r
- IN CPU_MP_DATA *CpuMpData\r
+RestoreWakeupBuffer (\r
+ IN CPU_MP_DATA *CpuMpData\r
)\r
{\r
CopyMem (\r
- (VOID *) CpuMpData->WakeupBuffer,\r
- (VOID *) CpuMpData->BackupBuffer,\r
+ (VOID *)CpuMpData->WakeupBuffer,\r
+ (VOID *)CpuMpData->BackupBuffer,\r
CpuMpData->BackupBufferSize\r
);\r
}\r
\r
+/**\r
+ Calculate the size of the reset vector.\r
+\r
+ @param[in] AddressMap The pointer to Address Map structure.\r
+\r
+ @return Total amount of memory required for the AP reset area\r
+**/\r
+STATIC\r
+UINTN\r
+GetApResetVectorSize (\r
+ IN MP_ASSEMBLY_ADDRESS_MAP *AddressMap\r
+ )\r
+{\r
+ UINTN Size;\r
+\r
+ Size = AddressMap->RendezvousFunnelSize +\r
+ AddressMap->SwitchToRealSize +\r
+ sizeof (MP_CPU_EXCHANGE_INFO);\r
+\r
+ return Size;\r
+}\r
+\r
/**\r
Allocate reset vector buffer.\r
\r
**/\r
VOID\r
AllocateResetVector (\r
- IN OUT CPU_MP_DATA *CpuMpData\r
+ IN OUT CPU_MP_DATA *CpuMpData\r
)\r
{\r
- UINTN ApResetVectorSize;\r
+ UINTN ApResetVectorSize;\r
+ UINTN ApResetStackSize;\r
\r
- if (CpuMpData->WakeupBuffer == (UINTN) -1) {\r
- ApResetVectorSize = CpuMpData->AddressMap.RendezvousFunnelSize +\r
- sizeof (MP_CPU_EXCHANGE_INFO);\r
+ if (CpuMpData->WakeupBuffer == (UINTN)-1) {\r
+ ApResetVectorSize = GetApResetVectorSize (&CpuMpData->AddressMap);\r
\r
CpuMpData->WakeupBuffer = GetWakeupBuffer (ApResetVectorSize);\r
- CpuMpData->MpCpuExchangeInfo = (MP_CPU_EXCHANGE_INFO *) (UINTN)\r
- (CpuMpData->WakeupBuffer + CpuMpData->AddressMap.RendezvousFunnelSize);\r
- CpuMpData->WakeupBufferHigh = GetModeTransitionBuffer (\r
- CpuMpData->AddressMap.RendezvousFunnelSize -\r
+ CpuMpData->MpCpuExchangeInfo = (MP_CPU_EXCHANGE_INFO *)(UINTN)\r
+ (CpuMpData->WakeupBuffer +\r
+ CpuMpData->AddressMap.RendezvousFunnelSize +\r
+ CpuMpData->AddressMap.SwitchToRealSize);\r
+ CpuMpData->WakeupBufferHigh = GetModeTransitionBuffer (\r
+ CpuMpData->AddressMap.RendezvousFunnelSize +\r
+ CpuMpData->AddressMap.SwitchToRealSize -\r
CpuMpData->AddressMap.ModeTransitionOffset\r
);\r
+ //\r
+ // The AP reset stack is only used by SEV-ES guests. Do not allocate it\r
+ // if SEV-ES is not enabled.\r
+ //\r
+ if (PcdGetBool (PcdSevEsIsEnabled)) {\r
+ //\r
+ // Stack location is based on ProcessorNumber, so use the total number\r
+ // of processors for calculating the total stack area.\r
+ //\r
+ ApResetStackSize = (AP_RESET_STACK_SIZE *\r
+ PcdGet32 (PcdCpuMaxLogicalProcessorNumber));\r
+\r
+ //\r
+ // Invoke GetWakeupBuffer a second time to allocate the stack area\r
+ // below 1MB. The returned buffer will be page aligned and sized and\r
+ // below the previously allocated buffer.\r
+ //\r
+ CpuMpData->SevEsAPResetStackStart = GetWakeupBuffer (ApResetStackSize);\r
+\r
+ //\r
+ // Check to be sure that the "allocate below" behavior hasn't changed.\r
+ // This will also catch a failed allocation, as "-1" is returned on\r
+ // failure.\r
+ //\r
+ if (CpuMpData->SevEsAPResetStackStart >= CpuMpData->WakeupBuffer) {\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "SEV-ES AP reset stack is not below wakeup buffer\n"\r
+ ));\r
+\r
+ ASSERT (FALSE);\r
+ CpuDeadLoop ();\r
+ }\r
+ }\r
}\r
+\r
BackupAndPrepareWakeupBuffer (CpuMpData);\r
}\r
\r
**/\r
VOID\r
FreeResetVector (\r
- IN CPU_MP_DATA *CpuMpData\r
+ IN CPU_MP_DATA *CpuMpData\r
)\r
{\r
- RestoreWakeupBuffer (CpuMpData);\r
+ //\r
+ // If SEV-ES is enabled, the reset area is needed for AP parking and\r
+ // and AP startup in the OS, so the reset area is reserved. Do not\r
+ // perform the restore as this will overwrite memory which has data\r
+ // needed by SEV-ES.\r
+ //\r
+ if (!CpuMpData->SevEsIsEnabled) {\r
+ RestoreWakeupBuffer (CpuMpData);\r
+ }\r
+}\r
+\r
+/**\r
+ Allocate the SEV-ES AP jump table buffer.\r
+\r
+ @param[in, out] CpuMpData The pointer to CPU MP Data structure.\r
+**/\r
+VOID\r
+AllocateSevEsAPMemory (\r
+ IN OUT CPU_MP_DATA *CpuMpData\r
+ )\r
+{\r
+ if (CpuMpData->SevEsAPBuffer == (UINTN)-1) {\r
+ CpuMpData->SevEsAPBuffer =\r
+ CpuMpData->SevEsIsEnabled ? GetSevEsAPMemory () : 0;\r
+ }\r
+}\r
+\r
+/**\r
+ Program the SEV-ES AP jump table buffer.\r
+\r
+ @param[in] SipiVector The SIPI vector used for the AP Reset\r
+**/\r
+VOID\r
+SetSevEsJumpTable (\r
+ IN UINTN SipiVector\r
+ )\r
+{\r
+ SEV_ES_AP_JMP_FAR *JmpFar;\r
+ UINT32 Offset, InsnByte;\r
+ UINT8 LoNib, HiNib;\r
+\r
+ JmpFar = (SEV_ES_AP_JMP_FAR *)(UINTN)FixedPcdGet32 (PcdSevEsWorkAreaBase);\r
+ ASSERT (JmpFar != NULL);\r
+\r
+ //\r
+ // Obtain the address of the Segment/Rip location in the workarea.\r
+ // This will be set to a value derived from the SIPI vector and will\r
+ // be the memory address used for the far jump below.\r
+ //\r
+ Offset = FixedPcdGet32 (PcdSevEsWorkAreaBase);\r
+ Offset += sizeof (JmpFar->InsnBuffer);\r
+ LoNib = (UINT8)Offset;\r
+ HiNib = (UINT8)(Offset >> 8);\r
+\r
+ //\r
+ // Program the workarea (which is the initial AP boot address) with\r
+ // far jump to the SIPI vector (where XX and YY represent the\r
+ // address of where the SIPI vector is stored.\r
+ //\r
+ // JMP FAR [CS:XXYY] => 2E FF 2E YY XX\r
+ //\r
+ InsnByte = 0;\r
+ JmpFar->InsnBuffer[InsnByte++] = 0x2E; // CS override prefix\r
+ JmpFar->InsnBuffer[InsnByte++] = 0xFF; // JMP (FAR)\r
+ JmpFar->InsnBuffer[InsnByte++] = 0x2E; // ModRM (JMP memory location)\r
+ JmpFar->InsnBuffer[InsnByte++] = LoNib; // YY offset ...\r
+ JmpFar->InsnBuffer[InsnByte++] = HiNib; // XX offset ...\r
+\r
+ //\r
+ // Program the Segment/Rip based on the SIPI vector (always at least\r
+ // 16-byte aligned, so Rip is set to 0).\r
+ //\r
+ JmpFar->Rip = 0;\r
+ JmpFar->Segment = (UINT16)(SipiVector >> 4);\r
}\r
\r
/**\r
**/\r
VOID\r
WakeUpAP (\r
- IN CPU_MP_DATA *CpuMpData,\r
- IN BOOLEAN Broadcast,\r
- IN UINTN ProcessorNumber,\r
- IN EFI_AP_PROCEDURE Procedure, OPTIONAL\r
- IN VOID *ProcedureArgument, OPTIONAL\r
- IN BOOLEAN WakeUpDisabledAps\r
+ IN CPU_MP_DATA *CpuMpData,\r
+ IN BOOLEAN Broadcast,\r
+ IN UINTN ProcessorNumber,\r
+ IN EFI_AP_PROCEDURE Procedure OPTIONAL,\r
+ IN VOID *ProcedureArgument OPTIONAL,\r
+ IN BOOLEAN WakeUpDisabledAps\r
)\r
{\r
- volatile MP_CPU_EXCHANGE_INFO *ExchangeInfo;\r
- UINTN Index;\r
- CPU_AP_DATA *CpuData;\r
- BOOLEAN ResetVectorRequired;\r
- CPU_INFO_IN_HOB *CpuInfoInHob;\r
+ volatile MP_CPU_EXCHANGE_INFO *ExchangeInfo;\r
+ UINTN Index;\r
+ CPU_AP_DATA *CpuData;\r
+ BOOLEAN ResetVectorRequired;\r
+ CPU_INFO_IN_HOB *CpuInfoInHob;\r
\r
CpuMpData->FinishedCount = 0;\r
- ResetVectorRequired = FALSE;\r
+ ResetVectorRequired = FALSE;\r
\r
if (CpuMpData->WakeUpByInitSipiSipi ||\r
- CpuMpData->InitFlag != ApInitDone) {\r
+ (CpuMpData->InitFlag != ApInitDone))\r
+ {\r
ResetVectorRequired = TRUE;\r
AllocateResetVector (CpuMpData);\r
+ AllocateSevEsAPMemory (CpuMpData);\r
FillExchangeInfoData (CpuMpData);\r
SaveLocalApicTimerSetting (CpuMpData);\r
}\r
// the AP procedure will be skipped for disabled AP because AP state\r
// is not CpuStateReady.\r
//\r
- if (GetApState (CpuData) == CpuStateDisabled && !WakeUpDisabledAps) {\r
+ if ((GetApState (CpuData) == CpuStateDisabled) && !WakeUpDisabledAps) {\r
continue;\r
}\r
\r
- CpuData->ApFunction = (UINTN) Procedure;\r
- CpuData->ApFunctionArgument = (UINTN) ProcedureArgument;\r
+ CpuData->ApFunction = (UINTN)Procedure;\r
+ CpuData->ApFunctionArgument = (UINTN)ProcedureArgument;\r
SetApState (CpuData, CpuStateReady);\r
if (CpuMpData->InitFlag != ApInitConfig) {\r
- *(UINT32 *) CpuData->StartupApSignal = WAKEUP_AP_SIGNAL;\r
+ *(UINT32 *)CpuData->StartupApSignal = WAKEUP_AP_SIGNAL;\r
}\r
}\r
}\r
+\r
if (ResetVectorRequired) {\r
+ //\r
+ // For SEV-ES, the initial AP boot address will be defined by\r
+ // PcdSevEsWorkAreaBase. The Segment/Rip must be the jump address\r
+ // from the original INIT-SIPI-SIPI.\r
+ //\r
+ if (CpuMpData->SevEsIsEnabled) {\r
+ SetSevEsJumpTable (ExchangeInfo->BufferStart);\r
+ }\r
+\r
//\r
// Wakeup all APs\r
//\r
- SendInitSipiSipiAllExcludingSelf ((UINT32) ExchangeInfo->BufferStart);\r
+ SendInitSipiSipiAllExcludingSelf ((UINT32)ExchangeInfo->BufferStart);\r
}\r
+\r
if (CpuMpData->InitFlag == ApInitConfig) {\r
if (PcdGet32 (PcdCpuBootLogicalProcessorNumber) > 0) {\r
//\r
);\r
\r
while (CpuMpData->MpCpuExchangeInfo->NumApsExecuting != 0) {\r
- CpuPause();\r
+ CpuPause ();\r
}\r
}\r
} else {\r
}\r
}\r
} else {\r
- CpuData = &CpuMpData->CpuData[ProcessorNumber];\r
- CpuData->ApFunction = (UINTN) Procedure;\r
- CpuData->ApFunctionArgument = (UINTN) ProcedureArgument;\r
+ CpuData = &CpuMpData->CpuData[ProcessorNumber];\r
+ CpuData->ApFunction = (UINTN)Procedure;\r
+ CpuData->ApFunctionArgument = (UINTN)ProcedureArgument;\r
SetApState (CpuData, CpuStateReady);\r
//\r
// Wakeup specified AP\r
//\r
ASSERT (CpuMpData->InitFlag != ApInitConfig);\r
- *(UINT32 *) CpuData->StartupApSignal = WAKEUP_AP_SIGNAL;\r
+ *(UINT32 *)CpuData->StartupApSignal = WAKEUP_AP_SIGNAL;\r
if (ResetVectorRequired) {\r
- CpuInfoInHob = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;\r
+ CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob;\r
+\r
+ //\r
+ // For SEV-ES, the initial AP boot address will be defined by\r
+ // PcdSevEsWorkAreaBase. The Segment/Rip must be the jump address\r
+ // from the original INIT-SIPI-SIPI.\r
+ //\r
+ if (CpuMpData->SevEsIsEnabled) {\r
+ SetSevEsJumpTable (ExchangeInfo->BufferStart);\r
+ }\r
+\r
SendInitSipiSipi (\r
CpuInfoInHob[ProcessorNumber].ApicId,\r
- (UINT32) ExchangeInfo->BufferStart\r
+ (UINT32)ExchangeInfo->BufferStart\r
);\r
}\r
+\r
//\r
// Wait specified AP waken up\r
//\r
OUT UINT64 *CurrentTime\r
)\r
{\r
- UINT64 TimeoutInSeconds;\r
- UINT64 TimestampCounterFreq;\r
+ UINT64 TimeoutInSeconds;\r
+ UINT64 TimestampCounterFreq;\r
\r
//\r
// Read the current value of the performance counter\r
if (Timeout == 0) {\r
return FALSE;\r
}\r
+\r
GetPerformanceCounterProperties (&Start, &End);\r
Cycle = End - Start;\r
if (Cycle < 0) {\r
Cycle = -Cycle;\r
}\r
+\r
Cycle++;\r
- CurrentTime = GetPerformanceCounter();\r
- Delta = (INT64) (CurrentTime - *PreviousTime);\r
+ CurrentTime = GetPerformanceCounter ();\r
+ Delta = (INT64)(CurrentTime - *PreviousTime);\r
if (Start > End) {\r
Delta = -Delta;\r
}\r
+\r
if (Delta < 0) {\r
Delta += Cycle;\r
}\r
- *TotalTime += Delta;\r
+\r
+ *TotalTime += Delta;\r
*PreviousTime = CurrentTime;\r
if (*TotalTime > Timeout) {\r
return TRUE;\r
}\r
+\r
return FALSE;\r
}\r
\r
**/\r
VOID\r
TimedWaitForApFinish (\r
- IN CPU_MP_DATA *CpuMpData,\r
- IN UINT32 FinishedApLimit,\r
- IN UINT32 TimeLimit\r
+ IN CPU_MP_DATA *CpuMpData,\r
+ IN UINT32 FinishedApLimit,\r
+ IN UINT32 TimeLimit\r
)\r
{\r
//\r
return;\r
}\r
\r
- CpuMpData->TotalTime = 0;\r
+ CpuMpData->TotalTime = 0;\r
CpuMpData->ExpectedTime = CalculateTimeout (\r
TimeLimit,\r
&CpuMpData->CurrentTime\r
&CpuMpData->CurrentTime,\r
&CpuMpData->TotalTime,\r
CpuMpData->ExpectedTime\r
- )) {\r
+ ))\r
+ {\r
CpuPause ();\r
}\r
\r
**/\r
VOID\r
ResetProcessorToIdleState (\r
- IN UINTN ProcessorNumber\r
+ IN UINTN ProcessorNumber\r
)\r
{\r
- CPU_MP_DATA *CpuMpData;\r
+ CPU_MP_DATA *CpuMpData;\r
\r
CpuMpData = GetCpuMpData ();\r
\r
while (CpuMpData->FinishedCount < 1) {\r
CpuPause ();\r
}\r
+\r
CpuMpData->InitFlag = ApInitDone;\r
\r
SetApState (&CpuMpData->CpuData[ProcessorNumber], CpuStateIdle);\r
**/\r
EFI_STATUS\r
GetNextWaitingProcessorNumber (\r
- OUT UINTN *NextProcessorNumber\r
+ OUT UINTN *NextProcessorNumber\r
)\r
{\r
- UINTN ProcessorNumber;\r
- CPU_MP_DATA *CpuMpData;\r
+ UINTN ProcessorNumber;\r
+ CPU_MP_DATA *CpuMpData;\r
\r
CpuMpData = GetCpuMpData ();\r
\r
**/\r
EFI_STATUS\r
CheckThisAP (\r
- IN UINTN ProcessorNumber\r
+ IN UINTN ProcessorNumber\r
)\r
{\r
- CPU_MP_DATA *CpuMpData;\r
- CPU_AP_DATA *CpuData;\r
+ CPU_MP_DATA *CpuMpData;\r
+ CPU_AP_DATA *CpuData;\r
\r
CpuMpData = GetCpuMpData ();\r
CpuData = &CpuMpData->CpuData[ProcessorNumber];\r
//\r
// If the AP finishes for StartupThisAP(), return EFI_SUCCESS.\r
//\r
- if (GetApState(CpuData) == CpuStateFinished) {\r
+ if (GetApState (CpuData) == CpuStateFinished) {\r
if (CpuData->Finished != NULL) {\r
*(CpuData->Finished) = TRUE;\r
}\r
+\r
SetApState (CpuData, CpuStateIdle);\r
return EFI_SUCCESS;\r
} else {\r
if (CpuData->Finished != NULL) {\r
*(CpuData->Finished) = FALSE;\r
}\r
+\r
//\r
// Reset failed AP to idle state\r
//\r
return EFI_TIMEOUT;\r
}\r
}\r
+\r
return EFI_NOT_READY;\r
}\r
\r
VOID\r
)\r
{\r
- UINTN ProcessorNumber;\r
- UINTN NextProcessorNumber;\r
- UINTN ListIndex;\r
- EFI_STATUS Status;\r
- CPU_MP_DATA *CpuMpData;\r
- CPU_AP_DATA *CpuData;\r
+ UINTN ProcessorNumber;\r
+ UINTN NextProcessorNumber;\r
+ UINTN ListIndex;\r
+ EFI_STATUS Status;\r
+ CPU_MP_DATA *CpuMpData;\r
+ CPU_AP_DATA *CpuData;\r
\r
CpuMpData = GetCpuMpData ();\r
\r
// Only BSP and corresponding AP access this unit of CPU Data. This means the AP will not modify the\r
// value of state after setting the it to CpuStateIdle, so BSP can safely make use of its value.\r
//\r
- if (GetApState(CpuData) == CpuStateFinished) {\r
- CpuMpData->RunningCount --;\r
+ if (GetApState (CpuData) == CpuStateFinished) {\r
+ CpuMpData->RunningCount--;\r
CpuMpData->CpuData[ProcessorNumber].Waiting = FALSE;\r
- SetApState(CpuData, CpuStateIdle);\r
+ SetApState (CpuData, CpuStateIdle);\r
\r
//\r
// If in Single Thread mode, then search for the next waiting AP for execution.\r
WakeUpAP (\r
CpuMpData,\r
FALSE,\r
- (UINT32) NextProcessorNumber,\r
+ (UINT32)NextProcessorNumber,\r
CpuMpData->Procedure,\r
CpuMpData->ProcArguments,\r
TRUE\r
);\r
- }\r
+ }\r
}\r
}\r
}\r
// If timeout expires, report timeout.\r
//\r
if (CheckTimeout (\r
- &CpuMpData->CurrentTime,\r
- &CpuMpData->TotalTime,\r
- CpuMpData->ExpectedTime)\r
- ) {\r
+ &CpuMpData->CurrentTime,\r
+ &CpuMpData->TotalTime,\r
+ CpuMpData->ExpectedTime\r
+ )\r
+ )\r
+ {\r
//\r
// If FailedCpuList is not NULL, record all failed APs in it.\r
//\r
if (CpuMpData->FailedCpuList != NULL) {\r
*CpuMpData->FailedCpuList =\r
- AllocatePool ((CpuMpData->RunningCount + 1) * sizeof (UINTN));\r
+ AllocatePool ((CpuMpData->RunningCount + 1) * sizeof (UINTN));\r
ASSERT (*CpuMpData->FailedCpuList != NULL);\r
}\r
+\r
ListIndex = 0;\r
\r
for (ProcessorNumber = 0; ProcessorNumber < CpuMpData->CpuCount; ProcessorNumber++) {\r
}\r
}\r
}\r
+\r
if (CpuMpData->FailedCpuList != NULL) {\r
(*CpuMpData->FailedCpuList)[ListIndex] = END_OF_CPU_LIST;\r
}\r
+\r
return EFI_TIMEOUT;\r
}\r
+\r
return EFI_NOT_READY;\r
}\r
\r
\r
OldCpuMpData = GetCpuMpDataFromGuidedHob ();\r
if (OldCpuMpData == NULL) {\r
- MaxLogicalProcessorNumber = PcdGet32(PcdCpuMaxLogicalProcessorNumber);\r
+ MaxLogicalProcessorNumber = PcdGet32 (PcdCpuMaxLogicalProcessorNumber);\r
} else {\r
MaxLogicalProcessorNumber = OldCpuMpData->CpuCount;\r
}\r
+\r
ASSERT (MaxLogicalProcessorNumber != 0);\r
\r
AsmGetAddressMap (&AddressMap);\r
- ApResetVectorSize = AddressMap.RendezvousFunnelSize + sizeof (MP_CPU_EXCHANGE_INFO);\r
- ApStackSize = PcdGet32(PcdCpuApStackSize);\r
- ApLoopMode = GetApLoopMode (&MonitorFilterSize);\r
+ ApResetVectorSize = GetApResetVectorSize (&AddressMap);\r
+ ApStackSize = PcdGet32 (PcdCpuApStackSize);\r
+ ApLoopMode = GetApLoopMode (&MonitorFilterSize);\r
\r
//\r
// Save BSP's Control registers for APs.\r
MpBuffer = AllocatePages (EFI_SIZE_TO_PAGES (BufferSize));\r
ASSERT (MpBuffer != NULL);\r
ZeroMem (MpBuffer, BufferSize);\r
- Buffer = (UINTN) MpBuffer;\r
+ Buffer = (UINTN)MpBuffer;\r
\r
//\r
// The layout of the Buffer is as below:\r
// CPU_INFO_IN_HOB (N)\r
// +--------------------+\r
//\r
- MonitorBuffer = (UINT8 *) (Buffer + ApStackSize * MaxLogicalProcessorNumber);\r
- BackupBufferAddr = (UINTN) MonitorBuffer + MonitorFilterSize * MaxLogicalProcessorNumber;\r
- ApIdtBase = ALIGN_VALUE (BackupBufferAddr + ApResetVectorSize, 8);\r
- CpuMpData = (CPU_MP_DATA *) (ApIdtBase + VolatileRegisters.Idtr.Limit + 1);\r
+ MonitorBuffer = (UINT8 *)(Buffer + ApStackSize * MaxLogicalProcessorNumber);\r
+ BackupBufferAddr = (UINTN)MonitorBuffer + MonitorFilterSize * MaxLogicalProcessorNumber;\r
+ ApIdtBase = ALIGN_VALUE (BackupBufferAddr + ApResetVectorSize, 8);\r
+ CpuMpData = (CPU_MP_DATA *)(ApIdtBase + VolatileRegisters.Idtr.Limit + 1);\r
CpuMpData->Buffer = Buffer;\r
CpuMpData->CpuApStackSize = ApStackSize;\r
CpuMpData->BackupBuffer = BackupBufferAddr;\r
CpuMpData->BackupBufferSize = ApResetVectorSize;\r
- CpuMpData->WakeupBuffer = (UINTN) -1;\r
+ CpuMpData->WakeupBuffer = (UINTN)-1;\r
CpuMpData->CpuCount = 1;\r
CpuMpData->BspNumber = 0;\r
CpuMpData->WaitEvent = NULL;\r
CpuMpData->SwitchBspFlag = FALSE;\r
- CpuMpData->CpuData = (CPU_AP_DATA *) (CpuMpData + 1);\r
- CpuMpData->CpuInfoInHob = (UINT64) (UINTN) (CpuMpData->CpuData + MaxLogicalProcessorNumber);\r
- InitializeSpinLock(&CpuMpData->MpLock);\r
+ CpuMpData->CpuData = (CPU_AP_DATA *)(CpuMpData + 1);\r
+ CpuMpData->CpuInfoInHob = (UINT64)(UINTN)(CpuMpData->CpuData + MaxLogicalProcessorNumber);\r
+ InitializeSpinLock (&CpuMpData->MpLock);\r
+ CpuMpData->SevEsIsEnabled = PcdGetBool (PcdSevEsIsEnabled);\r
+ CpuMpData->SevEsAPBuffer = (UINTN)-1;\r
+ CpuMpData->GhcbBase = PcdGet64 (PcdGhcbBase);\r
\r
//\r
// Make sure no memory usage outside of the allocated buffer.\r
//\r
- ASSERT ((CpuMpData->CpuInfoInHob + sizeof (CPU_INFO_IN_HOB) * MaxLogicalProcessorNumber) ==\r
- Buffer + BufferSize);\r
+ ASSERT (\r
+ (CpuMpData->CpuInfoInHob + sizeof (CPU_INFO_IN_HOB) * MaxLogicalProcessorNumber) ==\r
+ Buffer + BufferSize\r
+ );\r
\r
//\r
// Duplicate BSP's IDT to APs.\r
CpuMpData->CpuData[Index].StartupApSignal =\r
(UINT32 *)(MonitorBuffer + MonitorFilterSize * Index);\r
}\r
+\r
//\r
// Enable the local APIC for Virtual Wire Mode.\r
//\r
// APs have been wakeup before, just get the CPU Information\r
// from HOB\r
//\r
- CpuMpData->CpuCount = OldCpuMpData->CpuCount;\r
- CpuMpData->BspNumber = OldCpuMpData->BspNumber;\r
- CpuMpData->CpuInfoInHob = OldCpuMpData->CpuInfoInHob;\r
- CpuInfoInHob = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;\r
+ OldCpuMpData->NewCpuMpData = CpuMpData;\r
+ CpuMpData->CpuCount = OldCpuMpData->CpuCount;\r
+ CpuMpData->BspNumber = OldCpuMpData->BspNumber;\r
+ CpuMpData->CpuInfoInHob = OldCpuMpData->CpuInfoInHob;\r
+ CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob;\r
for (Index = 0; Index < CpuMpData->CpuCount; Index++) {\r
- InitializeSpinLock(&CpuMpData->CpuData[Index].ApLock);\r
- CpuMpData->CpuData[Index].CpuHealthy = (CpuInfoInHob[Index].Health == 0)? TRUE:FALSE;\r
+ InitializeSpinLock (&CpuMpData->CpuData[Index].ApLock);\r
+ CpuMpData->CpuData[Index].CpuHealthy = (CpuInfoInHob[Index].Health == 0) ? TRUE : FALSE;\r
CpuMpData->CpuData[Index].ApFunction = 0;\r
- CopyMem (&CpuMpData->CpuData[Index].VolatileRegisters, &VolatileRegisters, sizeof (CPU_VOLATILE_REGISTERS));\r
}\r
}\r
\r
if (!GetMicrocodePatchInfoFromHob (\r
&CpuMpData->MicrocodePatchAddress,\r
&CpuMpData->MicrocodePatchRegionSize\r
- )) {\r
+ ))\r
+ {\r
//\r
// The microcode patch information cache HOB does not exist, which means\r
// the microcode patches data has not been loaded into memory yet\r
// Wakeup APs to do some AP initialize sync (Microcode & MTRR)\r
//\r
if (CpuMpData->CpuCount > 1) {\r
- CpuMpData->InitFlag = ApInitReconfig;\r
+ if (OldCpuMpData != NULL) {\r
+ //\r
+ // Only needs to use this flag for DXE phase to update the wake up\r
+ // buffer. Wakeup buffer allocated in PEI phase is no longer valid\r
+ // in DXE.\r
+ //\r
+ CpuMpData->InitFlag = ApInitReconfig;\r
+ }\r
+\r
WakeUpAP (CpuMpData, TRUE, 0, ApInitializeSync, CpuMpData, TRUE);\r
//\r
// Wait for all APs finished initialization\r
while (CpuMpData->FinishedCount < (CpuMpData->CpuCount - 1)) {\r
CpuPause ();\r
}\r
- CpuMpData->InitFlag = ApInitDone;\r
+\r
+ if (OldCpuMpData != NULL) {\r
+ CpuMpData->InitFlag = ApInitDone;\r
+ }\r
+\r
for (Index = 0; Index < CpuMpData->CpuCount; Index++) {\r
SetApState (&CpuMpData->CpuData[Index], CpuStateIdle);\r
}\r
}\r
\r
+ //\r
+ // Dump the microcode revision for each core.\r
+ //\r
+ DEBUG_CODE_BEGIN ();\r
+ UINT32 ThreadId;\r
+ UINT32 ExpectedMicrocodeRevision;\r
+\r
+ CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob;\r
+ for (Index = 0; Index < CpuMpData->CpuCount; Index++) {\r
+ GetProcessorLocationByApicId (CpuInfoInHob[Index].InitialApicId, NULL, NULL, &ThreadId);\r
+ if (ThreadId == 0) {\r
+ //\r
+ // MicrocodeDetect() loads microcode in first thread of each core, so,\r
+ // CpuMpData->CpuData[Index].MicrocodeEntryAddr is initialized only for first thread of each core.\r
+ //\r
+ ExpectedMicrocodeRevision = 0;\r
+ if (CpuMpData->CpuData[Index].MicrocodeEntryAddr != 0) {\r
+ ExpectedMicrocodeRevision = ((CPU_MICROCODE_HEADER *)(UINTN)CpuMpData->CpuData[Index].MicrocodeEntryAddr)->UpdateRevision;\r
+ }\r
+\r
+ DEBUG ((\r
+ DEBUG_INFO,\r
+ "CPU[%04d]: Microcode revision = %08x, expected = %08x\n",\r
+ Index,\r
+ CpuMpData->CpuData[Index].MicrocodeRevision,\r
+ ExpectedMicrocodeRevision\r
+ ));\r
+ }\r
+ }\r
+\r
+ DEBUG_CODE_END ();\r
//\r
// Initialize global data for MP support\r
//\r
OUT EFI_HEALTH_FLAGS *HealthData OPTIONAL\r
)\r
{\r
- CPU_MP_DATA *CpuMpData;\r
- UINTN CallerNumber;\r
- CPU_INFO_IN_HOB *CpuInfoInHob;\r
+ CPU_MP_DATA *CpuMpData;\r
+ UINTN CallerNumber;\r
+ CPU_INFO_IN_HOB *CpuInfoInHob;\r
+ UINTN OriginalProcessorNumber;\r
\r
- CpuMpData = GetCpuMpData ();\r
- CpuInfoInHob = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;\r
+ CpuMpData = GetCpuMpData ();\r
+ CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob;\r
+\r
+ //\r
+ // Lower 24 bits contains the actual processor number.\r
+ //\r
+ OriginalProcessorNumber = ProcessorNumber;\r
+ ProcessorNumber &= BIT24 - 1;\r
\r
//\r
// Check whether caller processor is BSP\r
return EFI_NOT_FOUND;\r
}\r
\r
- ProcessorInfoBuffer->ProcessorId = (UINT64) CpuInfoInHob[ProcessorNumber].ApicId;\r
+ ProcessorInfoBuffer->ProcessorId = (UINT64)CpuInfoInHob[ProcessorNumber].ApicId;\r
ProcessorInfoBuffer->StatusFlag = 0;\r
if (ProcessorNumber == CpuMpData->BspNumber) {\r
ProcessorInfoBuffer->StatusFlag |= PROCESSOR_AS_BSP_BIT;\r
}\r
+\r
if (CpuMpData->CpuData[ProcessorNumber].CpuHealthy) {\r
ProcessorInfoBuffer->StatusFlag |= PROCESSOR_HEALTH_STATUS_BIT;\r
}\r
+\r
if (GetApState (&CpuMpData->CpuData[ProcessorNumber]) == CpuStateDisabled) {\r
ProcessorInfoBuffer->StatusFlag &= ~PROCESSOR_ENABLED_BIT;\r
} else {\r
&ProcessorInfoBuffer->Location.Thread\r
);\r
\r
+ if ((OriginalProcessorNumber & CPU_V2_EXTENDED_TOPOLOGY) != 0) {\r
+ GetProcessorLocation2ByApicId (\r
+ CpuInfoInHob[ProcessorNumber].ApicId,\r
+ &ProcessorInfoBuffer->ExtendedInformation.Location2.Package,\r
+ &ProcessorInfoBuffer->ExtendedInformation.Location2.Die,\r
+ &ProcessorInfoBuffer->ExtendedInformation.Location2.Tile,\r
+ &ProcessorInfoBuffer->ExtendedInformation.Location2.Module,\r
+ &ProcessorInfoBuffer->ExtendedInformation.Location2.Core,\r
+ &ProcessorInfoBuffer->ExtendedInformation.Location2.Thread\r
+ );\r
+ }\r
+\r
if (HealthData != NULL) {\r
HealthData->Uint32 = CpuInfoInHob[ProcessorNumber].Health;\r
}\r
**/\r
EFI_STATUS\r
SwitchBSPWorker (\r
- IN UINTN ProcessorNumber,\r
- IN BOOLEAN EnableOldBSP\r
+ IN UINTN ProcessorNumber,\r
+ IN BOOLEAN EnableOldBSP\r
)\r
{\r
CPU_MP_DATA *CpuMpData;\r
//\r
// Clear the BSP bit of MSR_IA32_APIC_BASE\r
//\r
- ApicBaseMsr.Uint64 = AsmReadMsr64 (MSR_IA32_APIC_BASE);\r
+ ApicBaseMsr.Uint64 = AsmReadMsr64 (MSR_IA32_APIC_BASE);\r
ApicBaseMsr.Bits.BSP = 0;\r
AsmWriteMsr64 (MSR_IA32_APIC_BASE, ApicBaseMsr.Uint64);\r
\r
//\r
// Set the BSP bit of MSR_IA32_APIC_BASE on new BSP\r
//\r
- ApicBaseMsr.Uint64 = AsmReadMsr64 (MSR_IA32_APIC_BASE);\r
+ ApicBaseMsr.Uint64 = AsmReadMsr64 (MSR_IA32_APIC_BASE);\r
ApicBaseMsr.Bits.BSP = 1;\r
AsmWriteMsr64 (MSR_IA32_APIC_BASE, ApicBaseMsr.Uint64);\r
ProgramVirtualWireMode ();\r
} else {\r
SetApState (&CpuMpData->CpuData[CallerNumber], CpuStateIdle);\r
}\r
+\r
//\r
// Save new BSP number\r
//\r
- CpuMpData->BspNumber = (UINT32) ProcessorNumber;\r
+ CpuMpData->BspNumber = (UINT32)ProcessorNumber;\r
\r
//\r
// Restore interrupt state.\r
**/\r
EFI_STATUS\r
EnableDisableApWorker (\r
- IN UINTN ProcessorNumber,\r
- IN BOOLEAN EnableAP,\r
- IN UINT32 *HealthFlag OPTIONAL\r
+ IN UINTN ProcessorNumber,\r
+ IN BOOLEAN EnableAP,\r
+ IN UINT32 *HealthFlag OPTIONAL\r
)\r
{\r
- CPU_MP_DATA *CpuMpData;\r
- UINTN CallerNumber;\r
+ CPU_MP_DATA *CpuMpData;\r
+ UINTN CallerNumber;\r
\r
CpuMpData = GetCpuMpData ();\r
\r
\r
if (HealthFlag != NULL) {\r
CpuMpData->CpuData[ProcessorNumber].CpuHealthy =\r
- (BOOLEAN) ((*HealthFlag & PROCESSOR_HEALTH_STATUS_BIT) != 0);\r
+ (BOOLEAN)((*HealthFlag & PROCESSOR_HEALTH_STATUS_BIT) != 0);\r
}\r
\r
return EFI_SUCCESS;\r
EFI_STATUS\r
EFIAPI\r
MpInitLibWhoAmI (\r
- OUT UINTN *ProcessorNumber\r
+ OUT UINTN *ProcessorNumber\r
)\r
{\r
- CPU_MP_DATA *CpuMpData;\r
+ CPU_MP_DATA *CpuMpData;\r
\r
if (ProcessorNumber == NULL) {\r
return EFI_INVALID_PARAMETER;\r
EFI_STATUS\r
EFIAPI\r
MpInitLibGetNumberOfProcessors (\r
- OUT UINTN *NumberOfProcessors, OPTIONAL\r
- OUT UINTN *NumberOfEnabledProcessors OPTIONAL\r
+ OUT UINTN *NumberOfProcessors OPTIONAL,\r
+ OUT UINTN *NumberOfEnabledProcessors OPTIONAL\r
)\r
{\r
- CPU_MP_DATA *CpuMpData;\r
- UINTN CallerNumber;\r
- UINTN ProcessorNumber;\r
- UINTN EnabledProcessorNumber;\r
- UINTN Index;\r
+ CPU_MP_DATA *CpuMpData;\r
+ UINTN CallerNumber;\r
+ UINTN ProcessorNumber;\r
+ UINTN EnabledProcessorNumber;\r
+ UINTN Index;\r
\r
CpuMpData = GetCpuMpData ();\r
\r
EnabledProcessorNumber = 0;\r
for (Index = 0; Index < ProcessorNumber; Index++) {\r
if (GetApState (&CpuMpData->CpuData[Index]) != CpuStateDisabled) {\r
- EnabledProcessorNumber ++;\r
+ EnabledProcessorNumber++;\r
}\r
}\r
\r
if (NumberOfProcessors != NULL) {\r
*NumberOfProcessors = ProcessorNumber;\r
}\r
+\r
if (NumberOfEnabledProcessors != NULL) {\r
*NumberOfEnabledProcessors = EnabledProcessorNumber;\r
}\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Worker function to execute a caller provided function on all enabled APs.\r
\r
**/\r
EFI_STATUS\r
StartupAllCPUsWorker (\r
- IN EFI_AP_PROCEDURE Procedure,\r
- IN BOOLEAN SingleThread,\r
- IN BOOLEAN ExcludeBsp,\r
- IN EFI_EVENT WaitEvent OPTIONAL,\r
- IN UINTN TimeoutInMicroseconds,\r
- IN VOID *ProcedureArgument OPTIONAL,\r
- OUT UINTN **FailedCpuList OPTIONAL\r
+ IN EFI_AP_PROCEDURE Procedure,\r
+ IN BOOLEAN SingleThread,\r
+ IN BOOLEAN ExcludeBsp,\r
+ IN EFI_EVENT WaitEvent OPTIONAL,\r
+ IN UINTN TimeoutInMicroseconds,\r
+ IN VOID *ProcedureArgument OPTIONAL,\r
+ OUT UINTN **FailedCpuList OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
- CPU_MP_DATA *CpuMpData;\r
- UINTN ProcessorCount;\r
- UINTN ProcessorNumber;\r
- UINTN CallerNumber;\r
- CPU_AP_DATA *CpuData;\r
- BOOLEAN HasEnabledAp;\r
- CPU_STATE ApState;\r
+ EFI_STATUS Status;\r
+ CPU_MP_DATA *CpuMpData;\r
+ UINTN ProcessorCount;\r
+ UINTN ProcessorNumber;\r
+ UINTN CallerNumber;\r
+ CPU_AP_DATA *CpuData;\r
+ BOOLEAN HasEnabledAp;\r
+ CPU_STATE ApState;\r
\r
CpuMpData = GetCpuMpData ();\r
\r
*FailedCpuList = NULL;\r
}\r
\r
- if (CpuMpData->CpuCount == 1 && ExcludeBsp) {\r
+ if ((CpuMpData->CpuCount == 1) && ExcludeBsp) {\r
return EFI_NOT_STARTED;\r
}\r
\r
\r
CpuMpData->RunningCount = 0;\r
for (ProcessorNumber = 0; ProcessorNumber < ProcessorCount; ProcessorNumber++) {\r
- CpuData = &CpuMpData->CpuData[ProcessorNumber];\r
+ CpuData = &CpuMpData->CpuData[ProcessorNumber];\r
CpuData->Waiting = FALSE;\r
if (ProcessorNumber != CpuMpData->BspNumber) {\r
if (CpuData->State == CpuStateIdle) {\r
TimeoutInMicroseconds,\r
&CpuMpData->CurrentTime\r
);\r
- CpuMpData->TotalTime = 0;\r
- CpuMpData->WaitEvent = WaitEvent;\r
+ CpuMpData->TotalTime = 0;\r
+ CpuMpData->WaitEvent = WaitEvent;\r
\r
if (!SingleThread) {\r
WakeUpAP (CpuMpData, TRUE, 0, Procedure, ProcedureArgument, FALSE);\r
if (ProcessorNumber == CallerNumber) {\r
continue;\r
}\r
+\r
if (CpuMpData->CpuData[ProcessorNumber].Waiting) {\r
WakeUpAP (CpuMpData, FALSE, ProcessorNumber, Procedure, ProcedureArgument, TRUE);\r
break;\r
**/\r
EFI_STATUS\r
StartupThisAPWorker (\r
- IN EFI_AP_PROCEDURE Procedure,\r
- IN UINTN ProcessorNumber,\r
- IN EFI_EVENT WaitEvent OPTIONAL,\r
- IN UINTN TimeoutInMicroseconds,\r
- IN VOID *ProcedureArgument OPTIONAL,\r
- OUT BOOLEAN *Finished OPTIONAL\r
+ IN EFI_AP_PROCEDURE Procedure,\r
+ IN UINTN ProcessorNumber,\r
+ IN EFI_EVENT WaitEvent OPTIONAL,\r
+ IN UINTN TimeoutInMicroseconds,\r
+ IN VOID *ProcedureArgument OPTIONAL,\r
+ OUT BOOLEAN *Finished OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
- CPU_MP_DATA *CpuMpData;\r
- CPU_AP_DATA *CpuData;\r
- UINTN CallerNumber;\r
+ EFI_STATUS Status;\r
+ CPU_MP_DATA *CpuMpData;\r
+ CPU_AP_DATA *CpuData;\r
+ UINTN CallerNumber;\r
\r
CpuMpData = GetCpuMpData ();\r
\r
// BSP saves data for CheckAPsStatus(), and returns EFI_SUCCESS.\r
// CheckAPsStatus() will check completion and timeout periodically.\r
//\r
- CpuData = &CpuMpData->CpuData[ProcessorNumber];\r
+ CpuData = &CpuMpData->CpuData[ProcessorNumber];\r
CpuData->WaitEvent = WaitEvent;\r
CpuData->Finished = Finished;\r
CpuData->ExpectedTime = CalculateTimeout (TimeoutInMicroseconds, &CpuData->CurrentTime);\r
VOID\r
)\r
{\r
- EFI_HOB_GUID_TYPE *GuidHob;\r
- VOID *DataInHob;\r
- CPU_MP_DATA *CpuMpData;\r
+ EFI_HOB_GUID_TYPE *GuidHob;\r
+ VOID *DataInHob;\r
+ CPU_MP_DATA *CpuMpData;\r
\r
CpuMpData = NULL;\r
- GuidHob = GetFirstGuidHob (&mCpuInitMpLibHobGuid);\r
+ GuidHob = GetFirstGuidHob (&mCpuInitMpLibHobGuid);\r
if (GuidHob != NULL) {\r
DataInHob = GET_GUID_HOB_DATA (GuidHob);\r
- CpuMpData = (CPU_MP_DATA *) (*(UINTN *) DataInHob);\r
+ CpuMpData = (CPU_MP_DATA *)(*(UINTN *)DataInHob);\r
}\r
+\r
return CpuMpData;\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
MpInitLibStartupAllCPUs (\r
- IN EFI_AP_PROCEDURE Procedure,\r
- IN UINTN TimeoutInMicroseconds,\r
- IN VOID *ProcedureArgument OPTIONAL\r
+ IN EFI_AP_PROCEDURE Procedure,\r
+ IN UINTN TimeoutInMicroseconds,\r
+ IN VOID *ProcedureArgument OPTIONAL\r
)\r
{\r
return StartupAllCPUsWorker (\r
projects / mirror_edk2.git / blobdiff