From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Permerror (SPF Permanent Error: More than 10 MX records returned) identity=mailfrom; client-ip=134.134.136.20; helo=mga02.intel.com; envelope-from=binx.song@intel.com; receiver=edk2-devel@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 93A2B2035B2CD for ; Sun, 17 Dec 2017 21:31:50 -0800 (PST) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Dec 2017 21:36:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,420,1508828400"; d="dat'59?scan'59,208,59";a="13480586" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga004.fm.intel.com with ESMTP; 17 Dec 2017 21:36:35 -0800 Received: from fmsmsx114.amr.corp.intel.com (10.18.116.8) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 17 Dec 2017 21:36:34 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX114.amr.corp.intel.com (10.18.116.8) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 17 Dec 2017 21:36:34 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.175]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.218]) with mapi id 14.03.0319.002; Mon, 18 Dec 2017 13:36:32 +0800 From: "Song, BinX" To: "edk2-devel@lists.01.org" CC: "Dong, Eric" , "lersek@redhat.com" , "Ni, Ruiyu" , "Kinney, Michael D" Thread-Topic: [PATCH V2] UefiCpuPkg: Keep library class header file definition independent Thread-Index: AdN3wigofs9MnqffToa0lNS10cOMdw== Date: Mon, 18 Dec 2017 05:36:31 +0000 Message-ID: <559D2DF22BC9A3468B4FA1AA547F0EF1025C2B93@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: <559D2DF22BC9A3468B4FA1AA547F0EF1025C2B93@shsmsx102.ccr.corp.intel.com> dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.22 Subject: [PATCH V2] UefiCpuPkg: Keep library class header file definition independent X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2017 05:31:50 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable V2: Move CPU_FEATURE_MAX definition from header file to C file. V1: Keep library class header file definition independent Cc: Eric Dong Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Bell Song --- UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h | 5 ----- .../Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c | 11 ++++++-= ---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h b/UefiCpuP= kg/Include/Library/RegisterCpuFeaturesLib.h index fc3ccda..9331e49 100644 --- a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h +++ b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h @@ -71,11 +71,6 @@ #define CPU_FEATURE_APIC_TPR_UPDATE_MESSAGE (32+9) #define CPU_FEATURE_ENERGY_PERFORMANCE_BIAS (32+10) #define CPU_FEATURE_PPIN (32+11) -// -// Currently, CPU_FEATURE_PROC_TRACE is the MAX feature we support. -// If you define a feature bigger than it, please also replace it -// in RegisterCpuFeatureLibIsFeatureValid function. -// #define CPU_FEATURE_PROC_TRACE (32+12) =20 #define CPU_FEATURE_BEFORE_ALL BIT27 diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesL= ib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c index 6ec26e1..afc424c 100644 --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c @@ -13,6 +13,10 @@ **/ =20 #include "RegisterCpuFeatures.h" +// +// Please keep CPU_FEATURE_MAX as the max CPU feature +// +#define CPU_FEATURE_MAX (32+12) =20 /** Checks if two CPU feature bit masks are equal. @@ -97,11 +101,8 @@ RegisterCpuFeatureLibIsFeatureValid ( =20 Data =3D Feature; Data &=3D ~(CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER | CPU_FEATURE_BEFORE_= ALL | CPU_FEATURE_AFTER_ALL); - // - // Currently, CPU_FEATURE_PROC_TRACE is the MAX feature we support. - // If you define a feature bigger than it, please replace it at below. - // - if (Data > CPU_FEATURE_PROC_TRACE) { + + if (Data > CPU_FEATURE_MAX) { DEBUG ((DEBUG_ERROR, "Invalid CPU feature: 0x%x ", Feature)); return FALSE; } --=20 2.10.2.windows.1