Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d6f82fe authored by Max Filippov's avatar Max Filippov Committed by Chris Zankel
Browse files

xtensa: move spill_registers to traps.h 



Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent b6c7e873

arch/xtensa/include/asm/traps.h

+24 −0
Original line number Original line Diff line number Diff line
@@ -20,4 +20,28 @@ 
extern void * __init trap_set_handler(int cause, void *handler);

extern void * __init trap_set_handler(int cause, void *handler);

extern void do_unhandled(struct pt_regs *regs, unsigned long exccause);

extern void do_unhandled(struct pt_regs *regs, unsigned long exccause);





static inline void spill_registers(void)

{

	unsigned int a0, ps;



	__asm__ __volatile__ (

		"movi	a14, " __stringify(PS_EXCM_BIT | LOCKLEVEL) "\n\t"

		"mov	a12, a0\n\t"

		"rsr	a13, sar\n\t"

		"xsr	a14, ps\n\t"

		"movi	a0, _spill_registers\n\t"

		"rsync\n\t"

		"callx0 a0\n\t"

		"mov	a0, a12\n\t"

		"wsr	a13, sar\n\t"

		"wsr	a14, ps\n\t"

		: : "a" (&a0), "a" (&ps)

#if defined(CONFIG_FRAME_POINTER)

		: "a2", "a3", "a4",       "a11", "a12", "a13", "a14", "a15",

#else

		: "a2", "a3", "a4", "a7", "a11", "a12", "a13", "a14", "a15",

#endif

		  "memory");

}



#endif /* _XTENSA_TRAPS_H */
 
#endif /* _XTENSA_TRAPS_H */

arch/xtensa/kernel/traps.c

+1 −20
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <asm/uaccess.h>

#include <asm/uaccess.h>

#include <asm/pgtable.h>

#include <asm/pgtable.h>

#include <asm/processor.h>

#include <asm/processor.h>

#include <asm/traps.h>





#ifdef CONFIG_KGDB

#ifdef CONFIG_KGDB

extern int gdb_enter;

extern int gdb_enter;
@@ -413,26 +414,6 @@ static __always_inline unsigned long *stack_pointer(struct task_struct *task) 
	return sp;

	return sp;

}

}





static inline void spill_registers(void)

{

	unsigned int a0, ps;



	__asm__ __volatile__ (

		"movi	a14, " __stringify(PS_EXCM_BIT | LOCKLEVEL) "\n\t"

		"mov	a12, a0\n\t"

		"rsr	a13, sar\n\t"

		"xsr	a14, ps\n\t"

		"movi	a0, _spill_registers\n\t"

		"rsync\n\t"

		"callx0 a0\n\t"

		"mov	a0, a12\n\t"

		"wsr	a13, sar\n\t"

		"wsr	a14, ps\n\t"

		:: "a" (&a0), "a" (&ps)

		: "a2", "a3", "a4", "a7", "a11", "a12", "a13", "a14", "a15",

		  "memory");

}



void show_trace(struct task_struct *task, unsigned long *sp)

void show_trace(struct task_struct *task, unsigned long *sp)

{

{

	unsigned long a0, a1, pc;

	unsigned long a0, a1, pc;