Patchwork model_65x CPU support

login
register
about
Submitter Keith Hui
Date 2010-10-16 03:25:02
Message ID <AANLkTi=r=vtUdxjMkxgO4FiFNZ6yGnp6CdAhnt08qQcJ@mail.gmail.com>
Download mbox | patch
Permalink /patch/2118/
State Accepted
Headers show

Comments

Keith Hui - 2010-10-16 03:25:02
Attached patch moves support for Deschutes Slot 1 CPUs (model_65x)
into its own home.

This is similar to the Katmai patch I submitted before, but without
microcode this time. With 17 of them they will make the patch too
large. I think I'll defer them for later or someone else*, hehe. :D

abuild-tested. I have no Deschutes CPUs to boot test this with.

Signed-off-by: Keith Hui <buurin@gmail.com>

* also because I like to keep all microcodes for the same family
within one file instead of one microcode per file.
Peter Stuge - 2010-10-16 04:04:46
Keith Hui wrote:
> Attached patch moves support for Deschutes Slot 1 CPUs (model_65x)
> into its own home.

Then I guess the patch should also delete some lines in existing
files?


> This is similar to the Katmai patch I submitted before, but without
> microcode this time. With 17 of them they will make the patch too
> large. I think I'll defer them for later or someone else*, hehe. :D
> 
> abuild-tested.

It doesn't look like the new code is used anywhere? Should it be?


> * also because I like to keep all microcodes for the same family
> within one file instead of one microcode per file.

We want microcode updates to be as close as possible to upstream
format. Eventually I think we want to put them verbatim into cbfs.


//Peter
Stefan Reinauer - 2010-10-16 04:22:55
On 10/15/10 9:04 PM, Peter Stuge wrote:
>> * also because I like to keep all microcodes for the same family
>> within one file instead of one microcode per file.
> We want microcode updates to be as close as possible to upstream
> format. Eventually I think we want to put them verbatim into cbfs.
Yes. Please use the microcode extraction script in our tree to put them
into the right places.
Uwe Hermann - 2010-10-16 08:51:57
On Fri, Oct 15, 2010 at 11:25:02PM -0400, Keith Hui wrote:
> Attached patch moves support for Deschutes Slot 1 CPUs (model_65x)
> into its own home.

Thanks, r5954.

 
> This is similar to the Katmai patch I submitted before, but without
> microcode this time. With 17 of them they will make the patch too
> large. I think I'll defer them for later or someone else*, hehe. :D
[...]
> * also because I like to keep all microcodes for the same family
> within one file instead of one microcode per file.

As Stefan mentioned, we should always use the script from
src/cpu/intel/microcode/update-microcodes.sh
to create/update the microcode files.

We're leaving model_6xx untouched for now, as it is still being used at
the moment and duplicate CPUs in model_6xx and model_65x for example should
not matter I think. When the splitting is done, we'll probably get rid
of model_6xx entirely and have slot1/slot2/socket370 etc. include only
the proper families they need.


Uwe.

Patch

Index: src/cpu/intel/model_65x/Kconfig
===================================================================
--- src/cpu/intel/model_65x/Kconfig	(revision 0)
+++ src/cpu/intel/model_65x/Kconfig	(revision 0)
@@ -0,0 +1,3 @@ 
+config CPU_INTEL_MODEL_65X
+	bool
+	select SMP
Index: src/cpu/intel/model_65x/Makefile.inc
===================================================================
--- src/cpu/intel/model_65x/Makefile.inc	(revision 0)
+++ src/cpu/intel/model_65x/Makefile.inc	(revision 0)
@@ -0,0 +1,22 @@ 
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2010 Keith Hui <buurin@gmail.com>
+##
+## 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; either version 2 of the License, or
+## (at your option) any later version.
+##
+## 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.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+driver-y += model_65x_init.c
+
Index: src/cpu/intel/model_65x/model_65x_init.c
===================================================================
--- src/cpu/intel/model_65x/model_65x_init.c	(revision 0)
+++ src/cpu/intel/model_65x/model_65x_init.c	(revision 0)
@@ -0,0 +1,78 @@ 
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2007-2009 coresystems GmbH
+ * Copyright (C) 2010 Keith Hui <buurin@gmail.com>
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <device/device.h>
+#include <device/pci.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/x86/cache.h>
+
+static uint32_t microcode_updates[] = {
+
+	/*  Dummy terminator  */
+	0x0, 0x0, 0x0, 0x0,
+	0x0, 0x0, 0x0, 0x0,
+	0x0, 0x0, 0x0, 0x0,
+	0x0, 0x0, 0x0, 0x0,
+};
+
+static void model_65x_init(device_t dev)
+{
+	/* Turn on caching if we haven't already */
+	x86_enable_cache();
+	x86_setup_mtrrs(36);
+	x86_mtrr_check();
+
+	/* Update the microcode */
+	intel_update_microcode(microcode_updates);
+
+	/* Enable the local cpu apics */
+	setup_lapic();
+};
+
+static struct device_operations cpu_dev_ops = {
+	.init     = model_65x_init,
+};
+
+/*
+ * Intel Pentium II Processor Specification Update
+ * http://download.intel.com/design/PentiumII/specupdt/24333749.pdf
+ *
+ * Mobile Intel Pentium II Processor Specification Update
+ * http://download.intel.com/design/intarch/specupdt/24388757.pdf
+ *
+ * Intel Pentium II Xeon Processor Specification Update
+ * http://download.intel.com/support/processors/pentiumii/xeon/24377632.pdf
+ */
+static struct cpu_device_id cpu_table[] = {
+	{ X86_VENDOR_INTEL, 0x0650 }, /* PII/Celeron, dA0/mdA0/A0 */
+	{ X86_VENDOR_INTEL, 0x0651 }, /* PII/Celeron, dA1/A1 */
+	{ X86_VENDOR_INTEL, 0x0652 }, /* PII/Celeron/Xeon, dB0/mdB0/B0 */
+	{ X86_VENDOR_INTEL, 0x0653 }, /* PII/Xeon, dB1/B1 */
+	{ 0, 0 },
+};
+
+static const struct cpu_driver driver __cpu_driver = {
+	.ops      = &cpu_dev_ops,
+	.id_table = cpu_table,
+};
Index: src/cpu/intel/slot_1/Makefile.inc
===================================================================
--- src/cpu/intel/slot_1/Makefile.inc	(revision 5951)
+++ src/cpu/intel/slot_1/Makefile.inc	(working copy)
@@ -20,6 +20,7 @@ 
 
 ramstage-y += slot_1.c
 subdirs-y += ../model_6xx
+subdirs-y += ../model_65x
 subdirs-y += ../model_67x
 subdirs-y += ../model_6bx
 subdirs-y += ../../x86/tsc