Reviewed-by: Ray Ni <ray...@intel.com> > -----Original Message----- > From: Liu, Zhiguang <zhiguang....@intel.com> > Sent: Tuesday, March 7, 2023 2:32 PM > To: devel@edk2.groups.io > Cc: Liu, Zhiguang <zhiguang....@intel.com>; Dong, Eric > <eric.d...@intel.com>; Ni, Ray <ray...@intel.com>; Kumar, Rahul R > <rahul.r.ku...@intel.com>; Gerd Hoffmann <kra...@redhat.com>; Zeng, > Star <star.z...@intel.com>; Mike Maslenkin <mike.maslen...@gmail.com> > Subject: [PATCH v2] UefiCpuPkg: Calculate DisplayFamily correctly > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4348 > > Per SDM: > DisplayFamily = Extended_Family_ID + Family_ID. > DisplayModelID = (Extended_Model_ID << 4) + Family_ID. > Correct the related code. > > Cc: Eric Dong <eric.d...@intel.com> > Reviewed-by: Ray Ni <ray...@intel.com> > Cc: Rahul Kumar <rahul1.ku...@intel.com> > Cc: Gerd Hoffmann <kra...@redhat.com> > Reviewed-by: Star Zeng <star.z...@intel.com> > Cc: Mike Maslenkin <mike.maslen...@gmail.com> > Signed-off-by: Zhiguang Liu <zhiguang....@intel.com> > --- > UefiCpuPkg/Application/Cpuid/Cpuid.c | 6 +++--- > .../Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c > b/UefiCpuPkg/Application/Cpuid/Cpuid.c > index 372c6ef87d..172476a275 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,12 +217,12 @@ CpuidVersionInfo ( > > DisplayFamily = Eax.Bits.FamilyId; > if (Eax.Bits.FamilyId == 0x0F) { > - DisplayFamily |= (Eax.Bits.ExtendedFamilyId << 4); > + DisplayFamily += Eax.Bits.ExtendedFamilyId; > } > > DisplayModel = Eax.Bits.Model; > if ((Eax.Bits.FamilyId == 0x06) || (Eax.Bits.FamilyId == 0x0f)) { > - DisplayModel |= (Eax.Bits.ExtendedModelId << 4); > + DisplayModel += (Eax.Bits.ExtendedModelId << 4); > } > > Print (L" Family = %x Model = %x Stepping = %x\n", DisplayFamily, > DisplayModel, Eax.Bits.SteppingId); > diff --git > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > index a8e4f920fc..552fdab417 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,12 +67,12 @@ FillProcessorInfo ( > > DisplayedFamily = Eax.Bits.FamilyId; > if (Eax.Bits.FamilyId == 0x0F) { > - DisplayedFamily |= (Eax.Bits.ExtendedFamilyId << 4); > + DisplayedFamily += Eax.Bits.ExtendedFamilyId; > } > > DisplayedModel = Eax.Bits.Model; > if ((Eax.Bits.FamilyId == 0x06) || (Eax.Bits.FamilyId == 0x0f)) { > - DisplayedModel |= (Eax.Bits.ExtendedModelId << 4); > + DisplayedModel += (Eax.Bits.ExtendedModelId << 4); > } > > CpuInfo->DisplayFamily = DisplayedFamily; > -- > 2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#100779): https://edk2.groups.io/g/devel/message/100779 Mute This Topic: https://groups.io/mt/97444543/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
