srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

rv32/boot: remove hotswap 

Signed-off-by: occheung <dc@m-labs.hk>
This commit is contained in:
occheung 2021-07-15 15:41:36 +08:00
parent 82b4052cd6
commit 9aee42f0f2
1 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
artiq/firmware/libboard_misoc/riscv32imac/boot.rs
View File

@ -1,7 +1,6 @@
use super::{irq, cache}; use super::cache;
pub unsafe fn reset() -> ! { pub unsafe fn reset() -> ! {
irq::set_ie(false);
llvm_asm!(r#" llvm_asm!(r#"
j _reset_handler j _reset_handler
nop nop
@ -10,7 +9,6 @@ pub unsafe fn reset() -> ! {
} }
pub unsafe fn jump(addr: usize) -> ! { pub unsafe fn jump(addr: usize) -> ! {
irq::set_ie(false);
cache::flush_cpu_icache(); cache::flush_cpu_icache();
llvm_asm!(r#" llvm_asm!(r#"
jalr x0, 0($0) jalr x0, 0($0)
@ -18,31 +16,3 @@ pub unsafe fn jump(addr: usize) -> ! {
"# : : "r"(addr) : : "volatile"); "# : : "r"(addr) : : "volatile");
loop {} loop {}
} }
pub unsafe fn hotswap(firmware: &[u8]) -> ! {
irq::set_ie(false);
llvm_asm!(r#"
# This loop overwrites itself, but it's structured in such a way
# that before that happens, it loads itself into I$$ fully.
lui a1, %hi(_reset_handler)
ori a1, a1, %lo(_reset_handler)
or a4, a1, zero
0: bnez a2, 1f
nop
jr a4
nop
1: lw a3, 0(a0)
sw a3, 0(a1)
addi a0, a0, 4
addi a1, a1, 4
addi a2, a2, -4
bnez a2, 0b
nop
"#
:
: "{a0}"(firmware.as_ptr() as usize),
"{a2}"(firmware.len())
:
: "volatile");
loop {}
}