sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amd/stoneyridge: Fix PmControl register size in SMI handler

Browse Source 
The AMD implementation of this register is only 16 bits.  Change the
source accordingly.

TEST=Suspend/Resume a Grunt several times

Change-Id: Ib900468cc1c790fa7d57bb6faa91aee012173f7a
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/29016
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
This commit is contained in:
Marshall Dawson
2018-10-07 21:45:47 -06:00
committed by Martin Roth
parent edba21e4a6
commit e1b1ec7154
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/soc/amd/stoneyridge/smihandler.c
View File

@ -122,13 +122,13 @@ static void disable_all_smi_status(void)
static void sb_slp_typ_handler(void) static void sb_slp_typ_handler(void)
{ {
uint32_t pm1cnt, pci_ctrl, reg32; uint32_t pci_ctrl, reg32;
uint16_t reg16; uint16_t pm1cnt, reg16;
uint8_t slp_typ, rst_ctrl; uint8_t slp_typ, rst_ctrl;
/* Figure out SLP_TYP */ /* Figure out SLP_TYP */
pm1cnt = inl(pm_acpi_pm_cnt_blk()); pm1cnt = inw(pm_acpi_pm_cnt_blk());
printk(BIOS_SPEW, "SMI#: SLP = 0x%08x\n", pm1cnt); printk(BIOS_SPEW, "SMI#: SLP = 0x%04x\n", pm1cnt);
slp_typ = acpi_sleep_from_pm1(pm1cnt); slp_typ = acpi_sleep_from_pm1(pm1cnt);
/* Do any mainboard sleep handling */ /* Do any mainboard sleep handling */
@ -196,7 +196,7 @@ static void sb_slp_typ_handler(void)
} /* if (IS_ENABLED(CONFIG_ELOG_GSMI)) */ } /* if (IS_ENABLED(CONFIG_ELOG_GSMI)) */
/* Reissue Pm1 write */ /* Reissue Pm1 write */
outl(pm1cnt | SLP_EN, pm_acpi_pm_cnt_blk()); outw(pm1cnt | SLP_EN, pm_acpi_pm_cnt_blk());
hlt(); hlt();
} }
} }