GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SMM: unify mainboard APM command handlers 

rename from mainboard_apm_cnt to mainboard_smi_apmc to match the function
naming scheme of the other handlers. Add prototype for mainboard_smi_sleep
(mainboard specific S3 sleep handlers in SMM) that is required by Sandybridge.

Change-Id: Ib479397e460e33772d90d9d41dba267e4e7e3008
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/933
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Stefan Reinauer 2012-04-27 00:44:04 +02:00
parent ac8209a4b3
commit bf34e94095
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/cpu/x86/smm.h
View File

@ -279,7 +279,9 @@ void __attribute__((weak)) northbridge_smi_handler(unsigned int node, smm_state_
void __attribute__((weak)) southbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save);
void __attribute__((weak)) mainboard_smi_gpi(u16 gpi_sts);
int __attribute__((weak)) mainboard_apm_cnt(u8 data);
int __attribute__((weak)) mainboard_smi_apmc(u8 data);
void __attribute__((weak)) mainboard_smi_sleep(u8 slp_typ);
#if !CONFIG_SMM_TSEG
void smi_release_lock(void);
#endif

2
src/mainboard/lenovo/t60/mainboard_smi.c
View File

@ -159,7 +159,7 @@ void mainboard_smi_gpi(u16 gpi)
mainboard_smi_handle_ec_sci();
}
int mainboard_apm_cnt(u8 data)
int mainboard_smi_apmc(u8 data)
{
u16 pmbase = pci_read_config16(PCI_DEV(0, 0x1f, 0), 0x40) & 0xfffc;
u8 tmp;

2
src/mainboard/lenovo/x60/mainboard_smi.c
View File

@ -165,7 +165,7 @@ void mainboard_smi_gpi(u16 gpi)
mainboard_smi_handle_ec_sci();
}
int mainboard_apm_cnt(u8 data)
int mainboard_smi_apmc(u8 data)
{
u16 pmbase = pci_read_config16(PCI_DEV(0, 0x1f, 0), 0x40) & 0xfffc;
u8 tmp;

2
src/southbridge/intel/bd82x6x/smihandler.c
View File

@ -405,7 +405,7 @@ static void southbridge_smi_apmc(unsigned int node, smm_state_save_area_t *state
{
u32 pmctrl;
u8 reg8;
void (*mainboard_apmc)(u8 apmc) = mainboard_smi_apmc;
int (*mainboard_apmc)(u8 apmc) = mainboard_smi_apmc;
/* Emulate B2 register as the FADT / Linux expects it */

2
src/southbridge/intel/i82801gx/smihandler.c
View File

@ -366,7 +366,7 @@ static void southbridge_smi_apmc(unsigned int node, smm_state_save_area_t *state
/* Emulate B2 register as the FADT / Linux expects it */
reg8 = inb(APM_CNT);
if (mainboard_apm_cnt && mainboard_apm_cnt(reg8))
if (mainboard_smi_apmc && mainboard_smi_apmc(reg8))
return;
switch (reg8) {