From: "Ni, Ray" <ray.ni@intel.com>
To: "Wang, William2" <william2.wang@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Kinney, Michael D" <michael.d.kinney@intel.com>,
"Gao, Liming" <gaoliming@byosoft.com.cn>,
"Kuo, Donald" <donald.kuo@intel.com>,
"Kumar, Chandana C" <chandana.c.kumar@intel.com>
Subject: Re: [PATCH v1] Update Arch. MSR and CPUID to follow latest SDM.
Date: Fri, 13 Jan 2023 07:55:41 +0000 [thread overview]
Message-ID: <MN6PR11MB82447AD9BF45F583DC0EB7A78CC29@MN6PR11MB8244.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20230113070304.2047-1-william2.wang@intel.com>
Can you separate to 2 patches?
> -----Original Message-----
> From: Wang, William2 <william2.wang@intel.com>
> Sent: Friday, January 13, 2023 3:03 PM
> To: devel@edk2.groups.io
> Cc: Wang, William2 <william2.wang@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; Ni, Ray <ray.ni@intel.com>; Kuo, Donald <donald.kuo@intel.com>; Kumar, Chandana C
> <chandana.c.kumar@intel.com>
> Subject: [PATCH v1] Update Arch. MSR and CPUID to follow latest SDM.
>
> From: William2 Wang <william2.wang@intel.com>
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4262
> https://bugzilla.tianocore.org/show_bug.cgi?id=4263
>
> Update CPUID Leaf 06H to follow latest SDM.
> Update Architecture MSR contains the MSR10A.BIT23 and
> MSR195.BIT2-0 for overclocking undervolt protection.
>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Donald Kuo <Donald.Kuo@intel.com>
> Cc: Chandana C Kumar <chandana.c.kumar@intel.com>
> ---
> MdePkg/Include/Register/Intel/ArchitecturalMsr.h | 198 ++++++++++++++++++++
> MdePkg/Include/Register/Intel/Cpuid.h | 56 +++++-
> 2 files changed, 251 insertions(+), 3 deletions(-)
>
> diff --git a/MdePkg/Include/Register/Intel/ArchitecturalMsr.h b/MdePkg/Include/Register/Intel/ArchitecturalMsr.h
> index 071a8c689c..f548b56672 100644
> --- a/MdePkg/Include/Register/Intel/ArchitecturalMsr.h
> +++ b/MdePkg/Include/Register/Intel/ArchitecturalMsr.h
> @@ -682,6 +682,149 @@ typedef union {
> UINT64 Uint64;
> } MSR_IA32_MTRRCAP_REGISTER;
>
> +/**
> + Enumeration of Architectural Features (R/O). If CPUID.(EAX=07H, ECX=0):EDX[29]=1.
> +
> + @param ECX IA32_ARCH_CAPABILITIES (0x0000010A)
> + @param EAX Lower 32-bits of MSR value.
> + Described by the type IA32_ARCH_CAPABILITIES_REGISTER.
> + @param EDX Upper 32-bits of MSR value.
> + Described by the type IA32_ARCH_CAPABILITIES_REGISTER.
> +
> + <b>Example usage</b>
> + @code
> + IA32_ARCH_CAPABILITIES_REGISTER Msr;
> +
> + Msr.Uint64 = AsmReadMsr64 (IA32_ARCH_CAPABILITIES);
> + @endcode
> + @note IA32_ARCH_CAPABILITIES is defined as IA32_ARCH_CAPABILITIES in SDM.
> +**/
> +#define IA32_ARCH_CAPABILITIES 0x0000010A
> +
> +/**
> + MSR information returned for MSR index #IA32_ARCH_CAPABILITIES
> +**/
> +typedef union {
> + ///
> + /// Individual bit fields
> + ///
> + struct {
> + ///
> + /// [Bits 0] RDCL_NO: The processor is not susceptible to Rogue Data Cache Load (RDCL).
> + ///
> + UINT32 RDCL_NO : 1;
> + ///
> + /// [Bit 1] IBRS_ALL: The processor supports enhanced IBRS.
> + ///
> + UINT32 IBRS_ALL : 1;
> + ///
> + /// [Bit 2] RSBA: The processor supports RSB Alternate. Alternative branch predictors
> + /// may be used by RET instructions when the RSB is empty. SW using retpoline may be
> + /// affected by this behavior.
> + ///
> + UINT32 RSBA : 1;
> + ///
> + /// [Bit 3] SKIP_L1DFL_VMENTRY: A value of 1 indicates the hypervisor need not flush the
> + /// L1D on VM entry.
> + ///
> + UINT32 SKIP_L1DFL_VMENTRY : 1;
> + ///
> + /// [Bit 4] SSB_NO: Processor is not susceptible to Speculative Store Bypass.
> + ///
> + UINT32 SSB_NO : 1;
> + ///
> + /// [Bit 5] MDS_NO: Processor is not susceptible to Microarchitectural Data Sampling (MDS).
> + ///
> + UINT32 MDS_NO : 1;
> + ///
> + /// [Bit 6] IF_PSCHANGE_MC_NO: The processor is not susceptible to a machine check error due to
> + /// modifying the size of a code page without TLB invalidation.
> + ///
> + UINT32 IF_PSCHANGE_MC_NO : 1;
> + ///
> + /// [Bit 7] TSX_CTRL: If 1, indicates presence of IA32_TSX_CTRL MSR.
> + ///
> + UINT32 TSX_CTRL : 1;
> + ///
> + /// [Bit 8] TAA_NO: If 1, processor is not affected by TAA.
> + ///
> + UINT32 TAA_NO : 1;
> + UINT32 Reserved1 : 1;
> + ///
> + /// [Bit 10] MISC_PACKAGE_CTLS: The processor supports IA32_MISC_PACKAGE_CTLS MSR.
> + ///
> + UINT32 MISC_PACKAGE_CTLS : 1;
> + ///
> + /// [Bit 11] ENERGY_FILTERING_CTL: The processor supports setting and reading the
> + /// IA32_MISC_PACKAGE_CTLS[0] (ENERGY_FILTERING_ENABLE) bit.
> + ///
> + UINT32 ENERGY_FILTERING_CTL : 1;
> + ///
> + /// [Bit 12] DOITM: If 1, the processor supports Data Operand Independent Timing Mode.
> + ///
> + UINT32 DOITM : 1;
> + ///
> + /// [Bit 13] SBDR_SSDP_NO: The processor is not affected by either the Shared Buffers Data
> + /// Read (SBDR) vulnerability or the Sideband Stale Data Propagator (SSDP).
> + ///
> + UINT32 SBDR_SSDP_NO : 1;
> + ///
> + /// [Bit 14] FBSDP_NO: The processor is not affected by the Fill Buffer Stale Data Propagator (FBSDP).
> + ///
> + UINT32 FBSDP_NO : 1;
> + ///
> + /// [Bit 15] PSDP_NO: The processor is not affected by vulnerabilities involving the Primary Stale Data Propagator (PSDP).
> + ///
> + UINT32 PSDP_NO : 1;
> + UINT32 Reserved2 : 1;
> + ///
> + /// [Bit 17] FB_CLEAR: If 1, the processor supports overwrite of fill buffer values as part of MD_CLEAR operations
> + /// with the VERW instruction.
> + ///
> + UINT32 FB_CLEAR : 1;
> + ///
> + /// [Bit 18] FB_CLEAR_CTRL: If 1, the processor supports the IA32_MCU_OPT_CTRL MSR
> + /// and allows software to set bit 3 of that MSR (FB_CLEAR_DIS).
> + ///
> + UINT32 FB_CLEAR_CTRL : 1;
> + ///
> + /// [Bit 19] RRSBA: A value of 1 indicates the processor may have the RRSBA alternate prediction
> + /// behavior, if not disabled by RRSBA_DIS_U or RRSBA_DIS_S.
> + ///
> + UINT32 RRSBA : 1;
> + ///
> + /// [Bit 20] BHI_NO: A value of 1 indicates BHI_NO branch prediction behavior, regardless of
> + /// the value of IA32_SPEC_CTRL[BHI_DIS_S] MSR bit.
> + ///
> + UINT32 BHI_NO : 1;
> + //
> + /// [Bit 21] XAPIC_DISABLE_STATUS: Enumerates that the IA32_XAPIC_DISABLE_STATUS MSR exists,
> + /// and that bit 0 specifies whether the legacy xAPIC is disabled and APIC state is locked to x2APIC.
> + ///
> + UINT32 XAPIC_DISABLE_STATUS : 1;
> + UINT32 Reserved3 : 1;
> + ///
> + /// [Bit 23] OVERCLOCKING_STATUS: If set, the IA32_OVERCLOCKING_STATUS MSR exists.
> + ///
> + UINT32 OVERCLOCKING_STATUS : 1;
> + ///
> + /// [Bit 24] PBRSB_NO: If 1, the processor is not affected by issues related to Post-Barrier
> + /// Return Stack Buffer Predictions.
> + ///
> + UINT32 PBRSB_NO : 1;
> + UINT32 Reserved4 : 7;
> + UINT32 Reserved5 : 32;
> + } Bits;
> + ///
> + /// All bit fields as a 32-bit value
> + ///
> + UINT32 Uint32;
> + ///
> + /// All bit fields as a 64-bit value
> + ///
> + UINT64 Uint64;
> +} IA32_ARCH_CAPABILITIES_REGISTER;
> +
> /**
> SYSENTER_CS_MSR (R/W). Introduced at Display Family / Display Model 06_01H.
>
> @@ -1035,6 +1178,61 @@ typedef union {
> UINT64 Uint64;
> } MSR_IA32_PERFEVTSEL_REGISTER;
>
> +/**
> + Overclocking Status (R/O) IA32_ARCH_CAPABILITIES[bit 23] enumerates support for this MSR.
> +
> + @param ECX IA32_OVERCLOCKING_STATUS (0x00000195)
> + @param EAX Lower 32-bits of MSR value.
> + Described by the type IA32_OVERCLOCKING_STATUS_REGISTER.
> + @param EDX Upper 32-bits of MSR value.
> + Described by the type IA32_OVERCLOCKING_STATUS_REGISTER.
> +
> + <b>Example usage</b>
> + @code
> + IA32_OVERCLOCKING_STATUS_REGISTER Msr;
> +
> + Msr.Uint64 = AsmReadMsr64 (IA32_OVERCLOCKING_STATUS);
> + @endcode
> + @note IA32_OVERCLOCKING_STATUS is defined as IA32_OVERCLOCKING_STATUS in SDM.
> +**/
> +#define IA32_OVERCLOCKING_STATUS 0x00000195
> +
> +/**
> + MSR information returned for MSR index #IA32_ARCH_CAPABILITIES
> +**/
> +typedef union {
> + ///
> + /// Individual bit fields
> + ///
> + struct {
> + ///
> + /// [Bits 0] Indicates if specific forms of overclocking have been enabled on this boot or reset
> + /// cycle: 0 indicates no, 1 indicates yes.
> + ///
> + UINT32 OverclockingUtilized : 1;
> + ///
> + /// [Bits 1] Indicates if the “Dynamic OC Undervolt Protection” security feature is active:
> + /// 0 indicates disabled, 1 indicates enabled.
> + ///
> + UINT32 UndervoltProtection : 1;
> + ///
> + /// [Bits 2] Indicates that overclocking capabilities have been unlocked by BIOS,
> + /// with or without overclocking: 0 indicates Not Secured, 1 indicates Secure.
> + ///
> + UINT32 OverclockingSecureStatus : 1;
> + UINT32 Reserved1 : 29;
> + UINT32 Reserved2 : 32;
> + } Bits;
> + ///
> + /// All bit fields as a 32-bit value
> + ///
> + UINT32 Uint32;
> + ///
> + /// All bit fields as a 64-bit value
> + ///
> + UINT64 Uint64;
> +} IA32_OVERCLOCKING_STATUS_REGISTER;
> +
> /**
> Current performance state(P-State) operating point (RO). Introduced at
> Display Family / Display Model 0F_03H.
> diff --git a/MdePkg/Include/Register/Intel/Cpuid.h b/MdePkg/Include/Register/Intel/Cpuid.h
> index 350bf60252..46cdb827e2 100644
> --- a/MdePkg/Include/Register/Intel/Cpuid.h
> +++ b/MdePkg/Include/Register/Intel/Cpuid.h
> @@ -1195,12 +1195,24 @@ typedef union {
> /// [Bit 18] Fast access mode for the IA32_HWP_REQUEST MSR is supported if set.
> ///
> UINT32 FastAccessMode : 1;
> - UINT32 Reserved4 : 1;
> + ///
> + /// [Bit 19] IA32_HW_FEEDBACK_PTR MSR, IA32_HW_FEEDBACK_CONFIG MSR,
> + /// IA32_PACKAGE_THERM_STATUS MSR bit 26, and IA32_PACKAGE_THERM_INTERRUPT MSR bit 25 are supported if
> set.
> + UINT32 HW_FEEDBACK : 1;
> ///
> /// [Bit 20] Ignoring Idle Logical Processor HWP request is supported if set.
> ///
> UINT32 IgnoringIdleLogicalProcessorHWPRequest : 1;
> - UINT32 Reserved5 : 11;
> + UINT32 Reserved4 : 2;
> + ///
> + /// [Bit 23] Intel Thread Director supported if set. IA32_HW_FEEDBACK_CHAR and
> + /// IA32_HW_FEEDBACK_THREAD_CONFIG MSRs are supported if set.
> + UINT32 ThreadDirector : 1;
> + ///
> + /// [Bit 24] IA32_THERM_INTERRUPT MSR bit 25 is supported if set.
> + ///
> + UINT32 IA32_THERM_INTERRUPT : 1;
> + UINT32 Reserved5 : 7;
> } Bits;
> ///
> /// All bit fields as a 32-bit value
> @@ -1252,7 +1264,13 @@ typedef union {
> /// (1B0H).
> ///
> UINT32 PerformanceEnergyBias : 1;
> - UINT32 Reserved2 : 28;
> + UINT32 Reserved2 : 4;
> + ///
> + /// {Bit 15:8] Number of Intel Thread Director classes supported by the processor. Information for that
> + /// many classes is written into the Intel Thread Director Table by the hardware.
> + ///
> + UINT32 ThreadDirectorClasses : 8;
> + UINT32 Reserved3 : 16;
> } Bits;
> ///
> /// All bit fields as a 32-bit value
> @@ -1260,6 +1278,38 @@ typedef union {
> UINT32 Uint32;
> } CPUID_THERMAL_POWER_MANAGEMENT_ECX;
>
> +/**
> + CPUID Thermal and Power Management Information returned in EDX for CPUID leaf
> + #CPUID_THERMAL_POWER_MANAGEMENT.
> +**/
> +typedef union {
> + ///
> + /// Individual bit fields
> + ///
> + struct {
> + ///
> + /// {Bits 7:0] Bitmap of supported hardware feedback interface capabilities.
> + ///
> + UINT32 InterfaceCapability : 8;
> + ///
> + /// {Bits 11:8] Enumerates the size of the hardware feedback interface structure in number of 4 KB pages;
> + /// add one to the return value to get the result.
> + ///
> + UINT32 InterfaceStructureSize : 4;
> + UINT32 Reserved : 4;
> + ///
> + /// {Bits 31:16] : Index (starting at 0) of this logical processor's row in the hardware feedback interface structure.
> + /// Note that on some parts the index may be same for multiple logical processors. On some parts the
> + /// indices may not be contiguous, i.e., there may be unused rows in the hardware feedback interface structure.
> + ///
> + UINT32 LogicalProcessorRowIndex : 16;
> + } Bits;
> + ///
> + /// All bit fields as a 32-bit value
> + ///
> + UINT32 Uint32;
> +} CPUID_THERMAL_POWER_MANAGEMENT_EDX;
> +
> /**
> CPUID Structured Extended Feature Flags Enumeration
>
> --
> 2.34.1.windows.1
prev parent reply other threads:[~2023-01-13 7:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 7:03 [PATCH v1] Update Arch. MSR and CPUID to follow latest SDM william2.wang
2023-01-13 7:55 ` Ni, Ray [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=MN6PR11MB82447AD9BF45F583DC0EB7A78CC29@MN6PR11MB8244.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox