diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2022-04-15 02:59:33 -0700 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2022-05-01 19:51:22 -0700 |
| commit | 9fa8c59f5f82aec99a7f87095ab093b68dd492a5 (patch) | |
| tree | 4440140a9065f5d6a94ace1e597bc8fc83f9389b | |
| parent | 3e554d47dfe3f1d0639fd3d2d4f64bca0e5e62e0 (diff) | |
| download | linux-next-9fa8c59f5f82aec99a7f87095ab093b68dd492a5.tar.gz | |
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>
| -rw-r--r-- | arch/xtensa/include/asm/traps.h | 4 | ||||
| -rw-r--r-- | arch/xtensa/kernel/traps.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/xtensa/include/asm/traps.h b/arch/xtensa/include/asm/traps.h index bfdb0af61b07..514376eff58c 100644 --- 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 d6b1a0c3e319..95903f25e523 100644 --- 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) |