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=192.55.52.120; helo=mga04.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 18A052216D8C2 for ; Thu, 14 Dec 2017 20:57:21 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Dec 2017 21:02:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,403,1508828400"; d="scan'208";a="184351609" Received: from ray-dev.ccr.corp.intel.com (HELO [10.239.9.14]) ([10.239.9.14]) by orsmga005.jf.intel.com with ESMTP; 14 Dec 2017 21:02:02 -0800 To: "Song, BinX" , "edk2-devel@lists.01.org" Cc: "lersek@redhat.com" , "Dong, Eric" References: <559D2DF22BC9A3468B4FA1AA547F0EF1025C2739@shsmsx102.ccr.corp.intel.com> From: "Ni, Ruiyu" Message-ID: <195703e3-0831-80a7-b3c4-f44116c06aee@Intel.com> Date: Fri, 15 Dec 2017 13:02:01 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <559D2DF22BC9A3468B4FA1AA547F0EF1025C2739@shsmsx102.ccr.corp.intel.com> Subject: Re: [PATCH] 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: Fri, 15 Dec 2017 04:57:22 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit On 12/14/2017 4:31 PM, Song, BinX wrote: > 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 | 7 +++---- > UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c | 7 ++----- > 2 files changed, 5 insertions(+), 9 deletions(-) > > diff --git a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h > index fc3ccda..9582ad8 100644 > --- a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h > +++ b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h > @@ -71,12 +71,11 @@ > #define CPU_FEATURE_APIC_TPR_UPDATE_MESSAGE (32+9) > #define CPU_FEATURE_ENERGY_PERFORMANCE_BIAS (32+10) > #define CPU_FEATURE_PPIN (32+11) > +#define CPU_FEATURE_PROC_TRACE (32+12) > // > -// 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. > +// Please keep CPU_FEATURE_MAX as the max CPU feature > // > -#define CPU_FEATURE_PROC_TRACE (32+12) > +#define CPU_FEATURE_MAX (32+12) I think we need to define this CPU_FEATURE_MAX in RegisterCpuFeaturesLib.c. Thinking about another instance of RegisterCpuFeatureLib that only supports features up to (32+9). The MAX will be 32+9 for that instance. The library class header only defines the features and corresponding ID (32+xx). Library instance chooses which features to support. > > #define CPU_FEATURE_BEFORE_ALL BIT27 > #define CPU_FEATURE_AFTER_ALL BIT28 > diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c > index 6ec26e1..911f4d0 100644 > --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c > +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c > @@ -97,11 +97,8 @@ RegisterCpuFeatureLibIsFeatureValid ( > > Data = Feature; > Data &= ~(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; > } > -- Thanks, Ray