cpu/intel: Move is_tme_supported() from soc/intel to cpu/intel

It makes the detection of this feature accessible without the
CONFIG_SOC_INTEL_COMMON_BLOCK_CPU dependency.

BUG=288978352
TEST=compilation

Change-Id: I005c4953648ac9a90af23818b251efbfd2c04043
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/77697
Reviewed-by: Bora Guvendik <bora.guvendik@intel.com>
Reviewed-by: Wonkyu Kim <wonkyu.kim@intel.com>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Jeremy Compostella 2023-09-07 10:08:35 -07:00 committed by Subrata Banik
parent e099176412
commit a6a5b25ce4
9 changed files with 26 additions and 18 deletions

View File

@ -51,6 +51,9 @@ static inline unsigned int cpuid_get_max_func(void)
#define CPUID_FEATURE_PSE36 (1 << 17)
#define CPUID_FEAURE_HTT (1 << 28)
/* Structured Extended Feature Flags */
#define CPUID_STRUCT_EXTENDED_FEATURE_FLAGS 0x7
// Intel leaf 0x4, AMD leaf 0x8000001d EAX
#define CPUID_CACHE(x, res) \

View File

@ -1,5 +1,6 @@
## SPDX-License-Identifier: GPL-2.0-only
romstage-$(CONFIG_CPU_INTEL_COMMON) += common_init.c
ramstage-$(CONFIG_CPU_INTEL_COMMON) += common_init.c
ramstage-$(CONFIG_CPU_INTEL_COMMON) += hyperthreading.c
ramstage-$(CONFIG_CPU_INTEL_COMMON_VOLTAGE) += voltage.c

View File

@ -66,4 +66,12 @@ void set_energy_perf_pref(u8 pref);
*/
void enable_energy_perf_pref(void);
/*
* Check if Total Memory Encryption (TME) is supported by the CPU
*
* coreboot shall detect the existence of TME feature by running CPUID instruction:
* CPUID leaf 7/sub-leaf 0: Return Value in ECX [bit 13] = 1
*/
bool is_tme_supported(void);
#endif

View File

@ -14,6 +14,9 @@
#define CPUID_6_ENGERY_PERF_PREF (1 << 10)
#define CPUID_6_HWP (1 << 7)
/* Structured Extended Feature Flags */
#define CPUID_EXT_FEATURE_TME_SUPPORTED (1 << 13)
void set_vmx_and_lock(void)
{
set_feature_ctrl_vmx();
@ -227,3 +230,11 @@ void set_energy_perf_pref(u8 pref)
msr_unset_and_set(IA32_HWP_REQUEST, IA32_HWP_REQUEST_EPP_MASK,
(uint64_t)pref << IA32_HWP_REQUEST_EPP_SHIFT);
}
bool is_tme_supported(void)
{
struct cpuid_result cpuid_regs;
cpuid_regs = cpuid_ext(CPUID_STRUCT_EXTENDED_FEATURE_FLAGS, 0x0);
return (cpuid_regs.ecx & CPUID_EXT_FEATURE_TME_SUPPORTED);
}

View File

@ -3,6 +3,7 @@
#include <assert.h>
#include <console/console.h>
#include <cpu/x86/msr.h>
#include <cpu/intel/common/common.h>
#include <cpu/intel/cpu_ids.h>
#include <device/device.h>
#include <drivers/wifi/generic/wifi.h>

View File

@ -19,7 +19,6 @@
#define CPUID_HYBRID_INFORMATION 0x1a
/* Structured Extended Feature Flags */
#define CPUID_STRUCT_EXTENDED_FEATURE_FLAGS 0x7
#define HYBRID_FEATURE BIT(15)
/*
@ -485,15 +484,6 @@ void init_core_prmrr(void)
sync_core_prmrr();
}
bool is_tme_supported(void)
{
struct cpuid_result cpuid_regs;
/* ECX[13] is feature capability */
cpuid_regs = cpuid_ext(CPUID_STRUCT_EXTENDED_FEATURE_FLAGS, 0x0);
return (cpuid_regs.ecx & TME_SUPPORTED);
}
void set_tme_core_activate(void)
{
msr_t msr = { .lo = 0, .hi = 0 };

View File

@ -190,14 +190,6 @@ void enable_pm_timer_emulation(void);
*/
void init_core_prmrr(void);
/*
* Check if TME is supported by the CPU
*
* coreboot shall detect the existence of TME feature by running CPUID instruction:
* CPUID leaf 7/sub-leaf 0: Return Value in ECX [bit 13] = 1
*/
bool is_tme_supported(void);
/*
* Set TME core activate MSR
*

View File

@ -2,6 +2,7 @@
#include <assert.h>
#include <console/console.h>
#include <cpu/intel/common/common.h>
#include <cpu/intel/cpu_ids.h>
#include <cpu/x86/msr.h>
#include <device/device.h>

View File

@ -2,6 +2,7 @@
#include <assert.h>
#include <console/console.h>
#include <cpu/intel/common/common.h>
#include <cpu/intel/cpu_ids.h>
#include <cpu/x86/msr.h>
#include <device/device.h>