Sorry, the file mode looks wrong again.... I will fix this. Leo. > -----Original Message----- > From: Duran, Leo > Sent: Friday, October 28, 2016 12:08 PM > To: [email protected] > Cc: [email protected]; [email protected]; [email protected]; > [email protected]; Duran, Leo <[email protected]> > Subject: [PATCH] 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 <[email protected]> > --- > Maintainers.txt | 240 > --------------------- > UefiCpuPkg/Include/Library/LocalApicLib.h | 18 ++ > UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c | 130 +++++++++++ > .../BaseXApicX2ApicLib/BaseXApicX2ApicLib.c | 130 +++++++++++ > UefiCpuPkg/Library/MpInitLib/MpLib.c | 128 +---------- > UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c | 121 +---------- > 6 files changed, 280 insertions(+), 487 deletions(-) delete mode 100644 > Maintainers.txt mode change 100644 => 100755 > UefiCpuPkg/Include/Library/LocalApicLib.h > mode change 100644 => 100755 > UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c > mode change 100644 => 100755 > UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c > mode change 100644 => 100755 UefiCpuPkg/Library/MpInitLib/MpLib.c > mode change 100644 => 100755 > UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c > > diff --git a/Maintainers.txt b/Maintainers.txt deleted file mode 100644 index > 94d3380..0000000 > --- a/Maintainers.txt > +++ /dev/null > @@ -1,240 +0,0 @@ > -EDK II Maintainers > -================== > - > -This file provides information about the primary maintainers for -EDK II. > - > -In general, you should not privately email the maintainer. You should -email > the edk2-devel list, but you can also Cc the maintainer. > - > -Descriptions of section entries: > - > - L: Mailing list that is relevant to this area (default is edk2-devel) > - Patches and questions should be sent to the email list. > - M: Cc address for patches and questions (ie, the package maintainer) > - W: Web-page with status/info > - T: SCM tree type and location. Type is one of: git, svn. > - S: Status, one of the following: > - Supported: Someone is actually paid to look after this. > - Maintained: Someone actually looks after it. > - Odd Fixes: It has a maintainer but they don't have time to do > - much other than throw the odd patch in. See below. > - Orphan: No current maintainer [but maybe you could take the > - role as you write your new code]. > - Obsolete: Old code. Something tagged obsolete generally means > - it has been replaced by a better system and you > - should be using that. > - > -EDK II > ------- > -W: http://www.tianocore.org/edk2/ > -L: https://lists.sourceforge.net/lists/listinfo/edk2-devel > -T: git - https://github.com/tianocore/edk2.git > -T: git (mirror) - https://bitbucket.org/tianocore/edk2.git > -T: git (mirror) - http://git.code.sf.net/p/tianocore/edk2 > -T: svn (read-only, deprecated) - > https://svn.code.sf.net/p/edk2/code/trunk/edk2 > - > -Responsible Disclosure, Reporting Security Issues > -------------------------------------------------- > -W: https://github.com/tianocore/tianocore.github.io/wiki/Security > - > -EDK II Releases: > ----------------- > -UDK2014 > -W: http://www.tianocore.org/udk2014/ > -S: Supported > - > -EDK II Packages: > ----------------- > -AppPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/AppPkg > -M: Daryl McDaniel <[email protected]> > -M: Jaben Carsey <[email protected]> > - > -ArmPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPkg > -M: Leif Lindholm <[email protected]> > -M: Ard Biesheuvel <[email protected]> > - > -ArmPlatformPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg > -M: Leif Lindholm <[email protected]> > -M: Ard Biesheuvel <[email protected]> > - > -ArmVirtPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg > -M: Laszlo Ersek <[email protected]> > -M: Ard Biesheuvel <[email protected]> > - > -BaseTools > -W: https://github.com/tianocore/tianocore.github.io/wiki/BaseTools > -M: Yonghong Zhu <[email protected]> > -M: Liming Gao <[email protected]> > - > -BeagleBoardPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/BeagleBoardPkg > -M: Leif Lindholm <[email protected]> > -M: Ard Biesheuvel <[email protected]> > - > -CorebootModulePkg, CorebootPayloadPkg > -W: > https://github.com/tianocore/tianocore.github.io/wiki/Coreboot_UEFI_payl > oad > -M: Maurice Ma <[email protected]> > -M: Prince Agyeman <[email protected]> > -S: Maintained > - > -CryptoPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/CryptoPkg > -M: Qin Long <[email protected]> > -M: Ting Ye <[email protected]> > - > -DuetPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/DuetPkg > -M: Ruiyu Ni <[email protected]> > - > -EdkCompatibilityPkg > -W: > https://github.com/tianocore/tianocore.github.io/wiki/EdkCompatibilityPkg > -M: Liming Gao <[email protected]> > - > -EdkShellPkg, EdkShellBinPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/EdkShellPkg > -M: Ruiyu Ni <[email protected]> > -T: svn - https://svn.code.sf.net/p/efi-shell/code/trunk/Shell/ > -S: Obsolete (Use ShellPkg & ShellBinPkg instead) > - > -EmbeddedPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg > -M: Leif Lindholm <[email protected]> > -M: Ard Biesheuvel <[email protected]> > - > -EmulatorPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg > -M: Jordan Justen <[email protected]> > -M: Andrew Fish <[email protected]> > -S: Maintained > - > -FatPkg, FatBinPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/Edk2-fat-driver > -M: Ruiyu Ni <[email protected]> > -T: svn - https://svn.code.sf.net/p/edk2-fatdriver2/code/trunk/EnhancedFat > -T: git - https://github.com/tianocore/edk2-FatPkg.git > - > -IntelFrameworkModulePkg > -W: > https://github.com/tianocore/tianocore.github.io/wiki/IntelFrameworkMod > ulePkg > -M: Jeff Fan <[email protected]> > - > -IntelFrameworkPkg > -W: > https://github.com/tianocore/tianocore.github.io/wiki/IntelFrameworkPkg > -M: Michael D Kinney <[email protected]> > -M: Jeff Fan <[email protected]> > - > -IntelFsp2Pkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFsp2Pkg > -M: Jiewen Yao <[email protected]> > -M: Giri P Mudusuru <[email protected]> > - > -IntelFsp2WrapperPkg > -W: > https://github.com/tianocore/tianocore.github.io/wiki/IntelFsp2WrapperPk > g > -M: Jiewen Yao <[email protected]> > -M: Giri P Mudusuru <[email protected]> > - > -IntelFspPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFspPkg > -M: Jiewen Yao <[email protected]> > - > -IntelFspWrapperPkg > -W: > https://github.com/tianocore/tianocore.github.io/wiki/IntelFspWrapperPkg > -M: Jiewen Yao <[email protected]> > - > -IntelSiliconPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/IntelSiliconPkg > -M: Jiewen Yao <[email protected]> > -M: Giri P Mudusuru <[email protected]> > - > -MdeModulePkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/MdeModulePkg > -M: Feng Tian <[email protected]> > -M: Star Zeng <[email protected]> > - > -MdePkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/MdePkg > -M: Michael D Kinney <[email protected]> > -M: Liming Gao <[email protected]> > - > -NetworkPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg > -M: Siyuan Fu <[email protected]> > -M: Jiaxin Wu <[email protected]> > - > -Nt32Pkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/Nt32Pkg > -M: Ruiyu Ni <[email protected]> > - > -Omap35xxPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/Omap35xxPkg > -M: Leif Lindholm <[email protected]> > -M: Ard Biesheuvel <[email protected]> > - > -OptionRomPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/OptionRomPkg > -M: Ruiyu Ni <[email protected]> > - > -OvmfPkg > -W: http://www.tianocore.org/ovmf/ > -M: Jordan Justen <[email protected]> > -M: Laszlo Ersek <[email protected]> > -S: Maintained > - > -PcAtChipsetPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/PcAtChipsetPkg > -M: Ruiyu Ni <[email protected]> > - > -PerformancePkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/PerformancePkg > -M: Daryl McDaniel <[email protected]> > -M: Jaben Carsey <[email protected]> > - > -QuarkPlatformPkg, QuarkSocPkg > -M: Michael D Kinney <[email protected]> > -M: Kelly Steele <[email protected]> > - > -SecurityPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/SecurityPkg > -M: Chao Zhang <[email protected]> > - > -ShellBinPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg > -M: Jaben Carsey <[email protected]> (Ia32/X64) > -M: Ruiyu Ni <[email protected]> (Ia32/X64) > -M: Leif Lindholm <[email protected]> (ARM/AArch64) > -M: Ard Biesheuvel <[email protected]> (ARM/AArch64) > - > -ShellPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg > -M: Jaben Carsey <[email protected]> > -M: Ruiyu Ni <[email protected]> > - > -SourceLevelDebugPkg > -W: > https://github.com/tianocore/tianocore.github.io/wiki/SourceLevelDebugPk > g > -M: Jeff Fan <[email protected]> > -M: Hao Wu <[email protected]> > - > -StdLib, StdLibPrivateInternalFiles > -W: https://github.com/tianocore/tianocore.github.io/wiki/StdLib > -M: Daryl McDaniel <[email protected]> > -M: Jaben Carsey <[email protected]> > - > -UefiCpuPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/UefiCpuPkg > -M: Jeff Fan <[email protected]> > - > -UnixPkg > -W: https://github.com/tianocore/tianocore.github.io/wiki/UnixPkg > -S: Obsolete (Use EmulatorPkg instead) > - > -Vlv2DeviceRefCodePkg > -M: David Wei <[email protected]> > -M: Mang Guo <[email protected]> > - > -Vlv2TbltDevicePkg > -M: David Wei <[email protected]> > -M: Mang Guo <[email protected]> > diff --git a/UefiCpuPkg/Include/Library/LocalApicLib.h > b/UefiCpuPkg/Include/Library/LocalApicLib.h > old mode 100644 > new mode 100755 > index cd4e613..4abf64c > --- a/UefiCpuPkg/Include/Library/LocalApicLib.h > +++ b/UefiCpuPkg/Include/Library/LocalApicLib.h > @@ -21,6 +21,9 @@ > #define LOCAL_APIC_MODE_XAPIC 0x1 ///< xAPIC mode. > #define LOCAL_APIC_MODE_X2APIC 0x2 ///< x2APIC mode. > > +#include <PiPei.h> > +#include <Protocol/MpService.h> > + > /** > Retrieve the base address of local APIC. > > @@ -410,6 +413,21 @@ GetApicMsiValue ( > IN BOOLEAN LevelTriggered, > IN BOOLEAN AssertionLevel > ); > + > +/** > +Get Package ID/Core ID/Thread ID of a processor. > + > +The algorithm assumes the target system has symmetry across physical > +package boundaries with respect to the number of logical processors per > package, number of cores per package. > + > +@param InitialApicId Must be the initial APIC ID of the target logical > processor. > +@param Location Returns the processor location information. > +**/ > +VOID > +GetProcessorLocation( > + IN UINT32 InitialApicId, > + OUT EFI_CPU_PHYSICAL_LOCATION *Location ); > > #endif > > diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c > b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c > old mode 100644 > new mode 100755 > index 8d0fb02..219f99f > --- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c > +++ b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c > @@ -941,3 +941,133 @@ GetApicMsiValue ( > } > return MsiData.Uint64; > } > + > +/** > +Get Package ID/Core ID/Thread ID of a processor. > + > +The algorithm assumes the target system has symmetry across physical > +package boundaries with respect to the number of logical processors per > package, number of cores per package. > + > +@param InitialApicId Must be the initial APIC ID of the target logical > processor. > +@param Location Returns the processor location information. > +**/ > +VOID > +GetProcessorLocation( > +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)); } > diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c > b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c > old mode 100644 > new mode 100755 > index 4c42696..16395a3 > --- a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c > +++ b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c > @@ -1036,3 +1036,133 @@ GetApicMsiValue ( > } > return MsiData.Uint64; > } > + > +/** > +Get Package ID/Core ID/Thread ID of a processor. > + > +The algorithm assumes the target system has symmetry across physical > +package boundaries with respect to the number of logical processors per > package, number of cores per package. > + > +@param InitialApicId Must be the initial APIC ID of the target logical > processor. > +@param Location Returns the processor location information. > +**/ > +VOID > +GetProcessorLocation( > +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)); } > diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c > b/UefiCpuPkg/Library/MpInitLib/MpLib.c > old mode 100644 > new mode 100755 > index c3fe721..f3380bb > --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c > +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c > @@ -58,132 +58,6 @@ IsBspExecuteDisableEnabled ( } > > /** > - 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(). > > Worker function for SwitchBSP(), assigned to the AP which is intended @@ > -1451,7 +1325,7 @@ MpInitLibGetProcessorInfo ( > // > // Get processor location information > // > - ExtractProcessorLocation (CpuMpData- > >CpuData[ProcessorNumber].ApicId, &ProcessorInfoBuffer->Location); > + GetProcessorLocation (CpuMpData->CpuData[ProcessorNumber].ApicId, > + &ProcessorInfoBuffer->Location); > > if (HealthData != NULL) { > HealthData->Uint32 = CpuMpData->CpuData[ProcessorNumber].Health; > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c > b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c > old mode 100644 > new mode 100755 > index 40f2a17..67cd0a0 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c > @@ -27,125 +27,6 @@ EFI_SMM_CPU_SERVICE_PROTOCOL > mSmmCpuService = { }; > > /** > - Get Package ID/Core ID/Thread ID of a processor. > - > - APIC ID must be an initial APIC ID. > - > - The algorithm below assumes the target system has symmetry across > physical package boundaries > - with respect to the number of logical processors per package, number of > cores per package. > - > - @param ApicId APIC ID of the target logical processor. > - @param Location Returns the processor location information. > -**/ > -VOID > -SmmGetProcessorLocation ( > - IN UINT32 ApicId, > - OUT EFI_CPU_PHYSICAL_LOCATION *Location > - ) > -{ > - UINTN ThreadBits; > - UINTN CoreBits; > - UINT32 RegEax; > - UINT32 RegEbx; > - UINT32 RegEcx; > - UINT32 RegEdx; > - UINT32 MaxCpuIdIndex; > - UINT32 SubIndex; > - UINTN LevelType; > - UINT32 MaxLogicProcessorsPerPackage; > - UINT32 MaxCoresPerPackage; > - BOOLEAN TopologyLeafSupported; > - > - ASSERT (Location != NULL); > - > - ThreadBits = 0; > - CoreBits = 0; > - TopologyLeafSupported = FALSE; > - > - // > - // Check if the processor is capable of supporting more than one logical > processor. > - // > - AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, &RegEdx); > - ASSERT ((RegEdx & BIT28) != 0); > - > - // > - // Assume three-level mapping of APIC ID: Package:Core:SMT. > - // > - > - // > - // 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, &RegEax, &RegEbx, > &RegEcx, 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 ((RegEbx & 0xffff) != 0) { > - TopologyLeafSupported = TRUE; > - > - // > - // Sub-leaf index 0 (ECX= 0 as input) provides enumeration parameters > to > extract > - // the SMT sub-field of x2APIC ID. > - // > - LevelType = (RegEcx >> 8) & 0xff; > - ASSERT (LevelType == > CPUID_EXTENDED_TOPOLOGY_LEVEL_TYPE_SMT); > - if ((RegEbx & 0xffff) > 1 ) { > - ThreadBits = RegEax & 0x1f; > - } else { > - // > - // HT is not supported > - // > - ThreadBits = 0; > - } > - > - // > - // 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, &RegEax, NULL, > &RegEcx, NULL); > - LevelType = (RegEcx >> 8) & 0xff; > - if (LevelType == CPUID_EXTENDED_TOPOLOGY_LEVEL_TYPE_CORE) { > - CoreBits = (RegEax & 0x1f) - ThreadBits; > - break; > - } > - SubIndex++; > - } while (LevelType != > CPUID_EXTENDED_TOPOLOGY_LEVEL_TYPE_INVALID); > - } > - } > - > - if (!TopologyLeafSupported) { > - AsmCpuid (CPUID_VERSION_INFO, NULL, &RegEbx, NULL, NULL); > - MaxLogicProcessorsPerPackage = (RegEbx >> 16) & 0xff; > - if (MaxCpuIdIndex >= CPUID_CACHE_PARAMS) { > - AsmCpuidEx (CPUID_CACHE_PARAMS, 0, &RegEax, NULL, NULL, NULL); > - MaxCoresPerPackage = (RegEax >> 26) + 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 = ApicId & ~((-1) << ThreadBits); > - Location->Core = (ApicId >> ThreadBits) & ~((-1) << CoreBits); > - Location->Package = (ApicId >> (ThreadBits+ CoreBits)); -} > - > -/** > Gets processor information on the requested processor at the instant this > call is made. > > @param[in] This A pointer to the > EFI_SMM_CPU_SERVICE_PROTOCOL instance. > @@ -280,7 +161,7 @@ SmmAddProcessor ( > gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId == > INVALID_APIC_ID) { > gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId = ProcessorId; > gSmmCpuPrivate->ProcessorInfo[Index].StatusFlag = 0; > - SmmGetProcessorLocation ((UINT32)ProcessorId, &gSmmCpuPrivate- > >ProcessorInfo[Index].Location); > + GetProcessorLocation ((UINT32)ProcessorId, > + &gSmmCpuPrivate->ProcessorInfo[Index].Location); > > *ProcessorNumber = Index; > gSmmCpuPrivate->Operation[Index] = SmmCpuAdd; > -- > 1.9.1
_______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
