[coreboot-gerrit] Patch set updated for coreboot: src/cpu/intel: Add Pentium 4 model F6x

[HAOUAS Elyes (ehaouas@noos.fr)]

HAOUAS Elyes (ehaouas at noos.fr) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17410

-gerrit

commit 33d691c2e67a15ab4cafd7c1301e1fbab6d79edc
Author: Elyes HAOUAS <ehaouas at noos.fr>
Date:   Sun Nov 13 18:32:52 2016 +0100

    src/cpu/intel: Add Pentium 4 model F6x
    
    Change-Id: I9c691db73e3ec44895f623ede5a7ee04c13e1851
    Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
 src/cpu/intel/model_f6x/Kconfig          |  8 +++++
 src/cpu/intel/model_f6x/Makefile.inc     |  3 ++
 src/cpu/intel/model_f6x/model_f6x_init.c | 61 ++++++++++++++++++++++++++++++++
 src/cpu/intel/socket_LGA775/Kconfig      |  2 +-
 src/cpu/intel/socket_LGA775/Makefile.inc |  2 +-
 5 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/src/cpu/intel/model_f6x/Kconfig b/src/cpu/intel/model_f6x/Kconfig
new file mode 100644
index 0000000..ede6a4a
--- /dev/null
+++ b/src/cpu/intel/model_f6x/Kconfig
@@ -0,0 +1,8 @@
+config CPU_INTEL_MODEL_F6X
+	bool
+	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_VERSTAGE_X86_32
+	select ARCH_ROMSTAGE_X86_32
+	select ARCH_RAMSTAGE_X86_32
+	select SMP
+	select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/model_f6x/Makefile.inc b/src/cpu/intel/model_f6x/Makefile.inc
new file mode 100644
index 0000000..b71f96d
--- /dev/null
+++ b/src/cpu/intel/model_f6x/Makefile.inc
@@ -0,0 +1,3 @@
+ramstage-y += model_f6x_init.c
+
+#cpu_microcode_bins += 3rdparty/blobs/cpu/intel/model_f6x/microcode.bin
diff --git a/src/cpu/intel/model_f6x/model_f6x_init.c b/src/cpu/intel/model_f6x/model_f6x_init.c
new file mode 100644
index 0000000..c533501
--- /dev/null
+++ b/src/cpu/intel/model_f6x/model_f6x_init.c
@@ -0,0 +1,61 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <console/console.h>
+#include <device/device.h>
+#include <string.h>
+#include <cpu/cpu.h>
+#include <cpu/x86/mtrr.h>
+#include <cpu/x86/msr.h>
+#include <cpu/x86/lapic.h>
+#include <cpu/intel/microcode.h>
+#include <cpu/intel/hyperthreading.h>
+#include <cpu/x86/cache.h>
+
+static void model_f6x_init(struct device *cpu)
+{
+	/* Turn on caching if we haven't already */
+	x86_enable_cache();
+
+	if (!intel_ht_sibling()) {
+		/* MTRRs are shared between threads */
+		x86_setup_mtrrs();
+		x86_mtrr_check();
+
+		/* Update the microcode */
+		intel_update_microcode_from_cbfs();
+	}
+
+	/* Enable the local CPU APICs */
+	setup_lapic();
+
+	/* Start up my CPU siblings */
+	intel_sibling_init(cpu);
+};
+
+static struct device_operations cpu_dev_ops = {
+	.init = model_f6x_init,
+};
+
+static struct cpu_device_id cpu_table[] = {
+	{ X86_VENDOR_INTEL, 0x0f62 },
+	{ X86_VENDOR_INTEL, 0x0f64 },
+	{ X86_VENDOR_INTEL, 0x0f65 },
+	{ X86_VENDOR_INTEL, 0x0f68 },
+	{ 0, 0 },
+};
+
+static const struct cpu_driver model_f6x __cpu_driver = {
+	.ops      = &cpu_dev_ops,
+	.id_table = cpu_table,
+};
diff --git a/src/cpu/intel/socket_LGA775/Kconfig b/src/cpu/intel/socket_LGA775/Kconfig
index e5c687a..27f8d36 100644
--- a/src/cpu/intel/socket_LGA775/Kconfig
+++ b/src/cpu/intel/socket_LGA775/Kconfig
@@ -9,7 +9,7 @@ config SOCKET_SPECIFIC_OPTIONS # dummy
 	select CPU_INTEL_MODEL_6FX
 	select CPU_INTEL_MODEL_F3X
 	select CPU_INTEL_MODEL_F4X
-#	select CPU_INTEL_MODEL_F6X
+	select CPU_INTEL_MODEL_F6X
 #	select CPU_INTEL_MODEL_1066X
 	select CPU_INTEL_MODEL_1067X
 	select MMX
diff --git a/src/cpu/intel/socket_LGA775/Makefile.inc b/src/cpu/intel/socket_LGA775/Makefile.inc
index 371a801..9917c9b 100644
--- a/src/cpu/intel/socket_LGA775/Makefile.inc
+++ b/src/cpu/intel/socket_LGA775/Makefile.inc
@@ -2,7 +2,7 @@ subdirs-y += ../model_6ex
 subdirs-y += ../model_6fx
 subdirs-y += ../model_f3x
 subdirs-y += ../model_f4x
-#subdirs-y += ../model_f6x
+subdirs-y += ../model_f6x
 #subdirs-y += ../model_1066x
 subdirs-y += ../model_1067x
 subdirs-y += ../../x86/tsc