summaryrefslogtreecommitdiffstats
path: root/UefiCpuPkg
diff options
context:
space:
mode:
authorRay Ni <ray.ni@intel.com>2023-02-28 16:18:08 +0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-04-01 01:08:34 +0000
commitbb5c115fa61b727002f0aa2170c0881a6424b4e0 (patch)
treefdeeeba1ffdcce34da6e6efc41e9aec83e972eab /UefiCpuPkg
parent24f57f96487da290a9725b0200e0fd520898b655 (diff)
downloadedk2-bb5c115fa61b727002f0aa2170c0881a6424b4e0.tar.gz
edk2-bb5c115fa61b727002f0aa2170c0881a6424b4e0.tar.bz2
edk2-bb5c115fa61b727002f0aa2170c0881a6424b4e0.zip
UefiCpuPkg/MtrrTest: Only claim CPUID max leaf as 1
MtrrLib code queries the CPUID leaf 7h result if support. Update Test code temporary to claim the CPUID only supports max leaf as 1 so MtrrLib skips to query CPUID leaf 7h. Signed-off-by: Ray Ni <ray.ni@intel.com> Cc: Eric Dong <eric.dong@intel.com> Cc: Rahul Kumar <rahul1.kumar@intel.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Ahmad Anadani <ahmad.anadani@intel.com> Acked-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Diffstat (limited to 'UefiCpuPkg')
-rw-r--r--UefiCpuPkg/Library/MtrrLib/UnitTest/Support.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/UefiCpuPkg/Library/MtrrLib/UnitTest/Support.c b/UefiCpuPkg/Library/MtrrLib/UnitTest/Support.c
index 748c403281..260966e7b6 100644
--- a/UefiCpuPkg/Library/MtrrLib/UnitTest/Support.c
+++ b/UefiCpuPkg/Library/MtrrLib/UnitTest/Support.c
@@ -1,7 +1,7 @@
/** @file
Unit tests of the MtrrLib instance of the MtrrLib class
- Copyright (c) 2018 - 2020, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2018 - 2023, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -122,6 +122,13 @@ UnitTestMtrrLibAsmCpuid (
)
{
switch (Index) {
+ case CPUID_SIGNATURE:
+ if (Eax != NULL) {
+ *Eax = CPUID_VERSION_INFO;
+ }
+
+ return Index;
+ break;
case CPUID_VERSION_INFO:
if (Edx != NULL) {
*Edx = mCpuidVersionInfoEdx.Uint32;