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

UefiCpuPkg/MpInitLib: Remove redundant microcode fields in CPU_MP_DATA 

Previous commits have introduced below fields in structure CPU_AP_DATA:

  UINT32                         ProcessorSignature;
  UINT8                          PlatformId;
  UINT64                         MicrocodeEntryAddr;

which store the information of:

A. CPUID
B. Platform ID
C. Detected microcode patch entry address (including the microcode patch
   header)

for each processor within system.

Therefore, the below fields in structure CPU_MP_DATA:

  UINT32                         ProcessorSignature;
  UINT32                         ProcessorFlags;
  UINT64                         MicrocodeDataAddress;
  UINT32                         MicrocodeRevision;

which store the BSP's information of:

A. CPUID
B. Platform ID
C. The address and revision of detected microcode patch

are redundant and can be removed.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
This commit is contained in:
Hao A Wu 2019-12-24 15:02:23 +08:00 committed by mergify[bot]
parent 88bd066166
commit fd30b00707
2 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
UefiCpuPkg/Library/MpInitLib/Microcode.c
View File

@ -85,6 +85,7 @@ MicrocodeDetect (
UINTN Index; UINTN Index;
UINT8 PlatformId; UINT8 PlatformId;
CPUID_VERSION_INFO_EAX Eax; CPUID_VERSION_INFO_EAX Eax;
CPU_AP_DATA *CpuData;
UINT32 CurrentRevision; UINT32 CurrentRevision;
UINT32 LatestRevision; UINT32 LatestRevision;
UINTN TotalSize; UINTN TotalSize;
@ -92,16 +93,9 @@ MicrocodeDetect (
UINT32 InCompleteCheckSum32; UINT32 InCompleteCheckSum32;
BOOLEAN CorrectMicrocode; BOOLEAN CorrectMicrocode;
VOID *MicrocodeData; VOID *MicrocodeData;
MSR_IA32_PLATFORM_ID_REGISTER PlatformIdMsr;
UINT32 ProcessorFlags;
UINT32 ThreadId; UINT32 ThreadId;
BOOLEAN IsBspCallIn; BOOLEAN IsBspCallIn;
//
// set ProcessorFlags to suppress incorrect compiler/analyzer warnings
//
ProcessorFlags = 0;
if (CpuMpData->MicrocodePatchRegionSize == 0) { if (CpuMpData->MicrocodePatchRegionSize == 0) {
// //
// There is no microcode patches // There is no microcode patches
@ -127,28 +121,25 @@ MicrocodeDetect (
} }
ExtendedTableLength = 0; ExtendedTableLength = 0;
// Eax.Uint32 = CpuMpData->CpuData[ProcessorNumber].ProcessorSignature;
// Here data of CPUID leafs have not been collected into context buffer, so PlatformId = CpuMpData->CpuData[ProcessorNumber].PlatformId;
// GetProcessorCpuid() cannot be used here to retrieve CPUID data.
//
AsmCpuid (CPUID_VERSION_INFO, &Eax.Uint32, NULL, NULL, NULL);
//
// The index of platform information resides in bits 50:52 of MSR IA32_PLATFORM_ID
//
PlatformIdMsr.Uint64 = AsmReadMsr64 (MSR_IA32_PLATFORM_ID);
PlatformId = (UINT8) PlatformIdMsr.Bits.PlatformId;
// //
// Check whether AP has same processor with BSP. // Check whether AP has same processor with BSP.
// If yes, direct use microcode info saved by BSP. // If yes, direct use microcode info saved by BSP.
// //
if (!IsBspCallIn) { if (!IsBspCallIn) {
if ((CpuMpData->ProcessorSignature == Eax.Uint32) && //
(CpuMpData->ProcessorFlags & (1 << PlatformId)) != 0) { // Get the CPU data for BSP
MicrocodeData = (VOID *)(UINTN) CpuMpData->MicrocodeDataAddress; //
LatestRevision = CpuMpData->MicrocodeRevision; CpuData = &(CpuMpData->CpuData[CpuMpData->BspNumber]);
goto Done; if ((CpuData->ProcessorSignature == Eax.Uint32) &&
(CpuData->PlatformId == PlatformId) &&
(CpuData->MicrocodeEntryAddr != 0)) {
MicrocodeEntryPoint = (CPU_MICROCODE_HEADER *)(UINTN) CpuData->MicrocodeEntryAddr;
MicrocodeData = (VOID *) (MicrocodeEntryPoint + 1);
LatestRevision = MicrocodeEntryPoint->UpdateRevision;
goto Done;
} }
} }
@ -216,7 +207,6 @@ MicrocodeDetect (
CheckSum32 += MicrocodeEntryPoint->Checksum; CheckSum32 += MicrocodeEntryPoint->Checksum;
if (CheckSum32 == 0) { if (CheckSum32 == 0) {
CorrectMicrocode = TRUE; CorrectMicrocode = TRUE;
ProcessorFlags = MicrocodeEntryPoint->ProcessorFlags;
} }
} else if ((MicrocodeEntryPoint->DataSize != 0) && } else if ((MicrocodeEntryPoint->DataSize != 0) &&
(MicrocodeEntryPoint->UpdateRevision > LatestRevision)) { (MicrocodeEntryPoint->UpdateRevision > LatestRevision)) {
@ -260,7 +250,6 @@ MicrocodeDetect (
// Find one // Find one
// //
CorrectMicrocode = TRUE; CorrectMicrocode = TRUE;
ProcessorFlags = ExtendedTable->ProcessorFlag;
break; break;
} }
} }
@ -332,18 +321,6 @@ Done:
ReleaseSpinLock(&CpuMpData->MpLock); ReleaseSpinLock(&CpuMpData->MpLock);
} }
} }
if (IsBspCallIn && (LatestRevision != 0)) {
//
// Save BSP processor info and microcode info for later AP use.
//
CpuMpData->ProcessorSignature = Eax.Uint32;
CpuMpData->ProcessorFlags = ProcessorFlags;
CpuMpData->MicrocodeDataAddress = (UINTN) MicrocodeData;
CpuMpData->MicrocodeRevision = LatestRevision;
DEBUG ((DEBUG_INFO, "BSP Microcode:: signature [0x%08x], ProcessorFlags [0x%08x], \
MicroData [0x%08x], Revision [0x%08x]\n", Eax.Uint32, ProcessorFlags, (UINTN) MicrocodeData, LatestRevision));
}
} }
/** /**

5
UefiCpuPkg/Library/MpInitLib/MpLib.h
View File

@ -263,11 +263,6 @@ struct _CPU_MP_DATA {
BOOLEAN PeriodicMode; BOOLEAN PeriodicMode;
BOOLEAN TimerInterruptState; BOOLEAN TimerInterruptState;
UINT32 ProcessorSignature;
UINT32 ProcessorFlags;
UINT64 MicrocodeDataAddress;
UINT32 MicrocodeRevision;
// //
// Whether need to use Init-Sipi-Sipi to wake up the APs. // Whether need to use Init-Sipi-Sipi to wake up the APs.
// Two cases need to set this value to TRUE. One is in HLT // Two cases need to set this value to TRUE. One is in HLT