MIPS: Loongson-3: Enable COP2 usage in kernel
PATCH v2 1/2 MIPS: Loongson-3: Enable COP2 usage in kernel
Loongson-3's COP2 is Multi-Media coprocessor, it is disabled in kernel mode by default. However, gslq/gssq (16-bytes load/store instructions) overrides the instruction format of lwc2/swc2. If we wan't to use gslq/ gssq for optimization in kernel, we should enable COP2 usage in kernel.
Please pay attention that in this patch we only enable COP2 in kernel, which means it will lose ST0_CU2 when a process go to user space (try to use COP2 in user space will trigger an exception and then grab COP2, which is similar to FPU). And as a result, we need to modify the context switching code because the new scheduled process doesn't contain ST0_CU2 in its THERAD_STATUS probably.
--- arch/mips/boot/compressed/head.S | 7 +++++++ arch/mips/include/asm/mipsregs.h | 1 + arch/mips/include/asm/stackframe.h | 12 +++++++++--- arch/mips/kernel/head.S | 18 +++++++++--------- arch/mips/kernel/r4k_switch.S | 3 +++ arch/mips/kernel/traps.c | 3 +++ 6 files changed, 32 insertions(+), 12 deletions(-)
arch/mips/boot/compressed/head.S +7 -0
@@ -14,11 +14,18 @@ #include <asm/asm.h> #include <asm/regdef.h> +#include <asm/mipsregs.h> .set noreorder .cprestore LEAF(start) start: +#ifdef CONFIG_CPU_LOONGSON64 + mfc0 t0, CP0_STATUS + or t0, ST0_MM + mtc0 t0, CP0_STATUS +#endif + /* Save boot rom start args */ move s0, a0 move s1, a1
arch/mips/include/asm/mipsregs.h +1 -0
@@ -386,6 +386,7 @@#define ST0_CU1 0x20000000#define ST0_CU2 0x40000000#define ST0_CU3 0x80000000 +#define ST0_MM 0x40000000/* Loongson-3 naming */ #define ST0_XX 0x80000000/* MIPS IV naming */ /*
arch/mips/include/asm/stackframe.h +9 -3
@@ -42,6 +42,12 @@ cfi_restore \reg \offset \docfi .endm +#ifdef CONFIG_CPU_LOONGSON64 +#define ST0_CUMASK (ST0_CU0 | ST0_CU2) +#else +#define ST0_CUMASK ST0_CU0 +#endif +#if defined(CONFIG_CPU_R3000 ) || defined(CONFIG_CPU_TX39XX )#define STATMASK 0x3f#else
@@ -450,7 +456,7 @@*/ .macro CLImfc0 t0,CP0_STATUS - li t1, ST0_CU0 | STATMASK + li t1, ST0_CUMASK | STATMASK or t0, t1 xori t0, STATMASK mtc0 t0, CP0_STATUS
@@ -463,7 +469,7 @@*/ .macro STImfc0 t0,CP0_STATUS - li t1, ST0_CU0 | STATMASK + li t1, ST0_CUMASK | STATMASK or t0, t1 xori t0, STATMASK & ~1 mtc0 t0, CP0_STATUS
@@ -477,7 +483,7 @@*/ .macro KMODEmfc0 t0,CP0_STATUS - li t1, ST0_CU0 | (STATMASK & ~1) + li t1, ST0_CUMASK | (STATMASK & ~1)#if defined(CONFIG_CPU_R3000 ) || defined(CONFIG_CPU_TX39XX )andi t2, t0,ST0_IEP srl t2, 2
arch/mips/kernel/head.S +9 -9
@@ -43,20 +43,20 @@ .set pop .endm - .macro setup_c0_status_pri -#ifdef CONFIG_64BIT - setup_c0_status ST0_KX 0 +#ifdef CONFIG_CPU_LOONGSON64 +#define ST0_SET ST0_KX | ST0_MM +#elif defined(CONFIG_64BIT) +#define ST0_SET ST0_KX #else - setup_c0_status 0 0 +#define ST0_SET 0 #endif + + .macro setup_c0_status_pri + setup_c0_status ST0_SET 0 .endm .macro setup_c0_status_sec -#ifdef CONFIG_64BIT - setup_c0_status ST0_KX ST0_BEV -#else - setup_c0_status 0 ST0_BEV -#endif + setup_c0_status ST0_SET ST0_BEV .endm #ifndef CONFIG_NO_EXCEPT_FILL
arch/mips/kernel/r4k_switch.S +3 -0
@@ -53,6 +53,9 @@ nor a3, $0, a3 and a2, a3 or a2, t1 +#ifdef CONFIG_CPU_LOONGSON64 + or a2, ST0_MM +#endif mtc0 a2, CP0_STATUS move v0, a0 jr ra
arch/mips/kernel/traps.c +3 -0
@@ -2114,6 +2114,9 @@ static void configure_status(void)#ifdef CONFIG_64BIT status_set |=ST0_FR |ST0_KX |ST0_SX |ST0_UX ;#endif +#ifdef CONFIG_CPU_LOONGSON64 + status_set |=ST0_MM ; +#endif if (current_cpu_data.isa_level &MIPS_CPU_ISA_IV ) status_set |=ST0_XX ;if (cpu_has_dsp)
Signature · 1 line
2.7.0
PATCH v2 2/2 MIPS: Loongson-3: Calculate ra properly when unwinding the stack
Loongson-3 has 16-bytes load/store instructions: gslq and gssq. This patch calculate ra properly when unwinding the stack, if ra is saved by gssq and restored by gslq.
--- arch/mips/kernel/process.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
arch/mips/kernel/process.c +15 -1
@@ -279,7 +279,21 @@ static inline int is_ra_save_ins(union mips_instruction *ip, int *poff) *poff = ip->i_format.simmediate /sizeof (ulong); return 1; } - +#ifdef CONFIG_CPU_LOONGSON64 +if ((ip->loongson3_lswc2_format.opcode == swc2_op) && + (ip->loongson3_lswc2_format.ls ==1 ) && + (ip->loongson3_lswc2_format.fr ==0 ) && + (ip->loongson3_lswc2_format.base ==29 )) { +if (ip->loongson3_lswc2_format.rt ==31 ) { + *poff = ip->loongson3_lswc2_format.offset <<1 ; +return 1 ; + } +if (ip->loongson3_lswc2_format.rq ==31 ) { + *poff = (ip->loongson3_lswc2_format.offset <<1 ) +1 ; +return 1 ; + } + } +#endif return 0 ;#endif }
Signature · 1 line
2.7.0