feat: update Orange Pi 5 Plus configurations and enhance virtualization handling (#81)

Author: YanLien

configs/vms/arceos-aarch64-orangepi5p-smp1.toml

@@ -20,11 +20,11 @@ phys_cpu_ids = [0x200]
 entry_point = 0x4008_0000
 # The location of image: "memory" | "fs".
 # Load from memory.
-image_location = "memory"
+image_location = "fs"
 # The load address of the kernel image.
 kernel_load_addr = 0x4008_0000
 ## The file path of the kernel image.
-kernel_path = "../images/orangepi_arceos/orangepi-5-plus"
+kernel_path = "/guest/arceos/orangepi-5-plus"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x4000_0000
 #dtb_path = "/path/arceos-rk3568.dtb"

configs/vms/linux-aarch64-orangepi5p-smp1.toml

@@ -20,19 +20,19 @@ phys_cpu_ids = [0x00]
 entry_point = 0x2_4008_0000
 # The location of image: "memory" | "fs".
 # Load from file system.
-image_location = "memory"
+image_location = "fs"
 # The load address of the kernel image.
 kernel_load_addr = 0x2_4008_0000
 ## The file path of the kernel image.
 # kernel_path = "/guest/orangepi-5-plus"
-kernel_path = "../images/orangepi_linux/orangepi-5-plus"
+kernel_path = "/guest/linux/orangepi-5-plus"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x2_4000_0000
 # dtb_path = "/path/to/axvisor/configs/vms/orangepi-5-plus-guest.dtb"
 
-# ramdisk_path = "/home/orangepi/initramfs.cpio"
-# # The load address of the ramdisk image (U-Boot ramdisk_addr_r).
-# ramdisk_load_addr = 0xc000_0000
+ramdisk_path = "/guest/linux/initramfs.cpio"
+# The load address of the ramdisk image (U-Boot ramdisk_addr_r).
+ramdisk_load_addr = 0xc000_0000
 
 # Memory regions with format (`base_paddr`, `size`, `flags`, `map_type`).
 # For `map_type`, 0 means `MAP_ALLOC`, 1 means `MAP_IDENTICAL`.

src/hal/mod.rs

@@ -122,8 +122,10 @@ pub(crate) fn enable_virtualization() {
 
     // Wait for all cores to enable virtualization.
     while CORES.load(Ordering::Acquire) != cpu_count {
-        // Use `yield_now` instead of `core::hint::spin_loop` to avoid deadlock.
         thread::yield_now();
+        for _ in 0..10 {
+            core::hint::spin_loop();
+        }
     }
 
     info!("All cores have enabled hardware virtualization support.");