Skip to contentSkip to conversation

riscv/purgatory: align riscv_kernel_entry

PATCH Applied Daniel Maslowski 2 participants 2 messages Jul 19, 2024 – Aug 1, 2024 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 riscv/purgatory: align riscv_kernel_entry

When alignment handling is delegated to the kernel, everything must be word-aligned in purgatory, since the trap handler is then set to the kexec one. Without the alignment, hitting the exception would ultimately crash. On other occasions, the kernel's handler would take care of exceptions.
This has been tested on a JH7110 SoC with oreboot and its SBI delegating unaligned access exceptions and the kernel configured to handle them.

Fixes 736e30af583fb ("RISC-V: Add purgatory")
---
 arch/riscv/purgatory/entry.S | 2 ++
 1 file changed, 2 insertions(+)
arch/riscv/purgatory/entry.S +2 -0
index 5bcf3af903da..0e6ca6d5ae4b 100644
@@ -7,6 +7,7 @@
  * Author: Li Zhengyu ([email protected])
  *
  */
+#include <asm/asm.h>
 #include <linux/linkage.h>
 
 .text
@@ -34,6 +35,7 @@ SYM_CODE_END(purgatory_start)
 
 .data
 
+.align LGREG
 SYM_DATA(riscv_kernel_entry, .quad 0)
 
 .end
Signature · 7 lines
2.45.2


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
#1 lore raw
This patch was applied to riscv/linux.git (fixes) by Palmer Dabbelt <[email protected]>:

Hello:

This patch was applied to riscv/linux.git (fixes)
by Palmer Dabbelt <[email protected]>:

Quoted 9 lines · On Fri, 19 Jul 2024 19:04:37 +0200 you wrote:

When alignment handling is delegated to the kernel, everything must be word-aligned in purgatory, since the trap handler is then set to the kexec one. Without the alignment, hitting the exception would ultimately crash. On other occasions, the kernel's handler would take care of exceptions.
This has been tested on a JH7110 SoC with oreboot and its SBI delegating unaligned access exceptions and the kernel configured to handle them.

[...]

Here is the summary with links:
- [v3] riscv/purgatory: align riscv_kernel_entry

    https://git.kernel.org/riscv/c/fb197c5d2fd2

You are awesome, thank you!

Signature · 9 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv