Update Cargo.toml and configuration files for ArceOS support; adjust dependencies and paths for modules

Author: YanLien

Cargo.lock

@@ -92,8 +92,7 @@ axvmconfig = {git = "https://github.com/arceos-hypervisor/axvmconfig.git", branc
 [patch.crates-io]
 axvmconfig = { path = "crates/axvmconfig" }
 axvisor_api = {path = "../axvisor_api"}
-# page_table_entry = { path = "../page_table_multiarch/page_table_entry" }
-# page_table_multiarch = { path = "../page_table_multiarch/page_table_multiarch", features = ["stage-2"]}
+# axvcpu = { path = "./crates/axvcpu" }
 
 [patch."https://github.com/arceos-hypervisor/axvmconfig.git"]
 axvmconfig = {path = "crates/axvmconfig"}

Cargo.toml

@@ -20,9 +20,9 @@ phys_cpu_ids = [0]
 entry_point = 0x8020_0000
 # The location of image: "memory" | "fs".
 # load from memory.
-image_location = "fs"
+image_location = "memory"
 # The file path of the kernel image.
-kernel_path = "/guest/helloworld_riscv64-qemu-virt.bin"
+kernel_path = "/path/tmp/images/helloworld_riscv64-qemu-virt.bin"
 # The load address of the kernel image.
 kernel_load_addr = 0x8020_0000
 # The file path of the device tree blob (DTB).
@@ -40,7 +40,7 @@ dtb_load_addr = 0x8220_0000
 # Memory regions with format (`base_paddr`, `size`, `flags`, `map_type`).
 # For `map_type`, 0 means `MAP_ALLOC`, 1 means `MAP_IDENTICAL`.
 memory_regions = [
-  [0x8000_0000, 0x4000_0000, 0x7, 1], # System RAM 1G MAP_ALLOC
+  [0x8000_0000, 0x800_0000, 0x7, 0], # System RAM 1G MAP_ALLOC
 ]
 
 #
@@ -49,7 +49,6 @@ memory_regions = [
 [devices]
 # Pass-through devices.
 passthrough_devices = [
-  ["/",],
 ]
 
 # Passthrough addresses.
@@ -60,7 +59,6 @@ passthrough_addresses = [
 
 # Devices that are not desired to be passed through to the guest
 excluded_devices = [
-    ["/pci@30000000"],
 ]
 
 # Emu_devices.

configs/vms/arceos-riscv64-qemu-smp1.toml

@@ -17,24 +17,24 @@ phys_cpu_ids = [0]
 #
 [kernel]
 # The entry point of the kernel image.
-entry_point = 0x8020_0000
+entry_point = 0x9000_0000
 # The location of image: "memory" | "fs".
 # load from memory.
-image_location = "fs"
+image_location = "memory"
 # The file path of the kernel image.
 # kernel_path = "linux-6.6.62.bin"
-kernel_path = "/guest/qemu-riscv64"
+kernel_path = "/path/tmp/images/qemu_riscv64_linux/qemu-riscv64"
 # The load address of the kernel image.
-kernel_load_addr = 0x8020_0000
+kernel_load_addr = 0x9000_0000
 # The file path of the device tree blob (DTB).
-dtb_path = "/guest/linux-aarch64-qemu-smp1.dtb"
+dtb_path = "/path/tmp/configs/linux-riscv64-qemu-smp1.dtb"
 # The load address of the device tree blob (DTB).
-dtb_load_addr = 0x8000_0000
+dtb_load_addr = 0x9200_0000
 
 # Memory regions with format (`base_paddr`, `size`, `flags`, `map_type`).
 # For `map_type`, 0 means `MAP_ALLOC`, 1 means `MAP_IDENTICAL`.
 memory_regions = [
-  [0x8000_0000, 0x1000_0000, 0x7, 1], # System RAM 1G MAP_IDENTICAL
+    [0x9000_0000, 0x4000_0000, 0x7, 2], # System RAM 1G MAP_IDENTICAL
 ]
 
 #
@@ -44,27 +44,24 @@ memory_regions = [
 # Pass-through devices.
 # Name Base-Ipa Base-Pa Length Alloc-Irq.
 passthrough_devices = [
-    ["/"],
-    #["/timer"],
+    # ["/soc/serial@10000000", 0x1000_0000, 0x1000_0000, 0x1000, 33],
 ]
 
 # Passthrough addresses.
 # Base-GPA  Length.
 passthrough_addresses = [
-    #[0x28041000, 0x100_0000]
+    [0x1000_0000, 0x1000],     # uart
+    [0x1000_1000, 0x8000],     # virtio-mmio
 ]
 
 # Devices that are not desired to be passed through to the guest
 excluded_devices = [
-   # ["/gic-v3"],
 ]
 
 # Emu_devices.
 # Name Base-Ipa Ipa_len Alloc-Irq Emu-Type EmuConfig.
 emu_devices = [
-  # ["gppt-gicd", 0x0800_0000, 0x1_0000, 0, 0x21, []],
-  # ["gppt-gicr", 0x080a_0000, 0x2_0000, 0, 0x20, [1, 0x2_0000, 0]], # 1 vcpu, stride 0x20000, starts with pcpu 0
-  # ["gppt-gits", 0x0808_0000, 0x2_0000, 0, 0x22, [0x0808_0000]], # host_gits_base
+    ["plic", 0x0c00_0000, 0x60_0000, 0, 0x30, [2]],     # [context_num]
 ]
 
 interrupt_mode = "passthrough"

configs/vms/linux-riscv64-qemu-smp1.toml

@@ -36,6 +36,7 @@ axhvc.workspace = true
 axruntime = {workspace = true, features = ["alloc", "irq", "paging", "smp", "multitask"]}
 axvcpu.workspace = true
 axvm.workspace = true
+axdriver.workspace = true
 
 # System independent crates provided by ArceOS, these crates could be imported by remote url. 
 axerrno.workspace = true
@@ -57,7 +58,6 @@ axdevice_base = "0.1"
 axvisor_api = "0.1"
 driver.workspace = true
 
-
 [target.'cfg(target_arch = "aarch64")'.dependencies]
 aarch64-cpu-ext = "0.1"
 arm-gic-driver = {version = "0.15.5", features = ["rdif"]}

kernel/Cargo.toml

@@ -40,7 +40,16 @@ pub mod devices {
     #[doc = " Timer interrupt num (PPI, physical timer)."]
     pub const TIMER_IRQ: usize = 0xf0;
     #[doc = " VirtIO MMIO regions with format (`base_paddr`, `size`)."]
-    pub const VIRTIO_MMIO_RANGES: &[(usize, usize)] = &[];
+    pub const VIRTIO_MMIO_RANGES: &[(usize, usize)] = &[
+        (0x1000_1000, 0x1000),
+        (0x1000_2000, 0x1000),
+        (0x1000_3000, 0x1000),
+        (0x1000_4000, 0x1000),
+        (0x1000_5000, 0x1000),
+        (0x1000_6000, 0x1000),
+        (0x1000_7000, 0x1000),
+        (0x1000_8000, 0x1000),
+    ];
 }
 #[doc = ""]
 #[doc = " Platform configs"]

modules/axconfig/src/lib.rs

@@ -128,7 +128,6 @@ pub fn rust_main(cpu_id: usize, arg: usize) -> ! {
     //     build_mode = {}\n\
     //     smp = {}\n\
     //     ",
-
     // );
     #[cfg(feature = "rtc")]
     ax_println!(

modules/axruntime/src/lib.rs

@@ -14,7 +14,7 @@ cpu-num = 4                         # uint
 # Base address of the whole physical memory.
 phys-memory-base = 0x8000_0000      # uint
 # Size of the whole physical memory. (8GB)
-phys-memory-size = 0x2_0000_0000    # uint
+phys-memory-size = 0x1_0000_0000    # uint
 # Base physical address of the kernel image.
 kernel-base-paddr = 0x8020_0000     # uint
 # Base virtual address of the kernel image.
@@ -44,6 +44,7 @@ mmio-ranges = [
     [0x1000_1000, 0x8000],          # VirtIO
     [0x3000_0000, 0x1000_0000],     # PCI config space
     [0x4000_0000, 0x4000_0000],     # PCI memory ranges (ranges 1: 32-bit MMIO space)
+    [0x2_7fe0_0000, 0x1000_0000]
 ]                                   # [(uint, uint)]
 # VirtIO MMIO ranges with format (`base_paddr`, `size`).
 virtio-mmio-ranges = [