From nobody Tue Dec 24 00:58:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1512980221131276.2708610622491; Mon, 11 Dec 2017 00:17:01 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id ADF592218E95A; Mon, 11 Dec 2017 00:12:22 -0800 (PST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 41BA82214E358 for ; Mon, 11 Dec 2017 00:12:21 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Dec 2017 00:16:58 -0800 Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga002.fm.intel.com with ESMTP; 11 Dec 2017 00:16:57 -0800 Received: from FMSMSX110.amr.corp.intel.com (10.18.116.10) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 11 Dec 2017 00:16:57 -0800 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx110.amr.corp.intel.com (10.18.116.10) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 11 Dec 2017 00:16:56 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.175]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.152]) with mapi id 14.03.0319.002; Mon, 11 Dec 2017 16:16:55 +0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Permerror (SPF Permanent Error: More than 10 MX records returned) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=binx.song@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,391,1508828400"; d="dat'59?scan'59,208,59";a="472427" From: "Song, BinX" To: "edk2-devel@lists.01.org" Thread-Topic: [PATCH] UefiCpuPkg: Singularize function name Thread-Index: AdNyWGanPD1XzEXwSZy6jXpjtcQjgg== Date: Mon, 11 Dec 2017 08:16:54 +0000 Message-ID: <559D2DF22BC9A3468B4FA1AA547F0EF1025C1CCA@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: <559D2DF22BC9A3468B4FA1AA547F0EF1025C1CCA@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: [edk2] [PATCH] UefiCpuPkg: Singularize function name 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: , Cc: "lersek@redhat.com" , "Dong, Eric" Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Change GetSupportPcds and GetConfigurationPcds to be singular Cc: Eric Dong Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Bell Song Reviewed-by: Eric Dong Reviewed-by: Laszlo Ersek --- .../RegisterCpuFeaturesLib/CpuFeaturesInitialize.c | 48 +++++++++++-------= ---- .../RegisterCpuFeaturesLib/RegisterCpuFeatures.h | 8 ++-- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitializ= e.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c index b8f76f1..d72ffec 100644 --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c @@ -56,7 +56,7 @@ SetSettingPcd ( @return The pointer to CPU feature bits mask buffer. **/ UINT8 * -GetSupportPcds ( +GetSupportPcd ( VOID ) { @@ -77,7 +77,7 @@ GetSupportPcds ( @return The pointer to CPU feature bits mask buffer. **/ UINT8 * -GetConfigurationPcds ( +GetConfigurationPcd ( VOID ) { @@ -180,8 +180,8 @@ CpuInitDataInitialize ( // // Get support and configuration PCDs // - CpuFeaturesData->SupportPcds =3D GetSupportPcds (); - CpuFeaturesData->ConfigurationPcds =3D GetConfigurationPcds (); + CpuFeaturesData->SupportPcd =3D GetSupportPcd (); + CpuFeaturesData->ConfigurationPcd =3D GetConfigurationPcd (); } =20 /** @@ -321,7 +321,7 @@ CollectProcessorData ( Entry =3D GetFirstNode (&CpuFeaturesData->FeatureList); while (!IsNull (&CpuFeaturesData->FeatureList, Entry)) { CpuFeature =3D CPU_FEATURE_ENTRY_FROM_LINK (Entry); - if (IsBitMaskMatch (CpuFeaturesData->SupportPcds, CpuFeature->FeatureM= ask)) { + if (IsBitMaskMatch (CpuFeaturesData->SupportPcd, CpuFeature->FeatureMa= sk)) { if (CpuFeature->SupportFunc =3D=3D NULL) { // // If SupportFunc is NULL, then the feature is supported. @@ -444,29 +444,29 @@ AnalysisProcessorFeatures ( CPU_FEATURES_DATA *CpuFeaturesData; =20 CpuFeaturesData =3D GetCpuFeaturesData (); - CpuFeaturesData->CapabilityPcds =3D AllocatePool (CpuFeaturesData->BitMa= skSize); - ASSERT (CpuFeaturesData->CapabilityPcds !=3D NULL); - SetMem (CpuFeaturesData->CapabilityPcds, CpuFeaturesData->BitMaskSize, 0= xFF); + CpuFeaturesData->CapabilityPcd =3D AllocatePool (CpuFeaturesData->BitMas= kSize); + ASSERT (CpuFeaturesData->CapabilityPcd !=3D NULL); + SetMem (CpuFeaturesData->CapabilityPcd, CpuFeaturesData->BitMaskSize, 0x= FF); for (ProcessorNumber =3D 0; ProcessorNumber < NumberOfCpus; ProcessorNum= ber++) { CpuInitOrder =3D &CpuFeaturesData->InitOrder[ProcessorNumber]; // // Calculate the last capability on all processors // - SupportedMaskAnd (CpuFeaturesData->CapabilityPcds, CpuInitOrder->Featu= resSupportedMask); + SupportedMaskAnd (CpuFeaturesData->CapabilityPcd, CpuInitOrder->Featur= esSupportedMask); } // // Calculate the last setting // =20 - CpuFeaturesData->SettingPcds =3D AllocateCopyPool (CpuFeaturesData->BitM= askSize, CpuFeaturesData->CapabilityPcds); - ASSERT (CpuFeaturesData->SettingPcds !=3D NULL); - SupportedMaskAnd (CpuFeaturesData->SettingPcds, CpuFeaturesData->Configu= rationPcds); + CpuFeaturesData->SettingPcd =3D AllocateCopyPool (CpuFeaturesData->BitMa= skSize, CpuFeaturesData->CapabilityPcd); + ASSERT (CpuFeaturesData->SettingPcd !=3D NULL); + SupportedMaskAnd (CpuFeaturesData->SettingPcd, CpuFeaturesData->Configur= ationPcd); =20 // // Save PCDs and display CPU PCDs // - SetCapabilityPcd (CpuFeaturesData->CapabilityPcds); - SetSettingPcd (CpuFeaturesData->SettingPcds); + SetCapabilityPcd (CpuFeaturesData->CapabilityPcd); + SetSettingPcd (CpuFeaturesData->SettingPcd); =20 // // Dump the last CPU feature list @@ -476,8 +476,8 @@ AnalysisProcessorFeatures ( Entry =3D GetFirstNode (&CpuFeaturesData->FeatureList); while (!IsNull (&CpuFeaturesData->FeatureList, Entry)) { CpuFeature =3D CPU_FEATURE_ENTRY_FROM_LINK (Entry); - if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData->Capabi= lityPcds)) { - if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData->Sett= ingPcds)) { + if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData->Capabi= lityPcd)) { + if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData->Sett= ingPcd)) { DEBUG ((DEBUG_INFO, "[Enable ] ")); } else { DEBUG ((DEBUG_INFO, "[Disable ] ")); @@ -489,13 +489,13 @@ AnalysisProcessorFeatures ( Entry =3D Entry->ForwardLink; } DEBUG ((DEBUG_INFO, "PcdCpuFeaturesSupport:\n")); - DumpCpuFeatureMask (CpuFeaturesData->SupportPcds); + DumpCpuFeatureMask (CpuFeaturesData->SupportPcd); DEBUG ((DEBUG_INFO, "PcdCpuFeaturesUserConfiguration:\n")); - DumpCpuFeatureMask (CpuFeaturesData->ConfigurationPcds); + DumpCpuFeatureMask (CpuFeaturesData->ConfigurationPcd); DEBUG ((DEBUG_INFO, "PcdCpuFeaturesCapability:\n")); - DumpCpuFeatureMask (CpuFeaturesData->CapabilityPcds); + DumpCpuFeatureMask (CpuFeaturesData->CapabilityPcd); DEBUG ((DEBUG_INFO, "PcdCpuFeaturesSetting:\n")); - DumpCpuFeatureMask (CpuFeaturesData->SettingPcds); + DumpCpuFeatureMask (CpuFeaturesData->SettingPcd); ); =20 for (ProcessorNumber =3D 0; ProcessorNumber < NumberOfCpus; ProcessorNum= ber++) { @@ -506,7 +506,7 @@ AnalysisProcessorFeatures ( // Insert each feature into processor's order list // CpuFeature =3D CPU_FEATURE_ENTRY_FROM_LINK (Entry); - if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData->Capabi= lityPcds)) { + if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData->Capabi= lityPcd)) { CpuFeatureInOrder =3D AllocateCopyPool (sizeof (CPU_FEATURES_ENTRY= ), CpuFeature); ASSERT (CpuFeatureInOrder !=3D NULL); InsertTailList (&CpuInitOrder->OrderList, &CpuFeatureInOrder->Link= ); @@ -520,13 +520,13 @@ AnalysisProcessorFeatures ( Entry =3D GetFirstNode (&CpuInitOrder->OrderList); while (!IsNull (&CpuInitOrder->OrderList, Entry)) { CpuFeatureInOrder =3D CPU_FEATURE_ENTRY_FROM_LINK (Entry); - if (IsBitMaskMatch (CpuFeatureInOrder->FeatureMask, CpuFeaturesData-= >SettingPcds)) { + if (IsBitMaskMatch (CpuFeatureInOrder->FeatureMask, CpuFeaturesData-= >SettingPcd)) { Status =3D CpuFeatureInOrder->InitializeFunc (ProcessorNumber, Cpu= Info, CpuFeatureInOrder->ConfigData, TRUE); if (EFI_ERROR (Status)) { // // Clean the CpuFeatureInOrder->FeatureMask in setting PCD. // - SupportedMaskCleanBit (CpuFeaturesData->SettingPcds, CpuFeatureI= nOrder->FeatureMask); + SupportedMaskCleanBit (CpuFeaturesData->SettingPcd, CpuFeatureIn= Order->FeatureMask); if (CpuFeatureInOrder->FeatureName !=3D NULL) { DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature: Name= =3D %a.\n", CpuFeatureInOrder->FeatureName)); } else { @@ -553,7 +553,7 @@ AnalysisProcessorFeatures ( // again during initialize the features. // DEBUG ((DEBUG_INFO, "Dump final value for PcdCpuFeaturesSetting:\n")); - DumpCpuFeatureMask (CpuFeaturesData->SettingPcds); + DumpCpuFeatureMask (CpuFeaturesData->SettingPcd); =20 // // Dump the RegisterTable diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.= h b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h index 7731f88..69b4121 100644 --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h @@ -59,10 +59,10 @@ typedef struct { LIST_ENTRY FeatureList; =20 CPU_FEATURES_INIT_ORDER *InitOrder; - UINT8 *SupportPcds; - UINT8 *CapabilityPcds; - UINT8 *ConfigurationPcds; - UINT8 *SettingPcds; + UINT8 *SupportPcd; + UINT8 *CapabilityPcd; + UINT8 *ConfigurationPcd; + UINT8 *SettingPcd; =20 CPU_REGISTER_TABLE *RegisterTable; CPU_REGISTER_TABLE *PreSmmRegisterTable; --=20 2.10.2.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel