From 5a96b3743edb99ced733cf37cbeea305b58768c7 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 18 Aug 2015 10:11:35 -0500 Subject: skylake: only generate ACPI cpu entries once The acpi_fill_ssdt_generator function pointer is evaluated for each device. As there are multiple cpus in the system the acpi_fill_ssdt_generator was being called more than once creating duplicate ACPI entries because there was more than 1 cpu device. Fix this by only generating them once by removing the acpi_fill_ssdt_generator for the cpu devices, but add the generator to the cpu cluster device. BUG=chrome-os-partner:44084 BRANCH=None TEST=Built and booted on glados. Noted ACPI entries only generated once. Original-Change-Id: I695c30e6150f6d3a79d13744c532f1b658b10402 Original-Signed-off-by: Aaron Durbin Original-Reviewed-on: https://chromium-review.googlesource.com/294240 Original-Reviewed-by: Duncan Laurie Original-Reviewed-by: Leroy P Leahy Original-Commit-Queue: Leroy P Leahy Change-Id: I7c85f44ba65398bda668e13db8be531535a983c5 Signed-off-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/11285 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/soc/intel/skylake/chip.c | 2 ++ src/soc/intel/skylake/cpu.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/soc/intel/skylake') diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c index f79a02dd00..8bd62b4d13 100644 --- a/src/soc/intel/skylake/chip.c +++ b/src/soc/intel/skylake/chip.c @@ -18,6 +18,7 @@ * Foundation, Inc. */ +#include #include #include #include @@ -40,6 +41,7 @@ static struct device_operations pci_domain_ops = { static struct device_operations cpu_bus_ops = { .init = &soc_init_cpus, + .acpi_fill_ssdt_generator = generate_cpu_entries, }; static void soc_enable(device_t dev) diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c index 980a05a577..1f26093794 100644 --- a/src/soc/intel/skylake/cpu.c +++ b/src/soc/intel/skylake/cpu.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -503,7 +502,6 @@ static struct mp_flight_record mp_steps[] = { static struct device_operations cpu_dev_ops = { .init = cpu_core_init, - .acpi_fill_ssdt_generator = generate_cpu_entries, }; static struct cpu_device_id cpu_table[] = { -- cgit v1.2.3