fix: 识别 qemu7.2 设备树里的 serial 节点

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

Author: YdrMaster

Cargo.lock

@@ -9,6 +9,6 @@ publish = false
 
 [dependencies]
 sbi-rt = "0.0.2"
-riscv = "0.9.0"
+riscv = "0.10.1"
 uart_16550 = "0.2"
 rcore-console = "0.0.0"

bench-kernel/Cargo.toml

@@ -19,7 +19,7 @@ edition = "2021"
 [dependencies]
 rustsbi = "0.3.0"
 sbi-spec = { version = "0.0.4", features = ["legacy"] }
-riscv = "0.9.0"
+riscv = "0.10.1"
 spin = "0.9"
 uart_16550 = "0.2"
 rcore-console = "0.0.0"

rustsbi-qemu/Cargo.toml

@@ -32,6 +32,7 @@ pub(crate) fn parse(opaque: usize) -> BoardInfo {
     const MEMORY: &str = "memory";
     const SOC: &str = "soc";
     const UART: &str = "uart";
+    const SERIAL: &str = "serial";
     const TEST: &str = "test";
     const CLINT: &str = "clint";
 
@@ -61,7 +62,11 @@ pub(crate) fn parse(opaque: usize) -> BoardInfo {
                     StepOver
                 }
             } else if current == Str::from(SOC) {
-                if name.starts_with(UART) || name.starts_with(TEST) || name.starts_with(CLINT) {
+                if name.starts_with(UART)
+                    || name.starts_with(SERIAL)
+                    || name.starts_with(TEST)
+                    || name.starts_with(CLINT)
+                {
                     StepInto
                 } else {
                     StepOver
@@ -80,7 +85,7 @@ pub(crate) fn parse(opaque: usize) -> BoardInfo {
         }
         DtbObj::Property(Property::Reg(mut reg)) => {
             let node = ctx.name();
-            if node.starts_with(UART) {
+            if node.starts_with(UART) || node.starts_with(SERIAL) {
                 ans.uart = reg.next().unwrap();
                 StepOut
             } else if node.starts_with(TEST) {

rustsbi-qemu/src/device_tree.rs

@@ -10,7 +10,7 @@ publish = false
 [dependencies]
 sbi-testing = { version = "0.0.1", features = ["log"] }
 log = "0.4.17"
-riscv = "0.9.0"
+riscv = "0.10.1"
 spin = "0.9"
 uart_16550 = "0.2"
 rcore-console = "0.0.0"

test-kernel/Cargo.toml

@@ -121,14 +121,16 @@ impl BoardInfo {
                 } else if ctx.name() == Str::from("cpus") && name.starts_with("cpu@") {
                     ans.smp += 1;
                     StepOver
-                } else if ctx.name() == Str::from("soc") && name.starts_with("uart") {
+                } else if ctx.name() == Str::from("soc")
+                    && (name.starts_with("uart") || name.starts_with("serial"))
+                {
                     StepInto
                 } else {
                     StepOver
                 }
             }
             DtbObj::Property(Property::Reg(mut reg)) => {
-                if ctx.name().starts_with("uart") {
+                if ctx.name().starts_with("uart") || ctx.name().starts_with("serial") {
                     ans.uart = reg.next().unwrap().start;
                 }
                 StepOut

test-kernel/src/main.rs

@@ -9,6 +9,6 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "4.0", features = ["derive"] }
+clap = { version = "4.1", features = ["derive"] }
 os-xtask-utils = "0.0.0"
-once_cell = "1.16"
+once_cell = "1.17"