tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg/MpInitLib: don't shadow the microcode patch twice. 

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

MpInitLibInitialize in MpLib.c will be invoked on both PEI and DXE
CPU code, MicrocodeDetect would be performed twice and copy
Microcode from flash to memory twice as well, which consider as
duplicate work to lead longer boot time.
This patch just use microcode memory copied in PEI phase if exist.

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Eric Dong 2019-07-31 15:59:26 +08:00
parent 5e4ebd9ea5
commit 89164babec
1 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1607,38 +1607,42 @@ MpInitLibInitialize (
CpuMpData->SwitchBspFlag = FALSE; CpuMpData->SwitchBspFlag = FALSE;
CpuMpData->CpuData = (CPU_AP_DATA *) (CpuMpData + 1); CpuMpData->CpuData = (CPU_AP_DATA *) (CpuMpData + 1);
CpuMpData->CpuInfoInHob = (UINT64) (UINTN) (CpuMpData->CpuData + MaxLogicalProcessorNumber); CpuMpData->CpuInfoInHob = (UINT64) (UINTN) (CpuMpData->CpuData + MaxLogicalProcessorNumber);
CpuMpData->MicrocodePatchRegionSize = PcdGet64 (PcdCpuMicrocodePatchRegionSize); if (OldCpuMpData == NULL) {
// CpuMpData->MicrocodePatchRegionSize = PcdGet64 (PcdCpuMicrocodePatchRegionSize);
// If platform has more than one CPU, relocate microcode to memory to reduce //
// loading microcode time. // If platform has more than one CPU, relocate microcode to memory to reduce
// // loading microcode time.
MicrocodePatchInRam = NULL; //
if (MaxLogicalProcessorNumber > 1) { MicrocodePatchInRam = NULL;
MicrocodePatchInRam = AllocatePages ( if (MaxLogicalProcessorNumber > 1) {
EFI_SIZE_TO_PAGES ( MicrocodePatchInRam = AllocatePages (
(UINTN)CpuMpData->MicrocodePatchRegionSize EFI_SIZE_TO_PAGES (
) (UINTN)CpuMpData->MicrocodePatchRegionSize
); )
);
}
if (MicrocodePatchInRam == NULL) {
//
// there is only one processor, or no microcode patch is available, or
// memory allocation failed
//
CpuMpData->MicrocodePatchAddress = PcdGet64 (PcdCpuMicrocodePatchAddress);
} else {
//
// there are multiple processors, and a microcode patch is available, and
// memory allocation succeeded
//
CopyMem (
MicrocodePatchInRam,
(VOID *)(UINTN)PcdGet64 (PcdCpuMicrocodePatchAddress),
(UINTN)CpuMpData->MicrocodePatchRegionSize
);
CpuMpData->MicrocodePatchAddress = (UINTN)MicrocodePatchInRam;
}
}else {
CpuMpData->MicrocodePatchRegionSize = OldCpuMpData->MicrocodePatchRegionSize;
CpuMpData->MicrocodePatchAddress = OldCpuMpData->MicrocodePatchAddress;
} }
if (MicrocodePatchInRam == NULL) {
//
// there is only one processor, or no microcode patch is available, or
// memory allocation failed
//
CpuMpData->MicrocodePatchAddress = PcdGet64 (PcdCpuMicrocodePatchAddress);
} else {
//
// there are multiple processors, and a microcode patch is available, and
// memory allocation succeeded
//
CopyMem (
MicrocodePatchInRam,
(VOID *)(UINTN)PcdGet64 (PcdCpuMicrocodePatchAddress),
(UINTN)CpuMpData->MicrocodePatchRegionSize
);
CpuMpData->MicrocodePatchAddress = (UINTN)MicrocodePatchInRam;
}
InitializeSpinLock(&CpuMpData->MpLock); InitializeSpinLock(&CpuMpData->MpLock);
// //