arch/x86: Reduce max phys address size for Intel TME capable SoCs

On Intel SoCs, if TME is supported, TME key ID bits are reserved and
should be subtracted from the maximum physical addresses available.

BUG=288978352
TEST=Verified that DMAR ACPI table `Host Address Width` field on rex
     went from 45 to 41.

Signed-off-by: Cliff Huang <cliff.huang@intel.com>
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Change-Id: I9504a489782ab6ef8950a8631c269ed39c63f34d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/77613
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Wonkyu Kim <wonkyu.kim@intel.com>
Reviewed-by: Bora Guvendik <bora.guvendik@intel.com>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
This commit is contained in:
Jeremy Compostella 2023-09-07 10:33:30 -07:00 committed by Subrata Banik
parent a6a5b25ce4
commit 1eff77bc59
5 changed files with 46 additions and 2 deletions

View File

@ -49,8 +49,11 @@ int cpu_phys_address_size(void)
if (!(cpu_have_cpuid())) if (!(cpu_have_cpuid()))
return 32; return 32;
if (cpu_cpuid_extended_level() >= 0x80000008) if (cpu_cpuid_extended_level() >= 0x80000008) {
return cpuid_eax(0x80000008) & 0xff; int size = cpuid_eax(0x80000008) & 0xff;
size -= get_reserved_phys_addr_bits();
return size;
}
if (cpuid_edx(1) & (CPUID_FEATURE_PAE | CPUID_FEATURE_PSE36)) if (cpuid_edx(1) & (CPUID_FEATURE_PAE | CPUID_FEATURE_PSE36))
return 36; return 36;

View File

@ -316,4 +316,15 @@ size_t get_cache_size(const struct cpu_cache_info *info);
*/ */
bool fill_cpu_cache_info(uint8_t level, struct cpu_cache_info *info); bool fill_cpu_cache_info(uint8_t level, struct cpu_cache_info *info);
#if CONFIG(CPU_INTEL_COMMON)
int get_reserved_phys_addr_bits(void);
#else
/* Default implementation */
static inline int get_reserved_phys_addr_bits(void)
{
/* Default implementation */
return 0;
}
#endif
#endif /* ARCH_CPU_H */ #endif /* ARCH_CPU_H */

View File

@ -1,6 +1,8 @@
## SPDX-License-Identifier: GPL-2.0-only ## SPDX-License-Identifier: GPL-2.0-only
bootblock-$(CONFIG_CPU_INTEL_COMMON) += common_init.c
romstage-$(CONFIG_CPU_INTEL_COMMON) += common_init.c romstage-$(CONFIG_CPU_INTEL_COMMON) += common_init.c
postcar-$(CONFIG_CPU_INTEL_COMMON) += common_init.c
ramstage-$(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) += hyperthreading.c
ramstage-$(CONFIG_CPU_INTEL_COMMON_VOLTAGE) += voltage.c ramstage-$(CONFIG_CPU_INTEL_COMMON_VOLTAGE) += voltage.c

View File

@ -238,3 +238,28 @@ bool is_tme_supported(void)
cpuid_regs = cpuid_ext(CPUID_STRUCT_EXTENDED_FEATURE_FLAGS, 0x0); cpuid_regs = cpuid_ext(CPUID_STRUCT_EXTENDED_FEATURE_FLAGS, 0x0);
return (cpuid_regs.ecx & CPUID_EXT_FEATURE_TME_SUPPORTED); return (cpuid_regs.ecx & CPUID_EXT_FEATURE_TME_SUPPORTED);
} }
/*
* Get number of address bits used by Total Memory Encryption (TME)
*
* Returns TME_ACTIVATE[MK_TME_KEYID_BITS] (MSR 0x982 Bits[32-35]).
*
* NOTE: This function should be called after MK-TME features has been
* configured in the MSRs according to the capabilities and platform
* configuration. For instance, after FSP-M.
*/
static int get_tme_keyid_bits(void)
{
msr_t msr;
msr = rdmsr(MSR_TME_ACTIVATE);
return msr.hi & TME_ACTIVATE_HI_KEYID_BITS_MASK;
}
int get_reserved_phys_addr_bits(void)
{
if (!is_tme_supported())
return 0;
return get_tme_keyid_bits();
}

View File

@ -33,4 +33,7 @@
#define MSR_PKG_C10_RESIDENCY 0x632 #define MSR_PKG_C10_RESIDENCY 0x632
#define MSR_TME_ACTIVATE 0x982
#define TME_ACTIVATE_HI_KEYID_BITS_MASK 0xf
#endif /* CPU_INTEL_MSR_H */ #endif /* CPU_INTEL_MSR_H */