From nobody Mon May 6 00:53:08 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+100614+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+100614+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1677720427; cv=none; d=zohomail.com; s=zohoarc; b=GSiiVGdlCzelCIsXOpC/vNzJupAEPMkKbjer5CGp82+Adf38yXsIa6HzfDkV96slwakEdFLaSzmVzW+tfHMg1GhYLd2/Y1bBLYhZTHuA8Ioe+d0VUBWdNe0cpHIHVkU9hK4eXrO4oXBhWlVcl1g2nILtaH7obsCyGdn+Za4o638= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677720427; 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=iA6Iuot57Uro/RaJlfyvIdg4qrFv1CctpzlR4WBN8Kw=; b=AgdkVJ4cJRJ/wQX1dszhNK3YZAgbWBKTiiOE7LaTX4HyjfSi72CbpEpFl1MHL2om+qw6sRtjZbM1cBa3VVBDk3dQzgdponilpaYSU8iF6ZKJ7QUDyNccXnZrxMbf9nXLmd/PVcxfcl7SgQ0SljVtWWXHTYfIyahsfjPPz3lecIk= 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+100614+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 1677720427956916.7633167803308; Wed, 1 Mar 2023 17:27:07 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id UXjJYY1788612xSsoXkqg3iU; Wed, 01 Mar 2023 17:27:07 -0800 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web11.4523.1677720426309381617 for ; Wed, 01 Mar 2023 17:27:06 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10636"; a="336875659" X-IronPort-AV: E=Sophos;i="5.98,226,1673942400"; d="scan'208";a="336875659" X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2023 17:27:05 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10636"; a="848891040" X-IronPort-AV: E=Sophos;i="5.98,226,1673942400"; d="scan'208";a="848891040" X-Received: from shwdesfp01.ccr.corp.intel.com ([10.239.158.151]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2023 17:27:03 -0800 From: "Zhiguang Liu" To: devel@edk2.groups.io Cc: Zhiguang Liu , Eric Dong , Ray Ni , Rahul Kumar , Gerd Hoffmann Subject: [edk2-devel] [PATCH] UefiCpuPkg: Calculate DisplayFamily correctly Date: Thu, 2 Mar 2023 09:26:49 +0800 Message-Id: <20230302012649.1512-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: x0sbsCMTllYmrFC22vNbWRovx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1677720427; bh=+9GOOXD26b4PZ0D+UZtjbDMwI+QMlOYl1AymsM2xRHQ=; h=Cc:Date:From:Reply-To:Subject:To; b=crSJDde+fVD95FZWafiLjJmFx61Ll5MQqMA/pApG5z8OKhI+7B5JeJm1MmvbEQYEoR4 GhP5/UhCVPmp2t9tFsdfRYOGy6YnfhaIi2t70ljL5JozVKkCEjwmxDxTHfiCR3ysMpUiH ZkySMHYcFy4vqbQmoWzyIPE9f4p9d27S/NY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1677720429022100002 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4238 Per SDM, DisplayFamily =3D Extended_Family_ID + Family_ID. Correct the related code. Cc: Eric Dong Cc: Ray Ni Cc: Rahul Kumar Cc: Gerd Hoffmann Signed-off-by: Zhiguang Liu Acked-by: Gerd Hoffmann Reviewed-by: Ray Ni Reviewed-by: Star Zeng --- 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. =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,7 +217,7 @@ 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; diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitializ= e.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. =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,7 +67,7 @@ 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; --=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 (#100614): https://edk2.groups.io/g/devel/message/100614 Mute This Topic: https://groups.io/mt/97330573/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-