diff options
| -rw-r--r-- | src/soc/amd/stoneyridge/Kconfig | 4 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/acpi.c | 16 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/northbridge.c | 13 |
3 files changed, 4 insertions, 29 deletions
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index 6f5c6e0775..49eca5d1bf 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -21,6 +21,7 @@ config SOC_AMD_STONEYRIDGE select SOC_AMD_COMMON select SOC_AMD_COMMON_BLOCK_ACPI select SOC_AMD_COMMON_BLOCK_ACPI_GPIO + select SOC_AMD_COMMON_BLOCK_ACPI_CPU_POWER_STATE select SOC_AMD_COMMON_BLOCK_ACPIMMIO select SOC_AMD_COMMON_BLOCK_ACPIMMIO_BIOSRAM select SOC_AMD_COMMON_BLOCK_AOAC @@ -269,6 +270,9 @@ config ACPI_CPU_STRING string default "\\_SB.P%03d" +config ACPI_SSDT_PSD_INDEPENDENT + default n + config ACPI_BERT bool "Build ACPI BERT Table" default y diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c index 1a264f5a4f..caa64961fe 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -111,19 +111,3 @@ const acpi_cstate_t *get_cstate_config_data(size_t *size) *size = ARRAY_SIZE(cstate_cfg_table); return cstate_cfg_table; } - -void generate_cpu_entries(const struct device *device) -{ - int cpu; - const int cores = get_cpu_count(); - - printk(BIOS_DEBUG, "ACPI \\_SB report %d core(s)\n", cores); - - /* Generate \_SB.Pxxx */ - for (cpu = 0; cpu < cores; cpu++) { - acpigen_write_processor_device(cpu); - acpigen_write_processor_device_end(); - } - - acpigen_write_processor_package("PPKG", 0, cores); -} diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c index 384698ac55..7913827cd2 100644 --- a/src/soc/amd/stoneyridge/northbridge.c +++ b/src/soc/amd/stoneyridge/northbridge.c @@ -213,7 +213,6 @@ static unsigned long agesa_write_acpi_tables(const struct device *device, { acpi_srat_t *srat; acpi_slit_t *slit; - acpi_header_t *ssdt; acpi_header_t *alib; acpi_header_t *ivrs; acpi_hest_t *hest; @@ -277,18 +276,6 @@ static unsigned long agesa_write_acpi_tables(const struct device *device, " Skipping.\n"); } - current = acpi_align_current(current); - printk(BIOS_DEBUG, "ACPI: * SSDT at %lx\n", current); - ssdt = (acpi_header_t *)agesawrapper_getlateinitptr(PICK_PSTATE); - if (ssdt != NULL) { - memcpy((void *)current, ssdt, ssdt->length); - ssdt = (acpi_header_t *)current; - current += ssdt->length; - } else { - printk(BIOS_DEBUG, " AGESA PState table NULL. Skipping.\n"); - } - acpi_add_table(rsdp, ssdt); - printk(BIOS_DEBUG, "ACPI: * SSDT for PState at %lx\n", current); return current; } |