From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web10.30175.1678099050347915867 for ; Mon, 06 Mar 2023 02:37:30 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=bfG7g+bv; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: star.zeng@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678099050; x=1709635050; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=gyOuHuok9oz4NJMT813LzqJKxB+uy2s0oj5VYSScbOA=; b=bfG7g+bvZbEnDRrBa15uTqfv4FyVuHTMfhInX+C4DQHCfxceEVNcr79d K5gFl5gLuV5X730KJO/fegakQZue8D/15AIruKtNdhEitWicGRyH2O7rW VR2DXSMYRpM9fYvwEEuwgjefJcHDftCQc1h2J2JYqqV201bi/p/IwNBk1 hfaU5GiNNEXlhFafwKpynuSlRXKL5NXCEYNlAAn2VSip99FJN4YVbm6bm yhN9VI+f6IxdDALHTtyxe+ZEz0bUYsA7LwmcdRfkoUuC3InX/DtE8cSW8 QEEf0ELgqRyiaItKfwWlHDI7pIoSHtW4ZK5HjliaYmP7nnA7tVFLlPB3Y w==; X-IronPort-AV: E=McAfee;i="6500,9779,10640"; a="334237564" X-IronPort-AV: E=Sophos;i="5.98,236,1673942400"; d="scan'208";a="334237564" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 02:37:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10640"; a="819260219" X-IronPort-AV: E=Sophos;i="5.98,236,1673942400"; d="scan'208";a="819260219" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga001.fm.intel.com with ESMTP; 06 Mar 2023 02:37:29 -0800 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Mon, 6 Mar 2023 02:37:29 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21 via Frontend Transport; Mon, 6 Mar 2023 02:37:29 -0800 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.101) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.21; Mon, 6 Mar 2023 02:37:28 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F64jaN8M0pusRiUPSB3sMjlqvUrvCURkb4EYTj2D+VO+gn0ZevBFjYV14jQveD/AzbNUU9wXSyiAGXqutHLZ847rJdp56Q+SbBoasmxfnT33jW87xsyGzgl9WICVpKaxQa7dgFCp3vBwRehzJ1LGqvlVkLHaI34eitP61mE+gfs0Ssgj7Lx+jEEWXziVg+f0ocxyWcg/yS1zDm4diAAkXN+5GyGUFbVIkOoYZbl9Bw+K99SjER7cap5yTjBau86Lwekb91hD1joX3adejoi7185yu+q989OQk244fPR8LkXbnPkxjf/QH1v3aLoZxc2kv40g1tSoNz2AYUBjsTsP7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vnsHhrFAGt9sEitVE28+NJyRToRHS3m6eWR8Y0zgZIg=; b=AqEIYQ0fyBIwqQBmzrZYC0cJW2EClr6bIU9y+4kahvNa3oQUK94BqWXpaqMgmdJMdlrfAazz+POKFm6y/ics+oz4aDhj1pGlkcHDGQvHypE3+nmSh2tJThE+E/ShJA8PW76G+VwxWCpB4xB7EfnCiRuvtRIxJLcM2ROwk1ZUbAeBAND3vViThD/FCM+jntxwVFDVI4WJ4qS+CnyPZxTsxQKKbQ1r0qBfr/692X4n3mzl4KFzGMZ0zNaC9nxQFJU8DXdovd+AFZquLY73fhvOBwRwiSsubkut3izd2yCthPDYdiLP/GbHpabOvHFfQu1XYBLGrQf7E7TXBBM2q2c4Wg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from DM8PR11MB5623.namprd11.prod.outlook.com (2603:10b6:8:25::20) by MW5PR11MB5884.namprd11.prod.outlook.com (2603:10b6:303:1a0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.28; Mon, 6 Mar 2023 10:37:22 +0000 Received: from DM8PR11MB5623.namprd11.prod.outlook.com ([fe80::4548:1db9:bd40:4a26]) by DM8PR11MB5623.namprd11.prod.outlook.com ([fe80::4548:1db9:bd40:4a26%9]) with mapi id 15.20.6156.027; Mon, 6 Mar 2023 10:37:22 +0000 From: "Zeng, Star" To: "devel@edk2.groups.io" , "Zeng, Star" , "Liu, Zhiguang" CC: "Dong, Eric" , "Ni, Ray" , "Kumar, Rahul R" , Gerd Hoffmann , "Zeng, Star" Subject: Re: [edk2-devel] [PATCH] UefiCpuPkg: Calculate DisplayFamily correctly Thread-Topic: [edk2-devel] [PATCH] UefiCpuPkg: Calculate DisplayFamily correctly Thread-Index: AQHZTKYi/TLdJfKnM0m5WkhICrGJEa7tlTJwgAAAchA= Date: Mon, 6 Mar 2023 10:37:21 +0000 Message-ID: References: <20230302012649.1512-1-zhiguang.liu@intel.com> <1749CE106AC7BFA5.3736@groups.io> In-Reply-To: <1749CE106AC7BFA5.3736@groups.io> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM8PR11MB5623:EE_|MW5PR11MB5884:EE_ x-ms-office365-filtering-correlation-id: d802701a-4014-4096-3a38-08db1e2ec4a7 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: A/Q3NGVdP5GvZ/rxjdTnUZbp9h8uz3nX+840QdfRdqk5V4k3dHURkBd3ZbPuCe483sNxF7SpQnES0Ia+T9S+celt4MhT83W7/uHR1ULORwKR89E3t1IZ7g3qlHrgJEA17jx5l4c2Ut5O/xYLxUSet2zORy7DA3m2UOORzW2Hw6uKg9+rVp5TIROP4GXiwmG2Z/lkxv+7MabFE4siE+HQ9TWvbkysJVnakNjk+JU+1yL6uFPO+J0hcHi6kaH915SztN4KNZ2hPW+jAMoJf8dbK+R4QFd1D4Y2pNXLZDX6kBoxkiB4llLTcNwhHLOHsYhOzoDKsiqEkcRW3daHRRckmawXgaCZF9MD7DiGu2SbhQuPDUWrG2j6DczLr/3vr/1PQ8mbX62sjOQSHykxgJ9vJyiz9BhTGogdjo0WXVun1ozs4GWEaPYqbqEsVZ9cnMFIQ9WhLZfP4ZjFOqj8LgDuVdtlGfmnSRYnrKqCY3LHr5WSf2u8UQdf4IGWG1QrxwTxePGA81Ek29CP05fTRzT9nnzEBWlwZ64+5fnNiUATBGJTz+DX83QZLEd93f4zBmirM7vKoRoujEshWjAcai8nMwOvr9x2BuWhLSczBOOEix6fweJR6RYmyyFymf6LAyhMj0oF/yjnWqYjsMpzXt2Z17D/QvPf94K3YTKe18cGukI5zqN5KifwZ/k/tqqYsP9kyR0ugq/8Ajw6jLfyXC9/X+5RlYjrutzxa18ETdGntkk= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM8PR11MB5623.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(39860400002)(346002)(376002)(136003)(366004)(396003)(451199018)(110136005)(54906003)(6636002)(966005)(316002)(83380400001)(33656002)(55016003)(86362001)(66899018)(9686003)(186003)(2906002)(5660300002)(76116006)(66446008)(66556008)(8936002)(66946007)(41300700001)(66476007)(4326008)(8676002)(478600001)(53546011)(6506007)(26005)(64756008)(107886003)(71200400001)(82960400001)(7696005)(122000001)(52536014)(38100700002)(38070700005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Z2x2FEHwwMDHxL5zQDMH8ey58FMjHdef2uPeosXUqs5WhfA5KDHbjOPwCaLd?= =?us-ascii?Q?Wx/scw70LN8X4+ZTIwo12tVOfU0FlDUpaZv8UHgcaaOW5KdNmK25XH+jnDpp?= =?us-ascii?Q?ZgEX9R/mw7Wwo+aEqWO6CfDpDc6ZODf6QS4xT2p18ULXQYCvTGOZw7prqm/r?= =?us-ascii?Q?SW34chj+WX3nRzlO0rRaM9yKInYuabJpt5Jt5pZsQI7ldZxEBZSpz4wI26m2?= =?us-ascii?Q?CveCl7p457bMzZE7AuS+9V+cDFzluRC1MoaIodHzEXNMvnU0n10NbODt9XE8?= =?us-ascii?Q?0tzDwA1yMMFVpcQspjgA/6X1RRsf6G5j5/ssnnZzZrMhIoEeWd3YsOd3Shr1?= =?us-ascii?Q?qtrR4E400Zdql+KAHeylS1pI6h9Ko5Hc+T+qqPqR0uu3o0LQ1oJfwZ/rMWZQ?= =?us-ascii?Q?biiitcgodWQJoZmRlKDF5MY7jumo17ieNi1B3tpgAPb3PyrdDpTAZu0Jm+Yd?= =?us-ascii?Q?wTVevS2TWJo5ICWPrpchiumXsFxn/uNGuTokyp57dtGazKPNehrAFjrSrKyZ?= =?us-ascii?Q?S+NfeGQdpMlFKmdmMfMN44yRJmBPD+JRpyfA597Pscz46r0vcsXqhsRqrGuC?= =?us-ascii?Q?wZzKIiWGCbqGBGptQ2YrW3Km/upxUKEbdAcY57HleVQ8Ca1JT0x3CAyE3/tO?= =?us-ascii?Q?gp5oUkAgXgsr3UaCCUQNyOwzGOy39B1BtaHO210qIv5q8euIzMGbbUQsDp/9?= =?us-ascii?Q?+LuRR445qC28RxCyxSGdHmAtRsL2OxlDnlAJQenDQddMW4WPrqrbbSU2wc2+?= =?us-ascii?Q?JP5dYgyRF+Qg4Gsph31QBf1Crs2RwG5cFT5TprQMjfg9IzJ7voXIQ8pIIRE6?= =?us-ascii?Q?0WJX6KZmo62iDaLEoE6gzordsD4WQ/KO418elvDuHKvQwQC1F3j+3agLMP2s?= =?us-ascii?Q?9iTJI3d62u8XQvr3xCPGfDKf8hkOORDcUHx81adKDFGep8fnzWJPQt5LvLWs?= =?us-ascii?Q?he76o1eD5a9I9fyV+VpZjstdcu066Egf7ujW7AVxQ/BV8thsYk0xmhcKSxFN?= =?us-ascii?Q?8pTPiERWSFj32JUi4aFKR/I+CjBIz+KrqtzZ4AeAfPLAAU0LsKyeK7eB+8iE?= =?us-ascii?Q?dzXkdAsNLTQbdqQw/TUVYRK13xVRp0ktrmYpiUdaq2ZMog8KcjYm6RuOEFYh?= =?us-ascii?Q?9l1JetEtaqCTsKviCfJOHcqZlXk0cKpbHWF6uiYWZFSBJFsAMi6vSOmzBUaD?= =?us-ascii?Q?U1n078XnUY2iI33XkwMAlKHbSkPgmP2YIK220pRUiu/fkl87LcvKdhJqLUol?= =?us-ascii?Q?ELlf5IEyBz+3sJLjf7WsSUpdivi6q91uvbeV4JU+ixH88Qo85bs0JJeTULxM?= =?us-ascii?Q?Jpe/S2Fc9qLshK2KQX54/qv9j0UoC0Hjv99o0tH0W/0op1qbonfkXLUAvp09?= =?us-ascii?Q?VQNqnvU0ugVmlO3LkgIyA9g5SQ8wSUjP7X6W33PEjZ2AarsRVEozppo0dSx/?= =?us-ascii?Q?+Vn/UBs2K0GxrUkdZnHhu+l9yG5c+kh9NvN5Gv3s7J6qmypFdykRgkthuMFS?= =?us-ascii?Q?dNzeSV+bp8i/K0Nlv3GXcSbAyzKfJH7O3RK4kpi+j2vdTkZEXmwu40XoMJcG?= =?us-ascii?Q?9AM5P1guB9L4273FF4DK8mTivuQXMjs2hpkBFDIv?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8PR11MB5623.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d802701a-4014-4096-3a38-08db1e2ec4a7 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Mar 2023 10:37:21.9523 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: iplbMaSxQi5LXIBWbyRxzR6Mj4IOv+84/H4e6MatakrePBJRUQA8Mfu+pJ/pD0PuIoaPgd00DFTQu485JTaKPQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR11MB5884 Return-Path: star.zeng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable BTW, look like wrong Bugzilla ID is used in commit message, please correct = it when merging the patch. -----Original Message----- From: devel@edk2.groups.io On Behalf Of Zeng, Star Sent: Monday, March 6, 2023 6:35 PM To: devel@edk2.groups.io; Liu, Zhiguang Cc: Dong, Eric ; Ni, Ray ; Kumar, Ra= hul R ; Gerd Hoffmann ; Zeng, S= tar Subject: Re: [edk2-devel] [PATCH] UefiCpuPkg: Calculate DisplayFamily corre= ctly Reviewed-by: Star Zeng -----Original Message----- From: devel@edk2.groups.io On Behalf Of Zhiguang Liu Sent: Thursday, March 2, 2023 9:27 AM To: devel@edk2.groups.io Cc: Liu, Zhiguang ; Dong, Eric ; Ni, Ray ; Kumar, Rahul R ; Ge= rd Hoffmann Subject: [edk2-devel] [PATCH] UefiCpuPkg: Calculate DisplayFamily correctly 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 --- 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