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

soc/intel/common: use common Intel ACPI hardware definitions 

Transition to using the common Intel ACPI hardware definitions
generic ACPI definitions.

BUG=chrome-os-partner:54977

Change-Id: I40560b2a65a0cff6808ccdec80e0339786bf8908
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/15668
Tested-by: build bot (Jenkins)
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Aaron Durbin 2016-07-13 23:19:46 -05:00
parent ed35b7c546
commit 56db47fe20
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/soc/intel/common/smihandler.c
View File

@ -137,14 +137,14 @@ void southbridge_smi_sleep(const struct smm_save_state_ops *save_state_ops)
/* Figure out SLP_TYP */ /* Figure out SLP_TYP */
reg32 = inl(ACPI_PMIO_BASE + PM1_CNT); reg32 = inl(ACPI_PMIO_BASE + PM1_CNT);
printk(BIOS_SPEW, "SMI#: SLP = 0x%08x\n", reg32); printk(BIOS_SPEW, "SMI#: SLP = 0x%08x\n", reg32);
slp_typ = (reg32 >> 10) & 7; slp_typ = acpi_sleep_from_pm1(reg32);
/* Do any mainboard sleep handling */ /* Do any mainboard sleep handling */
mainboard_smi_sleep(slp_typ-2); mainboard_smi_sleep(slp_typ);
/* Log S3, S4, and S5 entry */ /* Log S3, S4, and S5 entry */
if (slp_typ >= 5 && IS_ENABLED(CONFIG_ELOG_GSMI)) if (slp_typ >= ACPI_S3 && IS_ENABLED(CONFIG_ELOG_GSMI))
elog_add_event_byte(ELOG_TYPE_ACPI_ENTER, slp_typ-2); elog_add_event_byte(ELOG_TYPE_ACPI_ENTER, slp_typ);
/* Clear pending GPE events */ /* Clear pending GPE events */
clear_gpe_status(); clear_gpe_status();
@ -152,19 +152,19 @@ void southbridge_smi_sleep(const struct smm_save_state_ops *save_state_ops)
/* Next, do the deed. */ /* Next, do the deed. */
switch (slp_typ) { switch (slp_typ) {
case SLP_TYP_S0: case ACPI_S0:
printk(BIOS_DEBUG, "SMI#: Entering S0 (On)\n"); printk(BIOS_DEBUG, "SMI#: Entering S0 (On)\n");
break; break;
case SLP_TYP_S3: case ACPI_S3:
printk(BIOS_DEBUG, "SMI#: Entering S3 (Suspend-To-RAM)\n"); printk(BIOS_DEBUG, "SMI#: Entering S3 (Suspend-To-RAM)\n");
/* Invalidate the cache before going to S3 */ /* Invalidate the cache before going to S3 */
wbinvd(); wbinvd();
break; break;
case SLP_TYP_S4: case ACPI_S4:
printk(BIOS_DEBUG, "SMI#: Entering S4 (Suspend-To-Disk)\n"); printk(BIOS_DEBUG, "SMI#: Entering S4 (Suspend-To-Disk)\n");
break; break;
case SLP_TYP_S5: case ACPI_S5:
printk(BIOS_DEBUG, "SMI#: Entering S5 (Soft Power off)\n"); printk(BIOS_DEBUG, "SMI#: Entering S5 (Soft Power off)\n");
/* Disable all GPE */ /* Disable all GPE */
@ -188,7 +188,7 @@ void southbridge_smi_sleep(const struct smm_save_state_ops *save_state_ops)
enable_pm1_control(SLP_EN); enable_pm1_control(SLP_EN);
/* Make sure to stop executing code here for S3/S4/S5 */ /* Make sure to stop executing code here for S3/S4/S5 */
if (slp_typ > 1) if (slp_typ >= ACPI_S3)
hlt(); hlt();
/* /*