2005-04-16 16:20:36 -06:00
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/bitops.h>
|
|
|
|
#include <linux/smp.h>
|
|
|
|
#include <linux/thread_info.h>
|
2005-11-13 17:07:23 -07:00
|
|
|
#include <linux/module.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
#include <asm/processor.h>
|
2007-10-17 10:04:33 -06:00
|
|
|
#include <asm/pgtable.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
#include <asm/msr.h>
|
|
|
|
#include <asm/uaccess.h>
|
2008-01-30 05:31:09 -07:00
|
|
|
#include <asm/ptrace.h>
|
|
|
|
#include <asm/ds.h>
|
2008-02-04 08:48:04 -07:00
|
|
|
#include <asm/bugs.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
#include "cpu.h"
|
|
|
|
|
|
|
|
#ifdef CONFIG_X86_LOCAL_APIC
|
|
|
|
#include <asm/mpspec.h>
|
|
|
|
#include <asm/apic.h>
|
|
|
|
#include <mach_apic.h>
|
|
|
|
#endif
|
|
|
|
|
x86: use ELF section to list CPU vendor specific code
Replace the hardcoded list of initialization functions for each CPU
vendor by a list in an ELF section, which is read at initialization in
arch/x86/kernel/cpu/cpu.c to fill the cpu_devs[] array. The ELF
section, named .x86cpuvendor.init, is reclaimed after boot, and
contains entries of type "struct cpu_vendor_dev" which associates a
vendor number with a pointer to a "struct cpu_dev" structure.
This first modification allows to remove all the VENDOR_init_cpu()
functions.
This patch also removes the hardcoded calls to early_init_amd() and
early_init_intel(). Instead, we add a "c_early_init" member to the
cpu_dev structure, which is then called if not NULL by the generic CPU
initialization code. Unfortunately, in early_cpu_detect(), this_cpu is
not yet set, so we have to use the cpu_devs[] array directly.
This patch is part of the Linux Tiny project, and is needed for
further patch that will allow to disable compilation of unused CPU
support code.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-02-15 04:00:23 -07:00
|
|
|
static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
/* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */
|
|
|
|
if (c->x86 == 15 && c->x86_cache_alignment == 64)
|
|
|
|
c->x86_cache_alignment = 128;
|
2008-01-30 05:32:40 -07:00
|
|
|
if ((c->x86 == 0xf && c->x86_model >= 0x03) ||
|
|
|
|
(c->x86 == 0x6 && c->x86_model >= 0x0e))
|
|
|
|
set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Early probe support logic for ppro memory erratum #50
|
|
|
|
*
|
|
|
|
* This is called before we do cpu ident work
|
|
|
|
*/
|
2008-02-22 15:09:42 -07:00
|
|
|
|
2006-03-23 03:59:33 -07:00
|
|
|
int __cpuinit ppro_with_ram_bug(void)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
/* Uses data from early_cpu_detect now */
|
|
|
|
if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL &&
|
|
|
|
boot_cpu_data.x86 == 6 &&
|
|
|
|
boot_cpu_data.x86_model == 1 &&
|
|
|
|
boot_cpu_data.x86_mask < 8) {
|
|
|
|
printk(KERN_INFO "Pentium Pro with Errata#50 detected. Taking evasive action.\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2008-02-22 15:09:42 -07:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* P4 Xeon errata 037 workaround.
|
|
|
|
* Hardware prefetcher may cause stale data to be loaded into the cache.
|
|
|
|
*/
|
2006-03-23 03:59:33 -07:00
|
|
|
static void __cpuinit Intel_errata_workarounds(struct cpuinfo_x86 *c)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
unsigned long lo, hi;
|
|
|
|
|
|
|
|
if ((c->x86 == 15) && (c->x86_model == 1) && (c->x86_mask == 1)) {
|
2008-02-22 15:09:42 -07:00
|
|
|
rdmsr(MSR_IA32_MISC_ENABLE, lo, hi);
|
2005-04-16 16:20:36 -06:00
|
|
|
if ((lo & (1<<9)) == 0) {
|
|
|
|
printk (KERN_INFO "CPU: C0 stepping P4 Xeon detected.\n");
|
|
|
|
printk (KERN_INFO "CPU: Disabling hardware prefetching (Errata 037)\n");
|
|
|
|
lo |= (1<<9); /* Disable hw prefetching */
|
|
|
|
wrmsr (MSR_IA32_MISC_ENABLE, lo, hi);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-04-16 16:25:15 -06:00
|
|
|
/*
|
|
|
|
* find out the number of processor cores on the die
|
|
|
|
*/
|
2006-03-23 03:59:33 -07:00
|
|
|
static int __cpuinit num_cpu_cores(struct cpuinfo_x86 *c)
|
2005-04-16 16:25:15 -06:00
|
|
|
{
|
2005-09-03 16:56:42 -06:00
|
|
|
unsigned int eax, ebx, ecx, edx;
|
2005-04-16 16:25:15 -06:00
|
|
|
|
|
|
|
if (c->cpuid_level < 4)
|
|
|
|
return 1;
|
|
|
|
|
2005-09-03 16:56:42 -06:00
|
|
|
/* Intel has a non-standard dependency on %ecx for this CPUID level. */
|
|
|
|
cpuid_count(4, 0, &eax, &ebx, &ecx, &edx);
|
2005-04-16 16:25:15 -06:00
|
|
|
if (eax & 0x1f)
|
|
|
|
return ((eax >> 26) + 1);
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-10-17 10:04:33 -06:00
|
|
|
#ifdef CONFIG_X86_F00F_BUG
|
|
|
|
static void __cpuinit trap_init_f00f_bug(void)
|
|
|
|
{
|
|
|
|
__set_fixmap(FIX_F00F_IDT, __pa(&idt_table), PAGE_KERNEL_RO);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Update the IDT descriptor and reload the IDT so that
|
|
|
|
* it uses the read-only mapped virtual address.
|
|
|
|
*/
|
|
|
|
idt_descr.address = fix_to_virt(FIX_F00F_IDT);
|
|
|
|
load_idt(&idt_descr);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-03-23 03:59:33 -07:00
|
|
|
static void __cpuinit init_intel(struct cpuinfo_x86 *c)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
unsigned int l2 = 0;
|
|
|
|
char *p = NULL;
|
|
|
|
|
2008-01-30 05:32:40 -07:00
|
|
|
early_init_intel(c);
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
#ifdef CONFIG_X86_F00F_BUG
|
|
|
|
/*
|
|
|
|
* All current models of Pentium and Pentium with MMX technology CPUs
|
|
|
|
* have the F0 0F bug, which lets nonprivileged users lock up the system.
|
|
|
|
* Note that the workaround only should be initialized once...
|
|
|
|
*/
|
|
|
|
c->f00f_bug = 0;
|
2006-12-06 18:14:08 -07:00
|
|
|
if (!paravirt_enabled() && c->x86 == 5) {
|
2008-02-22 15:09:42 -07:00
|
|
|
static int f00f_workaround_enabled;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
c->f00f_bug = 1;
|
2008-02-22 15:09:42 -07:00
|
|
|
if (!f00f_workaround_enabled) {
|
2005-04-16 16:20:36 -06:00
|
|
|
trap_init_f00f_bug();
|
|
|
|
printk(KERN_NOTICE "Intel Pentium with F0 0F bug - workaround enabled.\n");
|
|
|
|
f00f_workaround_enabled = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
l2 = init_intel_cacheinfo(c);
|
2008-02-22 15:09:42 -07:00
|
|
|
if (c->cpuid_level > 9) {
|
2006-06-26 05:59:59 -06:00
|
|
|
unsigned eax = cpuid_eax(10);
|
|
|
|
/* Check for version and the number of counters */
|
|
|
|
if ((eax & 0xff) && (((eax>>8) & 0xff) > 1))
|
2008-02-26 00:52:33 -07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_ARCH_PERFMON);
|
2006-06-26 05:59:59 -06:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* SEP CPUID bug: Pentium Pro reports SEP but doesn't have it until model 3 mask 3 */
|
|
|
|
if ((c->x86<<8 | c->x86_model<<4 | c->x86_mask) < 0x633)
|
2008-02-26 00:52:33 -07:00
|
|
|
clear_cpu_cap(c, X86_FEATURE_SEP);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2008-02-22 15:09:42 -07:00
|
|
|
/*
|
|
|
|
* Names for the Pentium II/Celeron processors
|
|
|
|
* detectable only by also checking the cache size.
|
|
|
|
* Dixon is NOT a Celeron.
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
if (c->x86 == 6) {
|
|
|
|
switch (c->x86_model) {
|
|
|
|
case 5:
|
|
|
|
if (c->x86_mask == 0) {
|
|
|
|
if (l2 == 0)
|
|
|
|
p = "Celeron (Covington)";
|
|
|
|
else if (l2 == 256)
|
|
|
|
p = "Mobile Pentium II (Dixon)";
|
|
|
|
}
|
|
|
|
break;
|
2008-02-22 15:09:42 -07:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
case 6:
|
|
|
|
if (l2 == 128)
|
|
|
|
p = "Celeron (Mendocino)";
|
|
|
|
else if (c->x86_mask == 0 || c->x86_mask == 5)
|
|
|
|
p = "Celeron-A";
|
|
|
|
break;
|
2008-02-22 15:09:42 -07:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
case 8:
|
|
|
|
if (l2 == 128)
|
|
|
|
p = "Celeron (Coppermine)";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-22 15:09:42 -07:00
|
|
|
if (p)
|
2005-04-16 16:20:36 -06:00
|
|
|
strcpy(c->x86_model_id, p);
|
2008-02-22 15:09:42 -07:00
|
|
|
|
2005-11-05 09:25:54 -07:00
|
|
|
c->x86_max_cores = num_cpu_cores(c);
|
2005-04-16 16:25:15 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
detect_ht(c);
|
|
|
|
|
|
|
|
/* Work around errata */
|
|
|
|
Intel_errata_workarounds(c);
|
|
|
|
|
|
|
|
#ifdef CONFIG_X86_INTEL_USERCOPY
|
|
|
|
/*
|
|
|
|
* Set up the preferred alignment for movsl bulk memory moves
|
|
|
|
*/
|
|
|
|
switch (c->x86) {
|
|
|
|
case 4: /* 486: untested */
|
|
|
|
break;
|
|
|
|
case 5: /* Old Pentia: untested */
|
|
|
|
break;
|
|
|
|
case 6: /* PII/PIII only like movsl with 8-byte alignment */
|
|
|
|
movsl_mask.mask = 7;
|
|
|
|
break;
|
|
|
|
case 15: /* P4 is OK down to 8-byte alignment */
|
|
|
|
movsl_mask.mask = 7;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-01-30 05:32:38 -07:00
|
|
|
if (cpu_has_xmm2)
|
2008-02-26 00:52:33 -07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
|
2007-05-02 11:27:20 -06:00
|
|
|
if (c->x86 == 15) {
|
2008-02-26 00:52:33 -07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_P4);
|
2007-05-02 11:27:20 -06:00
|
|
|
}
|
2008-02-22 15:09:42 -07:00
|
|
|
if (c->x86 == 6)
|
2008-02-26 00:52:33 -07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_P3);
|
2006-12-06 18:14:01 -07:00
|
|
|
if (cpu_has_ds) {
|
|
|
|
unsigned int l1;
|
|
|
|
rdmsr(MSR_IA32_MISC_ENABLE, l1, l2);
|
2006-12-06 18:14:11 -07:00
|
|
|
if (!(l1 & (1<<11)))
|
2008-02-26 00:52:33 -07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_BTS);
|
2006-12-06 18:14:01 -07:00
|
|
|
if (!(l1 & (1<<12)))
|
2008-02-26 00:52:33 -07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_PEBS);
|
2006-12-06 18:14:01 -07:00
|
|
|
}
|
2008-01-30 05:31:09 -07:00
|
|
|
|
|
|
|
if (cpu_has_bts)
|
|
|
|
ds_init_intel(c);
|
2008-07-12 23:52:55 -06:00
|
|
|
|
x86: APIC: remove apic_write_around(); use alternatives
Use alternatives to select the workaround for the 11AP Pentium erratum
for the affected steppings on the fly rather than build time. Remove the
X86_GOOD_APIC configuration option and replace all the calls to
apic_write_around() with plain apic_write(), protecting accesses to the
ESR as appropriate due to the 3AP Pentium erratum. Remove
apic_read_around() and all its invocations altogether as not needed.
Remove apic_write_atomic() and all its implementing backends. The use of
ASM_OUTPUT2() is not strictly needed for input constraints, but I have
used it for readability's sake.
I had the feeling no one else was brave enough to do it, so I went ahead
and here it is. Verified by checking the generated assembly and tested
with both a 32-bit and a 64-bit configuration, also with the 11AP
"feature" forced on and verified with gdb on /proc/kcore to work as
expected (as an 11AP machines are quite hard to get hands on these days).
Some script complained about the use of "volatile", but apic_write() needs
it for the same reason and is effectively a replacement for writel(), so I
have disregarded it.
I am not sure what the policy wrt defconfig files is, they are generated
and there is risk of a conflict resulting from an unrelated change, so I
have left changes to them out. The option will get removed from them at
the next run.
Some testing with machines other than mine will be needed to avoid some
stupid mistake, but despite its volume, the change is not really that
intrusive, so I am fairly confident that because it works for me, it will
everywhere.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-16 12:15:30 -06:00
|
|
|
/*
|
|
|
|
* See if we have a good local APIC by checking for buggy Pentia,
|
|
|
|
* i.e. all B steppings and the C2 stepping of P54C when using their
|
|
|
|
* integrated APIC (see 11AP erratum in "Pentium Processor
|
|
|
|
* Specification Update").
|
|
|
|
*/
|
|
|
|
if (cpu_has_apic && (c->x86<<8 | c->x86_model<<4) == 0x520 &&
|
|
|
|
(c->x86_mask < 0x6 || c->x86_mask == 0xb))
|
|
|
|
set_cpu_cap(c, X86_FEATURE_11AP);
|
|
|
|
|
2008-07-12 23:52:55 -06:00
|
|
|
#ifdef CONFIG_X86_NUMAQ
|
|
|
|
numaq_tsc_disable();
|
|
|
|
#endif
|
2006-12-06 18:14:01 -07:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2008-02-22 15:09:42 -07:00
|
|
|
static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 *c, unsigned int size)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2008-02-22 15:09:42 -07:00
|
|
|
/*
|
|
|
|
* Intel PIII Tualatin. This comes in two flavours.
|
2005-04-16 16:20:36 -06:00
|
|
|
* One has 256kb of cache, the other 512. We have no way
|
|
|
|
* to determine which, so we use a boottime override
|
|
|
|
* for the 512kb model, and assume 256 otherwise.
|
|
|
|
*/
|
|
|
|
if ((c->x86 == 6) && (c->x86_model == 11) && (size == 0))
|
|
|
|
size = 256;
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
2006-03-23 03:59:33 -07:00
|
|
|
static struct cpu_dev intel_cpu_dev __cpuinitdata = {
|
2005-04-16 16:20:36 -06:00
|
|
|
.c_vendor = "Intel",
|
2008-02-22 15:09:42 -07:00
|
|
|
.c_ident = { "GenuineIntel" },
|
2005-04-16 16:20:36 -06:00
|
|
|
.c_models = {
|
2008-02-22 15:09:42 -07:00
|
|
|
{ .vendor = X86_VENDOR_INTEL, .family = 4, .model_names =
|
|
|
|
{
|
|
|
|
[0] = "486 DX-25/33",
|
|
|
|
[1] = "486 DX-50",
|
|
|
|
[2] = "486 SX",
|
|
|
|
[3] = "486 DX/2",
|
|
|
|
[4] = "486 SL",
|
|
|
|
[5] = "486 SX/2",
|
|
|
|
[7] = "486 DX/2-WB",
|
|
|
|
[8] = "486 DX/4",
|
2005-04-16 16:20:36 -06:00
|
|
|
[9] = "486 DX/4-WB"
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ .vendor = X86_VENDOR_INTEL, .family = 5, .model_names =
|
2008-02-22 15:09:42 -07:00
|
|
|
{
|
|
|
|
[0] = "Pentium 60/66 A-step",
|
|
|
|
[1] = "Pentium 60/66",
|
2005-04-16 16:20:36 -06:00
|
|
|
[2] = "Pentium 75 - 200",
|
2008-02-22 15:09:42 -07:00
|
|
|
[3] = "OverDrive PODP5V83",
|
2005-04-16 16:20:36 -06:00
|
|
|
[4] = "Pentium MMX",
|
2008-02-22 15:09:42 -07:00
|
|
|
[7] = "Mobile Pentium 75 - 200",
|
2005-04-16 16:20:36 -06:00
|
|
|
[8] = "Mobile Pentium MMX"
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ .vendor = X86_VENDOR_INTEL, .family = 6, .model_names =
|
2008-02-22 15:09:42 -07:00
|
|
|
{
|
2005-04-16 16:20:36 -06:00
|
|
|
[0] = "Pentium Pro A-step",
|
2008-02-22 15:09:42 -07:00
|
|
|
[1] = "Pentium Pro",
|
|
|
|
[3] = "Pentium II (Klamath)",
|
|
|
|
[4] = "Pentium II (Deschutes)",
|
|
|
|
[5] = "Pentium II (Deschutes)",
|
2005-04-16 16:20:36 -06:00
|
|
|
[6] = "Mobile Pentium II",
|
2008-02-22 15:09:42 -07:00
|
|
|
[7] = "Pentium III (Katmai)",
|
|
|
|
[8] = "Pentium III (Coppermine)",
|
2005-04-16 16:20:36 -06:00
|
|
|
[10] = "Pentium III (Cascades)",
|
|
|
|
[11] = "Pentium III (Tualatin)",
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ .vendor = X86_VENDOR_INTEL, .family = 15, .model_names =
|
|
|
|
{
|
|
|
|
[0] = "Pentium 4 (Unknown)",
|
|
|
|
[1] = "Pentium 4 (Willamette)",
|
|
|
|
[2] = "Pentium 4 (Northwood)",
|
|
|
|
[4] = "Pentium 4 (Foster)",
|
|
|
|
[5] = "Pentium 4 (Foster)",
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
x86: use ELF section to list CPU vendor specific code
Replace the hardcoded list of initialization functions for each CPU
vendor by a list in an ELF section, which is read at initialization in
arch/x86/kernel/cpu/cpu.c to fill the cpu_devs[] array. The ELF
section, named .x86cpuvendor.init, is reclaimed after boot, and
contains entries of type "struct cpu_vendor_dev" which associates a
vendor number with a pointer to a "struct cpu_dev" structure.
This first modification allows to remove all the VENDOR_init_cpu()
functions.
This patch also removes the hardcoded calls to early_init_amd() and
early_init_intel(). Instead, we add a "c_early_init" member to the
cpu_dev structure, which is then called if not NULL by the generic CPU
initialization code. Unfortunately, in early_cpu_detect(), this_cpu is
not yet set, so we have to use the cpu_devs[] array directly.
This patch is part of the Linux Tiny project, and is needed for
further patch that will allow to disable compilation of unused CPU
support code.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-02-15 04:00:23 -07:00
|
|
|
.c_early_init = early_init_intel,
|
2005-04-16 16:20:36 -06:00
|
|
|
.c_init = init_intel,
|
|
|
|
.c_size_cache = intel_size_cache,
|
2008-09-04 13:09:45 -06:00
|
|
|
.c_x86_vendor = X86_VENDOR_INTEL,
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2008-09-04 13:09:45 -06:00
|
|
|
cpu_dev_register(intel_cpu_dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2008-02-22 15:09:42 -07:00
|
|
|
/* arch_initcall(intel_cpu_init); */
|
2005-04-16 16:20:36 -06:00
|
|
|
|