erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: Initialize drivers in SMM context if needed

Browse source 
This adds a block in the SMI handler to call init functions for
drivers which may be used in SMM. A static variable is used to
ensure the init functions are only called once.

BUG=chrome-os-partner:29580
BRANCH=mccloud
TEST=Built and booted on mccloud, system no longer hangs when
pressing power button at the dev mode screen. Also tested on parrot.

Original-Signed-off-by: David Hendricks <dhendrix@chromium.org>
Original-Change-Id: I225f572f7b3072bec2bc06aac3fb50d90a2e30ee
Original-Reviewed-on: https://chromium-review.googlesource.com/204764
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
(cherry picked from commit 9315c485de)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>

Change-Id: I8d2b21765c35c7ac7746986d5334dca17dcd6861
Reviewed-on: http://review.coreboot.org/8134
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
David Hendricks 2014-06-19 15:39:29 -07:00 • committed by Marc Jones
commit bb0d5ef97a
2 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/cpu/x86/smm/smihandler.c
View file

@ -24,6 +24,12 @@
#include <cpu/x86/cache.h>
#include <cpu/x86/smm.h>
#if CONFIG_SPI_FLASH_SMM
#include <spi-generic.h>
#endif
static int do_driver_init = 1;
#if !CONFIG_SMM_TSEG /* TSEG handler locks in assembly */
typedef enum { SMI_LOCKED, SMI_UNLOCKED } smi_semaphore;
@ -184,6 +190,14 @@ void smi_handler(u32 smm_revision)
return;
}
/* Allow drivers to initialize variables in SMM context. */
if (do_driver_init) {
#if CONFIG_SPI_FLASH_SMM
spi_init();
#endif
do_driver_init = 0;
}
/* Call chipset specific SMI handlers. */
if (cpu_smi_handler)
cpu_smi_handler(node, &state_save);

14
src/cpu/x86/smm/smm_module_handler.c
View file

@ -22,6 +22,12 @@
#include <cpu/x86/smm.h>
#include <rmodule.h>
#if CONFIG_SPI_FLASH_SMM
#include <spi-generic.h>
#endif
static int do_driver_init = 1;
typedef enum { SMI_LOCKED, SMI_UNLOCKED } smi_semaphore;
/* SMI multiprocessing semaphore */
@ -154,6 +160,14 @@ void asmlinkage smm_handler_start(void *arg)
printk(BIOS_SPEW, "\nSMI# #%d\n", cpu);
/* Allow drivers to initialize variables in SMM context. */
if (do_driver_init) {
#if CONFIG_SPI_FLASH_SMM
spi_init();
#endif
do_driver_init = 0;
}
cpu_smi_handler();
northbridge_smi_handler();
southbridge_smi_handler();