address more review comments

Author: m4tx

linker/qemu.ld

@@ -1,16 +1,10 @@
 MEMORY
 {
 	image : ORIGIN = 0x40080000, LENGTH = 4M
-	heap (rw) : ORIGIN = 0x40400000, LENGTH = 4M
-	payload (rwx) : ORIGIN = 0x40800000, LENGTH = 64M
+	payload (rwx) : ORIGIN = 0x40400000, LENGTH = 64M
 }
 
 SECTIONS {
-     .heap :
-	 {
-       *(.heap);
-       . = ALIGN(4);
-     } > heap
 	.payload :
 	{
        *(.payload);

src/hypervisor.rs

@@ -73,12 +73,6 @@ pub unsafe fn entry_point_el1(arg0: u64, arg1: u64, arg2: u64, arg3: u64, entry_
         arch::elr_el2::write(entry_point);
     }
 
-    // Set stack pointer for EL1
-    // SAFETY: We only affect EL1.
-    unsafe {
-        arch::sp_el1::write(arch::sp());
-    }
-
     // SAFETY: The caller ensures that the provided arguments are valid and that this is called
     // from EL2. We've set the `elr_el2` system register right before calling this, and the caller
     // ensured that the value we've set is a valid address for EL1 execution that never returns.
@@ -181,10 +175,6 @@ unsafe fn handle_psci(fn_id: u64, arg0: u64, arg1: u64, arg2: u64) -> Result<u64
 
     let psci_fn = arm_psci::Function::try_from(&[fn_id, arg0, arg1, arg2])?;
     match psci_fn {
-        CpuSuspend { state, entry } => {
-            let result = psci_cpu_suspend(state, entry);
-            Ok(result)
-        }
         Version
         | CpuOff
         | AffinityInfo { .. }
@@ -205,6 +195,7 @@ unsafe fn handle_psci(fn_id: u64, arg0: u64, arg1: u64, arg2: u64) -> Result<u64
         | SetSuspendMode { .. }
         | StatResidency { .. }
         | StatCount { .. } => {
+            // forward the PSCI call
             let mut smc_args = [0; 17];
             smc_args[0] = arg0;
             smc_args[1] = arg1;
@@ -220,6 +211,10 @@ unsafe fn handle_psci(fn_id: u64, arg0: u64, arg1: u64, arg2: u64) -> Result<u64
             let result = psci_cpu_on(fn_id, target_cpu, entry);
             Ok(u64::from(i32::from(result).cast_unsigned()))
         }
+        CpuSuspend { state, entry } => {
+            let result = psci_cpu_suspend(state, entry);
+            Ok(result)
+        }
     }
 }
 

src/main.rs

@@ -37,7 +37,6 @@ use crate::{
 const LOG_LEVEL: LevelFilter = LevelFilter::Info;
 
 const HEAP_SIZE: usize = 40 * PAGE_SIZE;
-#[unsafe(link_section = ".heap")]
 static HEAP: SpinMutex<[u8; HEAP_SIZE]> = SpinMutex::new([0; HEAP_SIZE]);
 
 #[global_allocator]

src/platform/qemu.rs

@@ -82,14 +82,14 @@ impl Platform for Qemu {
         // will not try to use it.
         // See `linker/qemu.ld` for the address reference.
         let mut res = Vec::<u8>::new();
-        res.extend_from_slice(&0x4080_0000u64.to_be_bytes());
-        res.extend_from_slice(&(120u64 * 1024 * 1024).to_be_bytes()); // 128 MB default - 8 MB reserved
+        res.extend_from_slice(&0x4040_0000u64.to_be_bytes());
+        res.extend_from_slice(&(124u64 * 1024 * 1024).to_be_bytes()); // 128 MiB default - 4 MiB reserved
 
         dt.root_mut()
             .remove_child("memory@40000000")
             .expect("memory node not found");
         dt.root_mut().add_child(
-            DeviceTreeNode::builder("memory@40800000")
+            DeviceTreeNode::builder("memory@40400000")
                 .property(DeviceTreeProperty::new("reg", res))
                 .property(DeviceTreeProperty::new("device_type", b"memory\0"))
                 .build(),