From bc0f7a68df9c07518eb34ef4549a2f704ededcdd Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Sun, 1 Aug 2010 15:41:14 +0000 Subject: [PATCH] - 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/Kconfig | 12 +++++++++++ src/cpu/x86/smm/smmrelocate.S | 20 +++++++++++-------- src/southbridge/intel/i82801dx/i82801dx.h | 1 + src/southbridge/intel/i82801dx/i82801dx_smi.c | 8 +++++--- src/southbridge/intel/i82801gx/i82801gx_smi.c | 8 +++++--- 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 461087d17..61135c0d5 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -560,6 +560,18 @@ config DEBUG_SMI If unsure, say N. +config DEBUG_SMM_RELOCATION + bool "Debug SMM relocation code" + default n + depends on HAVE_SMI_HANDLER + help + This option enables additional SMM handler relocation related + debug messages. + + Note: This option will increase the size of the coreboot image. + + If unsure, say N. + config X86EMU_DEBUG bool "Output verbose x86emu debug messages" default n diff --git a/src/cpu/x86/smm/smmrelocate.S b/src/cpu/x86/smm/smmrelocate.S index 50a8f28c3..e79535978 100644 --- a/src/cpu/x86/smm/smmrelocate.S +++ b/src/cpu/x86/smm/smmrelocate.S @@ -1,7 +1,7 @@ /* * This file is part of the coreboot project. * - * Copyright (C) 2008 coresystems GmbH + * Copyright (C) 2008-2010 coresystems GmbH * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -24,12 +24,15 @@ // FIXME: Is this piece of code southbridge specific, or // can it be cleaned up so this include is not required? -// It's needed right now because we get our PM_BASE from +// It's needed right now because we get our DEFAULT_PMBASE from // here. +#if defined(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) #include "../../../southbridge/intel/i82801gx/i82801gx.h" - -#undef DEBUG_SMM_RELOCATION -//#define DEBUG_SMM_RELOCATION +#elif defined(CONFIG_SOUTHBRIDGE_INTEL_I82801DX) +#include "../../../southbridge/intel/i82801dx/i82801dx.h" +#else +#error "Southbridge needs SMM handler support." +#endif #define LAPIC_ID 0xfee00020 @@ -125,7 +128,7 @@ smm_relocate: addr32 movl %eax, (%ebx) - /* The next section of code is hardware specific */ + /* The next section of code is potentially southbridge specific */ /* Clear SMI status */ movw $(DEFAULT_PMBASE + 0x34), %dx @@ -143,8 +146,9 @@ smm_relocate: orl $(1 << 1), %eax outl %eax, %dx - /* End of hardware specific section. */ -#ifdef DEBUG_SMM_RELOCATION + /* End of southbridge specific section. */ + +#if defined(CONFIG_DEBUG_SMM_RELOCATION) && CONFIG_DEBUG_SMM_RELOCATION /* print [SMM-x] so we can determine if CPUx went to SMM */ movw $CONFIG_TTYS0_BASE, %dx mov $'[', %al diff --git a/src/southbridge/intel/i82801dx/i82801dx.h b/src/southbridge/intel/i82801dx/i82801dx.h index 1b995b120..cbdbc963a 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 e63fb501f..55d8a7096 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 0d15ca50f..39d5c4dca 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(); } -- 2.25.1