[coreboot] [v2] r4908 - in trunk/src/cpu/intel: . model_106cx socket_441
svn at coreboot.org
svn at coreboot.org
Wed Nov 4 13:18:44 CET 2009
Author: stepan
Date: 2009-11-04 13:18:44 +0100 (Wed, 04 Nov 2009)
New Revision: 4908
Added:
trunk/src/cpu/intel/model_106cx/Kconfig
trunk/src/cpu/intel/model_106cx/Makefile.inc
trunk/src/cpu/intel/model_106cx/model_106cx_init.c
trunk/src/cpu/intel/socket_441/Kconfig
trunk/src/cpu/intel/socket_441/Makefile.inc
Removed:
trunk/src/cpu/intel/model_106cx/model_6cx_init.c
Modified:
trunk/src/cpu/intel/Kconfig
trunk/src/cpu/intel/model_106cx/Config.lb
Log:
Fix up typo in Socket 441 CPUs, and add a few (trivial) Kconfig files for them.
Signed-off-by: Stefan Reinauer <stepan at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>
Modified: trunk/src/cpu/intel/Kconfig
===================================================================
--- trunk/src/cpu/intel/Kconfig 2009-11-03 15:02:15 UTC (rev 4907)
+++ trunk/src/cpu/intel/Kconfig 2009-11-04 12:18:44 UTC (rev 4908)
@@ -3,6 +3,7 @@
source src/cpu/intel/model_6ex/Kconfig
source src/cpu/intel/model_6fx/Kconfig
source src/cpu/intel/model_1067x/Kconfig
+source src/cpu/intel/model_106cx/Kconfig
source src/cpu/intel/bga956/Kconfig
source src/cpu/intel/ep80579/Kconfig
@@ -13,3 +14,4 @@
#source src/cpu/intel/socket_mPGA603/Kconfig
source src/cpu/intel/socket_mPGA604/Kconfig
source src/cpu/intel/socket_PGA370/Kconfig
+source src/cpu/intel/socket_441/Kconfig
Modified: trunk/src/cpu/intel/model_106cx/Config.lb
===================================================================
--- trunk/src/cpu/intel/model_106cx/Config.lb 2009-11-03 15:02:15 UTC (rev 4907)
+++ trunk/src/cpu/intel/model_106cx/Config.lb 2009-11-04 12:18:44 UTC (rev 4908)
@@ -28,4 +28,4 @@
dir /cpu/intel/microcode
dir /cpu/intel/hyperthreading
dir /cpu/intel/speedstep
-driver model_6cx_init.o
+driver model_106cx_init.o
Added: trunk/src/cpu/intel/model_106cx/Kconfig
===================================================================
--- trunk/src/cpu/intel/model_106cx/Kconfig (rev 0)
+++ trunk/src/cpu/intel/model_106cx/Kconfig 2009-11-04 12:18:44 UTC (rev 4908)
@@ -0,0 +1,3 @@
+config CPU_INTEL_ATOM_230
+ bool
+ select SMP
Added: trunk/src/cpu/intel/model_106cx/Makefile.inc
===================================================================
--- trunk/src/cpu/intel/model_106cx/Makefile.inc (rev 0)
+++ trunk/src/cpu/intel/model_106cx/Makefile.inc 2009-11-04 12:18:44 UTC (rev 4908)
@@ -0,0 +1 @@
+driver-y += model_106cx_init.o
Copied: trunk/src/cpu/intel/model_106cx/model_106cx_init.c (from rev 4907, trunk/src/cpu/intel/model_106cx/model_6cx_init.c)
===================================================================
--- trunk/src/cpu/intel/model_106cx/model_106cx_init.c (rev 0)
+++ trunk/src/cpu/intel/model_106cx/model_106cx_init.c 2009-11-04 12:18:44 UTC (rev 4908)
@@ -0,0 +1,222 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2007-2009 coresystems GmbH
+ *
+ * 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 <console/console.h>
+#include <device/device.h>
+#include <device/pci.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>
+#include <cpu/x86/mtrr.h>
+#include <usbdebug_direct.h>
+
+static const uint32_t microcode_updates[] = {
+ /* Dummy terminator */
+ 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0,
+};
+
+static inline void strcpy(char *dst, char *src)
+{
+ while (*src) *dst++ = *src++;
+}
+
+static void fill_processor_name(char *processor_name)
+{
+ struct cpuid_result regs;
+ char temp_processor_name[49];
+ char *processor_name_start;
+ unsigned int *name_as_ints = (unsigned int *)temp_processor_name;
+ int i;
+
+ for (i=0; i<3; i++) {
+ regs = cpuid(0x80000002 + i);
+ name_as_ints[i*4 + 0] = regs.eax;
+ name_as_ints[i*4 + 1] = regs.ebx;
+ name_as_ints[i*4 + 2] = regs.ecx;
+ name_as_ints[i*4 + 3] = regs.edx;
+ }
+
+ temp_processor_name[48] = 0;
+
+ /* Skip leading spaces */
+ processor_name_start = temp_processor_name;
+ while (*processor_name_start == ' ')
+ processor_name_start++;
+
+ memset(processor_name, 0, 49);
+ strcpy(processor_name, processor_name_start);
+}
+
+#define IA32_FEATURE_CONTROL 0x003a
+
+#define CPUID_VMX (1 << 5)
+#define CPUID_SMX (1 << 6)
+static void enable_vmx(void)
+{
+ struct cpuid_result regs;
+ msr_t msr;
+
+ msr = rdmsr(IA32_FEATURE_CONTROL);
+
+ if (msr.lo & (1 << 0)) {
+ /* VMX locked. If we set it again we get an illegal
+ * instruction
+ */
+ return;
+ }
+
+ regs = cpuid(1);
+ if (regs.ecx & CPUID_VMX) {
+ msr.lo |= (1 << 2);
+ if (regs.ecx & CPUID_SMX)
+ msr.lo |= (1 << 1);
+ }
+
+ wrmsr(IA32_FEATURE_CONTROL, msr);
+
+ msr.lo |= (1 << 0); /* Set lock bit */
+
+ wrmsr(IA32_FEATURE_CONTROL, msr);
+}
+
+#define PMG_CST_CONFIG_CONTROL 0xe2
+#define PMG_IO_BASE_ADDR 0xe3
+#define PMG_IO_CAPTURE_ADDR 0xe4
+#define PMB0 0x510 /* analogous to P_BLK in cpu.asl */
+#define PMB1 0x0 /* IO port that triggers SMI once cores are in the same state.
+ See CSM Trigger, at PMG_CST_CONFIG_CONTROL[6:4] */
+#define HIGHEST_CLEVEL 3
+static void configure_c_states(void)
+{
+ msr_t msr;
+
+ msr = rdmsr(PMG_CST_CONFIG_CONTROL);
+ msr.lo |= (1 << 15); // Lock configuration
+ msr.lo |= (1 << 10); // redirect IO-based CState transition requests to MWAIT
+ msr.lo &= ~(1 << 9); // Issue a single stop grant cycle upon stpclk
+ msr.lo &= ~7; msr.lo |= HIGHEST_CLEVEL; // support at most C3
+ // TODO Do we want Deep C4 and Dynamic L2 shrinking?
+ wrmsr(PMG_CST_CONFIG_CONTROL, msr);
+
+ // set P_BLK address
+ msr = rdmsr(PMG_IO_BASE_ADDR);
+ msr.lo = (PMB0 + 4) | (PMB1 << 16);
+ wrmsr(PMG_IO_BASE_ADDR, msr);
+
+ // set C_LVL controls
+ msr = rdmsr(PMG_IO_CAPTURE_ADDR);
+ msr.lo = (PMB0 + 4) | ((HIGHEST_CLEVEL - 2) << 16); // -2 because LVL0+1 aren't counted
+ wrmsr(PMG_IO_CAPTURE_ADDR, msr);
+}
+
+#define IA32_MISC_ENABLE 0x1a0
+static void configure_misc(void)
+{
+ msr_t msr;
+
+ msr = rdmsr(IA32_MISC_ENABLE);
+ msr.lo |= (1 << 3); /* TM1 enable */
+ msr.lo |= (1 << 13); /* TM2 enable */
+ msr.lo |= (1 << 17); /* Bidirectional PROCHOT# */
+
+ msr.lo |= (1 << 10); /* FERR# multiplexing */
+
+ // TODO: Only if IA32_PLATFORM_ID[17] = 0 and IA32_PLATFORM_ID[50] = 1
+ msr.lo |= (1 << 16); /* Enhanced SpeedStep Enable */
+
+ // TODO Do we want Deep C4 and Dynamic L2 shrinking?
+ wrmsr(IA32_MISC_ENABLE, msr);
+
+ msr.lo |= (1 << 20); /* Lock Enhanced SpeedStep Enable */
+ wrmsr(IA32_MISC_ENABLE, msr);
+}
+
+#if CONFIG_USBDEBUG_DIRECT
+static unsigned ehci_debug_addr;
+#endif
+
+static void model_106cx_init(device_t cpu)
+{
+ char processor_name[49];
+
+ /* Turn on caching if we haven't already */
+ x86_enable_cache();
+
+ /* Update the microcode */
+ intel_update_microcode(microcode_updates);
+
+ /* Print processor name */
+ fill_processor_name(processor_name);
+ printk_info("CPU: %s.\n", processor_name);
+
+#if CONFIG_USBDEBUG_DIRECT
+ // Is this caution really needed?
+ if(!ehci_debug_addr)
+ ehci_debug_addr = get_ehci_debug();
+ set_ehci_debug(0);
+#endif
+
+ /* Setup MTRRs */
+ x86_setup_mtrrs(36);
+ x86_mtrr_check();
+
+#if CONFIG_USBDEBUG_DIRECT
+ set_ehci_debug(ehci_debug_addr);
+#endif
+
+ /* Enable the local cpu apics */
+ setup_lapic();
+
+ /* Enable virtualization */
+ enable_vmx();
+
+ /* Configure C States */
+ configure_c_states();
+
+ /* Configure Enhanced SpeedStep and Thermal Sensors */
+ configure_misc();
+
+ /* TODO: PIC thermal sensor control */
+
+ /* Start up my cpu siblings */
+ intel_sibling_init(cpu);
+}
+
+static struct device_operations cpu_dev_ops = {
+ .init = model_106cx_init,
+};
+
+static struct cpu_device_id cpu_table[] = {
+ { X86_VENDOR_INTEL, 0x106c0 }, /* Intel Atom 230 */
+ { 0, 0 },
+};
+
+static const struct cpu_driver driver __cpu_driver = {
+ .ops = &cpu_dev_ops,
+ .id_table = cpu_table,
+};
+
Deleted: trunk/src/cpu/intel/model_106cx/model_6cx_init.c
===================================================================
--- trunk/src/cpu/intel/model_106cx/model_6cx_init.c 2009-11-03 15:02:15 UTC (rev 4907)
+++ trunk/src/cpu/intel/model_106cx/model_6cx_init.c 2009-11-04 12:18:44 UTC (rev 4908)
@@ -1,224 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2009 coresystems GmbH
- *
- * 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 <console/console.h>
-#include <device/device.h>
-#include <device/pci.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>
-#include <cpu/x86/mtrr.h>
-#include <usbdebug_direct.h>
-
-static const uint32_t microcode_updates[] = {
- /* Dummy terminator */
- 0x0, 0x0, 0x0, 0x0,
- 0x0, 0x0, 0x0, 0x0,
- 0x0, 0x0, 0x0, 0x0,
- 0x0, 0x0, 0x0, 0x0,
-};
-
-static inline void strcpy(char *dst, char *src)
-{
- while (*src) *dst++ = *src++;
-}
-
-static void fill_processor_name(char *processor_name)
-{
- struct cpuid_result regs;
- char temp_processor_name[49];
- char *processor_name_start;
- unsigned int *name_as_ints = (unsigned int *)temp_processor_name;
- int i;
-
- for (i=0; i<3; i++) {
- regs = cpuid(0x80000002 + i);
- name_as_ints[i*4 + 0] = regs.eax;
- name_as_ints[i*4 + 1] = regs.ebx;
- name_as_ints[i*4 + 2] = regs.ecx;
- name_as_ints[i*4 + 3] = regs.edx;
- }
-
- temp_processor_name[48] = 0;
-
- /* Skip leading spaces */
- processor_name_start = temp_processor_name;
- while (*processor_name_start == ' ')
- processor_name_start++;
-
- memset(processor_name, 0, 49);
- strcpy(processor_name, processor_name_start);
-}
-
-#define IA32_FEATURE_CONTROL 0x003a
-
-#define CPUID_VMX (1 << 5)
-#define CPUID_SMX (1 << 6)
-static void enable_vmx(void)
-{
- struct cpuid_result regs;
- msr_t msr;
-
- msr = rdmsr(IA32_FEATURE_CONTROL);
-
- if (msr.lo & (1 << 0)) {
- /* VMX locked. If we set it again we get an illegal
- * instruction
- */
- return;
- }
-
- regs = cpuid(1);
- if (regs.ecx & CPUID_VMX) {
- msr.lo |= (1 << 2);
- if (regs.ecx & CPUID_SMX)
- msr.lo |= (1 << 1);
- }
-
- wrmsr(IA32_FEATURE_CONTROL, msr);
-
- msr.lo |= (1 << 0); /* Set lock bit */
-
- wrmsr(IA32_FEATURE_CONTROL, msr);
-}
-
-#define PMG_CST_CONFIG_CONTROL 0xe2
-#define PMG_IO_BASE_ADDR 0xe3
-#define PMG_IO_CAPTURE_ADDR 0xe4
-#define PMB0 0x510 /* analogous to P_BLK in cpu.asl */
-#define PMB1 0x0 /* IO port that triggers SMI once cores are in the same state.
- See CSM Trigger, at PMG_CST_CONFIG_CONTROL[6:4] */
-#define HIGHEST_CLEVEL 3
-static void configure_c_states(void)
-{
- msr_t msr;
-
- msr = rdmsr(PMG_CST_CONFIG_CONTROL);
- msr.lo |= (1 << 15); // Lock configuration
- msr.lo |= (1 << 10); // redirect IO-based CState transition requests to MWAIT
- msr.lo &= ~(1 << 9); // Issue a single stop grant cycle upon stpclk
- msr.lo &= ~7; msr.lo |= HIGHEST_CLEVEL; // support at most C3
- // TODO Do we want Deep C4 and Dynamic L2 shrinking?
- wrmsr(PMG_CST_CONFIG_CONTROL, msr);
-
- // set P_BLK address
- msr = rdmsr(PMG_IO_BASE_ADDR);
- msr.lo = (PMB0 + 4) | (PMB1 << 16);
- wrmsr(PMG_IO_BASE_ADDR, msr);
-
- // set C_LVL controls
- msr = rdmsr(PMG_IO_CAPTURE_ADDR);
- msr.lo = (PMB0 + 4) | ((HIGHEST_CLEVEL - 2) << 16); // -2 because LVL0+1 aren't counted
- wrmsr(PMG_IO_CAPTURE_ADDR, msr);
-}
-
-#define IA32_MISC_ENABLE 0x1a0
-static void configure_misc(void)
-{
- msr_t msr;
-
- msr = rdmsr(IA32_MISC_ENABLE);
- msr.lo |= (1 << 3); /* TM1 enable */
- msr.lo |= (1 << 13); /* TM2 enable */
- msr.lo |= (1 << 17); /* Bidirectional PROCHOT# */
-
- msr.lo |= (1 << 10); /* FERR# multiplexing */
-
- // TODO: Only if IA32_PLATFORM_ID[17] = 0 and IA32_PLATFORM_ID[50] = 1
- msr.lo |= (1 << 16); /* Enhanced SpeedStep Enable */
-
- // TODO Do we want Deep C4 and Dynamic L2 shrinking?
- wrmsr(IA32_MISC_ENABLE, msr);
-
- msr.lo |= (1 << 20); /* Lock Enhanced SpeedStep Enable */
- wrmsr(IA32_MISC_ENABLE, msr);
-}
-
-#if CONFIG_USBDEBUG_DIRECT
-static unsigned ehci_debug_addr;
-#endif
-
-static void model_6ex_init(device_t cpu)
-{
- char processor_name[49];
-
- /* Turn on caching if we haven't already */
- x86_enable_cache();
-
- /* Update the microcode */
- intel_update_microcode(microcode_updates);
-
- /* Print processor name */
- fill_processor_name(processor_name);
- printk_info("CPU: %s.\n", processor_name);
-
-#if CONFIG_USBDEBUG_DIRECT
- // Is this caution really needed?
- if(!ehci_debug_addr)
- ehci_debug_addr = get_ehci_debug();
- set_ehci_debug(0);
-#endif
-
- /* Setup MTRRs */
- x86_setup_mtrrs(36);
- x86_mtrr_check();
-
-#if CONFIG_USBDEBUG_DIRECT
- set_ehci_debug(ehci_debug_addr);
-#endif
-
- /* Enable the local cpu apics */
- setup_lapic();
-
- /* Enable virtualization */
- enable_vmx();
-
- /* Configure C States */
- configure_c_states();
-
- /* Configure Enhanced SpeedStep and Thermal Sensors */
- configure_misc();
-
- /* TODO: PIC thermal sensor control */
-
- /* Start up my cpu siblings */
- intel_sibling_init(cpu);
-}
-
-static struct device_operations cpu_dev_ops = {
- .init = model_6ex_init,
-};
-
-static struct cpu_device_id cpu_table[] = {
- { X86_VENDOR_INTEL, 0x06e0 }, /* Intel Core Solo/Core Duo */
- { X86_VENDOR_INTEL, 0x06e8 }, /* Intel Core Solo/Core Duo */
- { X86_VENDOR_INTEL, 0x06ec }, /* Intel Core Solo/Core Duo */
- { 0, 0 },
-};
-
-static const struct cpu_driver driver __cpu_driver = {
- .ops = &cpu_dev_ops,
- .id_table = cpu_table,
-};
-
Added: trunk/src/cpu/intel/socket_441/Kconfig
===================================================================
--- trunk/src/cpu/intel/socket_441/Kconfig (rev 0)
+++ trunk/src/cpu/intel/socket_441/Kconfig 2009-11-04 12:18:44 UTC (rev 4908)
@@ -0,0 +1,5 @@
+config CPU_INTEL_SOCKET_441
+ bool
+ select CPU_INTEL_MODEL_106CX
+ select MMX
+ select SSE
Added: trunk/src/cpu/intel/socket_441/Makefile.inc
===================================================================
--- trunk/src/cpu/intel/socket_441/Makefile.inc (rev 0)
+++ trunk/src/cpu/intel/socket_441/Makefile.inc 2009-11-04 12:18:44 UTC (rev 4908)
@@ -0,0 +1,10 @@
+obj-y += socket_441.o
+subdirs-y += ../model_106cx
+subdirs-y += ../../x86/tsc
+subdirs-y += ../../x86/mtrr
+subdirs-y += ../../x86/lapic
+subdirs-y += ../../x86/cache
+subdirs-y += ../../x86/smm
+subdirs-y += ../microcode
+subdirs-y += ../hyperthreading
+
More information about the coreboot
mailing list