summaryrefslogtreecommitdiff
path: root/src/mainboard/lenovo/x201
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2014-09-02 22:25:36 +0200
committerVladimir Serbinenko <phcoder@gmail.com>2014-09-11 21:53:33 +0200
commit35c0f439fc2bc29817d643a7629a4d2b79d6b903 (patch)
tree1cb70aedcc75e29752a50fde10eca720c0e6f0ac /src/mainboard/lenovo/x201
parent955ca5d948519e89573b1508bb85d3b01353ac60 (diff)
downloadcoreboot-35c0f439fc2bc29817d643a7629a4d2b79d6b903.tar.xz
Move nehalem/sandy/ivy to per-device acpi
Change-Id: I3d664ab575bf9c49a7bff9a395fbab96748430d0 Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/6802 Reviewed-by: Aaron Durbin <adurbin@google.com> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/mainboard/lenovo/x201')
-rw-r--r--src/mainboard/lenovo/x201/acpi_tables.c186
-rw-r--r--src/mainboard/lenovo/x201/mainboard.c9
2 files changed, 10 insertions, 185 deletions
diff --git a/src/mainboard/lenovo/x201/acpi_tables.c b/src/mainboard/lenovo/x201/acpi_tables.c
index fc78e4e49d..b8979f495a 100644
--- a/src/mainboard/lenovo/x201/acpi_tables.c
+++ b/src/mainboard/lenovo/x201/acpi_tables.c
@@ -31,14 +31,8 @@
#include <device/pci.h>
#include <device/pci_ids.h>
#include "southbridge/intel/ibexpeak/nvs.h"
-#include "drivers/lenovo/lenovo.h"
-extern const unsigned char AmlCode[];
-#if CONFIG_HAVE_ACPI_SLIC
-unsigned long acpi_create_slic(unsigned long current);
-#endif
-
-static void acpi_create_gnvs(global_nvs_t * gnvs)
+void acpi_create_gnvs(global_nvs_t * gnvs)
{
memset((void *)gnvs, 0, sizeof(*gnvs));
gnvs->apic = 1;
@@ -90,14 +84,6 @@ unsigned long acpi_fill_madt(unsigned long current)
return current;
}
-unsigned long acpi_fill_ssdt_generator(unsigned long current,
- const char *oem_table_id)
-{
- generate_cpu_entries();
- drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0);
- return (unsigned long)(acpigen_get_current());
-}
-
unsigned long acpi_fill_slit(unsigned long current)
{
/* Not implemented */
@@ -109,173 +95,3 @@ unsigned long acpi_fill_srat(unsigned long current)
/* No NUMA, no SRAT */
return current;
}
-
-void smm_setup_structures(void *gnvs, void *tcg, void *smi1);
-
-#define ALIGN_CURRENT current = (ALIGN(current, 16))
-unsigned long write_acpi_tables(unsigned long start)
-{
- unsigned long current;
- int i;
- acpi_rsdp_t *rsdp;
- acpi_rsdt_t *rsdt;
- acpi_xsdt_t *xsdt;
- acpi_hpet_t *hpet;
- acpi_madt_t *madt;
- acpi_mcfg_t *mcfg;
- acpi_fadt_t *fadt;
- acpi_facs_t *facs;
-#if CONFIG_HAVE_ACPI_SLIC
- acpi_header_t *slic;
-#endif
- acpi_header_t *ssdt;
- acpi_header_t *dsdt;
- void *gnvs;
-
- current = start;
-
- /* Align ACPI tables to 16byte */
- ALIGN_CURRENT;
-
- printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx.\n", start);
-
- /* We need at least an RSDP and an RSDT Table */
- rsdp = (acpi_rsdp_t *) current;
- current += sizeof(acpi_rsdp_t);
- ALIGN_CURRENT;
- rsdt = (acpi_rsdt_t *) current;
- current += sizeof(acpi_rsdt_t);
- ALIGN_CURRENT;
- xsdt = (acpi_xsdt_t *) current;
- current += sizeof(acpi_xsdt_t);
- ALIGN_CURRENT;
-
- /* clear all table memory */
- memset((void *)start, 0, current - start);
-
- acpi_write_rsdp(rsdp, rsdt, xsdt);
- acpi_write_rsdt(rsdt);
- acpi_write_xsdt(xsdt);
-
- /*
- * We explicitly add these tables later on:
- */
- printk(BIOS_DEBUG, "ACPI: * HPET\n");
-
- hpet = (acpi_hpet_t *) current;
- current += sizeof(acpi_hpet_t);
- ALIGN_CURRENT;
- acpi_create_hpet(hpet);
- acpi_add_table(rsdp, hpet);
-
- /* If we want to use HPET Timers Linux wants an MADT */
- printk(BIOS_DEBUG, "ACPI: * MADT\n");
-
- madt = (acpi_madt_t *) current;
- acpi_create_madt(madt);
- current += madt->header.length;
- ALIGN_CURRENT;
- acpi_add_table(rsdp, madt);
-
- printk(BIOS_DEBUG, "ACPI: * MCFG\n");
- mcfg = (acpi_mcfg_t *) current;
- acpi_create_mcfg(mcfg);
- current += mcfg->header.length;
- ALIGN_CURRENT;
- acpi_add_table(rsdp, mcfg);
-
- printk(BIOS_DEBUG, "ACPI: * FACS\n");
- facs = (acpi_facs_t *) current;
- current += sizeof(acpi_facs_t);
- ALIGN_CURRENT;
- acpi_create_facs(facs);
-
- dsdt = (acpi_header_t *) current;
- memcpy(dsdt, &AmlCode, sizeof(acpi_header_t));
- current += dsdt->length;
- memcpy(dsdt, &AmlCode, dsdt->length);
-
- /* Fix up global NVS region for SMI handler. The GNVS region lives
- * in the (high) table area. The low memory map looks like this:
- *
- * 0x00000000 - 0x000003ff Real Mode IVT
- * 0x00000400 - 0x000004ff BDA (somewhat unused)
- * 0x00000500 - 0x0000052f Moved GDT
- * 0x00000530 - 0x00000b64 coreboot table
- * 0x0007c000 - 0x0007dfff OS boot sector (unused?)
- * 0x0007e000 - 0x0007ffff free to use (so no good for acpi+smi)
- * 0x00080000 - 0x0009fbff usable ram
- * 0x0009fc00 - 0x0009ffff EBDA (unused?)
- * 0x000a0000 - 0x000bffff VGA memory
- * 0x000c0000 - 0x000cffff VGA option rom
- * 0x000d0000 - 0x000dffff free for other option roms?
- * 0x000e0000 - 0x000fffff SeaBIOS? (if payload is SeaBIOS it
- overwrites those tables when
- loading but uses tables at the RAM
- end to put the tables again in suitable
- place)
- * 0x000f0000 - 0x000f03ff PIRQ table
- * 0x000f0400 - 0x000f66?? ACPI tables
- * 0x000f66?? - 0x000f???? DMI tables
- */
-
- ALIGN_CURRENT;
-
- /* Pack GNVS into the ACPI table area */
- for (i = 0; i < dsdt->length; i++) {
- if (*(u32 *) (((u32) dsdt) + i) == 0xC0DEBABE) {
- printk(BIOS_DEBUG,
- "ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08x\n",
- i, (u32) current);
- *(u32 *) (((u32) dsdt) + i) = current;
- break;
- }
- }
-
- /* And fill it */
- acpi_create_gnvs((global_nvs_t *) current);
-
- /* Keep pointer around */
- gnvs = (void *)current;
-
- current += 0x100;
- ALIGN_CURRENT;
-
- /* And tell SMI about it */
- smm_setup_structures(gnvs, NULL, NULL);
-
- /* We patched up the DSDT, so we need to recalculate the checksum */
- dsdt->checksum = 0;
- dsdt->checksum = acpi_checksum((void *)dsdt, dsdt->length);
-
- printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt,
- dsdt->length);
-
-#if CONFIG_HAVE_ACPI_SLIC
- printk(BIOS_DEBUG, "ACPI: * SLIC\n");
- slic = (acpi_header_t *) current;
- current += acpi_create_slic(current);
- ALIGN_CURRENT;
- acpi_add_table(rsdp, slic);
-#endif
-
- printk(BIOS_DEBUG, "ACPI: * FADT\n");
- fadt = (acpi_fadt_t *) current;
- current += sizeof(acpi_fadt_t);
- ALIGN_CURRENT;
-
- acpi_create_fadt(fadt, facs, dsdt);
- acpi_add_table(rsdp, fadt);
-
- printk(BIOS_DEBUG, "ACPI: * SSDT\n");
- ssdt = (acpi_header_t *) current;
- acpi_create_ssdt_generator(ssdt, ACPI_TABLE_CREATOR);
- current += ssdt->length;
- acpi_add_table(rsdp, ssdt);
- ALIGN_CURRENT;
-
- printk(BIOS_DEBUG, "current = %lx\n", current);
- printk(BIOS_INFO, "ACPI: done.\n");
-
- return current;
-}
diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c
index fdeddd4402..fb8c1d5626 100644
--- a/src/mainboard/lenovo/x201/mainboard.c
+++ b/src/mainboard/lenovo/x201/mainboard.c
@@ -48,6 +48,7 @@
#include <device/pci.h>
#include <smbios.h>
#include <build.h>
+#include "drivers/lenovo/lenovo.h"
static acpi_cstate_t cst_entries[] = {
{1, 1, 1000, {0x7f, 1, 2, {0}, 1, 0}},
@@ -119,12 +120,20 @@ static void mainboard_init(device_t dev)
0x42, 0x142);
}
+static unsigned long fill_ssdt(unsigned long current,
+ const char *oem_table_id)
+{
+ drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0);
+ return (unsigned long) (acpigen_get_current());
+}
+
static void mainboard_enable(device_t dev)
{
device_t dev0;
u16 pmbase;
dev->ops->init = mainboard_init;
+ dev->ops->acpi_fill_ssdt_generator = fill_ssdt;
pmbase = pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x1f, 0)),
PMBASE) & 0xff80;