summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-08-18 10:11:35 -0500
committerAaron Durbin <adurbin@chromium.org>2015-08-27 14:20:25 +0000
commit5a96b3743edb99ced733cf37cbeea305b58768c7 (patch)
tree68b22aa087e9b25e3d4108f7acf3f9625d1660e8 /src/soc
parent415022a86c1033e7b233fc2ca16e1d6367425ab5 (diff)
downloadcoreboot-5a96b3743edb99ced733cf37cbeea305b58768c7.tar.xz
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 <adurbin@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/294240 Original-Reviewed-by: Duncan Laurie <dlaurie@chromium.org> Original-Reviewed-by: Leroy P Leahy <leroy.p.leahy@intel.com> Original-Commit-Queue: Leroy P Leahy <leroy.p.leahy@intel.com> Change-Id: I7c85f44ba65398bda668e13db8be531535a983c5 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/11285 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/skylake/chip.c2
-rw-r--r--src/soc/intel/skylake/cpu.c2
2 files changed, 2 insertions, 2 deletions
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 <arch/acpi.h>
#include <chip.h>
#include <console/console.h>
#include <device/device.h>
@@ -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 <device/device.h>
#include <device/pci.h>
#include <string.h>
-#include <arch/acpi.h>
#include <chip.h>
#include <cpu/cpu.h>
#include <cpu/x86/mtrr.h>
@@ -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[] = {