fix use qemu-5.2.0 interrupt issue

Author: QQxiaoming

os/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-riscv = { git = "https://github.com/rcore-os/riscv", features = ["inline-asm"] }
+riscv = { git = "https://github.com/rcore-os/riscv", rev = "21e32ee" }
 spin = "0.5.2"
 buddy_system_allocator = "0.3"
 xmas-elf = "0.6"

os/Makefile

@@ -34,6 +34,6 @@ qemu: build
 		-machine virt \
 		-nographic \
 		-bios default \
-		-device loader,file=$(bin),addr=0x80200000
+		-kernel $(bin)
 
 run: build qemu

os/src/interrupt.rs

@@ -32,9 +32,14 @@ pub fn init() {
 }
 
 pub unsafe fn init_external_interrupt() {
+    let hart0_s_mode_interrupt_mth: *mut u32 = access_pa_via_va(0x0c20_1000) as *mut u32;
+    hart0_s_mode_interrupt_mth.write_volatile(0);
+
+    let hart0_s_mode_interrupt_priority_serial_irq: *mut u32 = access_pa_via_va(0x0c00_0000+4*0xa) as *mut u32;
+    hart0_s_mode_interrupt_priority_serial_irq.write_volatile(1);
+
     let hart0_s_mode_interrupt_enables: *mut u32 = access_pa_via_va(0x0c00_2080) as *mut u32;
-    const SERIAL: u32 = 0xa;
-    hart0_s_mode_interrupt_enables.write_volatile(1 << SERIAL);
+    hart0_s_mode_interrupt_enables.write_volatile(1 << 0xa);
 }
 
 pub unsafe fn enable_serial_interrupt() {

os/src/memory/mod.rs

@@ -55,8 +55,8 @@ pub fn kernel_remap() {
         None,
     );
     memory_set.push(
-        access_pa_via_va(0x0c00_2000),
-        access_pa_via_va(0x0c00_3000),
+        access_pa_via_va(0x0c00_0000),
+        access_pa_via_va(0x0c20_2000),
         MemoryAttr::default(),
         Linear::new(PHYSICAL_MEMORY_OFFSET),
         None,