diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2021-07-26 16:25:28 +0200 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2021-10-19 07:19:35 +0200 |
| commit | 09af39f649dac66c2681ca53977275fe876690cc (patch) | |
| tree | 07db54073ea470f28a96ece0b383a836a20b2c81 | |
| parent | xtensa: implement call0 ABI support in assembly (diff) | |
| download | linux-09af39f649dac66c2681ca53977275fe876690cc.tar.xz linux-09af39f649dac66c2681ca53977275fe876690cc.zip | |
xtensa: use register window specific opcodes only when present
xtensa core may be configured without register windows support, don't
use register window specific opcodes in that case. Use window register
specific opcodes to initialize hardware or reset core to a known state
regardless of the chosen ABI.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
| -rw-r--r-- | arch/xtensa/boot/boot-elf/bootstrap.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/boot/boot-redboot/bootstrap.S | 4 | ||||
| -rw-r--r-- | arch/xtensa/kernel/align.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/kernel/head.S | 2 |
5 files changed, 10 insertions, 2 deletions
diff --git a/arch/xtensa/boot/boot-elf/bootstrap.S b/arch/xtensa/boot/boot-elf/bootstrap.S index 99e98c9bae41..2dd28931d699 100644 --- a/arch/xtensa/boot/boot-elf/bootstrap.S +++ b/arch/xtensa/boot/boot-elf/bootstrap.S @@ -42,12 +42,14 @@ _bootparam: .align 4 _SetupMMU: +#if XCHAL_HAVE_WINDOWED movi a0, 0 wsr a0, windowbase rsync movi a0, 1 wsr a0, windowstart rsync +#endif movi a0, 0x1F wsr a0, ps rsync diff --git a/arch/xtensa/boot/boot-redboot/bootstrap.S b/arch/xtensa/boot/boot-redboot/bootstrap.S index 51e8f3b88e82..3ed94ad35000 100644 --- a/arch/xtensa/boot/boot-redboot/bootstrap.S +++ b/arch/xtensa/boot/boot-redboot/bootstrap.S @@ -56,13 +56,13 @@ _start: movi a4, 1 wsr a4, ps rsync - +#if XCHAL_HAVE_WINDOWED rsr a5, windowbase ssl a5 sll a4, a4 wsr a4, windowstart rsync - +#endif movi a4, KERNEL_PS_WOE_MASK wsr a4, ps rsync diff --git a/arch/xtensa/kernel/align.S b/arch/xtensa/kernel/align.S index 9301452e521e..d062c732ef18 100644 --- a/arch/xtensa/kernel/align.S +++ b/arch/xtensa/kernel/align.S @@ -58,7 +58,9 @@ * BE shift left / mask 0 0 X X */ +#if XCHAL_HAVE_WINDOWED #define UNALIGNED_USER_EXCEPTION +#endif #if XCHAL_HAVE_BE diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S index a144b467c3fd..8029ce24af92 100644 --- a/arch/xtensa/kernel/entry.S +++ b/arch/xtensa/kernel/entry.S @@ -940,12 +940,14 @@ unrecoverable_text: ENTRY(unrecoverable_exception) +#if XCHAL_HAVE_WINDOWED movi a0, 1 movi a1, 0 wsr a0, windowstart wsr a1, windowbase rsync +#endif movi a1, KERNEL_PS_WOE_MASK | LOCKLEVEL wsr a1, ps diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S index 8972d64e0b86..8484294bc623 100644 --- a/arch/xtensa/kernel/head.S +++ b/arch/xtensa/kernel/head.S @@ -67,11 +67,13 @@ _SetupOCD: * xt-gdb to single step via DEBUG exceptions received directly * by ocd. */ +#if XCHAL_HAVE_WINDOWED movi a1, 1 movi a0, 0 wsr a1, windowstart wsr a0, windowbase rsync +#endif movi a1, LOCKLEVEL wsr a1, ps |