From nobody Sat Apr 27 13:18:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+43830+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43830+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1563328746; cv=none; d=zoho.com; s=zohoarc; b=LHt2D77mpXbtDyKoAbqimMj/rg1xdQcGlrAn8lwyORUZVI0xaXUBgxysCTKSNZlfc34SwMrmx51VSgm07KeFQeJmxmZUMgO0Ri5Y8f683DROZJ0fnx+JUyYIJmlV7w9GZO2McoYwLHPkZilY1QGTLEKNipFDFDv6tL08s1fV0Gc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563328746; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=BzjHSuKYbA1ACK97AK8avAoOuPHRLBxwoqLUq+sMPog=; b=oD6QUcAoc5LEd2PXoGgso0qii7m6EBLSPEK3hZ6QH2CvchQBfGRUbof6a4WedR/0wTU3Ae/offOk1HEPGI6hDp0qtxLQbsU45f8+/pgzSCrFYKOxcvCNPfTYw+tEZ6ReU1mb99sHkx4XSWI7ab1wptV1koezDm/AAa+639r79N4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43830+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1563328746346703.8347625948413; Tue, 16 Jul 2019 18:59:06 -0700 (PDT) Return-Path: X-Received: from mga11.intel.com (mga11.intel.com []) by groups.io with SMTP; Tue, 16 Jul 2019 18:59:04 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jul 2019 18:59:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,272,1559545200"; d="scan'208";a="172719442" X-Received: from ydong10-win10.ccr.corp.intel.com ([10.239.158.133]) by orsmga006.jf.intel.com with ESMTP; 16 Jul 2019 18:59:02 -0700 From: "Dong, Eric" To: devel@edk2.groups.io Cc: Ray Ni , Laszlo Ersek , Chandana Kumar , Star Zeng Subject: [edk2-devel] [Patch v3 1/2] UefiCpuPkg/RegisterCpuFeaturesLib: Avoid AP calls PeiServices table. Date: Wed, 17 Jul 2019 09:58:59 +0800 Message-Id: <20190717015900.29224-2-eric.dong@intel.com> In-Reply-To: <20190717015900.29224-1-eric.dong@intel.com> References: <20190717015900.29224-1-eric.dong@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,eric.dong@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1563328744; bh=LeJambTbL+ddaHMa13Wg8NTF7F5MyTxzM6xVRNy2ZpY=; h=Cc:Date:From:Reply-To:Subject:To; b=S1lfWxQ2KcB5k7F0Bv99g9DrgAA9ViFUbxv5Ddr0yk8fsGxIdlUipU9WOx2uiqoUhyX 7BR7qeRWsKjfmpsHmziF0neyaM9vNu3c7kO9kH2IOyinAdPL/7dRAmzxMvg6zB1AT+lB2 UF5kNNrgduJMrhpMw/9/d7byIPuZGdKo0IQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1972 AP calls CollectProcessorData() to collect processor info. CollectProcessorData function finally calls PcdGetSize function to get DynamicPCD PcdCpuFeaturesSetting value. PcdGetSize will use PeiServices table which caused below assert info: Processor Info: Package: 1, MaxCore : 4, MaxThread: 1 Package: 0, Valid Core : 4 ASSERT [CpuFeaturesPei] c:\projects\jsl\jsl_v1193\Edk2\MdePkg\Library \PeiServicesTablePointerLibIdt\PeiServicesTablePointer.c(48): PeiServices !=3D ((void *) 0) This change uses saved global pcd size instead of calls PcdGetSize to fix this issue. Cc: Ray Ni Cc: Laszlo Ersek Cc: Chandana Kumar Cc: Star Zeng Signed-off-by: Eric Dong Reviewed-by: Ray Ni Reviewed-by: Star Zeng --- .../RegisterCpuFeaturesLib/CpuFeaturesInitialize.c | 13 ++++++++----- .../RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c | 5 +++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitializ= e.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c index 1746f4f07f..1e25ba8b32 100644 --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c @@ -246,19 +246,20 @@ CpuInitDataInitialize ( =20 @param[in] SupportedFeatureMask The pointer to CPU feature bits mask b= uffer @param[in] OrFeatureBitMask The feature bit mask to do OR operation + @param[in] BitMaskSize The CPU feature bits mask buffer size. + **/ VOID SupportedMaskOr ( IN UINT8 *SupportedFeatureMask, - IN UINT8 *OrFeatureBitMask + IN UINT8 *OrFeatureBitMask, + IN UINT32 BitMaskSize ) { UINTN Index; - UINTN BitMaskSize; UINT8 *Data1; UINT8 *Data2; =20 - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); Data1 =3D SupportedFeatureMask; Data2 =3D OrFeatureBitMask; for (Index =3D 0; Index < BitMaskSize; Index++) { @@ -384,12 +385,14 @@ CollectProcessorData ( // SupportedMaskOr ( CpuFeaturesData->InitOrder[ProcessorNumber].FeaturesSupportedMask, - CpuFeature->FeatureMask + CpuFeature->FeatureMask, + CpuFeaturesData->BitMaskSize ); } else if (CpuFeature->SupportFunc (ProcessorNumber, CpuInfo, CpuFeatu= re->ConfigData)) { SupportedMaskOr ( CpuFeaturesData->InitOrder[ProcessorNumber].FeaturesSupportedMask, - CpuFeature->FeatureMask + CpuFeature->FeatureMask, + CpuFeaturesData->BitMaskSize ); } Entry =3D Entry->ForwardLink; diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesL= ib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c index fa0f0b41e2..36aabd7267 100644 --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c @@ -658,6 +658,11 @@ RegisterCpuFeatureWorker ( InitializeListHead (&CpuFeaturesData->FeatureList); InitializeSpinLock (&CpuFeaturesData->CpuFlags.MemoryMappedLock); InitializeSpinLock (&CpuFeaturesData->CpuFlags.ConsoleLogLock); + // + // Driver has assumption that these three PCD should has same buffer s= ize. + // + ASSERT (PcdGetSize (PcdCpuFeaturesSetting) =3D=3D PcdGetSize (PcdCpuFe= aturesCapability)); + ASSERT (PcdGetSize (PcdCpuFeaturesSetting) =3D=3D PcdGetSize (PcdCpuFe= aturesSupport)); CpuFeaturesData->BitMaskSize =3D (UINT32) BitMaskSize; } ASSERT (CpuFeaturesData->BitMaskSize =3D=3D BitMaskSize); --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43830): https://edk2.groups.io/g/devel/message/43830 Mute This Topic: https://groups.io/mt/32498614/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat Apr 27 13:18:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+43831+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43831+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1563328756; cv=none; d=zoho.com; s=zohoarc; b=jpeKAahIy/Oz+SCsycF9UyN/RambYK+oN3iRBKPowiqdkD5pBIGxA9c/Pz1FNqu0+am5F3BjWZpPc1/kgz+TyBWN03/BjsTTRFjLBzan6JjQjAPjN8TD4ifn1rgMFBKV5+1lCH48UhuuPANYdkpqXxItpo6GJanMLJqJ13DnN8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563328756; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=u4ObfucvX2Any1M0ey1QWrvbOOJBCMd1XGxKPULrmXA=; b=JSKPDkzTW7VqVofAdBUb7uDQB47naCgmVyW25z9Use1adSDAZkgX8q/GZBF6DGlzJtK0V9hqGPsISZe+SB4WS75xdnVGoOzcjx/vX8pNseUigLOsaFKm/BeJlXBnqW2lW0cl1YGcVCzpewKGECEiZmndPhfIbvyb+Z3sU291m10= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43831+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 156332875606344.21247964285101; Tue, 16 Jul 2019 18:59:16 -0700 (PDT) Return-Path: X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by groups.io with SMTP; Tue, 16 Jul 2019 18:59:15 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jul 2019 18:59:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,272,1559545200"; d="scan'208";a="172719451" X-Received: from ydong10-win10.ccr.corp.intel.com ([10.239.158.133]) by orsmga006.jf.intel.com with ESMTP; 16 Jul 2019 18:59:04 -0700 From: "Dong, Eric" To: devel@edk2.groups.io Cc: "Dong, Eric" , Ray Ni , Laszlo Ersek , Chandana Kumar , Star Zeng Subject: [edk2-devel] [Patch v3 2/2] UefiCpuPkg/RegisterCpuFeaturesLib: avoid use dynamic PCD. Date: Wed, 17 Jul 2019 09:59:00 +0800 Message-Id: <20190717015900.29224-3-eric.dong@intel.com> In-Reply-To: <20190717015900.29224-1-eric.dong@intel.com> References: <20190717015900.29224-1-eric.dong@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,eric.dong@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1563328755; bh=fEbDFe3yiEMN0pBw7OOf+CFOSsyxsZ0Cr92YL9jhliE=; h=Cc:Date:From:Reply-To:Subject:To; b=I0MgCl4J2DDkdqjKGPzs22Wt7v9RQVEv3KsHjAEv93idaxrKMp47OIPY6lQlg4UiKE5 WoLN+2znM17q8grZzishBkWwWwfeggq/Ei+jwOqEu6atHJEDuVmdK7OOn7Gu/nMAtG6BG jI+eUKpX2vMnjrjwirocYEzFToRIw/aUBWg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: "Dong, Eric" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1972 Function in this library may be used by APs. Assert will be trig if AP uses dynamic pcd. This patch enhance the current code, remove the unnecessary usage of dynamic PCD. This change try to avoid report this issue again later. Cc: Ray Ni Cc: Laszlo Ersek Cc: Chandana Kumar Cc: Star Zeng Signed-off-by: Eric Dong Reviewed-by: Ray Ni Reviewed-by: Star Zeng --- .../CpuFeaturesInitialize.c | 64 +++++------ .../RegisterCpuFeatures.h | 10 +- .../RegisterCpuFeaturesLib.c | 107 +++++++----------- 3 files changed, 79 insertions(+), 102 deletions(-) diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitializ= e.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c index 1e25ba8b32..33752c1a9f 100644 --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c @@ -15,20 +15,16 @@ CHAR16 *mRegisterTypeStr[] =3D {L"MSR", L"CR", L"MMIO",= L"CACHE", L"SEMAP", L"INVA Worker function to save PcdCpuFeaturesCapability. =20 @param[in] SupportedFeatureMask The pointer to CPU feature bits mask b= uffer - @param[in] FeatureMaskSize CPU feature bits mask buffer size. + @param[in] BitMaskSize CPU feature bits mask buffer size. =20 **/ VOID SetCapabilityPcd ( IN UINT8 *SupportedFeatureMask, - IN UINT32 FeatureMaskSize + IN UINTN BitMaskSize ) { EFI_STATUS Status; - UINTN BitMaskSize; - - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesCapability); - ASSERT (FeatureMaskSize =3D=3D BitMaskSize); =20 Status =3D PcdSetPtrS (PcdCpuFeaturesCapability, &BitMaskSize, Supported= FeatureMask); ASSERT_EFI_ERROR (Status); @@ -38,16 +34,16 @@ SetCapabilityPcd ( Worker function to save PcdCpuFeaturesSetting. =20 @param[in] SupportedFeatureMask The pointer to CPU feature bits mask b= uffer + @param[in] BitMaskSize CPU feature bits mask buffer size. **/ VOID SetSettingPcd ( - IN UINT8 *SupportedFeatureMask + IN UINT8 *SupportedFeatureMask, + IN UINTN BitMaskSize ) { EFI_STATUS Status; - UINTN BitMaskSize; =20 - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); Status =3D PcdSetPtrS (PcdCpuFeaturesSetting, &BitMaskSize, SupportedFea= tureMask); ASSERT_EFI_ERROR (Status); } @@ -272,19 +268,20 @@ SupportedMaskOr ( =20 @param[in] SupportedFeatureMask The pointer to CPU feature bits mask b= uffer @param[in] AndFeatureBitMask The feature bit mask to do AND operati= on + @param[in] BitMaskSize CPU feature bits mask buffer size. + **/ VOID SupportedMaskAnd ( IN UINT8 *SupportedFeatureMask, - IN CONST UINT8 *AndFeatureBitMask + IN CONST UINT8 *AndFeatureBitMask, + IN UINT32 BitMaskSize ) { UINTN Index; - UINTN BitMaskSize; UINT8 *Data1; CONST UINT8 *Data2; =20 - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); Data1 =3D SupportedFeatureMask; Data2 =3D AndFeatureBitMask; for (Index =3D 0; Index < BitMaskSize; Index++) { @@ -297,19 +294,19 @@ SupportedMaskAnd ( =20 @param[in] SupportedFeatureMask The pointer to CPU feature bits mask b= uffer @param[in] AndFeatureBitMask The feature bit mask to do XOR operati= on + @param[in] BitMaskSize CPU feature bits mask buffer size. **/ VOID SupportedMaskCleanBit ( IN UINT8 *SupportedFeatureMask, - IN UINT8 *AndFeatureBitMask + IN UINT8 *AndFeatureBitMask, + IN UINT32 BitMaskSize ) { UINTN Index; - UINTN BitMaskSize; UINT8 *Data1; UINT8 *Data2; =20 - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); Data1 =3D SupportedFeatureMask; Data2 =3D AndFeatureBitMask; for (Index =3D 0; Index < BitMaskSize; Index++) { @@ -323,6 +320,7 @@ SupportedMaskCleanBit ( =20 @param[in] SupportedFeatureMask The pointer to CPU feature bits mask = buffer @param[in] ComparedFeatureBitMask The feature bit mask to be compared + @param[in] BitMaskSize CPU feature bits mask buffer size. =20 @retval TRUE The ComparedFeatureBitMask is set in CPU feature supporte= d bits mask buffer. @@ -332,16 +330,14 @@ SupportedMaskCleanBit ( BOOLEAN IsBitMaskMatch ( IN UINT8 *SupportedFeatureMask, - IN UINT8 *ComparedFeatureBitMask + IN UINT8 *ComparedFeatureBitMask, + IN UINT32 BitMaskSize ) { UINTN Index; - UINTN BitMaskSize; UINT8 *Data1; UINT8 *Data2; =20 - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); - Data1 =3D SupportedFeatureMask; Data2 =3D ComparedFeatureBitMask; for (Index =3D 0; Index < BitMaskSize; Index++) { @@ -557,14 +553,14 @@ AnalysisProcessorFeatures ( // // Calculate the last capability on all processors // - SupportedMaskAnd (CpuFeaturesData->CapabilityPcd, CpuInitOrder->Featur= esSupportedMask); + SupportedMaskAnd (CpuFeaturesData->CapabilityPcd, CpuInitOrder->Featur= esSupportedMask, CpuFeaturesData->BitMaskSize); } // // Calculate the last setting // CpuFeaturesData->SettingPcd =3D AllocateCopyPool (CpuFeaturesData->BitMa= skSize, CpuFeaturesData->CapabilityPcd); ASSERT (CpuFeaturesData->SettingPcd !=3D NULL); - SupportedMaskAnd (CpuFeaturesData->SettingPcd, PcdGetPtr (PcdCpuFeatures= Setting)); + SupportedMaskAnd (CpuFeaturesData->SettingPcd, PcdGetPtr (PcdCpuFeatures= Setting), CpuFeaturesData->BitMaskSize); =20 // // Dump the last CPU feature list @@ -574,8 +570,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= lityPcd)) { - if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData->Sett= ingPcd)) { + if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData->Capabi= lityPcd, CpuFeaturesData->BitMaskSize)) { + if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData->Sett= ingPcd, CpuFeaturesData->BitMaskSize)) { DEBUG ((DEBUG_INFO, "[Enable ] ")); } else { DEBUG ((DEBUG_INFO, "[Disable ] ")); @@ -583,22 +579,22 @@ AnalysisProcessorFeatures ( } else { DEBUG ((DEBUG_INFO, "[Unsupport] ")); } - DumpCpuFeature (CpuFeature); + DumpCpuFeature (CpuFeature, CpuFeaturesData->BitMaskSize); Entry =3D Entry->ForwardLink; } DEBUG ((DEBUG_INFO, "PcdCpuFeaturesCapability:\n")); - DumpCpuFeatureMask (CpuFeaturesData->CapabilityPcd); + DumpCpuFeatureMask (CpuFeaturesData->CapabilityPcd, CpuFeaturesData->B= itMaskSize); DEBUG ((DEBUG_INFO, "Origin PcdCpuFeaturesSetting:\n")); - DumpCpuFeatureMask (PcdGetPtr (PcdCpuFeaturesSetting)); + DumpCpuFeatureMask (PcdGetPtr (PcdCpuFeaturesSetting), CpuFeaturesData= ->BitMaskSize); DEBUG ((DEBUG_INFO, "Final PcdCpuFeaturesSetting:\n")); - DumpCpuFeatureMask (CpuFeaturesData->SettingPcd); + DumpCpuFeatureMask (CpuFeaturesData->SettingPcd, CpuFeaturesData->BitM= askSize); ); =20 // // Save PCDs and display CPU PCDs // SetCapabilityPcd (CpuFeaturesData->CapabilityPcd, CpuFeaturesData->BitMa= skSize); - SetSettingPcd (CpuFeaturesData->SettingPcd); + SetSettingPcd (CpuFeaturesData->SettingPcd, CpuFeaturesData->BitMaskSize= ); =20 for (ProcessorNumber =3D 0; ProcessorNumber < NumberOfCpus; ProcessorNum= ber++) { CpuInitOrder =3D &CpuFeaturesData->InitOrder[ProcessorNumber]; @@ -608,7 +604,7 @@ AnalysisProcessorFeatures ( // Insert each feature into processor's order list // CpuFeature =3D CPU_FEATURE_ENTRY_FROM_LINK (Entry); - if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData->Capabi= lityPcd)) { + if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData->Capabi= lityPcd, CpuFeaturesData->BitMaskSize)) { CpuFeatureInOrder =3D AllocateCopyPool (sizeof (CPU_FEATURES_ENTRY= ), CpuFeature); ASSERT (CpuFeatureInOrder !=3D NULL); InsertTailList (&CpuInitOrder->OrderList, &CpuFeatureInOrder->Link= ); @@ -624,18 +620,18 @@ AnalysisProcessorFeatures ( CpuFeatureInOrder =3D CPU_FEATURE_ENTRY_FROM_LINK (Entry); =20 Success =3D FALSE; - if (IsBitMaskMatch (CpuFeatureInOrder->FeatureMask, CpuFeaturesData-= >SettingPcd)) { + if (IsBitMaskMatch (CpuFeatureInOrder->FeatureMask, CpuFeaturesData-= >SettingPcd, CpuFeaturesData->BitMaskSize)) { Status =3D CpuFeatureInOrder->InitializeFunc (ProcessorNumber, Cpu= Info, CpuFeatureInOrder->ConfigData, TRUE); if (EFI_ERROR (Status)) { // // Clean the CpuFeatureInOrder->FeatureMask in setting PCD. // - SupportedMaskCleanBit (CpuFeaturesData->SettingPcd, CpuFeatureIn= Order->FeatureMask); + SupportedMaskCleanBit (CpuFeaturesData->SettingPcd, CpuFeatureIn= Order->FeatureMask, CpuFeaturesData->BitMaskSize); if (CpuFeatureInOrder->FeatureName !=3D NULL) { DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature: Name= =3D %a.\n", CpuFeatureInOrder->FeatureName)); } else { DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature: Mask= =3D ")); - DumpCpuFeatureMask (CpuFeatureInOrder->FeatureMask); + DumpCpuFeatureMask (CpuFeatureInOrder->FeatureMask, CpuFeature= sData->BitMaskSize); } } else { Success =3D TRUE; @@ -647,7 +643,7 @@ AnalysisProcessorFeatures ( DEBUG ((DEBUG_WARN, "Warning :: Failed to disable Feature: Nam= e =3D %a.\n", CpuFeatureInOrder->FeatureName)); } else { DEBUG ((DEBUG_WARN, "Warning :: Failed to disable Feature: Mas= k =3D ")); - DumpCpuFeatureMask (CpuFeatureInOrder->FeatureMask); + DumpCpuFeatureMask (CpuFeatureInOrder->FeatureMask, CpuFeature= sData->BitMaskSize); } } else { Success =3D TRUE; @@ -699,7 +695,7 @@ AnalysisProcessorFeatures ( // again during initialize the features. // DEBUG ((DEBUG_INFO, "Dump final value for PcdCpuFeaturesSetting:\n")); - DumpCpuFeatureMask (CpuFeaturesData->SettingPcd); + DumpCpuFeatureMask (CpuFeaturesData->SettingPcd, CpuFeaturesData->BitM= askSize); =20 // // Dump the RegisterTable diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.= h b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h index 5c546ee153..a18f926641 100644 --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h @@ -180,20 +180,26 @@ SwitchNewBsp ( Function that uses DEBUG() macros to display the contents of a a CPU fea= ture bit mask. =20 @param[in] FeatureMask A pointer to the CPU feature bit mask. + @param[in] BitMaskSize CPU feature bits mask buffer size. + **/ VOID DumpCpuFeatureMask ( - IN UINT8 *FeatureMask + IN UINT8 *FeatureMask, + IN UINT32 BitMaskSize ); =20 /** Dump CPU feature name or CPU feature bit mask. =20 @param[in] CpuFeature Pointer to CPU_FEATURES_ENTRY + @param[in] BitMaskSize CPU feature bits mask buffer size. + **/ VOID DumpCpuFeature ( - IN CPU_FEATURES_ENTRY *CpuFeature + IN CPU_FEATURES_ENTRY *CpuFeature, + IN UINT32 BitMaskSize ); =20 /** diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesL= ib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c index 36aabd7267..493566de5d 100644 --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c @@ -8,46 +8,22 @@ =20 #include "RegisterCpuFeatures.h" =20 -/** - Checks if two CPU feature bit masks are equal. - - @param[in] FirstFeatureMask The first input CPU feature bit mask - @param[in] SecondFeatureMask The second input CPU feature bit mask - - @retval TRUE Two CPU feature bit masks are equal. - @retval FALSE Two CPU feature bit masks are not equal. -**/ -BOOLEAN -IsCpuFeatureMatch ( - IN UINT8 *FirstFeatureMask, - IN UINT8 *SecondFeatureMask - ) -{ - UINTN BitMaskSize; - - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); - if (CompareMem (FirstFeatureMask, SecondFeatureMask, BitMaskSize) =3D=3D= 0) { - return TRUE; - } else { - return FALSE; - } -} - /** Function that uses DEBUG() macros to display the contents of a a CPU fea= ture bit mask. =20 @param[in] FeatureMask A pointer to the CPU feature bit mask. + @param[in] BitMaskSize CPU feature bits mask buffer size. + **/ VOID DumpCpuFeatureMask ( - IN UINT8 *FeatureMask + IN UINT8 *FeatureMask, + IN UINT32 BitMaskSize ) { UINTN Index; UINT8 *Data8; - UINTN BitMaskSize; =20 - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); Data8 =3D (UINT8 *) FeatureMask; for (Index =3D 0; Index < BitMaskSize; Index++) { DEBUG ((DEBUG_INFO, " %02x ", *Data8++)); @@ -59,10 +35,13 @@ DumpCpuFeatureMask ( Dump CPU feature name or CPU feature bit mask. =20 @param[in] CpuFeature Pointer to CPU_FEATURES_ENTRY + @param[in] BitMaskSize CPU feature bits mask buffer size. + **/ VOID DumpCpuFeature ( - IN CPU_FEATURES_ENTRY *CpuFeature + IN CPU_FEATURES_ENTRY *CpuFeature, + IN UINT32 BitMaskSize ) { =20 @@ -70,7 +49,7 @@ DumpCpuFeature ( DEBUG ((DEBUG_INFO, "FeatureName: %a\n", CpuFeature->FeatureName)); } else { DEBUG ((DEBUG_INFO, "FeatureMask =3D ")); - DumpCpuFeatureMask (CpuFeature->FeatureMask); + DumpCpuFeatureMask (CpuFeature->FeatureMask, BitMaskSize); } } =20 @@ -89,16 +68,16 @@ IsBitMaskMatchCheck ( IN UINT8 *DependentBitMask ) { - UINTN Index; - UINTN BitMaskSize; - UINT8 *Data1; - UINT8 *Data2; + UINTN Index; + UINT8 *Data1; + UINT8 *Data2; + CPU_FEATURES_DATA *CpuFeaturesData; =20 - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); + CpuFeaturesData =3D GetCpuFeaturesData (); =20 Data1 =3D FeatureMask; Data2 =3D DependentBitMask; - for (Index =3D 0; Index < BitMaskSize; Index++) { + for (Index =3D 0; Index < CpuFeaturesData->BitMaskSize; Index++) { if (((*(Data1++)) & (*(Data2++))) !=3D 0) { return TRUE; } @@ -631,6 +610,7 @@ CheckCpuFeaturesDependency ( /** Worker function to register CPU Feature. =20 + @param[in] CpuFeaturesData Pointer to CPU feature data structure. @param[in] CpuFeature Pointer to CPU feature entry =20 @retval RETURN_SUCCESS The CPU feature was successfully regis= tered. @@ -642,37 +622,21 @@ CheckCpuFeaturesDependency ( **/ RETURN_STATUS RegisterCpuFeatureWorker ( + IN CPU_FEATURES_DATA *CpuFeaturesData, IN CPU_FEATURES_ENTRY *CpuFeature ) { EFI_STATUS Status; - CPU_FEATURES_DATA *CpuFeaturesData; CPU_FEATURES_ENTRY *CpuFeatureEntry; LIST_ENTRY *Entry; - UINTN BitMaskSize; BOOLEAN FeatureExist; =20 - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); - CpuFeaturesData =3D GetCpuFeaturesData (); - if (CpuFeaturesData->FeaturesCount =3D=3D 0) { - InitializeListHead (&CpuFeaturesData->FeatureList); - InitializeSpinLock (&CpuFeaturesData->CpuFlags.MemoryMappedLock); - InitializeSpinLock (&CpuFeaturesData->CpuFlags.ConsoleLogLock); - // - // Driver has assumption that these three PCD should has same buffer s= ize. - // - ASSERT (PcdGetSize (PcdCpuFeaturesSetting) =3D=3D PcdGetSize (PcdCpuFe= aturesCapability)); - ASSERT (PcdGetSize (PcdCpuFeaturesSetting) =3D=3D PcdGetSize (PcdCpuFe= aturesSupport)); - CpuFeaturesData->BitMaskSize =3D (UINT32) BitMaskSize; - } - ASSERT (CpuFeaturesData->BitMaskSize =3D=3D BitMaskSize); - FeatureExist =3D FALSE; CpuFeatureEntry =3D NULL; Entry =3D GetFirstNode (&CpuFeaturesData->FeatureList); while (!IsNull (&CpuFeaturesData->FeatureList, Entry)) { CpuFeatureEntry =3D CPU_FEATURE_ENTRY_FROM_LINK (Entry); - if (IsCpuFeatureMatch (CpuFeature->FeatureMask, CpuFeatureEntry->Featu= reMask)) { + if (CompareMem (CpuFeature->FeatureMask, CpuFeatureEntry->FeatureMask,= CpuFeaturesData->BitMaskSize) =3D=3D 0) { // // If this feature already registered // @@ -684,12 +648,12 @@ RegisterCpuFeatureWorker ( =20 if (!FeatureExist) { DEBUG ((DEBUG_INFO, "[NEW] ")); - DumpCpuFeature (CpuFeature); + DumpCpuFeature (CpuFeature, CpuFeaturesData->BitMaskSize); InsertTailList (&CpuFeaturesData->FeatureList, &CpuFeature->Link); CpuFeaturesData->FeaturesCount++; } else { DEBUG ((DEBUG_INFO, "[OVERRIDE] ")); - DumpCpuFeature (CpuFeature); + DumpCpuFeature (CpuFeature, CpuFeaturesData->BitMaskSize); ASSERT (CpuFeatureEntry !=3D NULL); // // Overwrite original parameters of CPU feature @@ -849,7 +813,6 @@ RegisterCpuFeature ( EFI_STATUS Status; VA_LIST Marker; UINT32 Feature; - UINTN BitMaskSize; CPU_FEATURES_ENTRY *CpuFeature; UINT8 *FeatureMask; UINT8 *BeforeFeatureBitMask; @@ -860,6 +823,7 @@ RegisterCpuFeature ( UINT8 *PackageAfterFeatureBitMask; BOOLEAN BeforeAll; BOOLEAN AfterAll; + CPU_FEATURES_DATA *CpuFeaturesData; =20 FeatureMask =3D NULL; BeforeFeatureBitMask =3D NULL; @@ -871,7 +835,18 @@ RegisterCpuFeature ( BeforeAll =3D FALSE; AfterAll =3D FALSE; =20 - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); + CpuFeaturesData =3D GetCpuFeaturesData (); + if (CpuFeaturesData->FeaturesCount =3D=3D 0) { + InitializeListHead (&CpuFeaturesData->FeatureList); + InitializeSpinLock (&CpuFeaturesData->CpuFlags.MemoryMappedLock); + InitializeSpinLock (&CpuFeaturesData->CpuFlags.ConsoleLogLock); + // + // Code assumes below three PCDs have PCD same buffer size. + // + ASSERT (PcdGetSize (PcdCpuFeaturesSetting) =3D=3D PcdGetSize (PcdCpuFe= aturesCapability)); + ASSERT (PcdGetSize (PcdCpuFeaturesSetting) =3D=3D PcdGetSize (PcdCpuFe= aturesSupport)); + CpuFeaturesData->BitMaskSize =3D (UINT32) PcdGetSize (PcdCpuFeaturesSe= tting); + } =20 VA_START (Marker, InitializeFunc); Feature =3D VA_ARG (Marker, UINT32); @@ -889,19 +864,19 @@ RegisterCpuFeature ( AfterAll =3D ((Feature & CPU_FEATURE_AFTER_ALL) !=3D 0) ? TRUE : FA= LSE; Feature &=3D ~(CPU_FEATURE_BEFORE_ALL | CPU_FEATURE_AFTER_ALL); ASSERT (FeatureMask =3D=3D NULL); - SetCpuFeaturesBitMask (&FeatureMask, Feature, BitMaskSize); + SetCpuFeaturesBitMask (&FeatureMask, Feature, CpuFeaturesData->BitMa= skSize); } else if ((Feature & CPU_FEATURE_BEFORE) !=3D 0) { - SetCpuFeaturesBitMask (&BeforeFeatureBitMask, Feature & ~CPU_FEATURE= _BEFORE, BitMaskSize); + SetCpuFeaturesBitMask (&BeforeFeatureBitMask, Feature & ~CPU_FEATURE= _BEFORE, CpuFeaturesData->BitMaskSize); } else if ((Feature & CPU_FEATURE_AFTER) !=3D 0) { - SetCpuFeaturesBitMask (&AfterFeatureBitMask, Feature & ~CPU_FEATURE_= AFTER, BitMaskSize); + SetCpuFeaturesBitMask (&AfterFeatureBitMask, Feature & ~CPU_FEATURE_= AFTER, CpuFeaturesData->BitMaskSize); } else if ((Feature & CPU_FEATURE_CORE_BEFORE) !=3D 0) { - SetCpuFeaturesBitMask (&CoreBeforeFeatureBitMask, Feature & ~CPU_FEA= TURE_CORE_BEFORE, BitMaskSize); + SetCpuFeaturesBitMask (&CoreBeforeFeatureBitMask, Feature & ~CPU_FEA= TURE_CORE_BEFORE, CpuFeaturesData->BitMaskSize); } else if ((Feature & CPU_FEATURE_CORE_AFTER) !=3D 0) { - SetCpuFeaturesBitMask (&CoreAfterFeatureBitMask, Feature & ~CPU_FEAT= URE_CORE_AFTER, BitMaskSize); + SetCpuFeaturesBitMask (&CoreAfterFeatureBitMask, Feature & ~CPU_FEAT= URE_CORE_AFTER, CpuFeaturesData->BitMaskSize); } else if ((Feature & CPU_FEATURE_PACKAGE_BEFORE) !=3D 0) { - SetCpuFeaturesBitMask (&PackageBeforeFeatureBitMask, Feature & ~CPU_= FEATURE_PACKAGE_BEFORE, BitMaskSize); + SetCpuFeaturesBitMask (&PackageBeforeFeatureBitMask, Feature & ~CPU_= FEATURE_PACKAGE_BEFORE, CpuFeaturesData->BitMaskSize); } else if ((Feature & CPU_FEATURE_PACKAGE_AFTER) !=3D 0) { - SetCpuFeaturesBitMask (&PackageAfterFeatureBitMask, Feature & ~CPU_F= EATURE_PACKAGE_AFTER, BitMaskSize); + SetCpuFeaturesBitMask (&PackageAfterFeatureBitMask, Feature & ~CPU_F= EATURE_PACKAGE_AFTER, CpuFeaturesData->BitMaskSize); } Feature =3D VA_ARG (Marker, UINT32); } @@ -929,7 +904,7 @@ RegisterCpuFeature ( ASSERT_EFI_ERROR (Status); } =20 - Status =3D RegisterCpuFeatureWorker (CpuFeature); + Status =3D RegisterCpuFeatureWorker (CpuFeaturesData, CpuFeature); ASSERT_EFI_ERROR (Status); =20 return RETURN_SUCCESS; --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43831): https://edk2.groups.io/g/devel/message/43831 Mute This Topic: https://groups.io/mt/32498616/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-