Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

firmware: fw_base.S: Remove _relocate_lottery

Browse Source 
Remove _relocate_lottery and use _boot_status instead.

Signed-off-by: Xiang W <wxjstz@126.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Xiang W
2024-03-04 20:15:51 +08:00
committed by Anup Patel
parent 187397fd65
commit 8151105af5
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
firmware/fw_base.S
View File

@@ -14,8 +14,9 @@
#include <sbi/sbi_scratch.h> #include <sbi/sbi_scratch.h>
#include <sbi/sbi_trap.h> #include <sbi/sbi_trap.h>
#define BOOT_STATUS_RELOCATE_DONE 1 #define BOOT_STATUS_LOTTERY_DONE 1
#define BOOT_STATUS_BOOT_HART_DONE 2 #define BOOT_STATUS_RELOCATE_DONE 2
#define BOOT_STATUS_BOOT_HART_DONE 3
.macro MOV_3R __d0, __s0, __d1, __s1, __d2, __s2 .macro MOV_3R __d0, __s0, __d1, __s1, __d2, __s2
add \__d0, \__s0, zero add \__d0, \__s0, zero
@@ -58,9 +59,9 @@ _start:
bne a0, a6, _wait_relocate_copy_done bne a0, a6, _wait_relocate_copy_done
_try_lottery: _try_lottery:
/* Jump to relocation wait loop if we don't get relocation lottery */ /* Jump to relocation wait loop if we don't get relocation lottery */
lla a6, _relocate_lottery lla a6, _boot_status
li a7, 1 li a7, BOOT_STATUS_LOTTERY_DONE
amoadd.w a6, a7, (a6) amoswap.w a6, a7, (a6)
bnez a6, _wait_relocate_copy_done bnez a6, _wait_relocate_copy_done
#ifdef FW_PIC #ifdef FW_PIC
@@ -101,8 +102,6 @@ _relocate:
blt t2, t0, _relocate_copy_to_upper blt t2, t0, _relocate_copy_to_upper
_relocate_copy_to_lower: _relocate_copy_to_lower:
ble t1, t2, _relocate_copy_to_lower_loop ble t1, t2, _relocate_copy_to_lower_loop
lla t3, _relocate_lottery
BRANGE t2, t1, t3, _start_hang
lla t3, _boot_status lla t3, _boot_status
BRANGE t2, t1, t3, _start_hang BRANGE t2, t1, t3, _start_hang
lla t3, _relocate lla t3, _relocate
@@ -119,8 +118,6 @@ _relocate_copy_to_lower_loop:
jr t4 jr t4
_relocate_copy_to_upper: _relocate_copy_to_upper:
ble t3, t0, _relocate_copy_to_upper_loop ble t3, t0, _relocate_copy_to_upper_loop
lla t2, _relocate_lottery
BRANGE t0, t3, t2, _start_hang
lla t2, _boot_status lla t2, _boot_status
BRANGE t0, t3, t2, _start_hang BRANGE t0, t3, t2, _start_hang
lla t2, _relocate lla t2, _relocate
@@ -474,8 +471,6 @@ _skip_trap_handler_rv32_hyp:
.data .data
.align 3 .align 3
_relocate_lottery:
RISCV_PTR 0
_boot_status: _boot_status:
RISCV_PTR 0 RISCV_PTR 0