Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

UefiCpuPkg: Removing redundant parameter in RestoreVolatileRegisters 

Given that the second parameter can be universally set to TRUE across
all use cases, its removal simplifies the function interface and the
associated code paths.

Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
This commit is contained in:
Zhiguang Liu 2024-06-03 13:31:19 +08:00 committed by mergify[bot]
parent 6fe3137fe5
commit 9bc7a36120
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
UefiCpuPkg/Library/MpInitLib/MpLib.c
View File

@ -41,8 +41,7 @@ SaveVolatileRegisters (
**/ **/
VOID VOID
RestoreVolatileRegisters ( RestoreVolatileRegisters (
IN CPU_VOLATILE_REGISTERS *VolatileRegisters, IN CPU_VOLATILE_REGISTERS *VolatileRegisters
IN BOOLEAN IsRestoreDr
); );
/** /**
@ -118,7 +117,7 @@ FutureBSPProc (
// //
SaveVolatileRegisters (&DataInHob->APInfo.VolatileRegisters); SaveVolatileRegisters (&DataInHob->APInfo.VolatileRegisters);
AsmExchangeRole (&DataInHob->APInfo, &DataInHob->BSPInfo); AsmExchangeRole (&DataInHob->APInfo, &DataInHob->BSPInfo);
RestoreVolatileRegisters (&DataInHob->APInfo.VolatileRegisters, TRUE); RestoreVolatileRegisters (&DataInHob->APInfo.VolatileRegisters);
} }
/** /**
@ -244,13 +243,11 @@ SaveVolatileRegisters (
Restore the volatile registers following INIT IPI. Restore the volatile registers following INIT IPI.
@param[in] VolatileRegisters Pointer to volatile resisters @param[in] VolatileRegisters Pointer to volatile resisters
@param[in] IsRestoreDr TRUE: Restore DRx if supported
FALSE: Do not restore DRx
**/ **/
VOID VOID
RestoreVolatileRegisters ( RestoreVolatileRegisters (
IN CPU_VOLATILE_REGISTERS *VolatileRegisters, IN CPU_VOLATILE_REGISTERS *VolatileRegisters
IN BOOLEAN IsRestoreDr
) )
{ {
CPUID_VERSION_INFO_EDX VersionInfoEdx; CPUID_VERSION_INFO_EDX VersionInfoEdx;
@ -260,7 +257,6 @@ RestoreVolatileRegisters (
AsmWriteCr4 (VolatileRegisters->Cr4); AsmWriteCr4 (VolatileRegisters->Cr4);
AsmWriteCr0 (VolatileRegisters->Cr0); AsmWriteCr0 (VolatileRegisters->Cr0);
if (IsRestoreDr) {
AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, &VersionInfoEdx.Uint32); AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, &VersionInfoEdx.Uint32);
if (VersionInfoEdx.Bits.DE != 0) { if (VersionInfoEdx.Bits.DE != 0) {
// //
@ -274,7 +270,6 @@ RestoreVolatileRegisters (
AsmWriteDr6 (VolatileRegisters->Dr6); AsmWriteDr6 (VolatileRegisters->Dr6);
AsmWriteDr7 (VolatileRegisters->Dr7); AsmWriteDr7 (VolatileRegisters->Dr7);
} }
}
AsmWriteGdtr (&VolatileRegisters->Gdtr); AsmWriteGdtr (&VolatileRegisters->Gdtr);
AsmWriteIdtr (&VolatileRegisters->Idtr); AsmWriteIdtr (&VolatileRegisters->Idtr);
@ -769,7 +764,7 @@ ApWakeupFunction (
// to initialize AP in InitConfig path. // to initialize AP in InitConfig path.
// NOTE: IDTR.BASE stored in CpuMpData->CpuData[ProcessorNumber].VolatileRegisters points to a different IDT shared by all APs. // NOTE: IDTR.BASE stored in CpuMpData->CpuData[ProcessorNumber].VolatileRegisters points to a different IDT shared by all APs.
// //
RestoreVolatileRegisters (&CpuMpData->CpuData[ProcessorNumber].VolatileRegisters, TRUE); RestoreVolatileRegisters (&CpuMpData->CpuData[ProcessorNumber].VolatileRegisters);
InitializeApData (CpuMpData, ProcessorNumber, BistData, ApTopOfStack); InitializeApData (CpuMpData, ProcessorNumber, BistData, ApTopOfStack);
ApStartupSignalBuffer = CpuMpData->CpuData[ProcessorNumber].StartupApSignal; ApStartupSignalBuffer = CpuMpData->CpuData[ProcessorNumber].StartupApSignal;
} else { } else {
@ -796,7 +791,7 @@ ApWakeupFunction (
0 0
); );
RestoreVolatileRegisters (&CpuMpData->CpuData[ProcessorNumber].VolatileRegisters, TRUE); RestoreVolatileRegisters (&CpuMpData->CpuData[ProcessorNumber].VolatileRegisters);
if (GetApState (&CpuMpData->CpuData[ProcessorNumber]) == CpuStateReady) { if (GetApState (&CpuMpData->CpuData[ProcessorNumber]) == CpuStateReady) {
Procedure = (EFI_AP_PROCEDURE)CpuMpData->CpuData[ProcessorNumber].ApFunction; Procedure = (EFI_AP_PROCEDURE)CpuMpData->CpuData[ProcessorNumber].ApFunction;
@ -902,7 +897,7 @@ DxeApEntryPoint (
AsmWriteMsr64 (MSR_IA32_EFER, EferMsr.Uint64); AsmWriteMsr64 (MSR_IA32_EFER, EferMsr.Uint64);
} }
RestoreVolatileRegisters (&CpuMpData->CpuData[ProcessorNumber].VolatileRegisters, TRUE); RestoreVolatileRegisters (&CpuMpData->CpuData[ProcessorNumber].VolatileRegisters);
InterlockedIncrement ((UINT32 *)&CpuMpData->FinishedCount); InterlockedIncrement ((UINT32 *)&CpuMpData->FinishedCount);
PlaceAPInMwaitLoopOrRunLoop ( PlaceAPInMwaitLoopOrRunLoop (
CpuMpData->ApLoopMode, CpuMpData->ApLoopMode,
@ -2607,7 +2602,7 @@ SwitchBSPWorker (
// //
SaveVolatileRegisters (&CpuMpData->BSPInfo.VolatileRegisters); SaveVolatileRegisters (&CpuMpData->BSPInfo.VolatileRegisters);
AsmExchangeRole (&CpuMpData->BSPInfo, &CpuMpData->APInfo); AsmExchangeRole (&CpuMpData->BSPInfo, &CpuMpData->APInfo);
RestoreVolatileRegisters (&CpuMpData->BSPInfo.VolatileRegisters, TRUE); RestoreVolatileRegisters (&CpuMpData->BSPInfo.VolatileRegisters);
// //
// Set the BSP bit of MSR_IA32_APIC_BASE on new BSP // Set the BSP bit of MSR_IA32_APIC_BASE on new BSP
// //