andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-22 16:16:16 +04:00
Code Issues Projects Releases Wiki Activity

fix bugs on K210

Browse Source
This commit is contained in:
WangRunji 2018-12-27 21:33:55 +08:00
parent b3a8e95d78
commit daee1e9f94
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/src/arch/riscv32/board/k210/boot.asm
View File

@ -33,4 +33,6 @@ boot:
sw t0, 0(x1)
csrr a0, mhartid
// FIXME: enable core 1
li a2, 0 // hart_mask
j _start

6
kernel/src/arch/riscv32/cpu.rs
View File

@ -10,7 +10,10 @@ pub unsafe fn set_cpu_id(cpu_id: usize) {
pub fn id() -> usize {
let cpu_id;
#[cfg(not(feature = "m_mode"))]
unsafe { asm!("mv $0, tp" : "=r"(cpu_id)); }
#[cfg(feature = "m_mode")]
unsafe { asm!("csrr $0, mhartid" : "=r"(cpu_id)); }
cpu_id
}
@ -31,6 +34,5 @@ pub unsafe fn start_others(hart_mask: usize) {
}
pub fn halt() {
use riscv::asm::wfi;
unsafe { wfi() }
unsafe { riscv::asm::wfi() }
}

5
kernel/src/arch/riscv32/interrupt.rs
View File

@ -10,7 +10,7 @@ use riscv::register::{
sscratch as xscratch,
stvec as xtvec,
};
use riscv::register::{mcause, mepc, sie};
use riscv::register::{mcause, mepc, sie, mie};
pub use self::context::*;
use crate::memory::{MemorySet, InactivePageTable0};
use log::*;
@ -35,6 +35,9 @@ pub fn init() {
// Enable IPI
sie::set_ssoft();
// Enable serial interrupt
#[cfg(feature = "m_mode")]
mie::set_mext();
#[cfg(not(feature = "m_mode"))]
sie::set_sext();
// NOTE: In M-mode: mie.MSIE is set by BBL.
// mie.MEIE can not be set in QEMU v3.0

7
kernel/src/arch/riscv32/mod.rs
View File

@ -15,6 +15,8 @@ pub extern fn rust_main(hartid: usize, dtb: usize, hart_mask: usize, functions:
unsafe { cpu::set_cpu_id(hartid); }
if hartid != 0 {
#[cfg(feature = "board_k210")]
loop {} // K210: if not, an assert will fail in spin::RwLock ???
while unsafe { !cpu::has_started(hartid) } { }
println!("Hello RISCV! in hart {}, dtb @ {:#x}, functions @ {:#x}", hartid, dtb, functions);
others_main();
@ -28,16 +30,11 @@ pub extern fn rust_main(hartid: usize, dtb: usize, hart_mask: usize, functions:
crate::logging::init();
interrupt::init();
info!("interrupt::init end");
memory::init();
info!("memory::init end");
timer::init();
info!("timer::init end");
crate::process::init();
info!("crate::process::init end");
unsafe { cpu::start_others(hart_mask); }
info!("going to crate::kmain");
crate::kmain();
}