diff options
| author | Tom Lendacky <thomas.lendacky@amd.com> | 2023-11-07 06:45:30 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-11-28 11:07:59 +0000 |
| commit | 447798cd3a78c8bfc5adb90254d50d22a838b301 (patch) | |
| tree | 4a5b1dcd0a236f6d8b33cb3a94fb9994d7a0c84d | |
| parent | d451bba399687b4102459db5a447fc9abb8fdee1 (diff) | |
| download | edk2-447798cd3a78c8bfc5adb90254d50d22a838b301.tar.gz edk2-447798cd3a78c8bfc5adb90254d50d22a838b301.tar.bz2 edk2-447798cd3a78c8bfc5adb90254d50d22a838b301.zip | |
UefiCpuPkg/MpInitLib: Use AsmCpuidEx() for CPUID_EXTENDED_TOPOLOGY leaf
The CPUID_EXTENDED_TOPOLOGY CPUID leaf takes a subleaf as input when
returning CPUID information. However, the AsmCpuid() function does not
zero out ECX before the CPUID instruction, so the input leaf is used as
the sub-leaf for the CPUID request and returns erroneous/invalid CPUID
data, since the intent of the request was to get data related to sub-leaf
0. Instead, use AsmCpuidEx() for the CPUID_EXTENDED_TOPOLOGY leaf.
Fixes: d4d7c9ad5fe5 ("UefiCpuPkg/MpInitLib: use BSP to do extended ...")
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
| -rw-r--r-- | UefiCpuPkg/Library/MpInitLib/AmdSev.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/UefiCpuPkg/Library/MpInitLib/AmdSev.c b/UefiCpuPkg/Library/MpInitLib/AmdSev.c index bda4960f6f..d34f9513e0 100644 --- a/UefiCpuPkg/Library/MpInitLib/AmdSev.c +++ b/UefiCpuPkg/Library/MpInitLib/AmdSev.c @@ -256,7 +256,14 @@ FillExchangeInfoDataSevEs ( if (StdRangeMax >= CPUID_EXTENDED_TOPOLOGY) {
CPUID_EXTENDED_TOPOLOGY_EBX ExtTopoEbx;
- AsmCpuid (CPUID_EXTENDED_TOPOLOGY, NULL, &ExtTopoEbx.Uint32, NULL, NULL);
+ AsmCpuidEx (
+ CPUID_EXTENDED_TOPOLOGY,
+ 0,
+ NULL,
+ &ExtTopoEbx.Uint32,
+ NULL,
+ NULL
+ );
ExchangeInfo->ExtTopoAvail = !!ExtTopoEbx.Bits.LogicalProcessors;
}
}
|