10 files changed, 19 insertions, 24 deletions

diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c
index dbaade6945..5df44fb39e 100644
--- a/src/soc/intel/broadwell/acpi.c
+++ b/src/soc/intel/broadwell/acpi.c
@@ -6,6 +6,7 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <cbmem.h>
+#include <cpu/intel/haswell/haswell.h>
 #include <device/pci_ops.h>
 #include <cpu/x86/smm.h>
 #include <console/console.h>
@@ -15,10 +16,8 @@
 #include <cpu/x86/msr.h>
 #include <cpu/intel/turbo.h>
 #include <soc/acpi.h>
-#include <soc/cpu.h>
 #include <soc/iomap.h>
 #include <soc/lpc.h>
-#include <soc/msr.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <soc/systemagent.h>
diff --git a/src/soc/intel/broadwell/cpu/romstage.c b/src/soc/intel/broadwell/cpu/romstage.c
index c9f70a85d1..3b11e93cab 100644
--- a/src/soc/intel/broadwell/cpu/romstage.c
+++ b/src/soc/intel/broadwell/cpu/romstage.c
@@ -2,10 +2,8 @@
 
 #include <arch/cpu.h>
 #include <console/console.h>
+#include <cpu/intel/haswell/haswell.h>
 #include <cpu/x86/msr.h>
