[coreboot-gerrit] New patch to review for coreboot: skylake: only generate ACPI cpu entries once

[Aaron Durbin (adurbin@chromium.org)]

Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11285

-gerrit

commit 33eec0d658c2b7b4347489b772149d5cb2521bb0
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Tue Aug 18 10:11:35 2015 -0500

    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 at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/294240
    Original-Reviewed-by: Duncan Laurie <dlaurie at chromium.org>
    Original-Reviewed-by: Leroy P Leahy <leroy.p.leahy at intel.com>
    Original-Commit-Queue: Leroy P Leahy <leroy.p.leahy at intel.com>
    
    Change-Id: I7c85f44ba65398bda668e13db8be531535a983c5
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
 src/soc/intel/skylake/chip.c | 2 ++
 src/soc/intel/skylake/cpu.c  | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index f79a02d..8bd62b4 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 980a05a..1f26093 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[] = {