GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/common: Use CPUID_STRUCT_EXTENDED_FEATURE_FLAGS macro 

Use CPUID_STRUCT_EXTENDED_FEATURE_FLAGS macro to get extended CPU
capabilities flags using cpuid_ext inline function.

Signed-off-by: Pratikkumar Prajapati <pratikkumar.v.prajapati@intel.com>
Change-Id: If680ffff64e2e1dabded8c03c4042d349a11b635
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71646
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Sridhar Siricilla <sridhar.siricilla@intel.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Pratikkumar Prajapati 2023-01-03 18:10:42 -08:00 committed by Sridhar Siricilla
parent 2819edb497
commit 17c847b5ea
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/soc/intel/common/block/cpu/cpulib.c
View File

@ -506,8 +506,8 @@ bool is_tme_supported(void)
{ {
struct cpuid_result cpuid_regs; struct cpuid_result cpuid_regs;
cpuid_regs = cpuid_ext(0x7, 0x0); /* ECX[13] is feature capability */ /* ECX[13] is feature capability */
cpuid_regs = cpuid_ext(CPUID_STRUCT_EXTENDED_FEATURE_FLAGS, 0x0);
return (cpuid_regs.ecx & TME_SUPPORTED); return (cpuid_regs.ecx & TME_SUPPORTED);
} }
@ -529,7 +529,8 @@ bool is_sgx_supported(void)
struct cpuid_result cpuid_regs; struct cpuid_result cpuid_regs;
msr_t msr; msr_t msr;
cpuid_regs = cpuid_ext(0x7, 0x0); /* EBX[2] is feature capability */ /* EBX[2] is feature capability */
cpuid_regs = cpuid_ext(CPUID_STRUCT_EXTENDED_FEATURE_FLAGS, 0x0);
msr = rdmsr(MTRR_CAP_MSR); /* Bit 12 is PRMRR enablement */ msr = rdmsr(MTRR_CAP_MSR); /* Bit 12 is PRMRR enablement */
return ((cpuid_regs.ebx & SGX_SUPPORTED) && (msr.lo & MTRR_CAP_PRMRR)); return ((cpuid_regs.ebx & SGX_SUPPORTED) && (msr.lo & MTRR_CAP_PRMRR));
} }
@ -539,7 +540,8 @@ bool is_keylocker_supported(void)
struct cpuid_result cpuid_regs; struct cpuid_result cpuid_regs;
msr_t msr; msr_t msr;
cpuid_regs = cpuid_ext(0x7, 0x0); /* ECX[23] is feature capability */ /* ECX[23] is feature capability */
cpuid_regs = cpuid_ext(CPUID_STRUCT_EXTENDED_FEATURE_FLAGS, 0x0);
msr = rdmsr(MTRR_CAP_MSR); /* Bit 12 is PRMRR enablement */ msr = rdmsr(MTRR_CAP_MSR); /* Bit 12 is PRMRR enablement */
return ((cpuid_regs.ecx & KEYLOCKER_SUPPORTED) && (msr.lo & MTRR_CAP_PRMRR)); return ((cpuid_regs.ecx & KEYLOCKER_SUPPORTED) && (msr.lo & MTRR_CAP_PRMRR));
} }