From nobody Mon May 6 15:31:37 2024 Delivered-To: importer@patchew.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; 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 1502951754299633.9753274748919; Wed, 16 Aug 2017 23:35:54 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D7B1621E2DA63; Wed, 16 Aug 2017 23:33:24 -0700 (PDT) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 6725321E2571A for ; Wed, 16 Aug 2017 23:33:24 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Aug 2017 23:35:50 -0700 Received: from ydong10-win10.ccr.corp.intel.com ([10.239.158.51]) by orsmga003.jf.intel.com with ESMTP; 16 Aug 2017 23:35:49 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,386,1498546800"; d="scan'208";a="1004680917" From: Eric Dong To: edk2-devel@lists.01.org Date: Thu, 17 Aug 2017 14:35:47 +0800 Message-Id: <1502951747-10848-1-git-send-email-eric.dong@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 Subject: [edk2] [Patch] UefiCpuPkg/CpuCommonFeaturesLib: Use MSR data structure when change MSR value. 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: Michael Kinney , Ruiyu Ni MIME-Version: 1.0 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" When update MSR values, current code use BITxx to modify the MSR values. En= hance the code to use corresponding MSR's data structures to make it more user fr= iendly. Cc: Michael Kinney Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Eric Dong --- .../Library/CpuCommonFeaturesLib/ProcTrace.c | 112 +++++++++++++++--= ---- 1 file changed, 84 insertions(+), 28 deletions(-) diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/ProcTrace.c b/UefiCpuP= kg/Library/CpuCommonFeaturesLib/ProcTrace.c index 40e6321..fa458ab 100644 --- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/ProcTrace.c +++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/ProcTrace.c @@ -69,8 +69,50 @@ typedef struct { PROC_TRACE_PROCESSOR_DATA *ProcessorData; } PROC_TRACE_DATA; =20 +typedef union { + /// + /// Individual bit fields + /// + struct { + /// + /// [Bit 0] END. See Section 35.2.6.2, "Table of Physical Addresses (T= oPA)". + /// + UINT64 END:1; + UINT64 Reserved1:1; + /// + /// [Bit 2] INT. See Section 35.2.6.2, "Table of Physical Addresses (T= oPA)". + /// + UINT64 INT:1; + UINT64 Reserved2:1; + /// + /// [Bit 4] STOP. See Section 35.2.6.2, "Table of Physical Addresses (= ToPA)". + /// + UINT64 STOP:1; + UINT64 Reserved3:1; + /// + /// [Bit 6:9] Indicates the size of the associated output region. See = Section + /// 35.2.6.2, "Table of Physical Addresses (ToPA)". + /// + UINT64 Size:4; + UINT64 Reserved4:2; + /// + /// [Bit 12:63] Output Region Base Physical Address. + /// ATTENTION: The size of the address field is determined by the proc= essor's + /// physical-address width (MAXPHYADDR) in bits, as reported in + /// CPUID.80000008H:EAX[7:0]. the above part of address reserved. + /// True address field is [12:MAXPHYADDR-1], [MAXPHYADDR:63] is reserv= ed part. + /// Detail see Section 35.2.6.2, "Table of Physical Addresses (ToPA)". + /// + UINT64 Address:52; + } Bits; + /// + /// All bit fields as a 64-bit value + /// + UINT64 Uint64; +} PROC_TRACE_TOPA_ENTRY; + typedef struct { - UINT64 TopaEntry[MAX_TOPA_ENTRY_COUNT]; + PROC_TRACE_TOPA_ENTRY TopaEntry[MAX_TOPA_ENTRY_COUNT]; } PROC_TRACE_TOPA_TABLE; =20 /** @@ -186,7 +228,6 @@ ProcTraceInitialize ( IN BOOLEAN State ) { - UINT64 MsrValue; UINT32 MemRegionSize; UINTN Pages; UINTN Alignment; @@ -199,6 +240,11 @@ ProcTraceInitialize ( PROC_TRACE_TOPA_TABLE *TopaTable; PROC_TRACE_DATA *ProcTraceData; BOOLEAN FirstIn; + MSR_IA32_RTIT_CTL_REGISTER CtrlReg; + MSR_IA32_RTIT_STATUS_REGISTER StatusReg; + MSR_IA32_RTIT_OUTPUT_BASE_REGISTER OutputBaseReg; + MSR_IA32_RTIT_OUTPUT_MASK_PTRS_REGISTER OutputMaskPtrsReg; + PROC_TRACE_TOPA_ENTRY *TopaEntryPtr; =20 ProcTraceData =3D (PROC_TRACE_DATA *) ConfigData; =20 @@ -221,29 +267,28 @@ ProcTraceInitialize ( // // Clear MSR_IA32_RTIT_CTL[0] and IA32_RTIT_STS only if MSR_IA32_RTIT_CT= L[0]=3D=3D1b // - MsrValue =3D AsmReadMsr64 (MSR_IA32_RTIT_CTL); - if ((MsrValue & BIT0) !=3D 0) { + CtrlReg.Uint64 =3D AsmReadMsr64 (MSR_IA32_RTIT_CTL); + if (CtrlReg.Bits.TraceEn !=3D 0) { /// /// Clear bit 0 in MSR IA32_RTIT_CTL (570) /// - MsrValue &=3D (UINT64) ~BIT0; + CtrlReg.Bits.TraceEn =3D 0; CPU_REGISTER_TABLE_WRITE64 ( ProcessorNumber, Msr, MSR_IA32_RTIT_CTL, - MsrValue + CtrlReg.Uint64 ); =20 /// /// Clear MSR IA32_RTIT_STS (571h) to all zeros /// - MsrValue =3D AsmReadMsr64 (MSR_IA32_RTIT_STATUS); - MsrValue &=3D 0x0; + StatusReg.Uint64 =3D 0x0; CPU_REGISTER_TABLE_WRITE64 ( ProcessorNumber, Msr, MSR_IA32_RTIT_STATUS, - MsrValue + StatusReg.Uint64 ); } =20 @@ -309,35 +354,35 @@ ProcTraceInitialize ( // // Clear MSR IA32_RTIT_CTL (0x570) ToPA (Bit 8) // - MsrValue =3D AsmReadMsr64 (MSR_IA32_RTIT_CTL); - MsrValue &=3D (UINT64) ~BIT8; + CtrlReg.Uint64 =3D AsmReadMsr64 (MSR_IA32_RTIT_CTL); + CtrlReg.Bits.ToPA =3D 0; CPU_REGISTER_TABLE_WRITE64 ( ProcessorNumber, Msr, MSR_IA32_RTIT_CTL, - MsrValue + CtrlReg.Uint64 ); =20 // // Program MSR IA32_RTIT_OUTPUT_BASE (0x560) bits[47:12] with the allo= cated Memory Region // - MsrValue =3D (UINT64) MemRegionBaseAddr; + OutputBaseReg.Uint64 =3D (UINT64) MemRegionBaseAddr; CPU_REGISTER_TABLE_WRITE64 ( ProcessorNumber, Msr, MSR_IA32_RTIT_OUTPUT_BASE, - MsrValue + OutputBaseReg.Uint64 ); =20 // // Program the Mask bits for the Memory Region to MSR IA32_RTIT_OUTPUT= _MASK_PTRS (561h) // - MsrValue =3D (UINT64) MemRegionSize - 1; + OutputMaskPtrsReg.Uint64 =3D (UINT64) MemRegionSize - 1; CPU_REGISTER_TABLE_WRITE64 ( ProcessorNumber, Msr, MSR_IA32_RTIT_OUTPUT_MASK_PTRS, - MsrValue + OutputMaskPtrsReg.Uint64 ); =20 } @@ -408,55 +453,66 @@ ProcTraceInitialize ( } =20 TopaTable =3D (PROC_TRACE_TOPA_TABLE *) TopaTableBaseAddr; - TopaTable->TopaEntry[0] =3D (UINT64) (MemRegionBaseAddr | ((ProcTraceD= ata->ProcTraceMemSize) << 6)) & ~BIT0; - TopaTable->TopaEntry[1] =3D (UINT64) TopaTableBaseAddr | BIT0; + TopaEntryPtr =3D &TopaTable->TopaEntry[0]; + TopaEntryPtr->Bits.Address =3D MemRegionBaseAddr; + TopaEntryPtr->Bits.Size =3D ProcTraceData->ProcTraceMemSize; + TopaEntryPtr->Bits.END =3D 0; + + TopaEntryPtr =3D &TopaTable->TopaEntry[1]; + TopaEntryPtr->Bits.Address =3D TopaTableBaseAddr; + TopaEntryPtr->Bits.END =3D 1; =20 // // Program the MSR IA32_RTIT_OUTPUT_BASE (0x560) bits[47:12] with ToPA= base // - MsrValue =3D (UINT64) TopaTableBaseAddr; + OutputBaseReg.Uint64 =3D (UINT64) TopaTableBaseAddr; CPU_REGISTER_TABLE_WRITE64 ( ProcessorNumber, Msr, MSR_IA32_RTIT_OUTPUT_BASE, - MsrValue + OutputBaseReg.Uint64 ); =20 // // Set the MSR IA32_RTIT_OUTPUT_MASK (0x561) bits[63:7] to 0 // + OutputMaskPtrsReg.Uint64 =3D (UINT64) 0x7F; CPU_REGISTER_TABLE_WRITE64 ( ProcessorNumber, Msr, MSR_IA32_RTIT_OUTPUT_MASK_PTRS, - 0x7F + OutputMaskPtrsReg.Uint64 ); // // Enable ToPA output scheme by enabling MSR IA32_RTIT_CTL (0x570) ToP= A (Bit 8) // - MsrValue =3D AsmReadMsr64 (MSR_IA32_RTIT_CTL); - MsrValue |=3D BIT8; + CtrlReg.Uint64 =3D AsmReadMsr64 (MSR_IA32_RTIT_CTL); + CtrlReg.Bits.ToPA =3D 1; CPU_REGISTER_TABLE_WRITE64 ( ProcessorNumber, Msr, MSR_IA32_RTIT_CTL, - MsrValue + CtrlReg.Uint64 ); } =20 /// /// Enable the Processor Trace feature from MSR IA32_RTIT_CTL (570h) /// - MsrValue =3D AsmReadMsr64 (MSR_IA32_RTIT_CTL); - MsrValue |=3D (UINT64) BIT0 + BIT2 + BIT3 + BIT13; + CtrlReg.Uint64 =3D AsmReadMsr64 (MSR_IA32_RTIT_CTL); + CtrlReg.Bits.OS =3D 1; + CtrlReg.Bits.User =3D 1; + CtrlReg.Bits.BranchEn =3D 1; if (!State) { - MsrValue &=3D (UINT64) ~BIT0; + CtrlReg.Bits.TraceEn =3D 0; + } else { + CtrlReg.Bits.TraceEn =3D 1; } CPU_REGISTER_TABLE_WRITE64 ( ProcessorNumber, Msr, MSR_IA32_RTIT_CTL, - MsrValue + CtrlReg.Uint64 ); =20 return RETURN_SUCCESS; --=20 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel