From 881a553000d001bc62085d3055c8e19075e898e2 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 22 Feb 2010 09:32:33 +0000 Subject: [PATCH] mini update SMM: - allow northbridge and cpu handlers, too - support for older rev 2 cpus Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5141 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/x86/smm/smihandler.c | 9 +++++++-- src/include/cpu/x86/smm.h | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/cpu/x86/smm/smihandler.c b/src/cpu/x86/smm/smihandler.c index 7d6dfe4100..bb58140c67 100644 --- a/src/cpu/x86/smm/smihandler.c +++ b/src/cpu/x86/smm/smihandler.c @@ -118,6 +118,7 @@ void smi_handler(u32 smm_revision) printk_spew("\nSMI# #%d\n", node); switch (smm_revision) { + case 0x00030002: case 0x00030007: state_save.type = LEGACY; state_save.legacy_state_save = (legacy_smm_state_save_area_t *) @@ -145,8 +146,12 @@ void smi_handler(u32 smm_revision) /* Call chipset specific SMI handlers. This would be the place to * add a CPU or northbridge specific SMI handler, too */ - - southbridge_smi_handler(node, &state_save); + if (cpu_smi_handler) + cpu_smi_handler(node, &state_save); + if (northbridge_smi_handler) + northbridge_smi_handler(node, &state_save); + if (southbridge_smi_handler) + southbridge_smi_handler(node, &state_save); smi_release_lock(); diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h index 6baefcb2f7..a014ee0e55 100644 --- a/src/include/cpu/x86/smm.h +++ b/src/include/cpu/x86/smm.h @@ -254,5 +254,7 @@ void io_trap_handler(int smif); int southbridge_io_trap_handler(int smif); int mainboard_io_trap_handler(int smif); -void southbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save); +void __attribute__((weak)) cpu_smi_handler(unsigned int node, smm_state_save_area_t *state_save); +void __attribute__((weak)) northbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save); +void __attribute__((weak)) southbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save);