[coreboot] [commit] r5601 - trunk/util/inteltool

[repository service]

Author: stepan
Date: Tue Jun  1 12:04:28 2010
New Revision: 5601
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5601

Log:
inteltool: basic poulsbo sch support.
Signed-off-by: Stefan Reinauer <stepan at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>

Modified:
   trunk/util/inteltool/cpu.c
   trunk/util/inteltool/inteltool.c
   trunk/util/inteltool/inteltool.h

Modified: trunk/util/inteltool/cpu.c
==============================================================================
--- trunk/util/inteltool/cpu.c	Sun May 30 15:44:32 2010	(r5600)
+++ trunk/util/inteltool/cpu.c	Tue Jun  1 12:04:28 2010	(r5601)
@@ -464,7 +464,7 @@
 	/* Get CPU family and model, not the stepping
 	 * (TODO: extended family/model)
 	 */
-	id = cpuid(1) & 0xff0;
+	id = cpuid(1) & 0xfffff0;
 	for (i = 0; i < ARRAY_SIZE(cpulist); i++) {
 		if(cpulist[i].model == id) {
 			cpu = &cpulist[i];

Modified: trunk/util/inteltool/inteltool.c
==============================================================================
--- trunk/util/inteltool/inteltool.c	Sun May 30 15:44:32 2010	(r5600)
+++ trunk/util/inteltool/inteltool.c	Tue Jun  1 12:04:28 2010	(r5601)
@@ -45,7 +45,9 @@
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82G33, "P35/G33/G31/P31" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82Q33, "Q33" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58, "X58" },
-	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_GS45, "GS45ME-GMCH" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_GS45, "GS45ME" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_POULSBO, "SCH Poulsbo" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_POULSBO_LPC, "SCH Poulsbo" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10R, "ICH10R" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9DH, "ICH9DH" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9DO, "ICH9DO" },
@@ -261,8 +263,16 @@
 	}
 
 	id = cpuid(1);
-	printf("Intel CPU: Family %x, Model %x\n",
-			(id >> 8) & 0xf, (id >> 4) & 0xf);
+
+	/* Intel has suggested applications to display the family of a CPU as
+	 * the sum of the "Family" and the "Extended Family" fields shown
+	 * above, and the model as the sum of the "Model" and the 4-bit
+	 * left-shifted "Extended Model" fields.
+	 * http://download.intel.com/design/processor/applnots/24161832.pdf
+	 */
+	printf("Intel CPU: Processor Type: %x, Family %x, Model %x, Stepping %x\n",
+			(id >> 12) & 0x3, ((id >> 8) & 0xf) + ((id >> 20) & 0xff),
+			((id >> 12) & 0xf0) + ((id >> 4) & 0xf), (id & 0xf));
 
 	/* Determine names */
 	for (i = 0; i < ARRAY_SIZE(supported_chips_list); i++)

Modified: trunk/util/inteltool/inteltool.h
==============================================================================
--- trunk/util/inteltool/inteltool.h	Sun May 30 15:44:32 2010	(r5600)
+++ trunk/util/inteltool/inteltool.h	Tue Jun  1 12:04:28 2010	(r5601)
@@ -51,6 +51,7 @@
 #define PCI_DEVICE_ID_INTEL_ICH9M		0x2919
 #define PCI_DEVICE_ID_INTEL_ICH9ME		0x2917
 #define PCI_DEVICE_ID_INTEL_ICH10R		0x3a16
+#define PCI_DEVICE_ID_INTEL_SCH_POULSBO_LPC	0x8119
 
 #define PCI_DEVICE_ID_INTEL_82810		0x7120
 #define PCI_DEVICE_ID_INTEL_82810DC		0x7122
@@ -66,6 +67,7 @@
 #define PCI_DEVICE_ID_INTEL_82Q33		0x29d0
 #define PCI_DEVICE_ID_INTEL_GS45		0x2a40
 #define PCI_DEVICE_ID_INTEL_X58			0x3405
+#define PCI_DEVICE_ID_INTEL_SCH_POULSBO		0x8100
 
 #define PCI_DEVICE_ID_INTEL_82443LX		0x7180
 /* 82443BX has a different device ID if AGP is disabled (hardware-wise). */