From nobody Mon Apr 29 08:43:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+100778+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+100778+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1678170709; cv=none; d=zohomail.com; s=zohoarc; b=Io6OFZJO+OYGExjxyJtFYXl/AJM4tUORnw81Z8QHOxxflY9LzU7DBTQvBT20eS9kTfrbMM851HX8NcVGHD1rilLak84+iiIdYo8qjC3LIw2uv49f+2yYLNOz2WLefztTH2n/cSQzE22aHmdiuu8kV7ULlcoEGwvWDkc0iHxIqQo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678170709; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=0yYAPXlv8gUDAlktIw8aoZ2jDimtRlJz+YLiPFessiU=; b=Hhw40jrS/K84BAi3IB9K5qHI//P0yBktPr+jHiOc0el0Uy/FCcPOT1hKUHgW6kV3uXDuwUx1EYlOB8vvz9+7/0Hoz2aK9zCDdnxp5e8ciSmQvTfxH93YFIipG6/LareIFNd6n1hmbxA813t40KA2dThgF0m8ZteQGp0l2AvWQbs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+100778+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1678170709470731.0860480803833; Mon, 6 Mar 2023 22:31:49 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id eSrVYY1788612xpl2fYIav5O; Mon, 06 Mar 2023 22:31:49 -0800 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.8782.1678170707774506721 for ; Mon, 06 Mar 2023 22:31:48 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10641"; a="319605587" X-IronPort-AV: E=Sophos;i="5.98,240,1673942400"; d="scan'208";a="319605587" X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 22:31:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10641"; a="765519047" X-IronPort-AV: E=Sophos;i="5.98,240,1673942400"; d="scan'208";a="765519047" X-Received: from shwdesfp01.ccr.corp.intel.com ([10.239.158.151]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 22:31:43 -0800 From: "Zhiguang Liu" To: devel@edk2.groups.io Cc: Zhiguang Liu , Eric Dong , Ray Ni , Rahul Kumar , Gerd Hoffmann , Star Zeng , Mike Maslenkin Subject: [edk2-devel] [PATCH v2] UefiCpuPkg: Calculate DisplayFamily correctly Date: Tue, 7 Mar 2023 14:31:36 +0800 Message-Id: <20230307063136.1615-1-zhiguang.liu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhiguang.liu@intel.com X-Gm-Message-State: zU3Q0JsXe80FXonahAasy4b5x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1678170709; bh=B2QZ84pwYrn/AOFItBMBpZR8tULdprEpnoIbNPM8Mek=; h=Cc:Date:From:Reply-To:Subject:To; b=bKdzCsv6pX/XK1rYJ0p7XD+RQnyxY5lSpy6S/yk3pa0ZeX8YQoebCbxASSY3B3rtp/+ H8xG5xIMS0v+LdyIuNTVjL20PfSdXAHeFac26IzES8miX4eO+w60mDokR/5fkkMH2Mte4 Mcg2CYqNAxoyc+7nL7RkEMkJQJNOWbLuX04= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1678170710046100002 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4348 Per SDM: DisplayFamily =3D Extended_Family_ID + Family_ID. DisplayModelID =3D (Extended_Model_ID << 4) + Family_ID. Correct the related code. Cc: Eric Dong Reviewed-by: Ray Ni Cc: Rahul Kumar Cc: Gerd Hoffmann Reviewed-by: Star Zeng Cc: Mike Maslenkin Signed-off-by: Zhiguang Liu Acked-by: Gerd Hoffmann --- 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. =20 - Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.
+ Copyright (c) 2016 - 2023, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -217,12 +217,12 @@ CpuidVersionInfo ( =20 DisplayFamily =3D Eax.Bits.FamilyId; if (Eax.Bits.FamilyId =3D=3D 0x0F) { - DisplayFamily |=3D (Eax.Bits.ExtendedFamilyId << 4); + DisplayFamily +=3D Eax.Bits.ExtendedFamilyId; } =20 DisplayModel =3D Eax.Bits.Model; if ((Eax.Bits.FamilyId =3D=3D 0x06) || (Eax.Bits.FamilyId =3D=3D 0x0f)) { - DisplayModel |=3D (Eax.Bits.ExtendedModelId << 4); + DisplayModel +=3D (Eax.Bits.ExtendedModelId << 4); } =20 Print (L" Family =3D %x Model =3D %x Stepping =3D %x\n", DisplayFamil= y, DisplayModel, Eax.Bits.SteppingId); diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitializ= e.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. =20 - Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.
+ Copyright (c) 2017 - 2023, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -67,12 +67,12 @@ FillProcessorInfo ( =20 DisplayedFamily =3D Eax.Bits.FamilyId; if (Eax.Bits.FamilyId =3D=3D 0x0F) { - DisplayedFamily |=3D (Eax.Bits.ExtendedFamilyId << 4); + DisplayedFamily +=3D Eax.Bits.ExtendedFamilyId; } =20 DisplayedModel =3D Eax.Bits.Model; if ((Eax.Bits.FamilyId =3D=3D 0x06) || (Eax.Bits.FamilyId =3D=3D 0x0f)) { - DisplayedModel |=3D (Eax.Bits.ExtendedModelId << 4); + DisplayedModel +=3D (Eax.Bits.ExtendedModelId << 4); } =20 CpuInfo->DisplayFamily =3D DisplayedFamily; --=20 2.31.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#100778): https://edk2.groups.io/g/devel/message/100778 Mute This Topic: https://groups.io/mt/97444543/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-