xtensa: clean up excsave1 initialization

Use 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.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>

diff --git a/arch/xtensa/include/asm/traps.h b/arch/xtensa/include/asm/traps.h
index bfdb0af61b07cf5730897827bd941b6555ae20a1..514376eff58cfbaa2ebc7add7a680bb521a9fa50 100644 (file)
--- a/arch/xtensa/include/asm/traps.h
+++ b/arch/xtensa/include/asm/traps.h
@@ -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);

diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index d6b1a0c3e3193f178f9aed7caf0f3879699e346e..95903f25e523cd12cad39be5ad996a8297303fe7 100644 (file)
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -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)