CVSROOT: /home/cvs
Module name: malta
Changes by: chris@ftp.linux-mips.org 05/07/28 18:23:49
Modified files:
linux/arch/mips/kernel: Tag: MaltaRef_2_6 cpu-probe.c proc.c
setup.c
linux/include/asm-mips: Tag: MaltaRef_2_6 cpu-features.h cpu.h
Log message:
* include/asm-mips/cpu.h (MIPS_ASE_MIPSMT): ASE, not option.
* include/asm-mips/cpu-features.h (cpu_has_mipsmt): MIPSMT is an
ASE, not an option.
* arch/mips/kernel/setup.c (setup_arch): Initialise
current->switch_lock.lock (primarily for spinlock debugging)
(dsp_disable): DSP is an ase, not an option.
* arch/mips/kernel/proc.c (show_cpuinfo): Report DSP and MT ASEs.
* arch/mips/kernel/cpu-probe.c: MIPS_CPU_VINT and MIPS_CPU_VEIC go
in options and not ases. MIPSMT is an ase, not an option.
diff -urN malta/linux/arch/mips/kernel/cpu-probe.c
malta/linux/arch/mips/kernel/cpu-probe.c
--- malta/linux/arch/mips/kernel/cpu-probe.c 2005/06/21 13:24:02
1.35.1000.6
+++ malta/linux/arch/mips/kernel/cpu-probe.c 2005/07/28 17:23:49
1.35.1000.7
@@ -505,11 +505,11 @@
if (config3 & MIPS_CONF3_DSP)
c->ases |= MIPS_ASE_DSP;
if (config3 & MIPS_CONF3_VINT)
- c->ases |= MIPS_CPU_VINT;
+ c->options |= MIPS_CPU_VINT;
if (config3 & MIPS_CONF3_VEIC)
- c->ases |= MIPS_CPU_VEIC;
+ c->options |= MIPS_CPU_VEIC;
if (config3 & MIPS_CONF3_MT)
- c->ases |= MIPS_CPU_MIPSMT;
+ c->ases |= MIPS_ASE_MIPSMT;
return config3 & MIPS_CONF_M;
}
diff -urN malta/linux/arch/mips/kernel/proc.c
malta/linux/arch/mips/kernel/proc.c
--- malta/linux/arch/mips/kernel/proc.c 2005/06/21 13:24:03 1.53.1000.2
+++ malta/linux/arch/mips/kernel/proc.c 2005/07/28 17:23:49 1.53.1000.3
@@ -120,11 +120,14 @@
cpu_has_divec ? "yes" : "no");
seq_printf(m, "hardware watchpoint\t: %s\n",
cpu_has_watch ? "yes" : "no");
- seq_printf(m, "ASEs implemented\t:%s%s%s%s\n",
+ seq_printf(m, "ASEs implemented\t:%s%s%s%s%s%s\n",
cpu_has_mips16 ? " mips16" : "",
cpu_has_mdmx ? " mdmx" : "",
cpu_has_mips3d ? " mips3d" : "",
- cpu_has_smartmips ? " smartmips" : "");
+ cpu_has_smartmips ? " smartmips" : "",
+ cpu_has_dsp ? " dsp" : "",
+ cpu_has_mipsmt ? " mipsmt" : ""
+ );
sprintf(fmt, "VCE%%c exceptions\t\t: %s\n",
cpu_has_vce ? "%u" : "not available");
diff -urN malta/linux/arch/mips/kernel/setup.c
malta/linux/arch/mips/kernel/setup.c
--- malta/linux/arch/mips/kernel/setup.c 2005/06/21 13:24:03
1.168.1000.3
+++ malta/linux/arch/mips/kernel/setup.c 2005/07/28 17:23:49
1.168.1000.4
@@ -539,6 +539,10 @@
prom_init();
cpu_report();
+#if defined(CONFIG_SMP)
+ current->switch_lock.lock = 1;
+#endif
+
#if defined(CONFIG_VT)
#if defined(CONFIG_VGA_CONSOLE)
conswitchp = &vga_con;
@@ -572,7 +576,7 @@
int __init dsp_disable(char *s)
{
- cpu_data[0].options &= ~MIPS_ASE_DSP;
+ cpu_data[0].ases &= ~MIPS_ASE_DSP;
return 1;
}
diff -urN malta/linux/include/asm-mips/cpu-features.h
malta/linux/include/asm-mips/cpu-features.h
--- malta/linux/include/asm-mips/cpu-features.h 2005/06/21 13:36:22
1.4.1000.4
+++ malta/linux/include/asm-mips/cpu-features.h 2005/07/28 17:23:49
1.4.1000.5
@@ -120,7 +120,7 @@
#define PLAT_TRAMPOLINE_STUFF_LINE 0UL
#endif
#ifndef cpu_has_mipsmt
-# define cpu_has_mipsmt (cpu_data[0].ases & MIPS_CPU_MIPSMT)
+# define cpu_has_mipsmt (cpu_data[0].ases & MIPS_ASE_MIPSMT)
#endif
#ifdef CONFIG_MIPS32
diff -urN malta/linux/include/asm-mips/cpu.h malta/linux/include/asm-mips/cpu.h
--- malta/linux/include/asm-mips/cpu.h 2005/06/21 13:36:23 1.52.1000.3
+++ malta/linux/include/asm-mips/cpu.h 2005/07/28 17:23:49 1.52.1000.4
@@ -228,7 +228,6 @@
#define MIPS_CPU_PREFETCH 0x00040000 /* CPU has usable prefetch */
#define MIPS_CPU_VINT 0x00080000 /* CPU supports MIPSR2 vectored
interrupts */
#define MIPS_CPU_VEIC 0x00100000 /* CPU supports MIPSR2 external
interrupt controller mode */
-#define MIPS_CPU_MIPSMT 0x00400000 /* CPU supports MIPS MT */
/*
* CPU ASE encodings
@@ -238,5 +237,7 @@
#define MIPS_ASE_MIPS3D 0x00000004 /* MIPS-3D */
#define MIPS_ASE_SMARTMIPS 0x00000008 /* SmartMIPS */
#define MIPS_ASE_DSP 0x00000010 /* Signal Processing ASE */
+#define MIPS_ASE_MIPSMT 0x00000020 /* CPU supports MIPS MT */
+
#endif /* _ASM_CPU_H */
|