Add basic SMARTMIPS ASE support
Subsystems (2)
RFC 1/1 Add basic SMARTMIPS ASE support
From: Franck Bui-Huu <[email protected]>
This patch adds trivial support for SMARTMIPS extension. This extension is currently implemented by 4KS[CD] CPUs.
Basically it saves/restores ACX register, which is part of the SMARTMIPS ASE, when needed. This patch does *not* add any support for Smartmips MMU features.
Futhermore this patch does not add explicit support for 4KS[CD] CPUs since they are respectively mips32 and mips32r2 compliant. So with the current processor configuration, a platform that has such CPUs needs to select both configs:
CPU_HAS_SMARTMIPS SYS_HAS_CPU_MIPS32_R[12]
This is due to the processor configuration which is mixing up all the architecture variants and the processor types.
The drawback of this, is that we currently pass '-march=mips32' option to gcc when building a kernel instead of '-march=4ksc' for 4KSC case. This can lead to a kernel image a little bit bigger than required.
---
Ralf,
Here's the basic support for SMARTMIPS ASE. I'm not very confident with the sigcontext part, if you could double check that would be nice.
Please consider,
Franck
arch/mips/Kconfig | 3 +++ arch/mips/Makefile | 2 ++ arch/mips/kernel/asm-offsets.c | 4 ++++ arch/mips/kernel/ptrace.c | 10 ++++++++++ arch/mips/kernel/ptrace32.c | 10 ++++++++++ arch/mips/kernel/signal.c | 7 +++++++ arch/mips/kernel/signal32.c | 7 +++++++ arch/mips/kernel/traps.c | 3 +++ include/asm-mips/ptrace.h | 4 ++++ include/asm-mips/sigcontext.h | 6 ++++-- include/asm-mips/stackframe.h | 30 ++++++++++++++++++++++++------ 11 files changed, 78 insertions(+), 8 deletions(-)
arch/mips/Kconfig +3 -0
@@ -1633,6 +1633,9 @@ config CPU_HAS_LLSC config CPU_HAS_WB bool +config CPU_HAS_SMARTMIPS + bool + # # Vectored interrupt mode is an R2 feature #
arch/mips/Makefile +2 -0
@@ -103,6 +103,8 @@ predef-le += -DMIPSEL -D_MIPSEL -D__MIPSEL -D__MIPSEL__ cflags-$(CONFIG_CPU_BIG_ENDIAN) += $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB $(undef-all) $(predef-be)) cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL $(undef-all) $(predef-le)) +cflags-$(CONFIG_CPU_HAS_SMARTMIPS) += $(call cc-option,-msmartmips) + cflags-$(CONFIG_SB1XXX_CORELIS) += $(call cc-option,-mno-sched-prolog) \ -fno-omit-frame-pointer
arch/mips/kernel/asm-offsets.c +4 -0
@@ -64,6 +64,9 @@ void output_ptreg_defines(void) offset("#define PT_R31 ", struct pt_regs, regs[31]); offset("#define PT_LO ", struct pt_regs, lo); offset("#define PT_HI ", struct pt_regs, hi); +#ifdef CONFIG_CPU_HAS_SMARTMIPS + offset("#define PT_ACX ", struct pt_regs, acx); +#endif offset("#define PT_EPC ", struct pt_regs, cp0_epc); offset("#define PT_BVADDR ", struct pt_regs, cp0_badvaddr); offset("#define PT_STATUS ", struct pt_regs, cp0_status);
@@ -250,6 +253,7 @@ void output_sc_defines(void)text ("/* Linux sigcontext offsets. */" ); offset("#define SC_REGS ", struct sigcontext, sc_regs); offset("#define SC_FPREGS ", struct sigcontext, sc_fpregs); + offset("#define SC_ACX ", struct sigcontext, sc_acx); offset("#define SC_MDHI ", struct sigcontext, sc_mdhi); offset("#define SC_MDLO ", struct sigcontext, sc_mdlo); offset("#define SC_PC ", struct sigcontext, sc_pc);
arch/mips/kernel/ptrace.c +10 -0
@@ -236,6 +236,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)case MMLO : tmp = regs->lo;break ; +#ifdef CONFIG_CPU_HAS_SMARTMIPS +case ACX : + tmp = regs->acx; +break ; +#endif case FPC_CSR : tmp = child->thread.fpu.fcr31;break ;
@@ -362,6 +367,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)case MMLO : regs->lo = data;break ; +#ifdef CONFIG_CPU_HAS_SMARTMIPS +case ACX : + regs->acx = data; +break ; +#endif case FPC_CSR : child->thread.fpu.fcr31 = data;break ;
arch/mips/kernel/ptrace32.c +10 -0
@@ -165,6 +165,11 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)case MMLO : tmp = regs->lo;break ; +#ifdef CONFIG_CPU_HAS_SMARTMIPS +case ACX : + tmp = regs->acx; +break ; +#endif case FPC_CSR : tmp = child->thread.fpu.fcr31;break ;
@@ -315,6 +320,11 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)case MMLO : regs->lo = data;break ; +#ifdef CONFIG_CPU_HAS_SMARTMIPS +case ACX : + regs->acx = data; +break ; +#endif case FPC_CSR : child->thread.fpu.fcr31 = data;break ;
arch/mips/kernel/signal.c +7 -0
@@ -71,6 +71,9 @@ int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)for (i =1 ; i <32 ; i++) err |=__put_user (regs->regs[i], &sc->sc_regs[i]); +#ifdef CONFIG_CPU_HAS_SMARTMIPS + err |=__put_user (regs->acx, &sc->sc_acx); +#endif err |=__put_user (regs->hi, &sc->sc_mdhi); err |=__put_user (regs->lo, &sc->sc_mdlo);if (cpu_has_dsp) {
@@ -114,6 +117,10 @@ int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)current_thread_info ()->restart_block.fn = do_no_restart_syscall; err |=__get_user (regs->cp0_epc, &sc->sc_pc); + +#ifdef CONFIG_CPU_HAS_SMARTMIPS + err |=__get_user (regs->acx, &sc->sc_acx); +#endif err |=__get_user (regs->hi, &sc->sc_mdhi); err |=__get_user (regs->lo, &sc->sc_mdlo);if (cpu_has_dsp) {
arch/mips/kernel/signal32.c +7 -0
@@ -175,6 +175,9 @@ static int setup_sigcontext32(struct pt_regs *regs,for (i =1 ; i <32 ; i++) err |=__put_user (regs->regs[i], &sc->sc_regs[i]); +#ifdef CONFIG_CPU_HAS_SMARTMIPS + err |=__put_user (regs->acx, &sc->sc_acx); +#endif err |=__put_user (regs->hi, &sc->sc_mdhi); err |=__put_user (regs->lo, &sc->sc_mdlo);if (cpu_has_dsp) {
@@ -219,6 +222,10 @@ static int restore_sigcontext32(struct pt_regs *regs,current_thread_info ()->restart_block.fn = do_no_restart_syscall; err |=__get_user (regs->cp0_epc, &sc->sc_pc); + +#ifdef CONFIG_CPU_HAS_SMARTMIPS + err |=__get_user (regs->acx, &sc->sc_acx); +#endif err |=__get_user (regs->hi, &sc->sc_mdhi); err |=__get_user (regs->lo, &sc->sc_mdlo);if (cpu_has_dsp) {
arch/mips/kernel/traps.c +3 -0
@@ -229,6 +229,9 @@ void show_regs(struct pt_regs *regs)printk ("\n" ); } +#ifdef CONFIG_CPU_HAS_SMARTMIPS +printk ("Acx : %0*lx\n" , field, regs->acx); +#endif printk ("Hi : %0*lx\n" , field, regs->hi);printk ("Lo : %0*lx\n" , field, regs->lo);
include/asm-mips/ptrace.h +4 -0
@@ -21,6 +21,7 @@#define FPC_EIR 70#define DSP_BASE 71/* 3 more hi / lo register pairs */ #define DSP_CONTROL 77 +#define ACX 78/* * This struct defines the way the registers are stored on the stack during a
@@ -39,6 +40,9 @@ struct pt_regs {unsigned long cp0_status;unsigned long hi;unsigned long lo; +#ifdef CONFIG_CPU_HAS_SMARTMIPS +unsigned long acx; +#endif unsigned long cp0_badvaddr;unsigned long cp0_cause;unsigned long cp0_epc;
include/asm-mips/sigcontext.h +4 -2
@@ -23,7 +23,7 @@ struct sigcontext {unsigned long long sc_pc;unsigned long long sc_regs[32 ];unsigned long long sc_fpregs[32 ]; -unsigned int sc_ownedfp;/* Unused */ +unsigned int sc_acx;/* Was sc_ownedfp */ unsigned int sc_fpc_csr;unsigned int sc_fpc_eir;/* Unused */ unsigned int sc_used_math;
@@ -51,10 +51,12 @@ struct sigcontext {* binary compatibility - no prisoners. * DSP ASE in 2.6.12-rc4. Turn sc_mdhi and sc_mdlo into an array of four * entries, add sc_dsp and sc_reserved for padding. No prisoners. +* SMARTMIPS ASE in 2.6.20. Add sc_acx. */ struct sigcontext {unsigned long sc_regs[32 ];unsigned long sc_fpregs[32 ]; +unsigned long sc_acx;unsigned long sc_mdhi;unsigned long sc_hi1;unsigned long sc_hi2;
@@ -80,7 +82,7 @@ struct sigcontext32 {__u64 sc_pc;__u64 sc_regs[32 ];__u64 sc_fpregs[32 ]; -__u32 sc_ownedfp;/* Unused */ +__u32 sc_acx;/* Was sc_ownedfp */ __u32 sc_fpc_csr;__u32 sc_fpc_eir;/* Unused */ __u32 sc_used_math;
include/asm-mips/stackframe.h +24 -6
@@ -29,16 +29,25 @@ .endm .macro SAVE_TEMP +#ifdef CONFIG_CPU_HAS_SMARTMIPS + mflhxu v1 + LONG_S v1, PT_LO(sp) + mflhxu v1 + LONG_S v1, PT_HI(sp) + mflhxu v1 + LONG_S v1, PT_ACX(sp) +#else mfhi v1 + LONG_S v1, PT_HI(sp) + mflo v1 + LONG_S v1, PT_LO(sp) +#endif #ifdef CONFIG_32BIT LONG_S $8, PT_R8(sp) LONG_S $9, PT_R9(sp)#endif - LONG_S v1, PT_HI(sp) - mflo v1 LONG_S $10, PT_R10(sp) LONG_S $11, PT_R11(sp) - LONG_S v1, PT_LO(sp) LONG_S $12, PT_R12(sp) LONG_S $13, PT_R13(sp) LONG_S $14, PT_R14(sp)
@@ -182,16 +191,25 @@ .endm .macro RESTORE_TEMP +#ifdef CONFIG_CPU_HAS_SMARTMIPS + LONG_L $24, PT_ACX(sp) + mtlhx $24 + LONG_L $24, PT_HI(sp) + mtlhx $24 LONG_L $24, PT_LO(sp) + mtlhx $24 +#else + LONG_L $24, PT_LO(sp) + mtlo $24 + LONG_L $24, PT_HI(sp) + mthi $24 +#endif #ifdef CONFIG_32BIT LONG_L $8, PT_R8(sp) LONG_L $9, PT_R9(sp)#endif - mtlo $24 - LONG_L $24, PT_HI(sp) LONG_L $10, PT_R10(sp) LONG_L $11, PT_R11(sp) - mthi $24 LONG_L $12, PT_R12(sp) LONG_L $13, PT_R13(sp) LONG_L $14, PT_R14(sp)
Signature · 1 line
1.4.4.3.ge6d4
Quoted 4 lines · Franck Bui-Huu
From: Franck Bui-Huu <[email protected]>
This patch adds trivial support for SMARTMIPS extension. This extension is currently implemented by 4KS[CD] CPUs.
The SmartMIPS ASE according to the spec is explicitly for MIPS32, so I'm stripping the 64-bit kernel bits of it. I also did a bit of Kconfig polishing to make SmartMIPS selectable on those platforms which might actually have such a CPU only, that is currently all the FPGA-based platforms, Altas, SEAD and Malta.
Ralf
Quoted 4 lines · Ralf Baechle
Quoted 2 lines · Franck Bui-Huu
From: Franck Bui-Huu <[email protected]>
Quoted 9 lines
Quoted 2 lines
This patch adds trivial support for SMARTMIPS extension. This extension is currently implemented by 4KS[CD] CPUs.
The SmartMIPS ASE according to the spec is explicitly for MIPS32, so I'm stripping the 64-bit kernel bits of it. I also did a bit of
Kconfigpolishing to make SmartMIPS selectable on those platforms which might actually have such a CPU only, that is currently all the FPGA-based platforms, Altas, SEAD and Malta.
Thanks for polishing.
BTW, 'linux-2.6.21-rc1' tag is missing in your repo.
Signature · 1 line
Franck
Quoted 3 lines · Franck Bui-Huu
Thanks for polishing.
BTW, 'linux-2.6.21-rc1' tag is missing in your repo.
Indeed, pushing.
Ralf