[coreboot-gerrit] Patch set updated for coreboot: 32520e3 fsp_baytrail: Switch to per-device ACPI
Vladimir Serbinenko (phcoder@gmail.com)
gerrit at coreboot.org
Thu Oct 16 12:31:31 CEST 2014
Vladimir Serbinenko (phcoder at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7045
-gerrit
commit 32520e3ff37abd3aa971a563509bae55c4c5734f
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date: Sat Oct 11 10:52:08 2014 +0200
fsp_baytrail: Switch to per-device ACPI
Change-Id: Ib01596f56a3922fc08f0b2d64188977c2a7174e0
Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
---
src/mainboard/intel/bayleybay_fsp/acpi_tables.c | 187 +-------------------
src/mainboard/intel/minnowmax/acpi_tables.c | 223 +-----------------------
src/soc/intel/fsp_baytrail/Kconfig | 1 +
src/soc/intel/fsp_baytrail/acpi.c | 56 ++++++
src/soc/intel/fsp_baytrail/acpi/globalnvs.asl | 3 +-
src/soc/intel/fsp_baytrail/baytrail/acpi.h | 3 +
src/soc/intel/fsp_baytrail/baytrail/nvs.h | 1 +
src/soc/intel/fsp_baytrail/northcluster.c | 15 +-
src/soc/intel/fsp_baytrail/southcluster.c | 6 +
9 files changed, 85 insertions(+), 410 deletions(-)
diff --git a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
index 5f81e26..cb63df6 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,185 +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());
-}
-
-unsigned long acpi_fill_slit(unsigned long current)
-{
- // Not implemented
- return current;
-}
-
-unsigned long acpi_fill_srat(unsigned long current)
-{
- /* No NUMA, no SRAT */
- return 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 881c143..8e31da2 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);
@@ -62,221 +59,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());
-}
-
-unsigned long acpi_fill_slit(unsigned long current)
-{
- // Not implemented
- return current;
-}
-
-unsigned long acpi_fill_srat(unsigned long current)
-{
- /* No NUMA, no SRAT */
- return 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;
-}
diff --git a/src/soc/intel/fsp_baytrail/Kconfig b/src/soc/intel/fsp_baytrail/Kconfig
index e9391c3..1ca19c3 100644
--- a/src/soc/intel/fsp_baytrail/Kconfig
+++ b/src/soc/intel/fsp_baytrail/Kconfig
@@ -50,6 +50,7 @@ config CPU_SPECIFIC_OPTIONS
select SUPPORT_CPU_UCODE_IN_CBFS if INCLUDE_MICROCODE_IN_BUILD
select CPU_MICROCODE_ADDED_DURING_BUILD if INCLUDE_MICROCODE_IN_BUILD
select ROMSTAGE_RTC_INIT
+ select PER_DEVICE_ACPI_TABLES
config BOOTBLOCK_CPU_INIT
string
diff --git a/src/soc/intel/fsp_baytrail/acpi.c b/src/soc/intel/fsp_baytrail/acpi.c
index fb0dc87..8fd9cd8 100644
--- a/src/soc/intel/fsp_baytrail/acpi.c
+++ b/src/soc/intel/fsp_baytrail/acpi.c
@@ -47,6 +47,7 @@
#include <baytrail/msr.h>
#include <baytrail/pattrs.h>
#include <baytrail/pmc.h>
+#include <cpu/cpu.h>
#include <cbmem.h>
#include "chip.h"
@@ -575,3 +576,58 @@ unsigned long acpi_madt_irq_overrides(unsigned long current)
return current;
}
+
+#define ALIGN_CURRENT current = (ALIGN(current, 16))
+
+unsigned long southcluster_write_acpi_tables(unsigned long current,
+ struct acpi_rsdp *rsdp)
+{
+ acpi_header_t *ssdt2;
+
+ current = acpi_write_hpet(current, rsdp);
+ ALIGN_CURRENT;
+
+ 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);
+
+ return current;
+}
+
+void southcluster_inject_dsdt(void)
+{
+ global_nvs_t *gnvs;
+
+ gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS);
+ if (!gnvs) {
+ gnvs = cbmem_add(CBMEM_ID_ACPI_GNVS, sizeof (*gnvs));
+ if (gnvs)
+ memset(gnvs, 0, sizeof(*gnvs));
+ }
+
+ if (gnvs) {
+ int scopelen;
+ memset(gnvs, 0, sizeof(*gnvs));
+ acpi_create_gnvs(gnvs);
+ acpi_save_gnvs((unsigned long)gnvs);
+ /* And tell SMI about it */
+ smm_setup_structures(gnvs, NULL, NULL);
+
+ /* Add it to DSDT. */
+ scopelen = acpigen_write_scope("\\");
+ scopelen += acpigen_write_name_dword("NVSA", (u32) gnvs);
+ acpigen_patch_len(scopelen - 1);
+ }
+}
diff --git a/src/soc/intel/fsp_baytrail/acpi/globalnvs.asl b/src/soc/intel/fsp_baytrail/acpi/globalnvs.asl
index 696390d..d2dc021 100644
--- a/src/soc/intel/fsp_baytrail/acpi/globalnvs.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/globalnvs.asl
@@ -30,7 +30,8 @@ Name(\PICM, 0) // IOAPIC/8259
*/
-OperationRegion (GNVS, SystemMemory, 0xC0DEBABE, 0x2000)
+External(NVSA)
+OperationRegion (GNVS, SystemMemory, NVSA, 0x2000)
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
diff --git a/src/soc/intel/fsp_baytrail/baytrail/acpi.h b/src/soc/intel/fsp_baytrail/baytrail/acpi.h
index aaba61a..ea23974 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/acpi.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/acpi.h
@@ -29,5 +29,8 @@ void acpi_create_serialio_ssdt(acpi_header_t *ssdt);
void acpi_fill_in_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt);
unsigned long acpi_madt_irq_overrides(unsigned long current);
void acpi_init_gnvs(global_nvs_t *gnvs);
+unsigned long southcluster_write_acpi_tables(unsigned long current,
+ struct acpi_rsdp *rsdp);
+void southcluster_inject_dsdt(void);
#endif /* _BAYTRAIL_ACPI_H_ */
diff --git a/src/soc/intel/fsp_baytrail/baytrail/nvs.h b/src/soc/intel/fsp_baytrail/baytrail/nvs.h
index 242f6d3..11ad72e 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/nvs.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/nvs.h
@@ -68,6 +68,7 @@ typedef struct {
device_nvs_t dev;
} __attribute__((packed)) global_nvs_t;
+void acpi_create_gnvs(global_nvs_t *gnvs);
#ifdef __SMM__
/* Used in SMM to find the ACPI GNVS address */
global_nvs_t *smm_get_gnvs(void);
diff --git a/src/soc/intel/fsp_baytrail/northcluster.c b/src/soc/intel/fsp_baytrail/northcluster.c
index 838e554..a440b9a 100644
--- a/src/soc/intel/fsp_baytrail/northcluster.c
+++ b/src/soc/intel/fsp_baytrail/northcluster.c
@@ -32,7 +32,7 @@
#include <cbmem.h>
#include <baytrail/baytrail.h>
#include <drivers/intel/fsp/fsp_util.h>
-
+#include <arch/acpi.h>
static const int legacy_hole_base_k = 0xa0000 / 1024;
static const int legacy_hole_size_k = 384;
@@ -204,8 +204,21 @@ static void nc_enable(device_t dev)
print_fsp_info();
}
+unsigned long acpi_fill_slit(unsigned long current)
+{
+ // Not implemented
+ return current;
+}
+
+unsigned long acpi_fill_srat(unsigned long current)
+{
+ /* No NUMA, no SRAT */
+ return current;
+}
+
static struct device_operations nc_ops = {
.read_resources = nc_read_resources,
+ .acpi_fill_ssdt_generator = generate_cpu_entries,
.set_resources = NULL,
.enable_resources = NULL,
.init = NULL,
diff --git a/src/soc/intel/fsp_baytrail/southcluster.c b/src/soc/intel/fsp_baytrail/southcluster.c
index 2216902..3541482 100644
--- a/src/soc/intel/fsp_baytrail/southcluster.c
+++ b/src/soc/intel/fsp_baytrail/southcluster.c
@@ -40,10 +40,14 @@
#include <baytrail/irq.h>
#include <baytrail/lpc.h>
#include <baytrail/nvs.h>
+#include <baytrail/acpi.h>
#include <baytrail/pci_devs.h>
#include <baytrail/pmc.h>
#include <baytrail/ramstage.h>
#include "chip.h"
+#include <arch/acpi.h>
+#include <arch/acpigen.h>
+#include <cpu/cpu.h>
#define ENABLE_ACPI_MODE_IN_COREBOOT 0
#define TEST_SMM_FLASH_LOCKDOWN 0
@@ -647,6 +651,8 @@ void southcluster_enable_dev(device_t dev)
static struct device_operations device_ops = {
.read_resources = sc_read_resources,
.set_resources = pci_dev_set_resources,
+ .acpi_inject_dsdt_generator = southcluster_inject_dsdt,
+ .write_acpi_tables = southcluster_write_acpi_tables,
.enable_resources = NULL,
.init = sc_init,
.enable = southcluster_enable_dev,
More information about the coreboot-gerrit
mailing list