From nobody Sat Feb 7 11:39:09 2026 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+45255+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+45255+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1565331149; cv=none; d=zoho.com; s=zohoarc; b=Nl2HJyzMWrhq1O0irqLoVywM9rhnyZhw5Fz5cIKAarWvFik0wxs9L7fF/ToV1GxkkohEKIfT+H9PS6EFDalMLbkLV25AbeiS2/rKGeJAMMfvsQ7Xbvr9XXQ3UrblXtzHynGTBD0mv7IaZE0squ996NS74esMI53rh9cM/zOJOG0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565331149; 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=JqB59/u+67NAhFJrnxM1dJGyL4g6z+KPWpBK1akZ/yc=; b=MP96eh4OHPAI7E0IGxXAGm4ETWzZWj71qAM5nztvrHgrZLTRNG+EzU+vDhZeYMh8RzdY9ZT/1fAM8+JYYJ6H0l+tpEuScqrhT6RYQmHim4szG73c9EDd72yRtXS5Menm4OSK1DGDUiwhzyieOQQDSsctBpHawhU40ZG12MoSzOM= 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+45255+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 1565331149863115.66150446315453; Thu, 8 Aug 2019 23:12:29 -0700 (PDT) Return-Path: X-Received: from mga06.intel.com (mga06.intel.com []) by groups.io with SMTP; Thu, 08 Aug 2019 23:12:29 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Aug 2019 23:12:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,364,1559545200"; d="scan'208";a="326540071" X-Received: from ydong10-win10.ccr.corp.intel.com ([10.239.158.133]) by orsmga004.jf.intel.com with ESMTP; 08 Aug 2019 23:12:27 -0700 From: "Dong, Eric" To: devel@edk2.groups.io Cc: Ray Ni , Laszlo Ersek Subject: [edk2-devel] [Patch 1/4] UefiCpuPkg/RegisterCpuFeaturesLib: Add "detect before set" Micros. Date: Fri, 9 Aug 2019 14:11:56 +0800 Message-Id: <20190809061159.40248-2-eric.dong@intel.com> In-Reply-To: <20190809061159.40248-1-eric.dong@intel.com> References: <20190809061159.40248-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=1565331149; bh=Mqneg6SBcyGR137mZHU60zWiNWSROOL51lcDlCprOrA=; h=Cc:Date:From:Reply-To:Subject:To; b=V6IzQBe1Z4P1HEFa1dzD8xIXA4NnpEyOugURUHiXrXUUvqYrUXsK6conu7ssncZfYCR f7y+SC2oy7cs/pQqpAPRQvps2qdY3oHy8asXRiA4rb/jXo8pyiGQuFPNL2uQevrZSHtNi rgGub9Bv4EZO6ZMuXrPpxYX0jXkffVeo40w= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2040 Add below new micros which test the current value before set the new value. Only set new value when current value not same as new value. CPU_REGISTER_TABLE_TEST_THEN_WRITE32 CPU_REGISTER_TABLE_TEST_THEN_WRITE64 CPU_REGISTER_TABLE_TEST_THEN_WRITE_FIELD Signed-off-by: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek --- UefiCpuPkg/Include/AcpiCpuData.h | 1 + .../Include/Library/RegisterCpuFeaturesLib.h | 77 +++++++++++++++++-- .../RegisterCpuFeaturesLib.c | 14 +++- 3 files changed, 80 insertions(+), 12 deletions(-) diff --git a/UefiCpuPkg/Include/AcpiCpuData.h b/UefiCpuPkg/Include/AcpiCpuD= ata.h index b963a2f592..c764e209cf 100644 --- a/UefiCpuPkg/Include/AcpiCpuData.h +++ b/UefiCpuPkg/Include/AcpiCpuData.h @@ -81,6 +81,7 @@ typedef struct { UINT16 Reserved; // offset 10 - 11 UINT32 HighIndex; // offset 12-15, only valid for Me= moryMapped UINT64 Value; // offset 16-23 + UINT8 DetectIt; // 0ffset 24 } CPU_REGISTER_TABLE_ENTRY; =20 // diff --git a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h b/UefiCpuP= kg/Include/Library/RegisterCpuFeaturesLib.h index e420e7f075..87fe87acb7 100644 --- a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h +++ b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h @@ -335,6 +335,7 @@ SwitchBspAfterFeaturesInitialize ( @param[in] Index Index of the register to program @param[in] ValueMask Mask of bits in register to write @param[in] Value Value to write + @param[in] DetectIt Whether need to detect current Value before= writing. =20 @note This service could be called by BSP only. **/ @@ -345,7 +346,8 @@ CpuRegisterTableWrite ( IN REGISTER_TYPE RegisterType, IN UINT64 Index, IN UINT64 ValueMask, - IN UINT64 Value + IN UINT64 Value, + IN UINT8 DetectIt ); =20 /** @@ -385,9 +387,45 @@ PreSmmCpuRegisterTableWrite ( =20 @note This service could be called by BSP only. **/ -#define CPU_REGISTER_TABLE_WRITE32(ProcessorNumber, RegisterType, Index, V= alue) \ - do { = \ - CpuRegisterTableWrite (ProcessorNumber, RegisterType, Index, MAX_UINT3= 2, Value); \ +#define CPU_REGISTER_TABLE_WRITE32(ProcessorNumber, RegisterType, Index, V= alue) \ + do { = \ + CpuRegisterTableWrite (ProcessorNumber, RegisterType, Index, MAX_UINT3= 2, Value, FALSE); \ + } while(FALSE); + +/** + Adds a 32-bit register write entry in specified register table. + + This macro adds an entry in specified register table, with given registe= r type, + register index, and value. + + @param[in] ProcessorNumber The index of the CPU to add a register tabl= e entry. + @param[in] RegisterType Type of the register to program + @param[in] Index Index of the register to program + @param[in] Value Value to write + + @note This service could be called by BSP only. +**/ +#define CPU_REGISTER_TABLE_TEST_THEN_WRITE32(ProcessorNumber, RegisterType= , Index, Value) \ + do { = \ + CpuRegisterTableWrite (ProcessorNumber, RegisterType, Index, MAX_UINT3= 2, Value, TRUE); \ + } while(FALSE); + +/** + Adds a 64-bit register write entry in specified register table. + + This macro adds an entry in specified register table, with given registe= r type, + register index, and value. + + @param[in] ProcessorNumber The index of the CPU to add a register tabl= e entry. + @param[in] RegisterType Type of the register to program + @param[in] Index Index of the register to program + @param[in] Value Value to write + + @note This service could be called by BSP only. +**/ +#define CPU_REGISTER_TABLE_WRITE64(ProcessorNumber, RegisterType, Index, V= alue) \ + do { = \ + CpuRegisterTableWrite (ProcessorNumber, RegisterType, Index, MAX_UINT6= 4, Value, FALSE); \ } while(FALSE); =20 /** @@ -403,9 +441,9 @@ PreSmmCpuRegisterTableWrite ( =20 @note This service could be called by BSP only. **/ -#define CPU_REGISTER_TABLE_WRITE64(ProcessorNumber, RegisterType, Index, V= alue) \ - do { = \ - CpuRegisterTableWrite (ProcessorNumber, RegisterType, Index, MAX_UINT6= 4, Value); \ +#define CPU_REGISTER_TABLE_TEST_THEN_WRITE64(ProcessorNumber, RegisterType= , Index, Value) \ + do { = \ + CpuRegisterTableWrite (ProcessorNumber, RegisterType, Index, MAX_UINT6= 4, Value, TRUE); \ } while(FALSE); =20 /** @@ -428,7 +466,30 @@ PreSmmCpuRegisterTableWrite ( UINT64 ValueMask; = \ ValueMask =3D MAX_UINT64; = \ ((Type *)(&ValueMask))->Field =3D 0; = \ - CpuRegisterTableWrite (ProcessorNumber, RegisterType, Index, ~ValueMas= k, Value); \ + CpuRegisterTableWrite (ProcessorNumber, RegisterType, Index, ~ValueMas= k, Value, FALSE); \ + } while(FALSE); + +/** + Adds a bit field write entry in specified register table. + + This macro adds an entry in specified register table, with given registe= r type, + register index, bit field section, and value. + + @param[in] ProcessorNumber The index of the CPU to add a register tabl= e entry. + @param[in] RegisterType Type of the register to program. + @param[in] Index Index of the register to program. + @param[in] Type The data type name of a register structure. + @param[in] Field The bit fiel name in register structure to = write. + @param[in] Value Value to write to the bit field. + + @note This service could be called by BSP only. +**/ +#define CPU_REGISTER_TABLE_TEST_THEN_WRITE_FIELD(ProcessorNumber, Register= Type, Index, Type, Field, Value) \ + do { = \ + UINT64 ValueMask; = \ + ValueMask =3D MAX_UINT64; = \ + ((Type *)(&ValueMask))->Field =3D 0; = \ + CpuRegisterTableWrite (ProcessorNumber, RegisterType, Index, ~ValueMas= k, Value, TRUE); \ } while(FALSE); =20 /** diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesL= ib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c index 67885bf69b..152ab75988 100644 --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c @@ -1025,6 +1025,8 @@ EnlargeRegisterTable ( @param[in] ValidBitStart Start of the bit section @param[in] ValidBitLength Length of the bit section @param[in] Value Value to write + @param[in] DetectIt Whether need to detect current Value before= writing. + **/ VOID CpuRegisterTableWriteWorker ( @@ -1034,7 +1036,8 @@ CpuRegisterTableWriteWorker ( IN UINT64 Index, IN UINT8 ValidBitStart, IN UINT8 ValidBitLength, - IN UINT64 Value + IN UINT64 Value, + IN UINT8 DetectIt ) { CPU_FEATURES_DATA *CpuFeaturesData; @@ -1070,6 +1073,7 @@ CpuRegisterTableWriteWorker ( RegisterTableEntry[RegisterTable->TableLength].ValidBitStart =3D ValidB= itStart; RegisterTableEntry[RegisterTable->TableLength].ValidBitLength =3D ValidB= itLength; RegisterTableEntry[RegisterTable->TableLength].Value =3D Value; + RegisterTableEntry[RegisterTable->TableLength].DetectIt =3D Detect= It; =20 RegisterTable->TableLength++; } @@ -1085,6 +1089,7 @@ CpuRegisterTableWriteWorker ( @param[in] Index Index of the register to program @param[in] ValueMask Mask of bits in register to write @param[in] Value Value to write + @param[in] DetectIt Whether need to detect current Value before= writing. =20 @note This service could be called by BSP only. **/ @@ -1095,7 +1100,8 @@ CpuRegisterTableWrite ( IN REGISTER_TYPE RegisterType, IN UINT64 Index, IN UINT64 ValueMask, - IN UINT64 Value + IN UINT64 Value, + IN UINT8 DetectIt ) { UINT8 Start; @@ -1105,7 +1111,7 @@ CpuRegisterTableWrite ( Start =3D (UINT8)LowBitSet64 (ValueMask); End =3D (UINT8)HighBitSet64 (ValueMask); Length =3D End - Start + 1; - CpuRegisterTableWriteWorker (FALSE, ProcessorNumber, RegisterType, Index= , Start, Length, Value); + CpuRegisterTableWriteWorker (FALSE, ProcessorNumber, RegisterType, Index= , Start, Length, Value, DetectIt); } =20 /** @@ -1139,7 +1145,7 @@ PreSmmCpuRegisterTableWrite ( Start =3D (UINT8)LowBitSet64 (ValueMask); End =3D (UINT8)HighBitSet64 (ValueMask); Length =3D End - Start + 1; - CpuRegisterTableWriteWorker (TRUE, ProcessorNumber, RegisterType, Index,= Start, Length, Value); + CpuRegisterTableWriteWorker (TRUE, ProcessorNumber, RegisterType, Index,= Start, Length, Value, FALSE); } =20 /** --=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 (#45255): https://edk2.groups.io/g/devel/message/45255 Mute This Topic: https://groups.io/mt/32807819/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-