From 2ca679aecabb151935d4af44571622a2d383e102 Mon Sep 17 00:00:00 2001
From: Travis Geiselbrecht <travisg@gmail.com>
Date: Thu, 14 Nov 2024 19:33:46 -0800
Subject: [PATCH] [arch][riscv][asm] use the call pseudoinstruction instead of
 jal

This fixes a problem if the text segment gets larger than ~1MB where the
raw jal instruction cannot reach. Using 'call' or 'tail' allows the
assembler to emit a 2 instruction sequence that the linker later
relaxes if it can.
---
 arch/riscv/asm.S   |  4 ++--
 arch/riscv/start.S | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/riscv/asm.S b/arch/riscv/asm.S
index 1617ba028..18c6ec19d 100644
--- a/arch/riscv/asm.S
+++ b/arch/riscv/asm.S
@@ -156,7 +156,7 @@ LOCAL_FUNCTION(kernel_exception_entry)
 
     // bool kernel = true
     li     a3, 1
-    jal    riscv_exception_handler
+    call   riscv_exception_handler
 
     restore_regs 0
 
@@ -169,7 +169,7 @@ LOCAL_FUNCTION(user_exception_entry)
 
     // bool kernel = false
     li     a3, 0
-    jal    riscv_exception_handler
+    call   riscv_exception_handler
 
     restore_regs 1
 
diff --git a/arch/riscv/start.S b/arch/riscv/start.S
index 2394a62c5..734cfd8cd 100644
--- a/arch/riscv/start.S
+++ b/arch/riscv/start.S
@@ -85,7 +85,7 @@ FUNCTION(_start)
 #endif
 
 #if RISCV_MMU
-    jal     _mmu_init
+    call    _mmu_init
 #endif
 
 #if WITH_SMP
@@ -102,14 +102,14 @@ FUNCTION(_start)
     mv      s1, a1
     mv      s2, a2
     mv      s3, a3
-    jal     riscv_configure_percpu_early
+    call    riscv_configure_percpu_early
     mv      a0, s0
     mv      a1, s1
     mv      a2, s2
     mv      a3, s3
 
     // call main
-    jal     lk_main
+    call    lk_main
 
     // should never return here
     j       .
@@ -127,17 +127,17 @@ LOCAL_FUNCTION(secondary_trap)
 
 #if RISCV_MMU
     // enable the mmu on this core
-    jal     .Lenable_mmu
+    call    .Lenable_mmu
 #endif
 
     // a0 == hart id
     // a2 == assigned cpu id (may not be the same)
 
     // set the per cpu structure before getting into the secondary boot path
-    jal     riscv_configure_percpu_early
+    call    riscv_configure_percpu_early
 
     // bootstrap the secondary cpus
-    jal     riscv_secondary_entry
+    call    riscv_secondary_entry
 #endif
     // fallthrough if either no SMP or riscv_secondary_entry returns
 END_FUNCTION(secondary_trap)