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

soc/intel/cache_as_ram.S: Fix SOC_INTEL_APOLLOLAKE 

Intel Apollolake does not support the bootguard MSRs 0x139 MSR_BC_PBEC
and 0x13A MSR_BOOT_GUARD_SACM_INFO.

Change-Id: Ief40028a1c85084e012a83db8080d478e407487b
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55784
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
This commit is contained in:
Arthur Heymans 2021-06-23 10:52:01 +02:00
parent cd96fed5dc
commit 6da7fa26b0
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/soc/intel/apollolake/Kconfig
View File

@ -96,6 +96,7 @@ config CPU_SPECIFIC_OPTIONS
select SOC_INTEL_COMMON_BLOCK_CSE select SOC_INTEL_COMMON_BLOCK_CSE
select SOC_INTEL_COMMON_BLOCK_SMBUS select SOC_INTEL_COMMON_BLOCK_SMBUS
select SOC_INTEL_COMMON_FSP_RESET select SOC_INTEL_COMMON_FSP_RESET
select SOC_INTEL_NO_BOOTGUARD_MSR
select SOUTHBRIDGE_INTEL_COMMON_SMBUS select SOUTHBRIDGE_INTEL_COMMON_SMBUS
select UDELAY_TSC select UDELAY_TSC
select TSC_MONOTONIC_TIMER select TSC_MONOTONIC_TIMER

6
src/soc/intel/common/block/cpu/Kconfig
View File

@ -107,3 +107,9 @@ config CPU_SUPPORTS_PM_TIMER_EMULATION
Select this if the SoC's ucode supports PM ACPI timer emulation (Common Select this if the SoC's ucode supports PM ACPI timer emulation (Common
timer Copy), which is required to be able to disable the TCO PM ACPI timer Copy), which is required to be able to disable the TCO PM ACPI
timer for power saving. timer for power saving.
config SOC_INTEL_NO_BOOTGUARD_MSR
bool
help
Select this on platforms that do not support Bootguard related MSRs
0x139, MSR_BC_PBEC and 0x13A, MSR_BOOT_GUARD_SACM_INFO.

4
src/soc/intel/common/block/cpu/car/cache_as_ram.S
View File

@ -66,9 +66,13 @@
* Returns %eax and sets/unsets zero flag * Returns %eax and sets/unsets zero flag
*/ */
.macro is_bootguard_nem .macro is_bootguard_nem
#if CONFIG(SOC_INTEL_NO_BOOTGUARD_MSR)
xorl %eax, %eax
#else
movl $MSR_BOOT_GUARD_SACM_INFO, %ecx movl $MSR_BOOT_GUARD_SACM_INFO, %ecx
rdmsr rdmsr
andl $B_BOOT_GUARD_SACM_INFO_NEM_ENABLED, %eax andl $B_BOOT_GUARD_SACM_INFO_NEM_ENABLED, %eax
#endif
.endm .endm
.global bootblock_pre_c_entry .global bootblock_pre_c_entry