From: "Zhiguang Liu" <zhiguang.liu@intel.com>
To: devel@edk2.groups.io
Cc: Zhiguang Liu <zhiguang.liu@intel.com>,
Eric Dong <eric.dong@intel.com>, Ray Ni <ray.ni@intel.com>,
Rahul Kumar <rahul1.kumar@intel.com>,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH] UefiCpuPkg: Calculate DisplayFamily correctly
Date: Thu, 2 Mar 2023 09:26:49 +0800 [thread overview]
Message-ID: <20230302012649.1512-1-zhiguang.liu@intel.com> (raw)
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4238
Per SDM, DisplayFamily = Extended_Family_ID + Family_ID.
Correct the related code.
Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
UefiCpuPkg/Application/Cpuid/Cpuid.c | 4 ++--
.../Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c b/UefiCpuPkg/Application/Cpuid/Cpuid.c
index 372c6ef87d..51c463fb10 100644
--- a/UefiCpuPkg/Application/Cpuid/Cpuid.c
+++ b/UefiCpuPkg/Application/Cpuid/Cpuid.c
@@ -1,7 +1,7 @@
/** @file
UEFI Application to display CPUID leaf information.
- Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2016 - 2023, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -217,7 +217,7 @@ CpuidVersionInfo (
DisplayFamily = Eax.Bits.FamilyId;
if (Eax.Bits.FamilyId == 0x0F) {
- DisplayFamily |= (Eax.Bits.ExtendedFamilyId << 4);
+ DisplayFamily += Eax.Bits.ExtendedFamilyId;
}
DisplayModel = Eax.Bits.Model;
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
index a8e4f920fc..25b8958252 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
@@ -1,7 +1,7 @@
/** @file
CPU Features Initialize functions.
- Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2017 - 2023, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -67,7 +67,7 @@ FillProcessorInfo (
DisplayedFamily = Eax.Bits.FamilyId;
if (Eax.Bits.FamilyId == 0x0F) {
- DisplayedFamily |= (Eax.Bits.ExtendedFamilyId << 4);
+ DisplayedFamily += Eax.Bits.ExtendedFamilyId;
}
DisplayedModel = Eax.Bits.Model;
--
2.31.1.windows.1
next reply other threads:[~2023-03-02 1:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-02 1:26 Zhiguang Liu [this message]
2023-03-02 1:58 ` [PATCH] UefiCpuPkg: Calculate DisplayFamily correctly Ni, Ray
2023-03-02 7:13 ` Gerd Hoffmann
2023-03-06 10:34 ` [edk2-devel] " Zeng, Star
[not found] ` <1749CE106AC7BFA5.3736@groups.io>
2023-03-06 10:37 ` Zeng, Star
2023-03-06 11:13 ` Mike Maslenkin
2023-03-06 11:52 ` Ni, Ray
2023-03-06 13:36 ` Mike Maslenkin
2023-03-06 15:28 ` Chang, Abner
2023-03-07 1:50 ` Ni, Ray
2023-03-07 2:44 ` Zhiguang Liu
2023-03-07 1:23 ` Zhiguang Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230302012649.1512-1-zhiguang.liu@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox