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

southbridge/hudson: Initialize ACPI IO ports separate of FADT 

The ACPI IO ports, and the respective SMI (for HAVE_SMI_HANDLER), were
initialized when the FADT table was written. This works well on a cold
boot, but the ACPI ports are not initialized on S3 resume, as ACPI
tables are not written. This will not work on S3 resume if the default
ports are not what we set them, or if AGESA sets them to some other
value.

To solve this, move the port configuration to southbridge chip init.

Change-Id: Ib4043f0fa5e20f08d320acd12ce84d4d789cd035
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-on: http://review.coreboot.org/5559
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@gmail.com>
This commit is contained in:
Alexandru Gagniuc 2014-04-20 14:36:29 -05:00
parent cf38facbd2
commit 86777e36b3
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/southbridge/amd/agesa/hudson/fadt.c
View File

@ -65,9 +65,6 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
fadt->preferred_pm_profile = FADT_PM_PROFILE; fadt->preferred_pm_profile = FADT_PM_PROFILE;
fadt->sci_int = 9; /* HUDSON - IRQ 09 – ACPI SCI */ fadt->sci_int = 9; /* HUDSON - IRQ 09 – ACPI SCI */
/* We write to this port further down; configure it first */
pm_write16(0x62, ACPI_PM1_CNT_BLK);
if (IS_ENABLED(CONFIG_HAVE_SMI_HANDLER)) { if (IS_ENABLED(CONFIG_HAVE_SMI_HANDLER)) {
fadt->smi_cmd = ACPI_SMI_CTL_PORT; fadt->smi_cmd = ACPI_SMI_CTL_PORT;
fadt->acpi_enable = ACPI_SMI_CMD_ENABLE; fadt->acpi_enable = ACPI_SMI_CMD_ENABLE;
@ -75,7 +72,6 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
fadt->s4bios_req = 0; /* Not supported */ fadt->s4bios_req = 0; /* Not supported */
fadt->pstate_cnt = 0; /* Not supported */ fadt->pstate_cnt = 0; /* Not supported */
fadt->cst_cnt = 0; /* Not supported */ fadt->cst_cnt = 0; /* Not supported */
hudson_enable_acpi_cmd_smi();
outl(0x0, ACPI_PM1_CNT_BLK); /* clear SCI_EN */ outl(0x0, ACPI_PM1_CNT_BLK); /* clear SCI_EN */
} else { } else {
fadt->smi_cmd = 0; /* disable system management mode */ fadt->smi_cmd = 0; /* disable system management mode */
@ -87,18 +83,6 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
outl(0x1, ACPI_PM1_CNT_BLK); /* set SCI_EN */ outl(0x1, ACPI_PM1_CNT_BLK); /* set SCI_EN */
} }
pm_write16(0x60, ACPI_PM_EVT_BLK);
pm_write16(0x64, ACPI_PM_TMR_BLK);
pm_write16(0x68, ACPI_GPE0_BLK);
/* CpuControl is in \_PR.CPU0, 6 bytes */
pm_write16(0x66, ACPI_CPU_CONTROL);
pm_write16(0x6a, fadt->smi_cmd);
pm_write8(0x74, 1<<0 | 1<<1 | 1<<4 | 1<<2); /* AcpiDecodeEnable, When set, SB uses
* the contents of the PM registers at
* index 60-6B to decode ACPI I/O address.
* AcpiSmiEn & SmiCmdEn*/
fadt->pm1a_evt_blk = ACPI_PM_EVT_BLK; fadt->pm1a_evt_blk = ACPI_PM_EVT_BLK;
fadt->pm1b_evt_blk = 0x0000; fadt->pm1b_evt_blk = 0x0000;
fadt->pm1a_cnt_blk = ACPI_PM1_CNT_BLK; fadt->pm1a_cnt_blk = ACPI_PM1_CNT_BLK;

33
src/southbridge/amd/agesa/hudson/hudson.c
View File

@ -29,6 +29,7 @@
#include <cbmem.h> #include <cbmem.h>
#include "hudson.h" #include "hudson.h"
#include "smbus.h" #include "smbus.h"
#include "smi.h"
/* Offsets from ACPI_MMIO_BASE /* Offsets from ACPI_MMIO_BASE
* This is defined by AGESA, but we don't include AGESA headers to avoid * This is defined by AGESA, but we don't include AGESA headers to avoid
@ -129,7 +130,39 @@ unsigned long get_top_of_ram(void)
} }
#endif #endif
static void hudson_init_acpi_ports(void)
{
/* We use some of these ports in SMM regardless of whether or not
* ACPI tables are generated. Enable these ports indiscriminately.
*/
pm_write16(0x60, ACPI_PM_EVT_BLK);
pm_write16(0x62, ACPI_PM1_CNT_BLK);
pm_write16(0x64, ACPI_PM_TMR_BLK);
pm_write16(0x68, ACPI_GPE0_BLK);
/* CpuControl is in \_PR.CPU0, 6 bytes */
pm_write16(0x66, ACPI_CPU_CONTROL);
if (IS_ENABLED(CONFIG_HAVE_SMI_HANDLER)) {
pm_write16(0x6a, ACPI_SMI_CTL_PORT);
hudson_enable_acpi_cmd_smi();
} else {
pm_write16(0x6a, 0);
}
/* AcpiDecodeEnable, When set, SB uses the contents of the PM registers
* at index 60-6B to decode ACPI I/O address. AcpiSmiEn & SmiCmdEn
*/
pm_write8(0x74, 1<<0 | 1<<1 | 1<<4 | 1<<2);
}
static void hudson_init(void *chip_info)
{
hudson_init_acpi_ports();
}
struct chip_operations southbridge_amd_agesa_hudson_ops = { struct chip_operations southbridge_amd_agesa_hudson_ops = {
CHIP_NAME("ATI HUDSON") CHIP_NAME("ATI HUDSON")
.enable_dev = hudson_enable, .enable_dev = hudson_enable,
.init = hudson_init
}; };