fix: 正确实现 timer interrupt delegate

Signed-off-by: YdrMaster <ydrml@hotmail.com>

Author: YdrMaster

rustsbi-qemu/src/clint.rs

@@ -55,6 +55,8 @@ impl Timer for Clint {
     #[inline]
     fn set_timer(&self, time_value: u64) {
         unsafe {
+            riscv::register::mip::clear_stimer();
+            riscv::register::mie::set_mtimer();
             ((self.base as *mut u8).offset(0x4000) as *mut u64)
                 .add(hart_id())
                 .write_volatile(time_value);

test-kernel/src/main.rs

@@ -6,7 +6,7 @@
 
 use core::arch::asm;
 use riscv::register::{
-    scause::Trap,
+    scause::{Interrupt, Trap},
     sepc,
     stvec::{self, TrapMode},
 };
@@ -84,7 +84,10 @@ extern "C" fn primary_rust_main(hartid: usize, dtb_pa: usize) -> ! {
     test::sbi_ins_emulation();
 
     unsafe { stvec::write(start_trap as usize, TrapMode::Direct) };
-    test::trap_delegate(hartid);
+    test::trap_execption_delegate(hartid);
+
+    unsafe { riscv::register::sstatus::set_sie() };
+    test::trap_interrupt_delegate(hartid);
 
     test::hsm(hartid, smp);
 
@@ -97,9 +100,16 @@ extern "C" fn rust_trap_exception(trap_frame: &mut TrapFrame) {
 
     let cause = scause::read().cause();
     let expected = unsafe { core::mem::take(&mut EXPECTED[trap_frame.tp]) };
-
     if Some(cause) == expected {
-        sepc::write(sepc::read().wrapping_add(4));
+        match cause {
+            Trap::Exception(_) => {
+                sepc::write(sepc::read().wrapping_add(4));
+            }
+            Trap::Interrupt(Interrupt::SupervisorTimer) => {
+                sbi_rt::set_timer(u64::MAX);
+            }
+            _ => {}
+        }
     } else {
         panic!("[test-kernel] SBI test FAILED due to unexpected trap {cause:?}");
     }

test-kernel/src/test.rs

@@ -1,4 +1,6 @@
-pub(crate) fn base_extension() {
+use crate::EXPECTED;
+
+pub(crate) fn base_extension() {
     println!(
         "
 [test-kernel] Testing base extension"
@@ -55,8 +57,7 @@ pub(crate) fn sbi_ins_emulation() {
     }
 }
 
-pub(crate) fn trap_delegate(hartid: usize) {
-    use crate::EXPECTED;
+pub(crate) fn trap_execption_delegate(hartid: usize) {
     use core::arch::asm;
     use riscv::register::scause::{Exception, Trap};
 
@@ -78,6 +79,31 @@ pub(crate) fn trap_delegate(hartid: usize) {
     );
 }
 
+pub(crate) fn trap_interrupt_delegate(hartid: usize) {
+    use core::arch::asm;
+    use riscv::register::{
+        scause::{Interrupt, Trap},
+        sie, time,
+    };
+
+    println!(
+        "
+[test-kernel] Testing trap delegate
+[test-kernel] Set timer +1s"
+    );
+    unsafe {
+        sie::set_stimer();
+        EXPECTED[hartid] = Some(Trap::Interrupt(Interrupt::SupervisorTimer));
+    }
+    sbi_rt::set_timer(time::read64() + (10 << 20));
+
+    unsafe { riscv::asm::wfi() };
+    println!(
+        "\
+[test-kernel] Timer interrupt delegate success"
+    );
+}
+
 /// 所有副核：启动 -> 不可恢复休眠 -> 唤醒 -> 可恢复休眠 -> 唤醒 -> 关闭。
 pub(crate) fn hsm(hartid: usize, smp: usize) {
     use sbi_rt::SbiRet;