From 140d713175f8a6176e67f179fc31b540461d81e5 Mon Sep 17 00:00:00 2001 From: Eric Dong Date: Fri, 14 Sep 2018 08:59:27 +0800 Subject: [PATCH] UefiCpuPkg/Include/Register/Msr/GoldmontMsr.h: Add new MSR name and keep old one. Changes includes: 1. Change MSR name: 1. MSR_GOLDMONT_SGXOWNER0 => MSR_GOLDMONT_SGXOWNEREPOCH0 2. MSR_GOLDMONT_SGXOWNER1 => MSR_GOLDMONT_SGXOWNEREPOCH1 2. Keep old MSR definition (MSR_GOLDMONT_SGXOWNER0/1) for compatibility. 1. Define old MSR like below style: #define MSR_GOLDMONT_SGXOWNER0 MSR_GOLDMONT_SGXOWNEREPOCH0 Cc: Michael D Kinney Cc: Ruiyu Ni Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Eric Dong Reviewed-by: Ruiyu Ni Acked-by: Laszlo Ersek --- UefiCpuPkg/Include/Register/Msr/GoldmontMsr.h | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/UefiCpuPkg/Include/Register/Msr/GoldmontMsr.h b/UefiCpuPkg/Include/Register/Msr/GoldmontMsr.h index a9061133c9..383f31ee55 100644 --- a/UefiCpuPkg/Include/Register/Msr/GoldmontMsr.h +++ b/UefiCpuPkg/Include/Register/Msr/GoldmontMsr.h @@ -843,10 +843,12 @@ typedef union { /** - Package. Lower 64 Bit OwnerEpoch Component of SGX Key (RO). Low 64 bits of - an 128-bit external entropy value for key derivation of an enclave. + Package. Lower 64 Bit CR_SGXOWNEREPOCH (W) Writes do not update + CR_SGXOWNEREPOCH if CPUID.(EAX=12H, ECX=0):EAX.SGX1 is 1 on any thread in + the package. Lower 64 bits of an 128-bit external entropy value for key + derivation of an enclave. - @param ECX MSR_GOLDMONT_SGXOWNER0 (0x00000300) + @param ECX MSR_GOLDMONT_SGXOWNEREPOCH0 (0x00000300) @param EAX Lower 32-bits of MSR value. @param EDX Upper 32-bits of MSR value. @@ -854,18 +856,24 @@ typedef union { @code UINT64 Msr; - Msr = AsmReadMsr64 (MSR_GOLDMONT_SGXOWNER0); + Msr = AsmReadMsr64 (MSR_GOLDMONT_SGXOWNEREPOCH0); @endcode - @note MSR_GOLDMONT_SGXOWNER0 is defined as MSR_SGXOWNER0 in SDM. + @note MSR_GOLDMONT_SGXOWNEREPOCH0 is defined as MSR_SGXOWNEREPOCH0 in SDM. **/ -#define MSR_GOLDMONT_SGXOWNER0 0x00000300 +#define MSR_GOLDMONT_SGXOWNEREPOCH0 0x00000300 + + +// +// Define MSR_GOLDMONT_SGXOWNER0 for compatibility due to name change in the SDM. +// +#define MSR_GOLDMONT_SGXOWNER0 MSR_GOLDMONT_SGXOWNEREPOCH0 /** Package. Upper 64 Bit OwnerEpoch Component of SGX Key (RO). Upper 64 bits of an 128-bit external entropy value for key derivation of an enclave. - @param ECX MSR_GOLDMONT_SGXOWNER1 (0x00000301) + @param ECX MSR_GOLDMONT_SGXOWNEREPOCH1 (0x00000301) @param EAX Lower 32-bits of MSR value. @param EDX Upper 32-bits of MSR value. @@ -873,11 +881,17 @@ typedef union { @code UINT64 Msr; - Msr = AsmReadMsr64 (MSR_GOLDMONT_SGXOWNER1); + Msr = AsmReadMsr64 (MSR_GOLDMONT_SGXOWNEREPOCH1); @endcode - @note MSR_GOLDMONT_SGXOWNER1 is defined as MSR_SGXOWNER1 in SDM. + @note MSR_GOLDMONT_SGXOWNEREPOCH1 is defined as MSR_SGXOWNEREPOCH1 in SDM. **/ -#define MSR_GOLDMONT_SGXOWNER1 0x00000301 +#define MSR_GOLDMONT_SGXOWNEREPOCH1 0x00000301 + + +// +// Define MSR_GOLDMONT_SGXOWNER1 for compatibility due to name change in the SDM. +// +#define MSR_GOLDMONT_SGXOWNER1 MSR_GOLDMONT_SGXOWNEREPOCH1 /**