Commit 8f40611d authored by Ralf Baechle's avatar Ralf Baechle

Detect the MIPS R2 vectored interrupt, external interrupt controller

options and the precense of the MT ASE.
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 699dbc90
...@@ -501,6 +501,12 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c) ...@@ -501,6 +501,12 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c)
c->ases |= MIPS_ASE_SMARTMIPS; c->ases |= MIPS_ASE_SMARTMIPS;
if (config3 & MIPS_CONF3_DSP) if (config3 & MIPS_CONF3_DSP)
c->ases |= MIPS_ASE_DSP; c->ases |= MIPS_ASE_DSP;
if (config3 & MIPS_CONF3_VINT)
c->options |= MIPS_CPU_VINT;
if (config3 & MIPS_CONF3_VEIC)
c->options |= MIPS_CPU_VEIC;
if (config3 & MIPS_CONF3_MT)
c->ases |= MIPS_ASE_MIPSMT;
return config3 & MIPS_CONF_M; return config3 & MIPS_CONF_M;
} }
......
...@@ -109,6 +109,14 @@ ...@@ -109,6 +109,14 @@
#define cpu_has_dsp (cpu_data[0].ases & MIPS_ASE_DSP) #define cpu_has_dsp (cpu_data[0].ases & MIPS_ASE_DSP)
#endif #endif
#ifdef CONFIG_MIPS_MT
#ifndef cpu_has_mipsmt
# define cpu_has_mipsmt (cpu_data[0].ases & MIPS_ASE_MIPSMT)
#endif
#else
# define cpu_has_mipsmt 0
#endif
#ifdef CONFIG_32BIT #ifdef CONFIG_32BIT
# ifndef cpu_has_nofpuex # ifndef cpu_has_nofpuex
# define cpu_has_nofpuex (cpu_data[0].options & MIPS_CPU_NOFPUEX) # define cpu_has_nofpuex (cpu_data[0].options & MIPS_CPU_NOFPUEX)
...@@ -145,6 +153,22 @@ ...@@ -145,6 +153,22 @@
# endif # endif
#endif #endif
#ifdef CONFIG_CPU_MIPSR2
# if defined(CONFIG_CPU_MIPSR2_IRQ_VI) && !defined(cpu_has_vint)
# define cpu_has_vint (cpu_data[0].options & MIPS_CPU_VINT)
# else
# define cpu_has_vint 0
# endif
# if defined(CONFIG_CPU_MIPSR2_IRQ_EI) && !defined(cpu_has_veic)
# define cpu_has_veic (cpu_data[0].options & MIPS_CPU_VEIC)
# else
# define cpu_has_veic 0
# endif
#else
# define cpu_has_vint 0
# define cpu_has_veic 0
#endif
#ifndef cpu_has_subset_pcaches #ifndef cpu_has_subset_pcaches
#define cpu_has_subset_pcaches (cpu_data[0].options & MIPS_CPU_SUBSET_CACHES) #define cpu_has_subset_pcaches (cpu_data[0].options & MIPS_CPU_SUBSET_CACHES)
#endif #endif
......
...@@ -227,6 +227,8 @@ ...@@ -227,6 +227,8 @@
#define MIPS_CPU_LLSC 0x00010000 /* CPU has ll/sc instructions */ #define MIPS_CPU_LLSC 0x00010000 /* CPU has ll/sc instructions */
#define MIPS_CPU_SUBSET_CACHES 0x00020000 /* P-cache subset enforced */ #define MIPS_CPU_SUBSET_CACHES 0x00020000 /* P-cache subset enforced */
#define MIPS_CPU_PREFETCH 0x00040000 /* CPU has usable prefetch */ #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 */
/* /*
* CPU ASE encodings * CPU ASE encodings
...@@ -236,5 +238,7 @@ ...@@ -236,5 +238,7 @@
#define MIPS_ASE_MIPS3D 0x00000004 /* MIPS-3D */ #define MIPS_ASE_MIPS3D 0x00000004 /* MIPS-3D */
#define MIPS_ASE_SMARTMIPS 0x00000008 /* SmartMIPS */ #define MIPS_ASE_SMARTMIPS 0x00000008 /* SmartMIPS */
#define MIPS_ASE_DSP 0x00000010 /* Signal Processing ASE */ #define MIPS_ASE_DSP 0x00000010 /* Signal Processing ASE */
#define MIPS_ASE_MIPSMT 0x00000020 /* CPU supports MIPS MT */
#endif /* _ASM_CPU_H */ #endif /* _ASM_CPU_H */
...@@ -175,8 +175,8 @@ static inline unsigned int dvpe(void) ...@@ -175,8 +175,8 @@ static inline unsigned int dvpe(void)
" .set noreorder \n" " .set noreorder \n"
" .set noat \n" " .set noat \n"
" .set mips32r2 \n" " .set mips32r2 \n"
" move $1, %0 \n"
" .word 0x41610001 # dvpe $1 \n" " .word 0x41610001 # dvpe $1 \n"
" move %0, $1 \n"
" ehb \n" " ehb \n"
" .set pop \n" " .set pop \n"
: "=r" (res)); : "=r" (res));
...@@ -214,12 +214,13 @@ static inline unsigned int dmt(void) ...@@ -214,12 +214,13 @@ static inline unsigned int dmt(void)
int res; int res;
__asm__ __volatile__( __asm__ __volatile__(
" .set noreorder \n" " .set push \n"
" .set mips32r2 \n" " .set mips32r2 \n"
" dmt %0 \n" " .set noat \n"
" .word 0x41610BC1 # dmt $1 \n"
" ehb \n" " ehb \n"
" .set mips0 \n" " move %0, $1 \n"
" .set reorder \n" " .set pop \n"
: "=r" (res)); : "=r" (res));
instruction_hazard(); instruction_hazard();
...@@ -251,7 +252,10 @@ static inline void emt(int previous) ...@@ -251,7 +252,10 @@ static inline void emt(int previous)
static inline void ehb(void) static inline void ehb(void)
{ {
__asm__ __volatile__("ehb"); __asm__ __volatile__(
" .set mips32r2 \n"
" ehb \n"
" .set mips0 \n");
} }
#define mftc0(rt,sel) \ #define mftc0(rt,sel) \
...@@ -259,10 +263,14 @@ static inline void ehb(void) ...@@ -259,10 +263,14 @@ static inline void ehb(void)
unsigned long __res; \ unsigned long __res; \
\ \
__asm__ __volatile__( \ __asm__ __volatile__( \
" .set noat\n\t" \ " .set push \n" \
" mftc0\t%0," #rt ", " #sel "\n\t" \ " .set mips32r2 \n" \
" .set at\n\t" \ " .set noat \n" \
: "=r" (__res)); \ " # mftc0 $1, $" #rt ", " #sel " \n" \
" .word 0x41000800 | (" #rt " << 16) | " #sel " \n" \
" move %0, $1 \n" \
" .set pop \n" \
: "=r" (__res)); \
\ \
__res; \ __res; \
}) })
...@@ -272,9 +280,10 @@ static inline void ehb(void) ...@@ -272,9 +280,10 @@ static inline void ehb(void)
unsigned long __res; \ unsigned long __res; \
\ \
__asm__ __volatile__( \ __asm__ __volatile__( \
" .set noat \n" \ " .set push \n" \
" .set mips32r2 \n" \
" mftgpr %0," #rt " \n" \ " mftgpr %0," #rt " \n" \
" .set at \n" \ " .set pop \n" \
: "=r" (__res)); \ : "=r" (__res)); \
\ \
__res; \ __res; \
...@@ -294,17 +303,30 @@ static inline void ehb(void) ...@@ -294,17 +303,30 @@ static inline void ehb(void)
}) })
#define mttgpr(rd,v) \ #define mttgpr(rd,v) \
({ \ do { \
__asm__ __volatile__( \ __asm__ __volatile__( \
"mttgpr %0," #rd \ " .set push \n" \
" .set mips32r2 \n" \
" .set noat \n" \
" move $1, %0 \n" \
" # mttgpr $1, " #rd " \n" \
" .word 0x41810020 | (" #rd " << 11) \n" \
" .set pop \n" \
: : "r" (v)); \ : : "r" (v)); \
}) } while (0)
#define mttc0(rd,sel,v) \ #define mttc0(rd,sel,v) \
({ \ ({ \
__asm__ __volatile__( \ __asm__ __volatile__( \
"mttc0\t %0," #rd ", " #sel \ " .set push \n" \
: : "r" (v)); \ " .set mips32r2 \n" \
" .set noat \n" \
" move $1, %0 \n" \
" # mttc0 %0," #rd ", " #sel " \n" \
" .word 0x41810000 | (" #rd " << 11) | " #sel " \n" \
" .set pop \n" \
: \
: "r" (v)); \
}) })
...@@ -324,42 +346,42 @@ do { \ ...@@ -324,42 +346,42 @@ do { \
/* you *must* set the target tc (settc) before trying to use these */ /* you *must* set the target tc (settc) before trying to use these */
#define read_vpe_c0_vpecontrol() mftc0($1, 1) #define read_vpe_c0_vpecontrol() mftc0(1, 1)
#define write_vpe_c0_vpecontrol(val) mttc0($1, 1, val) #define write_vpe_c0_vpecontrol(val) mttc0(1, 1, val)
#define read_vpe_c0_vpeconf0() mftc0($1, 2) #define read_vpe_c0_vpeconf0() mftc0(1, 2)
#define write_vpe_c0_vpeconf0(val) mttc0($1, 2, val) #define write_vpe_c0_vpeconf0(val) mttc0(1, 2, val)
#define read_vpe_c0_status() mftc0($12, 0) #define read_vpe_c0_status() mftc0(12, 0)
#define write_vpe_c0_status(val) mttc0($12, 0, val) #define write_vpe_c0_status(val) mttc0(12, 0, val)
#define read_vpe_c0_cause() mftc0($13, 0) #define read_vpe_c0_cause() mftc0(13, 0)
#define write_vpe_c0_cause(val) mttc0($13, 0, val) #define write_vpe_c0_cause(val) mttc0(13, 0, val)
#define read_vpe_c0_config() mftc0($16, 0) #define read_vpe_c0_config() mftc0(16, 0)
#define write_vpe_c0_config(val) mttc0($16, 0, val) #define write_vpe_c0_config(val) mttc0(16, 0, val)
#define read_vpe_c0_config1() mftc0($16, 1) #define read_vpe_c0_config1() mftc0(16, 1)
#define write_vpe_c0_config1(val) mttc0($16, 1, val) #define write_vpe_c0_config1(val) mttc0(16, 1, val)
#define read_vpe_c0_config7() mftc0($16, 7) #define read_vpe_c0_config7() mftc0(16, 7)
#define write_vpe_c0_config7(val) mttc0($16, 7, val) #define write_vpe_c0_config7(val) mttc0(16, 7, val)
#define read_vpe_c0_ebase() mftc0($15,1) #define read_vpe_c0_ebase() mftc0(15,1)
#define write_vpe_c0_ebase(val) mttc0($15, 1, val) #define write_vpe_c0_ebase(val) mttc0(15, 1, val)
#define write_vpe_c0_compare(val) mttc0($11, 0, val) #define write_vpe_c0_compare(val) mttc0(11, 0, val)
/* TC */ /* TC */
#define read_tc_c0_tcstatus() mftc0($2, 1) #define read_tc_c0_tcstatus() mftc0(2, 1)
#define write_tc_c0_tcstatus(val) mttc0($2,1,val) #define write_tc_c0_tcstatus(val) mttc0(2,1,val)
#define read_tc_c0_tcbind() mftc0($2, 2) #define read_tc_c0_tcbind() mftc0(2, 2)
#define write_tc_c0_tcbind(val) mttc0($2,2,val) #define write_tc_c0_tcbind(val) mttc0(2,2,val)
#define read_tc_c0_tcrestart() mftc0($2, 3) #define read_tc_c0_tcrestart() mftc0(2, 3)
#define write_tc_c0_tcrestart(val) mttc0($2,3,val) #define write_tc_c0_tcrestart(val) mttc0(2,3,val)
#define read_tc_c0_tchalt() mftc0($2, 4) #define read_tc_c0_tchalt() mftc0(2, 4)
#define write_tc_c0_tchalt(val) mttc0($2,4,val) #define write_tc_c0_tchalt(val) mttc0(2,4,val)
#define read_tc_c0_tccontext() mftc0($2, 5) #define read_tc_c0_tccontext() mftc0(2, 5)
#define write_tc_c0_tccontext(val) mttc0($2,5,val) #define write_tc_c0_tccontext(val) mttc0(2,5,val)
/* GPR */ /* GPR */
#define read_tc_gpr_sp() mftgpr($29) #define read_tc_gpr_sp() mftgpr(29)
#define write_tc_gpr_sp(val) mttgpr($29, val) #define write_tc_gpr_sp(val) mttgpr(29, val)
#define read_tc_gpr_gp() mftgpr($28) #define read_tc_gpr_gp() mftgpr(28)
#define write_tc_gpr_gp(val) mttgpr($28, val) #define write_tc_gpr_gp(val) mttgpr(28, val)
#endif /* Not __ASSEMBLY__ */ #endif /* Not __ASSEMBLY__ */
......
...@@ -528,6 +528,7 @@ ...@@ -528,6 +528,7 @@
#define MIPS_CONF3_TL (_ULCAST_(1) << 0) #define MIPS_CONF3_TL (_ULCAST_(1) << 0)
#define MIPS_CONF3_SM (_ULCAST_(1) << 1) #define MIPS_CONF3_SM (_ULCAST_(1) << 1)
#define MIPS_CONF3_MT (_ULCAST_(1) << 2)
#define MIPS_CONF3_SP (_ULCAST_(1) << 4) #define MIPS_CONF3_SP (_ULCAST_(1) << 4)
#define MIPS_CONF3_VINT (_ULCAST_(1) << 5) #define MIPS_CONF3_VINT (_ULCAST_(1) << 5)
#define MIPS_CONF3_VEIC (_ULCAST_(1) << 6) #define MIPS_CONF3_VEIC (_ULCAST_(1) << 6)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment