xtensa: support coprocessors on SMP
Subsystems (2)
Max Filippov
maintainerPATCH v2 1/10 xtensa: clean up function declarations in traps.c
In reply to Max FilippovDrop 'extern' from all function declarations and move those that need to be visible from traps.c to traps.h. Add 'asmlinkage' to declarations of fucntions defined in assembly. Add 'static' to declarations and definitions only used locally. Add argument names in declarations. Drop unused second argument from do_multihit and do_page_fault.
---
Changes v1->v2:
- move declarations to traps.h and add 'asmlinkage' annotations
arch/xtensa/include/asm/traps.h | 18 +++++++++++-- arch/xtensa/kernel/traps.c | 46 ++++++++++++--------------------- 2 files changed, 32 insertions(+), 32 deletions(-)
arch/xtensa/include/asm/traps.h +16 -2
@@ -39,8 +39,22 @@ struct exc_table {* void (*)(struct pt_regs *regs, unsigned long exccause); */ extern void *__init trap_set_handler (int cause,void *handler); -extern void do_unhandled (struct pt_regs *regs,unsigned long exccause); -void fast_second_level_miss (void ); + +asmlinkage void fast_illegal_instruction_user(void); +asmlinkage void fast_syscall_user(void); +asmlinkage void fast_alloca(void); +asmlinkage void fast_unaligned(void); +asmlinkage void fast_second_level_miss(void); +asmlinkage void fast_store_prohibited(void); +asmlinkage void fast_coprocessor(void); + +asmlinkage void kernel_exception(void); +asmlinkage void user_exception(void); +asmlinkage void system_call(struct pt_regs *regs); + +void do_IRQ (int hwirq,struct pt_regs *regs); +void do_page_fault (struct pt_regs *regs); +void do_unhandled (struct pt_regs *regs,unsigned long exccause);/* Initialize minimal exc_table structure sufficient for basic paging */ static inline void __init early_trap_init (void )
arch/xtensa/kernel/traps.c +16 -30
94 lines not on this page · raw message
Signature · 1 line
2.30.2
Max Filippov
maintainerv2 cover xtensa: support coprocessors on SMP
Hello,
this series does a bunch of small cleanups around exception and coprocessor handling code and adds coprocessors support in SMP configurations.
Changes v1->v2:
- clean up exception handler prototypes
- merge SAVE_CP_REGS_TAB and LOAD_CP_REGS_TAB
- get rid of stack frame in coprocessor_flush
- document rules for coprocessor context management
- clean up context management from the LKMM point of view, introduce and document barriers
- support CPU hotplug
Max Filippov (10):
xtensa: clean up function declarations in traps.c
xtensa: clean up exception handler prototypes
xtensa: clean up declarations in coprocessor.h
xtensa: clean up excsave1 initialization
xtensa: use callx0 opcode in fast_coprocessor
xtensa: handle coprocessor exceptions in kernel mode
xtensa: add xtensa_xsr macro
xtensa: merge SAVE_CP_REGS_TAB and LOAD_CP_REGS_TAB
xtensa: get rid of stack frame in coprocessor_flush
xtensa: support coprocessors on SMP
arch/xtensa/include/asm/coprocessor.h | 11 +- arch/xtensa/include/asm/processor.h | 7 + arch/xtensa/include/asm/thread_info.h | 7 +- arch/xtensa/include/asm/traps.h | 40 +++-- arch/xtensa/kernel/asm-offsets.c | 8 +- arch/xtensa/kernel/coprocessor.S | 230 +++++++++++++++----------- arch/xtensa/kernel/entry.S | 12 +- arch/xtensa/kernel/process.c | 112 ++++++++++--- arch/xtensa/kernel/ptrace.c | 3 +- arch/xtensa/kernel/s32c1i_selftest.c | 7 +- arch/xtensa/kernel/signal.c | 3 +- arch/xtensa/kernel/smp.c | 7 + arch/xtensa/kernel/traps.c | 69 ++++---- 13 files changed, 334 insertions(+), 182 deletions(-)
Signature · 1 line
2.30.2
Max Filippov
maintainerPATCH v2 2/10 xtensa: clean up exception handler prototypes
Exception handlers are currently passed as void pointers because they may have one or two parameters. Only two handlers uses the second parameter and it is available in the struct pt_regs anyway. Make all handlers have only one parameter, introduce xtensa_exception_handler type for handlers and use it in trap_set_handler.
---
Changes v1->v2:
- new patch
arch/xtensa/include/asm/traps.h | 14 ++++++-------- arch/xtensa/kernel/s32c1i_selftest.c | 7 +++---- arch/xtensa/kernel/traps.c | 7 ++++--- 3 files changed, 13 insertions(+), 15 deletions(-)
arch/xtensa/include/asm/traps.h +6 -8
@@ -12,6 +12,8 @@#include <asm/ptrace.h> +typedef void xtensa_exception_handler (struct pt_regs *regs); +/* * Per-CPU exception handling data structure. * EXCSAVE1 points to it.
@@ -30,15 +32,11 @@ struct exc_table {/* Fast kernel exception handlers */ void *fast_kernel_handler[EXCCAUSE_N ];/* Default C-Handlers */ -void *default_handler[EXCCAUSE_N ]; +xtensa_exception_handler *default_handler[EXCCAUSE_N ]; }; -/* -* handler must be either of the following: -* void (*)(struct pt_regs *regs); -* void (*)(struct pt_regs *regs, unsigned long exccause); -*/ -extern void *__init trap_set_handler (int cause,void *handler); +xtensa_exception_handler * +__init trap_set_handler (int cause,xtensa_exception_handler *handler); asmlinkage void fast_illegal_instruction_user(void); asmlinkage void fast_syscall_user(void);
@@ -54,7 +52,7 @@ asmlinkage void system_call(struct pt_regs *regs);void do_IRQ (int hwirq,struct pt_regs *regs);void do_page_fault (struct pt_regs *regs); -void do_unhandled (struct pt_regs *regs,unsigned long exccause); +void do_unhandled (struct pt_regs *regs);/* Initialize minimal exc_table structure sufficient for basic paging */ static inline void __init early_trap_init (void )
arch/xtensa/kernel/s32c1i_selftest.c +3 -4
@@ -40,14 +40,13 @@ static inline int probed_compare_swap(int *v, int cmp, int set)/* Handle probed exception */ -static void __init do_probed_exception (struct pt_regs *regs, -unsigned long exccause) +static void __init do_probed_exception (struct pt_regs *regs) {if (regs->pc == rcw_probe_pc) {/* exception on s32c1i ? */ regs->pc +=3 ;/* skip the s32c1i instruction */ - rcw_exc = exccause; + rcw_exc = regs->exccause; }else { -do_unhandled (regs, exccause); +do_unhandled (regs); } }
arch/xtensa/kernel/traps.c +4 -3
@@ -170,7 +170,7 @@ __die_if_kernel(const char *str, struct pt_regs *regs, long err)* Unhandled Exceptions. Kill user task or panic if in kernel space. */ -void do_unhandled (struct pt_regs *regs,unsigned long exccause) +void do_unhandled (struct pt_regs *regs) {__die_if_kernel ("Caught unhandled exception - should not happen" , regs,SIGKILL );
@@ -180,7 +180,7 @@ void do_unhandled(struct pt_regs *regs, unsigned long exccause)"(pid = %d, pc = %#010lx) - should not happen\n" "\tEXCCAUSE is %ld\n" , current->comm,task_pid_nr (current), regs->pc, - exccause); + regs->exccause);force_sig (SIGILL ); }
@@ -360,7 +360,8 @@ static void do_debug(struct pt_regs *regs)/* Set exception C handler - for temporary use when probing exceptions */ -void *__init trap_set_handler (int cause,void *handler) +xtensa_exception_handler * +__init trap_set_handler (int cause,xtensa_exception_handler *handler) {void *previous =per_cpu (exc_table,0 ).default_handler[cause];
Signature · 1 line
2.30.2
Max Filippov
maintainerPATCH v2 3/10 xtensa: clean up declarations in coprocessor.h
In reply to Max FilippovDrop 'extern' from all function declarations. Add parameter names in declarations.
--- arch/xtensa/include/asm/coprocessor.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/xtensa/include/asm/coprocessor.h +3 -4
@@ -143,10 +143,9 @@ typedef struct { XCHAL_CP7_SA_LIST(2) } xtregs_cp7_t __attribute__ ((aligned (XCHAL_CP7_SA_ALIGN)));extern struct thread_info * coprocessor_owner[XCHAL_CP_MAX ]; -extern void coprocessor_flush (struct thread_info *,int ); - -extern void coprocessor_release_all (struct thread_info *); -extern void coprocessor_flush_all (struct thread_info *); +void coprocessor_flush (struct thread_info *ti,int cp_index); +void coprocessor_release_all (struct thread_info *ti); +void coprocessor_flush_all (struct thread_info *ti);#endif /* XTENSA_HAVE_COPROCESSORS */
Signature · 1 line
2.30.2
Max Filippov
maintainerPATCH v2 4/10 xtensa: clean up excsave1 initialization
In reply to Max FilippovUse xtensa_set_sr instead of inline assembly.
Rename local variable exc_table in early_trap_init to avoid conflict with per-CPU variable of the same name.
--- arch/xtensa/include/asm/traps.h | 4 ++-- arch/xtensa/kernel/traps.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-)
arch/xtensa/include/asm/traps.h +2 -2
@@ -57,11 +57,11 @@ void do_unhandled(struct pt_regs *regs);/* Initialize minimal exc_table structure sufficient for basic paging */ static inline void __init early_trap_init (void ) { -static struct exc_table exc_table__initdata = { +static struct exc_table init_exc_table__initdata = { .fast_kernel_handler[EXCCAUSE_DTLB_MISS ] = fast_second_level_miss, }; - __asm__ __volatile__("wsr %0, excsave1\n" : :"a" (&exc_table)); +xtensa_set_sr (&init_exc_table, excsave1); }void secondary_trap_init (void );
arch/xtensa/kernel/traps.c +1 -2
@@ -372,8 +372,7 @@ __init trap_set_handler(int cause, xtensa_exception_handler *handler)static void trap_init_excsave (void ) { -unsigned long excsave1 = (unsigned long )this_cpu_ptr (&exc_table); - __asm__ __volatile__("wsr %0, excsave1\n" : :"a" (excsave1)); +xtensa_set_sr (this_cpu_ptr (&exc_table), excsave1); }static void trap_init_debug (void )
Signature · 1 line
2.30.2
Max Filippov
maintainerPATCH v2 5/10 xtensa: use callx0 opcode in fast_coprocessor
In reply to Max FilippovInstead of emulating call0 in fast_coprocessor use that opcode directly. Use 'ret' instead of 'jx a0'.
--- arch/xtensa/kernel/coprocessor.S | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
arch/xtensa/kernel/coprocessor.S +8 -10
@@ -30,7 +30,7 @@ .align 4; \ .Lsave_cp_regs_cp##x: \ xchal_cp##x##_store a2 a3 a4 a5 a6; \ - jx a0; \ + ret; \ .endif #define SAVE_CP_REGS_TAB(x) \
@@ -47,7 +47,7 @@ .align 4; \ .Lload_cp_regs_cp##x: \ xchal_cp##x##_load a2 a3 a4 a5 a6; \ - jx a0; \ + ret; \ .endif #define LOAD_CP_REGS_TAB(x) \
@@ -163,21 +163,20 @@ ENTRY(fast_coprocessor) s32i a5, a4, THREAD_CPENABLE /* - * Get context save area and 'call' save routine. + * Get context save area and call save routine. * (a4 still holds previous owner (thread_info), a3 CP number) */ movi a5, .Lsave_cp_regs_jump_table - movi a0, 2f # a0: 'return' address addx8 a3, a3, a5 # a3: coprocessor number l32i a2, a3, 4 # a2: xtregs offset l32i a3, a3, 0 # a3: jump address add a2, a2, a4 - jx a3 + callx0 a3 /* Note that only a0 and a1 were preserved. */ -2: rsr a3, exccause + rsr a3, exccause addi a3, a3, -EXCCAUSE_COPROCESSOR0_DISABLED movi a0, coprocessor_owner addx4 a0, a3, a0
@@ -187,19 +186,18 @@ ENTRY(fast_coprocessor) 1: GET_THREAD_INFO (a4, a1) s32i a4, a0, 0 - /* Get context save area and 'call' load routine. */ + /* Get context save area and call load routine. */ movi a5, .Lload_cp_regs_jump_table - movi a0, 1f addx8 a3, a3, a5 l32i a2, a3, 4 # a2: xtregs offset l32i a3, a3, 0 # a3: jump address add a2, a2, a4 - jx a3 + callx0 a3 /* Restore all registers and return from exception handler. */ -1: l32i a6, a1, PT_AREG6 + l32i a6, a1, PT_AREG6 l32i a5, a1, PT_AREG5 l32i a4, a1, PT_AREG4
Signature · 1 line
2.30.2
Max Filippov
maintainerPATCH v2 6/10 xtensa: handle coprocessor exceptions in kernel mode
In reply to Max FilippovIn order to let drivers use xtensa coprocessors on behalf of the calling process the kernel must handle coprocessor exceptions from the kernel mode the same way as from the user mode.
This is not sufficient to allow using coprocessors transparently in IRQ or softirq context. Should such users exist they must be aware of the context and do the right thing, e.g. preserve the coprocessor state and resore it after use.
--- arch/xtensa/kernel/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/xtensa/kernel/traps.c +1 -1
@@ -69,7 +69,7 @@ static void do_debug(struct pt_regs *regs);#define USER 0x02#define COPROCESSOR (x) \ -{ EXCCAUSE_COPROCESSOR ## x ## _DISABLED, USER, fast_coprocessor } +{ EXCCAUSE_COPROCESSOR ## x ## _DISABLED, USER|KRNL, fast_coprocessor } typedef struct { int cause;
Signature · 1 line
2.30.2
Max Filippov
maintainerPATCH v2 7/10 xtensa: add xtensa_xsr macro
In reply to Max Filippovxtensa_xsr does the XSR instruction for the specified special register.
--- arch/xtensa/include/asm/processor.h | 7 +++++++ 1 file changed, 7 insertions(+)
arch/xtensa/include/asm/processor.h +7 -0
@@ -246,6 +246,13 @@ extern unsigned long __get_wchan(struct task_struct *p); v; \ }) +#define xtensa_xsr (x, sr) \ + ({ \ + unsigned int __v__ = (unsigned int)(x); \ + __asm__ __volatile__ ("xsr %0, " __stringify(sr) : "+a"(__v__)); \ + __v__; \ + }) +#if XCHAL_HAVE_EXTERN_REGS static inline void set_er (unsigned long value,unsigned long addr)
Signature · 1 line
2.30.2
Max Filippov
maintainerPATCH v2 8/10 xtensa: merge SAVE_CP_REGS_TAB and LOAD_CP_REGS_TAB
In reply to Max FilippovBoth tables share the same offset field but the different function pointers. Merge them into single table with 3-element entries to reduce code and data duplication.
---
Changes v1->v2:
- new patch
arch/xtensa/kernel/coprocessor.S | 85 ++++++++++++++------------------ 1 file changed, 37 insertions(+), 48 deletions(-)
arch/xtensa/kernel/coprocessor.S +37 -48
@@ -33,15 +33,6 @@ ret; \ .endif -#define SAVE_CP_REGS_TAB(x) \ - .if XTENSA_HAVE_COPROCESSOR(x); \ - .long .Lsave_cp_regs_cp##x; \ - .else; \ - .long 0; \ - .endif; \ - .long THREAD_XTREGS_CP##x - - #define LOAD_CP_REGS(x) \ .if XTENSA_HAVE_COPROCESSOR(x); \ .align 4; \
@@ -50,14 +41,19 @@ ret; \ .endif -#define LOAD_CP_REGS_TAB(x) \ +#define CP_REGS_TAB(x) \ .if XTENSA_HAVE_COPROCESSOR(x); \ + .long .Lsave_cp_regs_cp##x; \ .long .Lload_cp_regs_cp##x; \ .else; \ - .long 0; \ + .long 0, 0; \ .endif; \ .long THREAD_XTREGS_CP##x +#define CP_REGS_TAB_SAVE 0 +#define CP_REGS_TAB_LOAD 4 +#define CP_REGS_TAB_OFFSET 8 + __XTENSA_HANDLER SAVE_CP_REGS(0)
@@ -79,25 +75,15 @@ LOAD_CP_REGS(7) .align 4 -.Lsave_cp_regs_jump_table: - SAVE_CP_REGS_TAB(0) - SAVE_CP_REGS_TAB(1) - SAVE_CP_REGS_TAB(2) - SAVE_CP_REGS_TAB(3) - SAVE_CP_REGS_TAB(4) - SAVE_CP_REGS_TAB(5) - SAVE_CP_REGS_TAB(6) - SAVE_CP_REGS_TAB(7) - -.Lload_cp_regs_jump_table: - LOAD_CP_REGS_TAB(0) - LOAD_CP_REGS_TAB(1) - LOAD_CP_REGS_TAB(2) - LOAD_CP_REGS_TAB(3) - LOAD_CP_REGS_TAB(4) - LOAD_CP_REGS_TAB(5) - LOAD_CP_REGS_TAB(6) - LOAD_CP_REGS_TAB(7) +.Lcp_regs_jump_table: + CP_REGS_TAB(0) + CP_REGS_TAB(1) + CP_REGS_TAB(2) + CP_REGS_TAB(3) + CP_REGS_TAB(4) + CP_REGS_TAB(5) + CP_REGS_TAB(6) + CP_REGS_TAB(7) /* * Entry condition:
@@ -125,13 +111,12 @@ ENTRY(fast_coprocessor) rsr a2, depc s32i a2, a1, PT_AREG2 - /* - * The hal macros require up to 4 temporary registers. We use a3..a6. - */ + /* The hal macros require up to 4 temporary registers. We use a3..a6. */ s32i a4, a1, PT_AREG4 s32i a5, a1, PT_AREG5 s32i a6, a1, PT_AREG6 + s32i a7, a1, PT_AREG7 /* Find coprocessor number. Subtract first CP EXCCAUSE from EXCCAUSE */
@@ -148,6 +133,12 @@ ENTRY(fast_coprocessor) wsr a0, cpenable rsync + /* Get coprocessor save/load table entry (a7). */ + + movi a7, .Lcp_regs_jump_table + addx8 a7, a3, a7 + addx4 a7, a3, a7 + /* Retrieve previous owner. (a3 still holds CP number) */ movi a0, coprocessor_owner # list of owners
@@ -167,10 +158,8 @@ ENTRY(fast_coprocessor) * (a4 still holds previous owner (thread_info), a3 CP number) */ - movi a5, .Lsave_cp_regs_jump_table - addx8 a3, a3, a5 # a3: coprocessor number - l32i a2, a3, 4 # a2: xtregs offset - l32i a3, a3, 0 # a3: jump address + l32i a2, a7, CP_REGS_TAB_OFFSET + l32i a3, a7, CP_REGS_TAB_SAVE add a2, a2, a4 callx0 a3
@@ -188,15 +177,14 @@ ENTRY(fast_coprocessor) /* Get context save area and call load routine. */ - movi a5, .Lload_cp_regs_jump_table - addx8 a3, a3, a5 - l32i a2, a3, 4 # a2: xtregs offset - l32i a3, a3, 0 # a3: jump address + l32i a2, a7, CP_REGS_TAB_OFFSET + l32i a3, a7, CP_REGS_TAB_LOAD add a2, a2, a4 callx0 a3 /* Restore all registers and return from exception handler. */ + l32i a7, a1, PT_AREG7 l32i a6, a1, PT_AREG6 l32i a5, a1, PT_AREG5 l32i a4, a1, PT_AREG4
@@ -232,13 +220,14 @@ ENTRY(coprocessor_flush) abi_entry(4) s32i a0, a1, 0 - movi a0, .Lsave_cp_regs_jump_table - addx8 a3, a3, a0 - l32i a4, a3, 4 - l32i a3, a3, 0 - add a2, a2, a4 - beqz a3, 1f - callx0 a3 + movi a4, .Lcp_regs_jump_table + addx8 a4, a3, a4 + addx4 a3, a3, a4 + l32i a4, a3, CP_REGS_TAB_SAVE + beqz a4, 1f + l32i a3, a3, CP_REGS_TAB_OFFSET + add a2, a2, a3 + callx0 a4 1: l32i a0, a1, 0 abi_ret(4)
Signature · 1 line
2.30.2
Max Filippov
maintainerPATCH v2 10/10 xtensa: support coprocessors on SMP
In reply to Max FilippovCurrent coprocessor support on xtensa only works correctly on uniprocessor configurations. Make it work on SMP too and keep it lazy.
Make coprocessor_owner array per-CPU and move it to struct exc_table for easy access from the fast_coprocessor exception handler. Allow task to have live coprocessors only on single CPU, record this CPU number in the struct thread_info::cp_owner_cpu. Change struct thread_info::cpenable meaning to be 'coprocessors live on cp_owner_cpu'.
Introduce C-level coprocessor exception handler that flushes and releases live coprocessors of the task taking 'coprocessor disabled' exception and call it from the fast_coprocessor handler when the task has live coprocessors on other CPU.
Make coprocessor_flush_all and coprocessor_release_all work correctly when called from any CPU by sending IPI to the cp_owner_cpu. Add function coprocessor_flush_release_all to do flush followed by release atomically. Add function local_coprocessors_flush_release_all to flush and release all coprocessors on the local CPU and use it to flush coprocessor contexts from the CPU that goes offline.
---
Changes v1->v2:
- document rules for coprocessor context management
- clean up context management from the LKMM point of view, introduce and document barriers
- support CPU hotplug
arch/xtensa/include/asm/coprocessor.h | 4 +- arch/xtensa/include/asm/thread_info.h | 7 +- arch/xtensa/include/asm/traps.h | 6 ++ arch/xtensa/kernel/asm-offsets.c | 8 +- arch/xtensa/kernel/coprocessor.S | 122 +++++++++++++++++++------- arch/xtensa/kernel/entry.S | 12 ++- arch/xtensa/kernel/process.c | 112 +++++++++++++++++------ arch/xtensa/kernel/ptrace.c | 3 +- arch/xtensa/kernel/signal.c | 3 +- arch/xtensa/kernel/smp.c | 7 ++ arch/xtensa/kernel/traps.c | 13 ++- 11 files changed, 230 insertions(+), 67 deletions(-)
arch/xtensa/include/asm/coprocessor.h +3 -1
@@ -142,10 +142,12 @@ typedef struct { XCHAL_CP6_SA_LIST(2) } xtregs_cp6_t typedef struct { XCHAL_CP7_SA_LIST(2) } xtregs_cp7_t __attribute__ ((aligned (XCHAL_CP7_SA_ALIGN ))); -extern struct thread_info * coprocessor_owner[XCHAL_CP_MAX ]; +struct thread_info ;void coprocessor_flush (struct thread_info *ti,int cp_index);void coprocessor_release_all (struct thread_info *ti);void coprocessor_flush_all (struct thread_info *ti); +void coprocessor_flush_release_all (struct thread_info *ti); +void local_coprocessors_flush_release_all (void );#endif /* XTENSA_HAVE_COPROCESSORS */
arch/xtensa/include/asm/thread_info.h +6 -1
@@ -52,12 +52,17 @@ struct thread_info {__u32 cpu;/* current CPU */ __s32 preempt_count;/* 0 => preemptable,< 0 => BUG*/ -unsigned long cpenable;#if XCHAL_HAVE_EXCLUSIVE /* result of the most recent exclusive store */ unsigned long atomctl8;#endif +/* +* If i-th bit is set then coprocessor state is loaded into the +* coprocessor i on CPU cp_owner_cpu. +*/ +unsigned long cpenable; +u32 cp_owner_cpu;/* Allocate storage for extra user states and coprocessor states. */ #if XTENSA_HAVE_COPROCESSORS xtregs_coprocessor_t xtregs_cp;
arch/xtensa/include/asm/traps.h +6 -0
@@ -27,6 +27,10 @@ struct exc_table {void *fixup;/* For passing a parameter to fixup */ void *fixup_param; +#if XTENSA_HAVE_COPROCESSORS +/* Pointers to owner struct thread_info */ +struct thread_info *coprocessor_owner[XCHAL_CP_MAX ]; +#endif /* Fast user exception handlers */ void *fast_user_handler[EXCCAUSE_N ];/* Fast kernel exception handlers */
@@ -35,6 +39,8 @@ struct exc_table {xtensa_exception_handler *default_handler[EXCCAUSE_N ]; }; +DECLARE_PER_CPU(struct exc_table, exc_table); +xtensa_exception_handler *__init trap_set_handler (int cause,xtensa_exception_handler *handler);
arch/xtensa/kernel/asm-offsets.c +7 -1
@@ -91,10 +91,12 @@ int main(void)/* struct thread_info (offset from start_struct) */ DEFINE(THREAD_RA, offsetof (struct task_struct, thread.ra)); DEFINE(THREAD_SP, offsetof (struct task_struct, thread.sp)); -DEFINE (THREAD_CPENABLE , offsetof (struct thread_info , cpenable));#if XCHAL_HAVE_EXCLUSIVE DEFINE (THREAD_ATOMCTL8 , offsetof (struct thread_info , atomctl8));#endif +DEFINE (THREAD_CPENABLE , offsetof(struct thread_info , cpenable)); +DEFINE (THREAD_CPU , offsetof(struct thread_info , cpu)); +DEFINE (THREAD_CP_OWNER_CPU , offsetof(struct thread_info , cp_owner_cpu));#if XTENSA_HAVE_COPROCESSORS DEFINE(THREAD_XTREGS_CP0, offsetof(struct thread_info, xtregs_cp.cp0)); DEFINE(THREAD_XTREGS_CP1, offsetof(struct thread_info, xtregs_cp.cp1));
@@ -137,6 +139,10 @@ int main(void)DEFINE (EXC_TABLE_DOUBLE_SAVE , offsetof(struct exc_table , double_save));DEFINE (EXC_TABLE_FIXUP , offsetof(struct exc_table , fixup));DEFINE (EXC_TABLE_PARAM , offsetof(struct exc_table , fixup_param)); +#if XTENSA_HAVE_COPROCESSORS +DEFINE (EXC_TABLE_COPROCESSOR_OWNER , + offsetof(struct exc_table , coprocessor_owner)); +#endif DEFINE (EXC_TABLE_FAST_USER , offsetof(struct exc_table , fast_user_handler)); DEFINE(EXC_TABLE_FAST_KERNEL,
arch/xtensa/kernel/coprocessor.S +90 -32
174 lines not on this page · raw message
arch/xtensa/kernel/entry.S +10 -2
@@ -2071,8 +2071,16 @@ ENTRY(_switch_to) #if (XTENSA_HAVE_COPROCESSORS || XTENSA_HAVE_IO_PORTS) l32i a3, a5, THREAD_CPENABLE - xsr a3, cpenable - s32i a3, a4, THREAD_CPENABLE +#ifdef CONFIG_SMP + beqz a3, 1f + memw # pairs with memw (2) in fast_coprocessor + l32i a6, a5, THREAD_CP_OWNER_CPU + l32i a7, a5, THREAD_CPU + beq a6, a7, 1f # load 0 into CPENABLE if current CPU is not the owner + movi a3, 0 +1: +#endif + wsr a3, cpenable #endif #if XCHAL_HAVE_EXCLUSIVE
arch/xtensa/kernel/process.c +87 -25
153 lines not on this page · raw message
arch/xtensa/kernel/ptrace.c +1 -2
@@ -171,8 +171,7 @@ static int tie_set(struct task_struct *target,#if XTENSA_HAVE_COPROCESSORS /* Flush all coprocessors before we overwrite them. */ -coprocessor_flush_all (ti); -coprocessor_release_all (ti); +coprocessor_flush_release_all (ti); ti->xtregs_cp.cp0 = newregs->cp0; ti->xtregs_cp.cp1 = newregs->cp1; ti->xtregs_cp.cp2 = newregs->cp2;
arch/xtensa/kernel/signal.c +1 -2
@@ -162,8 +162,7 @@ setup_sigcontext(struct rt_sigframe __user *frame, struct pt_regs *regs)return err;#if XTENSA_HAVE_COPROCESSORS -coprocessor_flush_all (ti); -coprocessor_release_all (ti); +coprocessor_flush_release_all (ti); err |=__copy_to_user (&frame->xtregs.cp, &ti->xtregs_cp,sizeof (frame->xtregs.cp));#endif
arch/xtensa/kernel/smp.c +7 -0
@@ -30,6 +30,7 @@#include <linux/thread_info.h> #include <asm/cacheflush.h> +#include <asm/coprocessor.h> #include <asm/kdebug.h> #include <asm/mmu_context.h> #include <asm/mxregs.h>
@@ -273,6 +274,12 @@ int __cpu_disable(void)*/ set_cpu_online (cpu, false); +#if XTENSA_HAVE_COPROCESSORS +/* +* Flush coprocessor contexts that are active on the current CPU. +*/ +local_coprocessors_flush_release_all (); +#endif /* * OK - migrate IRQs away from this CPU */
arch/xtensa/kernel/traps.c +12 -1
@@ -57,6 +57,9 @@ static void do_nmi(struct pt_regs *regs);static void do_unaligned_user (struct pt_regs *regs);#endif static void do_multihit (struct pt_regs *regs); +#if XTENSA_HAVE_COPROCESSORS +static void do_coprocessor (struct pt_regs *regs); +#endif static void do_debug (struct pt_regs *regs);/*
@@ -69,7 +72,8 @@ static void do_debug(struct pt_regs *regs);#define USER 0x02#define COPROCESSOR (x) \ -{ EXCCAUSE_COPROCESSOR ## x ## _DISABLED, USER|KRNL, fast_coprocessor } +{ EXCCAUSE_COPROCESSOR ## x ## _DISABLED, USER|KRNL, fast_coprocessor },\ +{ EXCCAUSE_COPROCESSOR ## x ## _DISABLED, 0, do_coprocessor } typedef struct { int cause;
@@ -327,6 +331,13 @@ static void do_unaligned_user(struct pt_regs *regs) }#endif +#if XTENSA_HAVE_COPROCESSORS +static void do_coprocessor (struct pt_regs *regs) +{ +coprocessor_flush_release_all (current_thread_info ()); +} +#endif +/* Handle debug events. * When CONFIG_HAVE_HW_BREAKPOINT is on this handler is called with * preemption disabled to avoid rescheduling and keep mapping of hardware
Signature · 1 line
2.30.2
Max Filippov
maintainerPATCH v2 9/10 xtensa: get rid of stack frame in coprocessor_flush
In reply to Max Filippovcoprocessor_flush is an ordinary function, it can use all registers. Don't reserve stack frame for it and use a7 to preserve a0 around the context saving call.
---
Changes v1->v2:
- new patch
arch/xtensa/kernel/coprocessor.S | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
arch/xtensa/kernel/coprocessor.S +5 -6
@@ -216,10 +216,8 @@ ENDPROC(fast_coprocessor) ENTRY(coprocessor_flush) - /* reserve 4 bytes on stack to save a0 */ - abi_entry(4) + abi_entry_default - s32i a0, a1, 0 movi a4, .Lcp_regs_jump_table addx8 a4, a3, a4 addx4 a3, a3, a4
@@ -227,10 +225,11 @@ ENTRY(coprocessor_flush) beqz a4, 1f l32i a3, a3, CP_REGS_TAB_OFFSET add a2, a2, a3 + mov a7, a0 callx0 a4 -1: l32i a0, a1, 0 - - abi_ret(4) + mov a0, a7 +1: + abi_ret_default ENDPROC(coprocessor_flush)
Signature · 1 line
2.30.2