Add acpi_get_sleep_type() to i82371eb and P2B _PTS/_WAK methods
Build fix for src/arch/i386/boot/acpi.c if !CONFIG_SMP Also check for acpi_slp_type 2 in acpi_is_wakeup, since S2 uses the same acpi wakeup vector as S3. Add _PTS/_WAK methods to turn off/on the CPU/case fans and blink the power LED while sleeping. acpi_get_sleep_type() is in a seperate file i82371eb_wakeup.c because it is used in both romstage and ramstage after patch 3/3, whereas i82371eb_early_pm.c is used only in romstage. I used the name acpi_get_sleep_type instead of acpi_is_wakeup_early because I think acpi_is_wakeup_early is a bit misleading as a name since it doesn't return a boolean value. Other chipsets so far only ever set acpi_slp_type to 0 and 3, so the added check for acpi_slp_type == 2 (resume from S2) should not change behaviour of other boards: northbridge/intel/i945/northbridge.c:256:extern u8 acpi_slp_type; northbridge/intel/i945/northbridge.c:263: acpi_slp_type=0; northbridge/intel/i945/northbridge.c:267: acpi_slp_type=3; northbridge/intel/i945/northbridge.c:271: acpi_slp_type=0; southbridge/intel/i82801gx/i82801gx_lpc.c:171:extern u8 acpi_slp_type; southbridge/via/vt8237r/vt8237r_lpc.c:149:extern u8 acpi_slp_type; southbridge/via/vt8237r/vt8237r_lpc.c:238: acpi_slp_type = ((tmp & (7 << 10)) >> 10) == 1 ? 3 : 0 ; southbridge/via/vt8237r/vt8237r_lpc.c:239: printk(BIOS_DEBUG, "SLP_TYP type was %x %x\n", tmp, acpi_slp_type); Change-Id: I13feff0b8f49aa988e5467cdbef02981f0a6be8a Signed-off-by: Tobias Diedrich <ranma+coreboot@tdiedrich.de> Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: http://review.coreboot.org/188 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
committed by
Patrick Georgi
parent
78834b794d
commit
4e22a3bc58
@@ -1,6 +1,7 @@
|
||||
config SOUTHBRIDGE_INTEL_I82371EB
|
||||
bool
|
||||
select TINY_BOOTBLOCK
|
||||
select HAVE_ACPI_RESUME if HAVE_ACPI_TABLES
|
||||
|
||||
config BOOTBLOCK_SOUTHBRIDGE_INIT
|
||||
string
|
||||
|
@@ -26,6 +26,7 @@ driver-y += smbus.c
|
||||
driver-y += reset.c
|
||||
driver-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c
|
||||
driver-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.c
|
||||
driver-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.c
|
||||
|
||||
romstage-y += early_pm.c
|
||||
romstage-y += early_smbus.c
|
||||
|
@@ -31,6 +31,11 @@
|
||||
#include "i82371eb.h"
|
||||
#include "smbus.h"
|
||||
|
||||
#if CONFIG_HAVE_ACPI_RESUME == 1
|
||||
extern u8 acpi_slp_type;
|
||||
int acpi_get_sleep_type(void);
|
||||
#endif
|
||||
|
||||
static void pwrmgt_enable(struct device *dev)
|
||||
{
|
||||
struct southbridge_intel_i82371eb_config *sb = dev->chip_info;
|
||||
@@ -87,7 +92,13 @@ static void pwrmgt_enable(struct device *dev)
|
||||
outw(0xffff, DEFAULT_PMBASE + GLBSTS);
|
||||
outl(0xffffffff, DEFAULT_PMBASE + DEVSTS);
|
||||
|
||||
/* set pmcntrl default */
|
||||
#if CONFIG_HAVE_ACPI_RESUME == 1
|
||||
/* this reads PMCNTRL, so we have to call it before writing the
|
||||
* default value */
|
||||
acpi_slp_type = acpi_get_sleep_type();
|
||||
#endif
|
||||
|
||||
/* set PMCNTRL default */
|
||||
outw(SUS_TYP_S0|SCI_EN, DEFAULT_PMBASE + PMCNTRL);
|
||||
}
|
||||
|
||||
|
59
src/southbridge/intel/i82371eb/wakeup.c
Normal file
59
src/southbridge/intel/i82371eb/wakeup.c
Normal file
@@ -0,0 +1,59 @@
|
||||
/*
|
||||
* This file is part of the coreboot project.
|
||||
*
|
||||
* Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
#include <arch/io.h>
|
||||
#include <console/console.h>
|
||||
#include "i82371eb.h"
|
||||
|
||||
int acpi_get_sleep_type(void);
|
||||
|
||||
/*
|
||||
* Intel 82371EB (PIIX4E) datasheet, section 7.2.3, page 142
|
||||
*
|
||||
* 0: soft off/suspend to disk S5
|
||||
* 1: suspend to ram S3
|
||||
* 2: powered on suspend, context lost S2
|
||||
* Note: 'context lost' means the CPU restarts at the reset
|
||||
* vector
|
||||
* 3: powered on suspend, CPU context lost S1
|
||||
* Note: Looks like 'CPU context lost' does _not_ mean the
|
||||
* CPU restarts at the reset vector. Most likely only
|
||||
* caches are lost, so both 0x3 and 0x4 map to acpi S1
|
||||
* 4: powered on suspend, context maintained S1
|
||||
* 5: working (clock control) S0
|
||||
* 6: reserved
|
||||
* 7: reserved
|
||||
*/
|
||||
static const u8 acpi_sus_to_slp_typ[8] = {
|
||||
5, 3, 2, 1, 1, 0, 0, 0
|
||||
};
|
||||
|
||||
int acpi_get_sleep_type(void)
|
||||
{
|
||||
u16 reg, result;
|
||||
|
||||
reg = inw(DEFAULT_PMBASE + PMCNTRL);
|
||||
result = acpi_sus_to_slp_typ[(reg >> 10) & 7];
|
||||
|
||||
printk(BIOS_DEBUG, "Wakeup from ACPI sleep type S%d (PMCNTRL=%04x)\n", result, reg);
|
||||
|
||||
return result;
|
||||
}
|
Reference in New Issue
Block a user