summaryrefslogtreecommitdiff
path: root/src/mainboard/intel
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2014-10-08 22:56:27 +0200
committerVladimir Serbinenko <phcoder@gmail.com>2015-05-23 19:24:51 +0200
commit7fb149dce1d13be7dfae8ec1babb000ef18d2d94 (patch)
tree024123f233f51f711769d784cd381de7321cfe6f /src/mainboard/intel
parent2305e68df941c34c80875c6a68979177ec0cae27 (diff)
baytrail: Switch to per-device ACPI
Change-Id: I6a1b1daa291298c85e14f89aa47a0693837cec6f Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/7037 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <edward.ocallaghan@koparo.com> Reviewed-by: Aaron Durbin <adurbin@gmail.com>
Diffstat (limited to 'src/mainboard/intel')
-rw-r--r--src/mainboard/intel/bayleybay_fsp/acpi_tables.c175
-rw-r--r--src/mainboard/intel/minnowmax/acpi_tables.c212
2 files changed, 2 insertions, 385 deletions
diff --git a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
index f0e54bd753..f7d585fb67 100644
--- a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
+++ b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
@@ -35,10 +35,7 @@
#include <baytrail/nvs.h>
#include <baytrail/iomap.h>
-
-extern const unsigned char AmlCode[];
-
-static void acpi_create_gnvs(global_nvs_t *gnvs)
+void acpi_create_gnvs(global_nvs_t *gnvs)
{
acpi_init_gnvs(gnvs);
@@ -70,173 +67,3 @@ 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();
- return (unsigned long) (acpigen_get_current());
-}
-
-#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;
- acpi_header_t *ssdt;
- acpi_header_t *ssdt2;
- acpi_header_t *dsdt;
- global_nvs_t *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);
-
- facs = (acpi_facs_t *) current;
- current += sizeof(acpi_facs_t);
- ALIGN_CURRENT;
- acpi_create_facs(facs);
- printk(BIOS_DEBUG, "ACPI: * FACS @ %p Length %x", facs,
- facs->length);
-
- dsdt = (acpi_header_t *) current;
- memcpy(dsdt, &AmlCode, sizeof(acpi_header_t));
- current += dsdt->length;
- ALIGN_CURRENT;
- memcpy(dsdt, &AmlCode, dsdt->length);
- printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x", dsdt,
- dsdt->length);
-
- 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: * FADT @ %p Length %x", fadt,
- fadt->header.length);
-
- /*
- * We explicitly add these tables later on:
- */
- hpet = (acpi_hpet_t *) current;
- current += sizeof(acpi_hpet_t);
- ALIGN_CURRENT;
- acpi_create_intel_hpet(hpet);
- acpi_add_table(rsdp, hpet);
- printk(BIOS_DEBUG, "ACPI: * HPET @ %p Length %x\n", hpet,
- hpet->header.length);
-
- /* If we want to use HPET Timers Linux wants an MADT */
- madt = (acpi_madt_t *) current;
- acpi_create_madt(madt);
- current += madt->header.length;
- ALIGN_CURRENT;
- acpi_add_table(rsdp, madt);
- printk(BIOS_DEBUG, "ACPI: * MADT @ %p Length %x\n",madt,
- madt->header.length);
-
- mcfg = (acpi_mcfg_t *) current;
- acpi_create_mcfg(mcfg);
- current += mcfg->header.length;
- ALIGN_CURRENT;
- acpi_add_table(rsdp, mcfg);
- printk(BIOS_DEBUG, "ACPI: * MCFG @ %p Length %x\n",mcfg,
- mcfg->header.length);
-
- /* Update GNVS pointer into CBMEM */
- gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS);
- if (!gnvs) {
- printk(BIOS_DEBUG, "ACPI: Could not find CBMEM GNVS\n");
- gnvs = (global_nvs_t *)current;
- }
-
- 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 -> %p\n", i, gnvs);
- *(u32*)(((u32)dsdt) + i) = (unsigned long)gnvs;
- acpi_save_gnvs((unsigned long)gnvs);
- break;
- }
- }
-
- /* And fill it */
- acpi_create_gnvs(gnvs);
-
- /* And tell SMI about it */
-#if CONFIG_HAVE_SMI_HANDLER
- smm_setup_structures(gnvs, NULL, NULL);
-#endif
-
- current += sizeof(global_nvs_t);
- ALIGN_CURRENT;
-
- /* 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 Updated DSDT @ %p Length %x\n", dsdt,
- dsdt->length);
-
- ssdt = (acpi_header_t *)current;
- memset(ssdt, 0, sizeof(acpi_header_t));
- acpi_create_ssdt_generator(ssdt, ACPI_TABLE_CREATOR);
- if (ssdt->length) {
- current += ssdt->length;
- acpi_add_table(rsdp, ssdt);
- printk(BIOS_DEBUG, "ACPI: * SSDT @ %p Length %x\n",ssdt,
- ssdt->length);
- ALIGN_CURRENT;
- } else {
- ssdt = NULL;
- printk(BIOS_DEBUG, "ACPI: * SSDT not generated.\n");
- }
-
- ssdt2 = (acpi_header_t *)current;
- memset(ssdt2, 0, sizeof(acpi_header_t));
- acpi_create_serialio_ssdt(ssdt2);
- if (ssdt2->length) {
- current += ssdt2->length;
- acpi_add_table(rsdp, ssdt2);
- printk(BIOS_DEBUG, "ACPI: * SSDT2 @ %p Length %x\n",ssdt2,
- ssdt2->length);
- ALIGN_CURRENT;
- } else {
- ssdt2 = NULL;
- printk(BIOS_DEBUG, "ACPI: * SSDT2 not generated.\n");
- }
-
- printk(BIOS_DEBUG, "current = %lx\n", current);
-
- printk(BIOS_INFO, "ACPI: done.\n");
- return current;
-}
diff --git a/src/mainboard/intel/minnowmax/acpi_tables.c b/src/mainboard/intel/minnowmax/acpi_tables.c
index 7042bbf09a..7c35d712ec 100644
--- a/src/mainboard/intel/minnowmax/acpi_tables.c
+++ b/src/mainboard/intel/minnowmax/acpi_tables.c
@@ -36,10 +36,7 @@
#include <baytrail/nvs.h>
#include <baytrail/iomap.h>
-
-extern const unsigned char AmlCode[];
-
-static void acpi_create_gnvs(global_nvs_t *gnvs)
+void acpi_create_gnvs(global_nvs_t *gnvs)
{
acpi_init_gnvs(gnvs);
@@ -61,210 +58,3 @@ 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();
- return (unsigned long) (acpigen_get_current());
-}
-
-#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;
- acpi_header_t *ssdt;
- acpi_header_t *ssdt2;
- acpi_header_t *dsdt;
- global_nvs_t *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);
-
- facs = (acpi_facs_t *) current;
- current += sizeof(acpi_facs_t);
- ALIGN_CURRENT;
- acpi_create_facs(facs);
- printk(BIOS_DEBUG, "ACPI: * FACS @ %p Length %x", facs,
- facs->length);
-
- dsdt = (acpi_header_t *) current;
- memcpy(dsdt, &AmlCode, sizeof(acpi_header_t));
- current += dsdt->length;
- ALIGN_CURRENT;
- memcpy(dsdt, &AmlCode, dsdt->length);
- printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x", dsdt,
- dsdt->length);
-
- 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: * FADT @ %p Length %x", fadt,
- fadt->header.length);
-
- /*
- * We explicitly add these tables later on:
- */
- hpet = (acpi_hpet_t *) current;
- current += sizeof(acpi_hpet_t);
- ALIGN_CURRENT;
- acpi_create_intel_hpet(hpet);
- acpi_add_table(rsdp, hpet);
- printk(BIOS_DEBUG, "ACPI: * HPET @ %p Length %x\n", hpet,
- hpet->header.length);
-
- /* If we want to use HPET Timers Linux wants an MADT */
- madt = (acpi_madt_t *) current;
- acpi_create_madt(madt);
- current += madt->header.length;
- ALIGN_CURRENT;
- acpi_add_table(rsdp, madt);
- printk(BIOS_DEBUG, "ACPI: * MADT @ %p Length %x\n",madt,
- madt->header.length);
-
- mcfg = (acpi_mcfg_t *) current;
- acpi_create_mcfg(mcfg);
- current += mcfg->header.length;
- ALIGN_CURRENT;
- acpi_add_table(rsdp, mcfg);
- printk(BIOS_DEBUG, "ACPI: * MCFG @ %p Length %x\n",mcfg,
- mcfg->header.length);
-
- /* Update GNVS pointer into CBMEM */
- gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS);
- if (!gnvs) {
- printk(BIOS_DEBUG, "ACPI: Could not find CBMEM GNVS\n");
- gnvs = (global_nvs_t *)current;
- }
-
- 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 -> %p\n", i, gnvs);
- *(u32*)(((u32)dsdt) + i) = (unsigned long)gnvs;
- acpi_save_gnvs((unsigned long)gnvs);
- break;
- }
- }
-
- /* And fill it */
- acpi_create_gnvs(gnvs);
-
- /* And tell SMI about it */
-#if CONFIG_HAVE_SMI_HANDLER
- smm_setup_structures(gnvs, NULL, NULL);
-#endif
-
- current += sizeof(global_nvs_t);
- ALIGN_CURRENT;
-
- /* 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 Updated DSDT @ %p Length %x\n", dsdt,
- dsdt->length);
-
- ssdt = (acpi_header_t *)current;
- memset(ssdt, 0, sizeof(acpi_header_t));
- acpi_create_ssdt_generator(ssdt, ACPI_TABLE_CREATOR);
- if (ssdt->length) {
- current += ssdt->length;
- acpi_add_table(rsdp, ssdt);
- printk(BIOS_DEBUG, "ACPI: * SSDT @ %p Length %x\n",ssdt,
- ssdt->length);
- ALIGN_CURRENT;
- } else {
- ssdt = NULL;
- printk(BIOS_DEBUG, "ACPI: * SSDT not generated.\n");
- }
-
- ssdt2 = (acpi_header_t *)current;
- memset(ssdt2, 0, sizeof(acpi_header_t));
- acpi_create_serialio_ssdt(ssdt2);
- if (ssdt2->length) {
- current += ssdt2->length;
- acpi_add_table(rsdp, ssdt2);
- printk(BIOS_DEBUG, "ACPI: * SSDT2 @ %p Length %x\n",ssdt2,
- ssdt2->length);
- ALIGN_CURRENT;
- } else {
- ssdt2 = NULL;
- printk(BIOS_DEBUG, "ACPI: * SSDT2 not generated.\n");
- }
-
- printk(BIOS_DEBUG, "current = %lx\n", current);
-
-#if IS_ENABLED(CONFIG_DUMP_ACPI_TABLES)
- printk(BIOS_DEBUG, "rsdp\n");
- hexdump(BIOS_DEBUG, rsdp, sizeof(acpi_rsdp_t));
-
- printk(BIOS_DEBUG, "rsdt\n");
- hexdump(BIOS_DEBUG, rsdt, sizeof(acpi_rsdt_t));
-
- printk(BIOS_DEBUG, "hpet\n");
- hexdump(BIOS_DEBUG, hpet, hpet->header.length);
-
- printk(BIOS_DEBUG, "madt\n");
- hexdump(BIOS_DEBUG, madt, madt->header.length);
-
- printk(BIOS_DEBUG, "mcfg\n");
- hexdump(BIOS_DEBUG, mcfg, mcfg->header.length);
-
- printk(BIOS_DEBUG, "dsdt\n");
- hexdump(BIOS_DEBUG, dsdt, dsdt->length);
-
- if (ssdt != NULL) {
- printk(BIOS_DEBUG, "ssdt\n");
- hexdump(BIOS_DEBUG, ssdt, ssdt->length);
- }
-
- if (ssdt2 != NULL) {
- printk(BIOS_DEBUG, "ssdt2\n");
- hexdump(BIOS_DEBUG, ssdt2, ssdt2->length);
- }
-
- printk(BIOS_DEBUG, "fadt\n");
- hexdump(BIOS_DEBUG, fadt, fadt->header.length);
-
- printk(BIOS_DEBUG, "facs\n");
- hexdump(BIOS_DEBUG, facs, facs->length);
-
-#endif /* IS_ENABLED(CONFIG_DUMP_ACPI_TABLES) */
-
- printk(BIOS_INFO, "ACPI: done.\n");
- return current;
-}