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

amd/stoneyridge: Move acpi_get_sleep_type to sb_util 

Relocate the acpi_get_sleep_type() function out of the southbridge
ramstage file.  This will make it more convenient for using elsewhere.

Change-Id: Id7ba709bb867fb00ed6c7fa7526de087a3b9b3ca
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/22722
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Marshall Dawson 2017-11-16 09:14:15 -07:00 committed by Martin Roth
parent 2d51dd6625
commit 3a7de79885
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/soc/amd/stoneyridge/sb_util.c
View File

@ -13,6 +13,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/acpi.h>
#include <soc/southbridge.h> #include <soc/southbridge.h>
void pm_write8(u8 reg, u8 value) void pm_write8(u8 reg, u8 value)
@ -114,3 +115,8 @@ uint32_t xhci_pm_read32(uint8_t reg)
{ {
return read32((void *)(XHCI_ACPI_PM_MMIO_BASE + reg)); return read32((void *)(XHCI_ACPI_PM_MMIO_BASE + reg));
} }
int acpi_get_sleep_type(void)
{
return acpi_sleep_from_pm1(inw(pm_acpi_pm_cnt_blk()));
}

6
src/soc/amd/stoneyridge/southbridge.c
View File

@ -16,7 +16,6 @@
#include <console/console.h> #include <console/console.h>
#include <arch/io.h> #include <arch/io.h>
#include <arch/acpi.h>
#include <bootstate.h> #include <bootstate.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <device/device.h> #include <device/device.h>
@ -483,11 +482,6 @@ int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos)
return nvram_pos; return nvram_pos;
} }
int acpi_get_sleep_type(void)
{
return acpi_sleep_from_pm1(inw(pm_acpi_pm_cnt_blk()));
}
void sb_enable(device_t dev) void sb_enable(device_t dev)
{ {
printk(BIOS_DEBUG, "%s\n", __func__); printk(BIOS_DEBUG, "%s\n", __func__);