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

soc/intel/xeon_sp/: Fix SMI_LOCK setting 

Move the SMI_LOCK to post SMM setup. Also, use the correct access
method for SMI_LOCK. GEN_PMCON_A is in PCI config space and not
in MMIO space on this PCH.

Change-Id: Ibbb183ef61ca7330198c1243ecfc2d4df51e652b
Signed-off-by: Marc Jones <marcjones@sysproconsulting.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51452
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Jay Talbott <JayTalbott@sysproconsulting.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Marc Jones 2021-03-11 14:49:19 -07:00 committed by Marc Jones
parent f332e47f56
commit 52e14f78ba
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/soc/intel/xeon_sp/cpx/cpu.c
View File

@ -16,8 +16,10 @@
#include <cpu/x86/mtrr.h> #include <cpu/x86/mtrr.h>
#include <intelblocks/cpulib.h> #include <intelblocks/cpulib.h>
#include <intelblocks/mp_init.h> #include <intelblocks/mp_init.h>
#include <intelpch/lockdown.h>
#include <soc/cpu.h> #include <soc/cpu.h>
#include <soc/msr.h> #include <soc/msr.h>
#include <soc/pm.h>
#include <soc/soc_util.h> #include <soc/soc_util.h>
#include <soc/smmrelocate.h> #include <soc/smmrelocate.h>
#include <soc/util.h> #include <soc/util.h>
@ -175,8 +177,11 @@ static void post_mp_init(void)
/* Set Max Ratio */ /* Set Max Ratio */
set_max_turbo_freq(); set_max_turbo_freq();
if (CONFIG(HAVE_SMI_HANDLER)) if (CONFIG(HAVE_SMI_HANDLER)) {
global_smi_enable(); global_smi_enable();
if (get_lockdown_config() == CHIPSET_LOCKDOWN_COREBOOT)
pmc_lock_smi();
}
} }
static const struct mp_ops mp_ops = { static const struct mp_ops mp_ops = {

2
src/soc/intel/xeon_sp/include/soc/pm.h
View File

@ -125,4 +125,6 @@ int rtc_failure(void);
uint16_t get_pmbase(void); uint16_t get_pmbase(void);
void pmc_lock_smi(void);
#endif #endif

15
src/soc/intel/xeon_sp/lockdown.c
View File

@ -16,18 +16,6 @@ static void lpc_lockdown_config(int chipset_lockdown)
} }
} }
static void pmc_lock_smi(void)
{
uint8_t *pmcbase;
uint8_t reg8;
pmcbase = pmc_mmio_regs();
reg8 = read8(pmcbase + GEN_PMCON_A);
reg8 |= SMI_LOCK;
write8(pmcbase + GEN_PMCON_A, reg8);
}
static void pmc_lockdown_config(int chipset_lockdown) static void pmc_lockdown_config(int chipset_lockdown)
{ {
uint8_t *pmcbase; uint8_t *pmcbase;
@ -41,9 +29,6 @@ static void pmc_lockdown_config(int chipset_lockdown)
/* Make sure payload/OS can't trigger global reset */ /* Make sure payload/OS can't trigger global reset */
pmc_global_reset_disable_and_lock(); pmc_global_reset_disable_and_lock();
if (chipset_lockdown == CHIPSET_LOCKDOWN_COREBOOT)
pmc_lock_smi();
} }
void soc_lockdown_config(int chipset_lockdown) void soc_lockdown_config(int chipset_lockdown)

6
src/soc/intel/xeon_sp/pmc.c
View File

@ -163,6 +163,12 @@ uint16_t get_pmbase(void)
return ACPI_BASE_ADDRESS; return ACPI_BASE_ADDRESS;
} }
void pmc_lock_smi(void)
{
printk(BIOS_DEBUG, "Locking SMM enable.\n");
pci_or_config32(PCH_DEV_PMC, GEN_PMCON_A, SMI_LOCK);
}
const char *const *soc_smi_sts_array(size_t *smi_arr) const char *const *soc_smi_sts_array(size_t *smi_arr)
{ {
static const char *const smi_sts_bits[] = { static const char *const smi_sts_bits[] = {