From bc0f7a68df9c07518eb34ef4549a2f704ededcdd Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Sun, 1 Aug 2010 15:41:14 +0000 Subject: - fix SMM code relocation race - make SMM relocation debugging Kconfig accessible Signed-off-by: Stefan Reinauer Acked-by: Patrick Georgi git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5676 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/southbridge/intel/i82801dx/i82801dx.h | 1 + src/southbridge/intel/i82801dx/i82801dx_smi.c | 8 +++++--- src/southbridge/intel/i82801gx/i82801gx_smi.c | 8 +++++--- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'src/southbridge/intel') diff --git a/src/southbridge/intel/i82801dx/i82801dx.h b/src/southbridge/intel/i82801dx/i82801dx.h index 1b995b1204..cbdbc963af 100644 --- a/src/southbridge/intel/i82801dx/i82801dx.h +++ b/src/southbridge/intel/i82801dx/i82801dx.h @@ -86,6 +86,7 @@ extern void i82801dx_enable(device_t dev); #define PCICMD 0x04 #define PMBASE 0x40 #define PMBASE_ADDR 0x0400 +#define DEFAULT_PMBASE PMBASE_ADDR #define ACPI_CNTL 0x44 #define BIOS_CNTL 0x4E #define GPIO_BASE 0x58 diff --git a/src/southbridge/intel/i82801dx/i82801dx_smi.c b/src/southbridge/intel/i82801dx/i82801dx_smi.c index e63fb501f2..55d8a70965 100644 --- a/src/southbridge/intel/i82801dx/i82801dx_smi.c +++ b/src/southbridge/intel/i82801dx/i82801dx_smi.c @@ -335,11 +335,13 @@ static void smm_install(void) void smm_init(void) { - // FIXME is this a race condition? - smm_relocate(); + /* Put SMM code to 0xa0000 */ smm_install(); - // We're done. Make sure SMIs can happen! + /* Put relocation code to 0x38000 and relocate SMBASE */ + smm_relocate(); + + /* We're done. Make sure SMIs can happen! */ smi_set_eos(); } diff --git a/src/southbridge/intel/i82801gx/i82801gx_smi.c b/src/southbridge/intel/i82801gx/i82801gx_smi.c index 0d15ca50f5..39d5c4dca2 100644 --- a/src/southbridge/intel/i82801gx/i82801gx_smi.c +++ b/src/southbridge/intel/i82801gx/i82801gx_smi.c @@ -335,11 +335,13 @@ static void smm_install(void) void smm_init(void) { - // FIXME is this a race condition? - smm_relocate(); + /* Put SMM code to 0xa0000 */ smm_install(); - // We're done. Make sure SMIs can happen! + /* Put relocation code to 0x38000 and relocate SMBASE */ + smm_relocate(); + + /* We're done. Make sure SMIs can happen! */ smi_set_eos(); } -- cgit v1.2.3