fix: argument 0 is hart id, argument 1 is opaque

Author: luojia65

rustsbi-qemu/src/execute.rs

@@ -10,8 +10,8 @@ use riscv::register::{
     scause::{Exception, Trap},
 };
 
-pub fn execute_supervisor(supervisor_mepc: usize, a0: usize, a1: usize, hsm: QemuHsm) -> ! {
-    let mut rt = Runtime::new_sbi_supervisor(supervisor_mepc, a0, a1);
+pub fn execute_supervisor(supervisor_mepc: usize, hart_id: usize, a1: usize, hsm: QemuHsm) -> ! {
+    let mut rt = Runtime::new_sbi_supervisor(supervisor_mepc, hart_id, a1);
     hsm.record_current_start_finished();
     loop {
         match Pin::new(&mut rt).resume(()) {
@@ -28,7 +28,8 @@ pub fn execute_supervisor(supervisor_mepc: usize, a0: usize, a1: usize, hsm: Qem
                         }
                         hsm.record_current_start_finished();
                         ctx.mstatus = riscv::register::mstatus::read(); // get from modified sstatus
-                        ctx.a0 = opaque;
+                        ctx.a0 = hart_id;
+                        ctx.a1 = opaque;
                         ctx.mepc = start_paddr;
                     }
                 } else {
@@ -67,14 +68,26 @@ pub fn execute_supervisor(supervisor_mepc: usize, a0: usize, a1: usize, hsm: Qem
                     hsm.record_current_stop_finished();
                     pause();
                     if let Some(HsmCommand::Start(start_paddr, opaque)) = hsm.last_command() {
+                        // Resuming from a non-retentive suspend state is relatively more involved and requires software
+                        // to restore various hart registers and CSRs for all privilege modes.
+                        // Upon resuming from non-retentive suspend state, the hart will jump to supervisor-mode at address
+                        // specified by `resume_addr` with specific registers values described in the table below:
+                        //
+                        // | Register Name | Register Value
+                        // |:--------------|:--------------
+                        // | `satp`        | 0
+                        // | `sstatus.SIE` | 0
+                        // | a0            | hartid
+                        // | a1            | `opaque` parameter
                         unsafe {
                             riscv::register::satp::write(0);
                             riscv::register::sstatus::clear_sie();
                         }
                         hsm.record_current_start_finished();
                         let ctx = rt.context_mut();
                         ctx.mstatus = riscv::register::mstatus::read(); // get from modified sstatus
-                        ctx.a0 = opaque;
+                        ctx.a0 = hart_id;
+                        ctx.a1 = opaque;
                         ctx.mepc = start_paddr;
                     }
                 }

rustsbi-qemu/src/qemu_hsm.rs

@@ -230,15 +230,6 @@ impl rustsbi::Hsm for QemuHsm {
             }
             // Resuming from a non-retentive suspend state is relatively more involved and requires software
             // to restore various hart registers and CSRs for all privilege modes.
-            // Upon resuming from non-retentive suspend state, the hart will jump to supervisor-mode at address
-            // specified by `resume_addr` with specific registers values described in the table below:
-            //
-            // | Register Name | Register Value
-            // |:--------------|:--------------
-            // | `satp`        | 0
-            // | `sstatus.SIE` | 0
-            // | a0            | hartid
-            // | a1            | `opaque` parameter
             SUSPEND_NON_RETENTIVE => {
                 // try to set current target hart state to stop pending
                 let hart_id = riscv::register::mhartid::read();

test-kernel/src/main.rs

@@ -74,8 +74,8 @@ pub extern "C" fn rust_main(hartid: usize, dtb_pa: usize) -> ! {
     }
 }
 
-extern "C" fn hart_2_resume(param: usize) {
-    println!("<< The parameter passed to hart 2 resume is: {:#x}", param);
+extern "C" fn hart_2_resume(hart_id: usize, param: usize) {
+    println!("<< The parameter passed to hart {} resume is: {:#x}", hart_id, param);
     let param = 0x12345678;
     println!(">> Start hart 3 with parameter {:#x}", param);
     /* start_addr should be physical address, and here pa == va */
@@ -84,8 +84,8 @@ extern "C" fn hart_2_resume(param: usize) {
     loop {} // wait for machine shutdown
 }
 
-extern "C" fn hart_3_start(param: usize) {
-    println!("<< The parameter passed to hart 3 start is: {:#x}", param);
+extern "C" fn hart_3_start(hart_id: usize, param: usize) {
+    println!("<< The parameter passed to hart {} start is: {:#x}", hart_id, param);
     println!("<< Test-kernel: All hart SBI test SUCCESS, shutdown");
     sbi::shutdown()
 }