-#include <soc/cpu.h>
-#include <soc/msr.h>
-#include <soc/romstage.h>
 
 void set_max_freq(void)
 {
diff --git a/src/soc/intel/broadwell/gma.c b/src/soc/intel/broadwell/gma.c
index bbb6678b75..6556dd4e19 100644
--- a/src/soc/intel/broadwell/gma.c
+++ b/src/soc/intel/broadwell/gma.c
@@ -6,6 +6,7 @@
 #include <bootmode.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
+#include <cpu/intel/haswell/haswell.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
@@ -16,7 +17,6 @@
 #include <drivers/intel/gma/i915_reg.h>
 #include <drivers/intel/gma/libgfxinit.h>
 #include <drivers/intel/gma/opregion.h>
-#include <soc/cpu.h>
 #include <soc/pm.h>
 #include <soc/ramstage.h>
 #include <soc/systemagent.h>
@@ -527,7 +527,7 @@ static void igd_init(struct device *dev)
 		reg_script_run_on_dev(dev, broadwell_early_init_script);
 
 		/* Set GFXPAUSE based on stepping */
-		if (cpu_stepping() <= (CPUID_BROADWELL_E0 & 0xf) &&
+		if (cpu_stepping() <= (CPUID_BROADWELL_ULT_E0 & 0xf) &&
 		    systemagent_revision() <= 9) {
 			gtt_write(0xa000, 0x300ff);
 		} else {
diff --git a/src/soc/intel/broadwell/include/soc/romstage.h b/src/soc/intel/broadwell/include/soc/romstage.h
index 721e23f5f5..646ad0e5dc 100644
--- a/src/soc/intel/broadwell/include/soc/romstage.h
+++ b/src/soc/intel/broadwell/include/soc/romstage.h
@@ -20,8 +20,6 @@ struct chipset_power_state;
 struct chipset_power_state *fill_power_state(void);
 void report_platform_info(void);
 
-void set_max_freq(void);
-
 void systemagent_early_init(void);
 void pch_early_init(void);
 void pch_uart_init(void);
diff --git a/src/soc/intel/broadwell/northbridge.c b/src/soc/intel/broadwell/northbridge.c
index e2b84b397b..43fa0816fc 100644
--- a/src/soc/intel/broadwell/northbridge.c
+++ b/src/soc/intel/broadwell/northbridge.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <console/console.h>
+#include <cpu/intel/haswell/haswell.h>
 #include <acpi/acpi.h>
 #include <device/pci_ops.h>
 #include <stdint.h>
@@ -10,7 +11,6 @@
 #include <device/pci_ids.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <soc/acpi.h>
-#include <soc/cpu.h>
 #include <soc/iomap.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
diff --git a/src/soc/intel/broadwell/pch/acpi.c b/src/soc/intel/broadwell/pch/acpi.c
index 34f9c04562..9a501c3ab6 100644
--- a/src/soc/intel/broadwell/pch/acpi.c
+++ b/src/soc/intel/broadwell/pch/acpi.c
@@ -15,10 +15,8 @@
 #include <cpu/x86/msr.h>
 #include <cpu/intel/turbo.h>
 #include <soc/acpi.h>
-#include <soc/cpu.h>
 #include <soc/iomap.h>
 #include <soc/lpc.h>
-#include <soc/msr.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <soc/systemagent.h>
diff --git a/src/soc/intel/broadwell/pch/pcie.c b/src/soc/intel/broadwell/pch/pcie.c
index c98201e5ab..b098dc2af4 100644
--- a/src/soc/intel/broadwell/pch/pcie.c
+++ b/src/soc/intel/broadwell/pch/pcie.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <console/console.h>
+#include <cpu/intel/haswell/haswell.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pciexp.h>
@@ -14,7 +15,6 @@
 #include <soc/pci_devs.h>
 #include <soc/rcba.h>
 #include <soc/intel/broadwell/pch/chip.h>
-#include <soc/cpu.h>
 #include <delay.h>
 
 /* Low Power variant has 6 root ports. */
diff --git a/src/soc/intel/broadwell/pch/xhci.c b/src/soc/intel/broadwell/pch/xhci.c
index baaf5ba6e6..fd36fad4a0 100644
--- a/src/soc/intel/broadwell/pch/xhci.c
+++ b/src/soc/intel/broadwell/pch/xhci.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <cpu/intel/haswell/haswell.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
@@ -9,7 +10,6 @@
 #include <device/pci_ops.h>
 #include <soc/ramstage.h>
 #include <soc/xhci.h>
-#include <soc/cpu.h>
 
 #ifdef __SIMPLE_DEVICE__
 static u8 *usb_xhci_mem_base(pci_devfn_t dev)
diff --git a/src/soc/intel/broadwell/report_platform.c b/src/soc/intel/broadwell/report_platform.c
index 4ed84d7cea..018ea24a56 100644
--- a/src/soc/intel/broadwell/report_platform.c
+++ b/src/soc/intel/broadwell/report_platform.c
@@ -5,27 +5,28 @@
 #include <console/console.h>
 #include <device/pci.h>
 #include <string.h>
+#include <cpu/intel/haswell/haswell.h>
 #include <cpu/intel/microcode.h>
 #include <cpu/x86/msr.h>
-#include <soc/cpu.h>
 #include <soc/pch.h>
 #include <soc/pci_devs.h>
 #include <soc/romstage.h>
 #include <soc/systemagent.h>
 
+/* FIXME: Needs an update */
 static struct {
 	u32 cpuid;
 	const char *name;
 } cpu_table[] = {
-	{ CPUID_HASWELL_A0,     "Haswell A0" },
-	{ CPUID_HASWELL_B0,     "Haswell B0" },
-	{ CPUID_HASWELL_C0,     "Haswell C0" },
-	{ CPUID_HASWELL_ULT_B0, "Haswell ULT B0" },
-	{ CPUID_HASWELL_ULT,    "Haswell ULT C0 or D0" },
-	{ CPUID_HASWELL_HALO,   "Haswell Perf Halo" },
-	{ CPUID_BROADWELL_C0,   "Broadwell C0" },
-	{ CPUID_BROADWELL_D0,   "Broadwell D0" },
-	{ CPUID_BROADWELL_E0,   "Broadwell E0 or F0" },
+	{ CPUID_HASWELL_A0,       "Haswell A0" },
+	{ CPUID_HASWELL_B0,       "Haswell B0" },
+	{ CPUID_HASWELL_C0,       "Haswell C0" },
+	{ CPUID_HASWELL_ULT_B0,   "Haswell ULT B0" },
+	{ CPUID_HASWELL_ULT_C0,   "Haswell ULT C0 or D0" },
+	{ CPUID_CRYSTALWELL_C0,   "Haswell Perf Halo" },
+	{ CPUID_BROADWELL_ULT_C0, "Broadwell C0" },
+	{ CPUID_BROADWELL_ULT_D0, "Broadwell D0" },
+	{ CPUID_BROADWELL_ULT_E0, "Broadwell E0 or F0" },
 };
 
 static struct {
diff --git a/src/soc/intel/broadwell/romstage.c b/src/soc/intel/broadwell/romstage.c
index 2e5db76ce9..8e884d5d35 100644
--- a/src/soc/intel/broadwell/romstage.c
+++ b/src/soc/intel/broadwell/romstage.c
@@ -3,6 +3,7 @@
 #include <acpi/acpi.h>
 #include <arch/romstage.h>
 #include <console/console.h>
+#include <cpu/intel/haswell/haswell.h>
 #include <elog.h>
 #include <romstage_handoff.h>
 #include <soc/gpio.h>