From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.30214.1678098905794203490 for ; Mon, 06 Mar 2023 02:35:06 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=R+e3Z69g; spf=pass (domain: intel.com, ip: 134.134.136.24, 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=1678098905; x=1709634905; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=liqUVLT+4KMEvsfJok8H0KclnIHaFSXmd7ca+DEh160=; b=R+e3Z69g936U0MesHrwwZ9aU7Shq2k+xa/OYk1l8JgHr+32XxcFtXFCW iM7i5CDRZbMA3RxN3aicx2JMEMsybDrHWMIjm5SdRMqJ2v7KE3nMWmK0E vbFINdQs7DgE6CpwRH++mz/mZkkMeIdCDOuqMlLEMyh94Th2Y9YydsB94 55tpqFBSjDWGTRLMy+waJhgjHRX7a6VIKSJ0LTgjTVqMg7jNs4bjFh6mo VR0QNyFnH/G/2ZpQyPEn98nz2EE1KaQYyLNAf0OYrjfQurCksp2kXxk5u uXbsw04esQUdKRYksmHwHeZ/rIzUiD/Rt2APunp3QGUHPNULHFufHH5Tb w==; X-IronPort-AV: E=McAfee;i="6500,9779,10640"; a="337039832" X-IronPort-AV: E=Sophos;i="5.98,236,1673942400"; d="scan'208";a="337039832" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 02:35:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10640"; a="678418670" X-IronPort-AV: E=Sophos;i="5.98,236,1673942400"; d="scan'208";a="678418670" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga007.fm.intel.com with ESMTP; 06 Mar 2023 02:35:05 -0800 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx602.amr.corp.intel.com (10.18.126.82) 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:35:04 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) 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; Mon, 6 Mar 2023 02:35:04 -0800 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx610.amr.corp.intel.com (10.18.126.90) 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:35:04 -0800 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.103) by edgegateway.intel.com (192.55.55.71) 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:35:03 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b221gnCGdvE8rBszfcrvTONjX5tLykMQPccmXedoyiu6HBboD+qlDj0Nc5k+4UjE5zRgBhU3F4c9NnzDck23Ij459U2SHgFu/rEKRPcfGqAO1ZkQPPxDkXmYPhkoJmvjUaiY/Whyq8QHUA6/kuXZTvvEGaywsN+d6b8Bgri5aTqdLYsT9oNtXLHv1R+vNxJuMYmcOmHJyxAAYVH6pUOmAq30WDThjUiGWBijGnQ4PM7t7jpXd++RpSiMgjLtf7VKDyBZKO6ezOZyki0kt+2Wz5yqE/+3F4hkqedr7Kby/JCr6kyMDsR1+vx2PX6klqUpR3Ul83HK5xkCw8vjqHNZ+w== 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=x+ubnjssQ/gh3etz8K+ceZGtXL7sGkpOgz22lGVG0Lg=; b=Obc0UwU7levvayJQXSEALVBAWm5H/G6iWHhQPn07OatVsckj+h63XwexCENfR4T0hIgefDu+4Bdnsxz6NofGXuCDGe5KIJNoV2eXtWnG5zuszuvLRhHOf5FudenVwJcB5gcQZivm5EyzbLfk8+lVz+vO8yWuXQTtC/MFXt9rPLec6kIFGXs8YO2qbzpKb2qdo5X2Opc3wQs1PggAjxVitPfHIex6M+hXZIX3fp3ddCwdaPYvV4/b3L2PpcTGDlzk/dBc7IQid0JKYKYTD42pqv59QlGpfx6D0gby2qlm5ey57yj5Wcvg9vPuWVTeTVgQR06CmzA3RXBu4kKuERhzmw== 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 MN2PR11MB4552.namprd11.prod.outlook.com (2603:10b6:208:263::9) 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:34:57 +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:34:57 +0000 From: "Zeng, Star" To: "devel@edk2.groups.io" , "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/TLdJfKnM0m5WkhICrGJEa7tlTJw Date: Mon, 6 Mar 2023 10:34:56 +0000 Message-ID: References: <20230302012649.1512-1-zhiguang.liu@intel.com> In-Reply-To: <20230302012649.1512-1-zhiguang.liu@intel.com> 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_|MN2PR11MB4552:EE_ x-ms-office365-filtering-correlation-id: 986e6cb8-4f71-48dd-1bac-08db1e2e6e02 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: M9VzgP5toHCltCzf9HnIyd29v/cWvvkF3pmzpaEN+zRqM/N0OflMWeyOyzDIHJ/IGLyhBs3T/PrtmBeFSduVl0/E/kM11SNw03+Oh3XxTbYSvigKyYZBhPINi8RQEtYRqajLCZYse3KsC0tQ4l5/dlb9QG8KpuzZJgTkYN4VO9RZPiBwbwYrLEDkS3vL3wjb3T7wi9IahYPFD8A8j5O7WOk3lXxRsJKCLEjpuqCQ3zuLgbuGrt44RRmgGl+hFcR5Y6e+7dNh3cu1d4gfqaNpgAzoy2w5+pjeAGMNUlnyuHqKyoGBd/oZtGK75oobXZ2MWl5lCS0XH/k31AicVeioUDxYlWdbC7UVLlgE2PEko+PGy0JVUH9DueH21BI3+LVebOhwSa01cJvKJLPAbfmg5y2qXTI19sgET7XkyYWCzhcrd4fCtjk3OstEZEj/jEYMis+mEPyEWE0CFsYwUuoAcSDitmF13m7yWuN5cL+5O0EiutypcmLu1+1WrtF+FpTU5SKOe/f5BX0j1/UgVnvfpHJhR0XgGRET2EBKYN3rJ97IvdbsmEkoz9ipHOnj5wSM0vuUA+80YLTASzfBd12+S0zq05kHff8EuQyIk7mJkA7pwPmZwzwLBgZqFzmHolPz4aoeWPp2kmUozU8TLg7cTIY8Mlyx8iT/1WQVwkvT5wNiMqsUiEDqK0Y43yat6+6RjMzo4/fizwC9bvyrOsMh+Spqx3vclYar+m8AEllrqBw= 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)(396003)(366004)(136003)(451199018)(110136005)(54906003)(6636002)(966005)(316002)(83380400001)(66899018)(55016003)(33656002)(86362001)(64756008)(9686003)(186003)(82960400001)(2906002)(76116006)(5660300002)(66476007)(8936002)(66556008)(66946007)(8676002)(41300700001)(4326008)(478600001)(53546011)(26005)(6506007)(107886003)(66446008)(71200400001)(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?QcYFCNrWCGaOu1u6fMMZwWus+h6f6VhwxXFpSTGmUQudSeULU7wiPGBarGp/?= =?us-ascii?Q?9J4nVBbrKNsC9LL7TLqff/0D5mmG2wld2O5Dv06oMJj6tkvtW3H2Wroo+Tkj?= =?us-ascii?Q?ieR2Sd+6wwwMKHhs/S6VNNr8M2rViIXQBhFjItbLFXT0wGgR2PiNLfF7QOFA?= =?us-ascii?Q?fxSjIC+B2+JkmLIfCrvA3ijvVrdGGYvd+AaqQe890e69iLwWr9RMz1cjJdIh?= =?us-ascii?Q?Hq40XHUgaO8JgXJVq1GOjZis63C3DLSwy6pFH7jvCAe33Vj1V5FdTJBvE4qk?= =?us-ascii?Q?CwpEKxqtwN28wuNx91lyWD36LNjUE3eXFhJG5DsDG1PuvvFhABrHCNRmPkYW?= =?us-ascii?Q?8p5EZlarw+d6fkAdMFTnT1Bk2k4U6jwDKIEiznAFy7n63/XyYf7oInn+/+R6?= =?us-ascii?Q?tXoKOXV841LBbgT3gajovJzA8DFiJzWdN1kgbL2PyLr9PXJVCm8iBi4EcUzA?= =?us-ascii?Q?aj6PgDofszuVxtbyu8G5Xh2KYDtvtZgR2re/VNJ7teLDSK6haArtqBcBl30m?= =?us-ascii?Q?wO0Xmk4U6CoPj7h+DeBL0BfUC0gRr/4Yjxa8an49Xi5VgCqkTXKnv7tkb6IO?= =?us-ascii?Q?6Sl4+mfa1m6xqH5TFwzcUpdMgNejXmTKKW8NPorHuE14NCCWMr5LZRh2HTKf?= =?us-ascii?Q?pfP9YBOTIcUTyWWv+jyv9WRErnBYJ6STUOGSo4M5YW3yGh9a6auCTMf86Q6i?= =?us-ascii?Q?2HDCrmN19UZLJz742qu8WU0/vd6Ns8oZ6kzkror2fwk+DR03tyinW0uAvZ3A?= =?us-ascii?Q?dH+aW6B3vtoA/PCVi5iNEReus1tCEEcB/zgE4NlgpD0CxtKMq64QWYWHzNB1?= =?us-ascii?Q?DuOCIWnj3K67x7Jz6Khe8iOVHiCZfqRUgKloSJQHAsWoaNEOnDo1M6uUQq6v?= =?us-ascii?Q?wB55moi/Fjv1wPqIQAtuvUiYA1W6dT8SNJ+4r3dVAHqab3yXX9AffnJXbmpf?= =?us-ascii?Q?M7qpD/xOYiRktvPySumCHSyLfNJc7KzBhp6Qhhjk8FSxC0IWyPEdULCgfd03?= =?us-ascii?Q?kfC/JSxkOMHhvnuH4lWvlDRE0FQqAu0sfnHzIL8kFs+zrpkGYDWrHr31ZIeJ?= =?us-ascii?Q?pVp4ivj6N9iLJK3Da0bSlq+o4ISYnMZP0r7snw3Iym818M8V8MMfrIcY2Mc6?= =?us-ascii?Q?fSH2xCECLd2Hm3jPOeYXQOBsbOXir/lGHh1Y5woJrmAX0F1biMsJSXyl6CNE?= =?us-ascii?Q?nnX0Psf/BQ5yuvdcuIPzRSvbUoJOPDAdgQGeEhybMhfAsCZkkEusJ/cN3Yqm?= =?us-ascii?Q?EBIlioKqqDriZ4k/UDaEnzeWkXEik74M9OwCljw8Ha/FbuoXE4eJOrYCAY1T?= =?us-ascii?Q?wJcZbE139DwDce8tJ4MtLPLeHcfzSZ4hUK8re2QeDwQhC6TZwpD+mVVLmSdm?= =?us-ascii?Q?RXW70W5z9Bgi5bOFi3R9duFUvGf4Xd9gD3JSDLQHzUwkkjre3gt7LZMVMGkq?= =?us-ascii?Q?2GVwhL06zuxLTmJ6SLpaQ2GoTwY38v0jJsr6SiQU4Gca0C9DJV5kgngPYEN4?= =?us-ascii?Q?txkP5zMk/3aczhqOw/MTCfVv4vV4b5Ytc12ckN5LQfZKGJXn8EcUqA6DBeOr?= =?us-ascii?Q?V4cX8yn/fLb/omxhTIkCgX1+NYED8YfNaj7IGOxf?= 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: 986e6cb8-4f71-48dd-1bac-08db1e2e6e02 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Mar 2023 10:34:56.5860 (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: /xP/uUBf9hj/TO4BLCWaP+tmF03hmoP7URqYeJ3dG/kE8kzB8LDF5AMgMeKIsjQ/HymjClMkWrf/mYI7UJPizA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4552 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 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