UefiCpuPkg: Move GetProcessorLocation() to LocalApicLib library
1) Remove SmmGetProcessorLocation() from PiSmmCpuDxeSmm driver. 2) Remove ExtractProcessorLocation() from MpInitLib library. 3) Add GetProcessorLocation() to BaseXApicLib and BaseXApicX2ApicLib. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leo Duran <leo.duran@amd.com> Signed-off-by: Michael Kinney <Michael.d.kinney@intel.com> Tested-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Michael Kinney <Michael.d.kinney@intel.com> Reviewed-by: Jeff Fan <jeff.fan@intel.com>
This commit is contained in:
@@ -57,132 +57,6 @@ IsBspExecuteDisableEnabled (
|
||||
return Enabled;
|
||||
}
|
||||
|
||||
/**
|
||||
Get CPU Package/Core/Thread location information.
|
||||
|
||||
@param[in] InitialApicId CPU APIC ID
|
||||
@param[out] Location Pointer to CPU location information
|
||||
**/
|
||||
VOID
|
||||
ExtractProcessorLocation (
|
||||
IN UINT32 InitialApicId,
|
||||
OUT EFI_CPU_PHYSICAL_LOCATION *Location
|
||||
)
|
||||
{
|
||||
BOOLEAN TopologyLeafSupported;
|
||||
UINTN ThreadBits;
|
||||
UINTN CoreBits;
|
||||
CPUID_VERSION_INFO_EBX VersionInfoEbx;
|
||||
CPUID_VERSION_INFO_EDX VersionInfoEdx;
|
||||
CPUID_CACHE_PARAMS_EAX CacheParamsEax;
|
||||
CPUID_EXTENDED_TOPOLOGY_EAX ExtendedTopologyEax;
|
||||
CPUID_EXTENDED_TOPOLOGY_EBX ExtendedTopologyEbx;
|
||||
CPUID_EXTENDED_TOPOLOGY_ECX ExtendedTopologyEcx;
|
||||
UINT32 MaxCpuIdIndex;
|
||||
UINT32 SubIndex;
|
||||
UINTN LevelType;
|
||||
UINT32 MaxLogicProcessorsPerPackage;
|
||||
UINT32 MaxCoresPerPackage;
|
||||
|
||||
//
|
||||
// Check if the processor is capable of supporting more than one logical processor.
|
||||
//
|
||||
AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, &VersionInfoEdx.Uint32);
|
||||
if (VersionInfoEdx.Bits.HTT == 0) {
|
||||
Location->Thread = 0;
|
||||
Location->Core = 0;
|
||||
Location->Package = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
ThreadBits = 0;
|
||||
CoreBits = 0;
|
||||
|
||||
//
|
||||
// Assume three-level mapping of APIC ID: Package:Core:SMT.
|
||||
//
|
||||
|
||||
TopologyLeafSupported = FALSE;
|
||||
//
|
||||
// Get the max index of basic CPUID
|
||||
//
|
||||
AsmCpuid (CPUID_SIGNATURE, &MaxCpuIdIndex, NULL, NULL, NULL);
|
||||
|
||||
//
|
||||
// If the extended topology enumeration leaf is available, it
|
||||
// is the preferred mechanism for enumerating topology.
|
||||
//
|
||||
if (MaxCpuIdIndex >= CPUID_EXTENDED_TOPOLOGY) {
|
||||
AsmCpuidEx (
|
||||
CPUID_EXTENDED_TOPOLOGY,
|
||||
0,
|
||||
&ExtendedTopologyEax.Uint32,
|
||||
&ExtendedTopologyEbx.Uint32,
|
||||
&ExtendedTopologyEcx.Uint32,
|
||||
NULL
|
||||
);
|
||||
//
|
||||
// If CPUID.(EAX=0BH, ECX=0H):EBX returns zero and maximum input value for
|
||||
// basic CPUID information is greater than 0BH, then CPUID.0BH leaf is not
|
||||
// supported on that processor.
|
||||
//
|
||||
if (ExtendedTopologyEbx.Uint32 != 0) {
|
||||
TopologyLeafSupported = TRUE;
|
||||
|
||||
//
|
||||
// Sub-leaf index 0 (ECX= 0 as input) provides enumeration parameters to extract
|
||||
// the SMT sub-field of x2APIC ID.
|
||||
//
|
||||
LevelType = ExtendedTopologyEcx.Bits.LevelType;
|
||||
ASSERT (LevelType == CPUID_EXTENDED_TOPOLOGY_LEVEL_TYPE_SMT);
|
||||
ThreadBits = ExtendedTopologyEax.Bits.ApicIdShift;
|
||||
|
||||
//
|
||||
// Software must not assume any "level type" encoding
|
||||
// value to be related to any sub-leaf index, except sub-leaf 0.
|
||||
//
|
||||
SubIndex = 1;
|
||||
do {
|
||||
AsmCpuidEx (
|
||||
CPUID_EXTENDED_TOPOLOGY,
|
||||
SubIndex,
|
||||
&ExtendedTopologyEax.Uint32,
|
||||
NULL,
|
||||
&ExtendedTopologyEcx.Uint32,
|
||||
NULL
|
||||
);
|
||||
LevelType = ExtendedTopologyEcx.Bits.LevelType;
|
||||
if (LevelType == CPUID_EXTENDED_TOPOLOGY_LEVEL_TYPE_CORE) {
|
||||
CoreBits = ExtendedTopologyEax.Bits.ApicIdShift - ThreadBits;
|
||||
break;
|
||||
}
|
||||
SubIndex++;
|
||||
} while (LevelType != CPUID_EXTENDED_TOPOLOGY_LEVEL_TYPE_INVALID);
|
||||
}
|
||||
}
|
||||
|
||||
if (!TopologyLeafSupported) {
|
||||
AsmCpuid (CPUID_VERSION_INFO, NULL, &VersionInfoEbx.Uint32, NULL, NULL);
|
||||
MaxLogicProcessorsPerPackage = VersionInfoEbx.Bits.MaximumAddressableIdsForLogicalProcessors;
|
||||
if (MaxCpuIdIndex >= CPUID_CACHE_PARAMS) {
|
||||
AsmCpuidEx (CPUID_CACHE_PARAMS, 0, &CacheParamsEax.Uint32, NULL, NULL, NULL);
|
||||
MaxCoresPerPackage = CacheParamsEax.Bits.MaximumAddressableIdsForLogicalProcessors + 1;
|
||||
} else {
|
||||
//
|
||||
// Must be a single-core processor.
|
||||
//
|
||||
MaxCoresPerPackage = 1;
|
||||
}
|
||||
|
||||
ThreadBits = (UINTN) (HighBitSet32 (MaxLogicProcessorsPerPackage / MaxCoresPerPackage - 1) + 1);
|
||||
CoreBits = (UINTN) (HighBitSet32 (MaxCoresPerPackage - 1) + 1);
|
||||
}
|
||||
|
||||
Location->Thread = InitialApicId & ((1 << ThreadBits) - 1);
|
||||
Location->Core = (InitialApicId >> ThreadBits) & ((1 << CoreBits) - 1);
|
||||
Location->Package = (InitialApicId >> (ThreadBits + CoreBits));
|
||||
}
|
||||
|
||||
/**
|
||||
Worker function for SwitchBSP().
|
||||
|
||||
@@ -1451,7 +1325,12 @@ MpInitLibGetProcessorInfo (
|
||||
//
|
||||
// Get processor location information
|
||||
//
|
||||
ExtractProcessorLocation (CpuMpData->CpuData[ProcessorNumber].ApicId, &ProcessorInfoBuffer->Location);
|
||||
GetProcessorLocation (
|
||||
CpuMpData->CpuData[ProcessorNumber].ApicId,
|
||||
&ProcessorInfoBuffer->Location.Package,
|
||||
&ProcessorInfoBuffer->Location.Core,
|
||||
&ProcessorInfoBuffer->Location.Thread
|
||||
);
|
||||
|
||||
if (HealthData != NULL) {
|
||||
HealthData->Uint32 = CpuMpData->CpuData[ProcessorNumber].Health;
|
||||
|
Reference in New Issue
Block a user