Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42617 )
Change subject: cpu/x86/smm: Define APM_CNT_NOOP_SMI ......................................................................
cpu/x86/smm: Define APM_CNT_NOOP_SMI
Old (!PARALLEL_MP) cpu bringup uses this as the first control to do SMM relocation.
Change-Id: I4241120b00fac77f0491d37f05ba17763db1254e Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/42617 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M src/include/cpu/x86/smm.h M src/soc/intel/broadwell/smi.c M src/southbridge/intel/i82801dx/smi.c M src/southbridge/intel/i82801ix/smi.c M src/southbridge/intel/lynxpoint/smi.c 5 files changed, 5 insertions(+), 4 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h index ca83474..513b6df 100644 --- a/src/include/cpu/x86/smm.h +++ b/src/include/cpu/x86/smm.h @@ -17,6 +17,7 @@ #define SMM_SAVE_STATE_BEGIN(x) (SMM_ENTRY_OFFSET + (x))
#define APM_CNT 0xb2 +#define APM_CNT_NOOP_SMI 0x00 #define APM_CNT_CST_CONTROL 0x85 #define APM_CNT_PST_CONTROL 0x80 #define APM_CNT_ACPI_DISABLE 0x1e diff --git a/src/soc/intel/broadwell/smi.c b/src/soc/intel/broadwell/smi.c index 939815a..9d8d25e 100644 --- a/src/soc/intel/broadwell/smi.c +++ b/src/soc/intel/broadwell/smi.c @@ -72,7 +72,7 @@
/* raise an SMI interrupt */ printk(BIOS_SPEW, " ... raise SMI#\n"); - outb(0x00, 0xb2); + apm_control(APM_CNT_NOOP_SMI); }
static void __unused southbridge_clear_smi_status(void) diff --git a/src/southbridge/intel/i82801dx/smi.c b/src/southbridge/intel/i82801dx/smi.c index fe4f864..26bbbe1 100644 --- a/src/southbridge/intel/i82801dx/smi.c +++ b/src/southbridge/intel/i82801dx/smi.c @@ -293,7 +293,7 @@
/* raise an SMI interrupt */ printk(BIOS_SPEW, " ... raise SMI#\n"); - outb(0x00, 0xb2); + apm_control(APM_CNT_NOOP_SMI); }
static void aseg_smm_install(void) diff --git a/src/southbridge/intel/i82801ix/smi.c b/src/southbridge/intel/i82801ix/smi.c index 2bbac886..4f47e34 100644 --- a/src/southbridge/intel/i82801ix/smi.c +++ b/src/southbridge/intel/i82801ix/smi.c @@ -100,7 +100,7 @@
/* raise an SMI interrupt */ printk(BIOS_SPEW, " ... raise SMI#\n"); - outb(0x00, 0xb2); + apm_control(APM_CNT_NOOP_SMI); }
static int smm_handler_copied = 0; diff --git a/src/southbridge/intel/lynxpoint/smi.c b/src/southbridge/intel/lynxpoint/smi.c index df48d86..102ed24 100644 --- a/src/southbridge/intel/lynxpoint/smi.c +++ b/src/southbridge/intel/lynxpoint/smi.c @@ -75,7 +75,7 @@
/* raise an SMI interrupt */ printk(BIOS_SPEW, " ... raise SMI#\n"); - outb(0x00, 0xb2); + apm_control(APM_CNT_NOOP_SMI); }
static void __unused southbridge_clear_smi_status(void)