aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/mips/kernel/cpu-probe.c6
-rw-r--r--include/asm-mips/cpu-features.h24
-rw-r--r--include/asm-mips/cpu.h4
-rw-r--r--include/asm-mips/mipsmtregs.h118
-rw-r--r--include/asm-mips/mipsregs.h1
5 files changed, 105 insertions, 48 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 53e4496de6b6..844126b39ed3 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -501,6 +501,12 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c)
501 c->ases |= MIPS_ASE_SMARTMIPS; 501 c->ases |= MIPS_ASE_SMARTMIPS;
502 if (config3 & MIPS_CONF3_DSP) 502 if (config3 & MIPS_CONF3_DSP)
503 c->ases |= MIPS_ASE_DSP; 503 c->ases |= MIPS_ASE_DSP;
504 if (config3 & MIPS_CONF3_VINT)
505 c->options |= MIPS_CPU_VINT;
506 if (config3 & MIPS_CONF3_VEIC)
507 c->options |= MIPS_CPU_VEIC;
508 if (config3 & MIPS_CONF3_MT)
509 c->ases |= MIPS_ASE_MIPSMT;
504 510
505 return config3 & MIPS_CONF_M; 511 return config3 & MIPS_CONF_M;
506} 512}
diff --git a/include/asm-mips/cpu-features.h b/include/asm-mips/cpu-features.h
index bb2212cf460a..698c21125a5c 100644
--- a/include/asm-mips/cpu-features.h
+++ b/include/asm-mips/cpu-features.h
@@ -109,6 +109,14 @@
109#define cpu_has_dsp (cpu_data[0].ases & MIPS_ASE_DSP) 109#define cpu_has_dsp (cpu_data[0].ases & MIPS_ASE_DSP)
110#endif 110#endif
111 111
112#ifdef CONFIG_MIPS_MT
113#ifndef cpu_has_mipsmt
114# define cpu_has_mipsmt (cpu_data[0].ases & MIPS_ASE_MIPSMT)
115#endif
116#else
117# define cpu_has_mipsmt 0
118#endif
119
112#ifdef CONFIG_32BIT 120#ifdef CONFIG_32BIT
113# ifndef cpu_has_nofpuex 121# ifndef cpu_has_nofpuex
114# define cpu_has_nofpuex (cpu_data[0].options & MIPS_CPU_NOFPUEX) 122# define cpu_has_nofpuex (cpu_data[0].options & MIPS_CPU_NOFPUEX)
@@ -145,6 +153,22 @@
145# endif 153# endif
146#endif 154#endif
147 155
156#ifdef CONFIG_CPU_MIPSR2
157# if defined(CONFIG_CPU_MIPSR2_IRQ_VI) && !defined(cpu_has_vint)
158# define cpu_has_vint (cpu_data[0].options & MIPS_CPU_VINT)
159# else
160# define cpu_has_vint 0
161# endif
162# if defined(CONFIG_CPU_MIPSR2_IRQ_EI) && !defined(cpu_has_veic)
163# define cpu_has_veic (cpu_data[0].options & MIPS_CPU_VEIC)
164# else
165# define cpu_has_veic 0
166# endif
167#else
168# define cpu_has_vint 0
169# define cpu_has_veic 0
170#endif
171
148#ifndef cpu_has_subset_pcaches 172#ifndef cpu_has_subset_pcaches
149#define cpu_has_subset_pcaches (cpu_data[0].options & MIPS_CPU_SUBSET_CACHES) 173#define cpu_has_subset_pcaches (cpu_data[0].options & MIPS_CPU_SUBSET_CACHES)
150#endif 174#endif
diff --git a/include/asm-mips/cpu.h b/include/asm-mips/cpu.h
index e6927442f7b4..3bbb6431d218 100644
--- a/include/asm-mips/cpu.h
+++ b/include/asm-mips/cpu.h
@@ -227,6 +227,8 @@
227#define MIPS_CPU_LLSC 0x00010000 /* CPU has ll/sc instructions */ 227#define MIPS_CPU_LLSC 0x00010000 /* CPU has ll/sc instructions */
228#define MIPS_CPU_SUBSET_CACHES 0x00020000 /* P-cache subset enforced */ 228#define MIPS_CPU_SUBSET_CACHES 0x00020000 /* P-cache subset enforced */
229#define MIPS_CPU_PREFETCH 0x00040000 /* CPU has usable prefetch */ 229#define MIPS_CPU_PREFETCH 0x00040000 /* CPU has usable prefetch */
230#define MIPS_CPU_VINT 0x00080000 /* CPU supports MIPSR2 vectored interrupts */
231#define MIPS_CPU_VEIC 0x00100000 /* CPU supports MIPSR2 external interrupt controller mode */
230 232
231/* 233/*
232 * CPU ASE encodings 234 * CPU ASE encodings
@@ -236,5 +238,7 @@
236#define MIPS_ASE_MIPS3D 0x00000004 /* MIPS-3D */ 238#define MIPS_ASE_MIPS3D 0x00000004 /* MIPS-3D */
237#define MIPS_ASE_SMARTMIPS 0x00000008 /* SmartMIPS */ 239#define MIPS_ASE_SMARTMIPS 0x00000008 /* SmartMIPS */
238#define MIPS_ASE_DSP 0x00000010 /* Signal Processing ASE */ 240#define MIPS_ASE_DSP 0x00000010 /* Signal Processing ASE */
241#define MIPS_ASE_MIPSMT 0x00000020 /* CPU supports MIPS MT */
242
239 243
240#endif /* _ASM_CPU_H */ 244#endif /* _ASM_CPU_H */
diff --git a/include/asm-mips/mipsmtregs.h b/include/asm-mips/mipsmtregs.h
index 9aaefc13a2b3..eda24c2368ad 100644
--- a/include/asm-mips/mipsmtregs.h
+++ b/include/asm-mips/mipsmtregs.h
@@ -175,8 +175,8 @@ static inline unsigned int dvpe(void)
175 " .set noreorder \n" 175 " .set noreorder \n"
176 " .set noat \n" 176 " .set noat \n"
177 " .set mips32r2 \n" 177 " .set mips32r2 \n"
178 " move $1, %0 \n"
179 " .word 0x41610001 # dvpe $1 \n" 178 " .word 0x41610001 # dvpe $1 \n"
179 " move %0, $1 \n"
180 " ehb \n" 180 " ehb \n"
181 " .set pop \n" 181 " .set pop \n"
182 : "=r" (res)); 182 : "=r" (res));
@@ -214,12 +214,13 @@ static inline unsigned int dmt(void)
214 int res; 214 int res;
215 215
216 __asm__ __volatile__( 216 __asm__ __volatile__(
217 " .set noreorder \n" 217 " .set push \n"
218 " .set mips32r2 \n" 218 " .set mips32r2 \n"
219 " dmt %0 \n" 219 " .set noat \n"
220 " .word 0x41610BC1 # dmt $1 \n"
220 " ehb \n" 221 " ehb \n"
221 " .set mips0 \n" 222 " move %0, $1 \n"
222 " .set reorder \n" 223 " .set pop \n"
223 : "=r" (res)); 224 : "=r" (res));
224 225
225 instruction_hazard(); 226 instruction_hazard();
@@ -251,7 +252,10 @@ static inline void emt(int previous)
251 252
252static inline void ehb(void) 253static inline void ehb(void)
253{ 254{
254 __asm__ __volatile__("ehb"); 255 __asm__ __volatile__(
256 " .set mips32r2 \n"
257 " ehb \n"
258 " .set mips0 \n");
255} 259}
256 260
257#define mftc0(rt,sel) \ 261#define mftc0(rt,sel) \
@@ -259,10 +263,14 @@ static inline void ehb(void)
259 unsigned long __res; \ 263 unsigned long __res; \
260 \ 264 \
261 __asm__ __volatile__( \ 265 __asm__ __volatile__( \
262 " .set noat\n\t" \ 266 " .set push \n" \
263 " mftc0\t%0," #rt ", " #sel "\n\t" \ 267 " .set mips32r2 \n" \
264 " .set at\n\t" \ 268 " .set noat \n" \
265 : "=r" (__res)); \ 269 " # mftc0 $1, $" #rt ", " #sel " \n" \
270 " .word 0x41000800 | (" #rt " << 16) | " #sel " \n" \
271 " move %0, $1 \n" \
272 " .set pop \n" \
273 : "=r" (__res)); \
266 \ 274 \
267 __res; \ 275 __res; \
268}) 276})
@@ -272,9 +280,10 @@ static inline void ehb(void)
272 unsigned long __res; \ 280 unsigned long __res; \
273 \ 281 \
274 __asm__ __volatile__( \ 282 __asm__ __volatile__( \
275 " .set noat \n" \ 283 " .set push \n" \
284 " .set mips32r2 \n" \
276 " mftgpr %0," #rt " \n" \ 285 " mftgpr %0," #rt " \n" \
277 " .set at \n" \ 286 " .set pop \n" \
278 : "=r" (__res)); \ 287 : "=r" (__res)); \
279 \ 288 \
280 __res; \ 289 __res; \
@@ -294,17 +303,30 @@ static inline void ehb(void)
294}) 303})
295 304
296#define mttgpr(rd,v) \ 305#define mttgpr(rd,v) \
297({ \ 306do { \
298 __asm__ __volatile__( \ 307 __asm__ __volatile__( \
299 "mttgpr %0," #rd \ 308 " .set push \n" \
309 " .set mips32r2 \n" \
310 " .set noat \n" \
311 " move $1, %0 \n" \
312 " # mttgpr $1, " #rd " \n" \
313 " .word 0x41810020 | (" #rd " << 11) \n" \
314 " .set pop \n" \
300 : : "r" (v)); \ 315 : : "r" (v)); \
301}) 316} while (0)
302 317
303#define mttc0(rd,sel,v) \ 318#define mttc0(rd,sel,v) \
304({ \ 319({ \
305 __asm__ __volatile__( \ 320 __asm__ __volatile__( \
306 "mttc0\t %0," #rd ", " #sel \ 321 " .set push \n" \
307 : : "r" (v)); \ 322 " .set mips32r2 \n" \
323 " .set noat \n" \
324 " move $1, %0 \n" \
325 " # mttc0 %0," #rd ", " #sel " \n" \
326 " .word 0x41810000 | (" #rd " << 11) | " #sel " \n" \
327 " .set pop \n" \
328 : \
329 : "r" (v)); \
308}) 330})
309 331
310 332
@@ -324,42 +346,42 @@ do { \
324 346
325 347
326/* you *must* set the target tc (settc) before trying to use these */ 348/* you *must* set the target tc (settc) before trying to use these */
327#define read_vpe_c0_vpecontrol() mftc0($1, 1) 349#define read_vpe_c0_vpecontrol() mftc0(1, 1)
328#define write_vpe_c0_vpecontrol(val) mttc0($1, 1, val) 350#define write_vpe_c0_vpecontrol(val) mttc0(1, 1, val)
329#define read_vpe_c0_vpeconf0() mftc0($1, 2) 351#define read_vpe_c0_vpeconf0() mftc0(1, 2)
330#define write_vpe_c0_vpeconf0(val) mttc0($1, 2, val) 352#define write_vpe_c0_vpeconf0(val) mttc0(1, 2, val)
331#define read_vpe_c0_status() mftc0($12, 0) 353#define read_vpe_c0_status() mftc0(12, 0)
332#define write_vpe_c0_status(val) mttc0($12, 0, val) 354#define write_vpe_c0_status(val) mttc0(12, 0, val)
333#define read_vpe_c0_cause() mftc0($13, 0) 355#define read_vpe_c0_cause() mftc0(13, 0)
334#define write_vpe_c0_cause(val) mttc0($13, 0, val) 356#define write_vpe_c0_cause(val) mttc0(13, 0, val)
335#define read_vpe_c0_config() mftc0($16, 0) 357#define read_vpe_c0_config() mftc0(16, 0)
336#define write_vpe_c0_config(val) mttc0($16, 0, val) 358#define write_vpe_c0_config(val) mttc0(16, 0, val)
337#define read_vpe_c0_config1() mftc0($16, 1) 359#define read_vpe_c0_config1() mftc0(16, 1)
338#define write_vpe_c0_config1(val) mttc0($16, 1, val) 360#define write_vpe_c0_config1(val) mttc0(16, 1, val)
339#define read_vpe_c0_config7() mftc0($16, 7) 361#define read_vpe_c0_config7() mftc0(16, 7)
340#define write_vpe_c0_config7(val) mttc0($16, 7, val) 362#define write_vpe_c0_config7(val) mttc0(16, 7, val)
341#define read_vpe_c0_ebase() mftc0($15,1) 363#define read_vpe_c0_ebase() mftc0(15,1)
342#define write_vpe_c0_ebase(val) mttc0($15, 1, val) 364#define write_vpe_c0_ebase(val) mttc0(15, 1, val)
343#define write_vpe_c0_compare(val) mttc0($11, 0, val) 365#define write_vpe_c0_compare(val) mttc0(11, 0, val)
344 366
345 367
346/* TC */ 368/* TC */
347#define read_tc_c0_tcstatus() mftc0($2, 1) 369#define read_tc_c0_tcstatus() mftc0(2, 1)
348#define write_tc_c0_tcstatus(val) mttc0($2,1,val) 370#define write_tc_c0_tcstatus(val) mttc0(2,1,val)
349#define read_tc_c0_tcbind() mftc0($2, 2) 371#define read_tc_c0_tcbind() mftc0(2, 2)
350#define write_tc_c0_tcbind(val) mttc0($2,2,val) 372#define write_tc_c0_tcbind(val) mttc0(2,2,val)
351#define read_tc_c0_tcrestart() mftc0($2, 3) 373#define read_tc_c0_tcrestart() mftc0(2, 3)
352#define write_tc_c0_tcrestart(val) mttc0($2,3,val) 374#define write_tc_c0_tcrestart(val) mttc0(2,3,val)
353#define read_tc_c0_tchalt() mftc0($2, 4) 375#define read_tc_c0_tchalt() mftc0(2, 4)
354#define write_tc_c0_tchalt(val) mttc0($2,4,val) 376#define write_tc_c0_tchalt(val) mttc0(2,4,val)
355#define read_tc_c0_tccontext() mftc0($2, 5) 377#define read_tc_c0_tccontext() mftc0(2, 5)
356#define write_tc_c0_tccontext(val) mttc0($2,5,val) 378#define write_tc_c0_tccontext(val) mttc0(2,5,val)
357 379
358/* GPR */ 380/* GPR */
359#define read_tc_gpr_sp() mftgpr($29) 381#define read_tc_gpr_sp() mftgpr(29)
360#define write_tc_gpr_sp(val) mttgpr($29, val) 382#define write_tc_gpr_sp(val) mttgpr(29, val)
361#define read_tc_gpr_gp() mftgpr($28) 383#define read_tc_gpr_gp() mftgpr(28)
362#define write_tc_gpr_gp(val) mttgpr($28, val) 384#define write_tc_gpr_gp(val) mttgpr(28, val)
363 385
364 386
365#endif /* Not __ASSEMBLY__ */ 387#endif /* Not __ASSEMBLY__ */
diff --git a/include/asm-mips/mipsregs.h b/include/asm-mips/mipsregs.h
index 89aac1e1f348..a7a43ff8c5cf 100644
--- a/include/asm-mips/mipsregs.h
+++ b/include/asm-mips/mipsregs.h
@@ -528,6 +528,7 @@
528 528
529#define MIPS_CONF3_TL (_ULCAST_(1) << 0) 529#define MIPS_CONF3_TL (_ULCAST_(1) << 0)
530#define MIPS_CONF3_SM (_ULCAST_(1) << 1) 530#define MIPS_CONF3_SM (_ULCAST_(1) << 1)
531#define MIPS_CONF3_MT (_ULCAST_(1) << 2)
531#define MIPS_CONF3_SP (_ULCAST_(1) << 4) 532#define MIPS_CONF3_SP (_ULCAST_(1) << 4)
532#define MIPS_CONF3_VINT (_ULCAST_(1) << 5) 533#define MIPS_CONF3_VINT (_ULCAST_(1) << 5)
533#define MIPS_CONF3_VEIC (_ULCAST_(1) << 6) 534#define MIPS_CONF3_VEIC (_ULCAST_(1) << 6)
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-26 22:42:21 -0500