Merge pull request arceos-hypervisor#20 from arceos-hypervisor/guoweikang/adapt_axdevice

buhenxihuan · web-flow · commit 80233f479f90 · 2024-09-04T10:03:53.000+08:00
axvm to support axdevice
diff --git a/arceos-vmm/configs/arceos-aarch64.toml b/arceos-vmm/configs/arceos-aarch64.toml
@@ -16,4 +16,9 @@ memory_regions = [
     [0x900_0000, 0x1000, 0x17],       # pl011 (Uart)	4K  0b10111 R|W|DEVICE
     [0x901_0000, 0x1000, 0x17],       # pl031 (timer)	4K  0b10111 R|W|DEVICE
     [0xfed0_0000, 0x1000, 0x17],      # HPET 		    4K  0b10111 R|W|DEVICE
-]
+]
+
+# Emu_devices
+# Name Base-Ipa Ipa_len Alloc-Irq Emu-Type EmuConfig
+emu_devices = [
+]
diff --git a/arceos-vmm/configs/arceos-riscv64.toml b/arceos-vmm/configs/arceos-riscv64.toml
@@ -11,3 +11,8 @@ memory_regions = [
     [0x0c00_0000, 0x21_0000, 0x13], # PLIC  0x21_0000	0b10011 R|W|DEVICE
     [0x1000_0000, 0x1000, 0x13],    # UART	     4K	0b10011 R|W|DEVICE
 ]
+
+# Emu_devices
+# Name Base-Ipa Ipa_len Alloc-Irq Emu-Type EmuConfig
+emu_devices = [
+]
diff --git a/arceos-vmm/configs/arceos-x86_64.toml b/arceos-vmm/configs/arceos-x86_64.toml
@@ -16,4 +16,9 @@ memory_regions = [
     [0xfec0_0000, 0x1000, 0x17],      # IO APIC		4K	0b10111
     [0xfee0_0000, 0x1000, 0x17],      # Local APIC	4K	0b10111
     [0xfed0_0000, 0x1000, 0x17],      # HPET 		4K  0b10111
-]
+]
+
+# Emu_devices
+# Name Base-Ipa Ipa_len Alloc-Irq Emu-Type EmuConfig
+emu_devices = [
+]
diff --git a/arceos-vmm/configs/nimbos-aarch64.toml b/arceos-vmm/configs/nimbos-aarch64.toml
@@ -13,9 +13,14 @@ kernel_load_addr = 0x4008_0000
 # Memory regions with format (`base_paddr`, `size`, `flags`).
 memory_regions = [
     [0x4000_0000, 0x100_0000, 0x7],   # Low RAM		    16M 0b00111 R|W|EXECUTE
-    [0x800_0000, 0x10_000, 0x17],     # intc 		    4K  0b10111 R|W|DEVICE
     [0x801_0000, 0x10_000, 0x17],     # intc 		    4K  0b10111 R|W|DEVICE
     [0x900_0000, 0x1000, 0x17],       # pl011 (Uart)	4K  0b10111 R|W|DEVICE
     [0x901_0000, 0x1000, 0x17],       # pl031 (timer)	4K  0b10111 R|W|DEVICE
     [0xfed0_0000, 0x1000, 0x17],      # HPET 		    4K  0b10111 R|W|DEVICE
-]
+]
+
+# Emu_devices
+# Name Base-Ipa Ipa_len Alloc-Irq Emu-Type EmuConfig
+emu_devices = [
+    #["vgicd-v2", 0x800_0000, 0x10_000, 25, 1, [2]] # Vgicdv2  4k irq-25 EmuDeviceTGicdV2  config: vcpu_num
+]
diff --git a/arceos-vmm/configs/nimbos-riscv64.toml b/arceos-vmm/configs/nimbos-riscv64.toml
@@ -15,4 +15,9 @@ memory_regions = [
     [0x9000_0000, 0x100_0000, 0xf],  # Low RAM		16M	0b1111  R|W|EXECUTE|U
     [0x0c00_0000, 0x21_0000, 0x13],   # PLIC  0x21_0000	0b10011 R|W|DEVICE
     [0x1000_0000, 0x1000, 0x13],      # UART	     4K	0b10011 R|W|DEVICE
-]
+]
+
+# Emu_devices
+# Name Base-Ipa Ipa_len Alloc-Irq Emu-Type EmuConfig
+emu_devices = [
+]
diff --git a/arceos-vmm/configs/nimbos-x86_64.toml b/arceos-vmm/configs/nimbos-x86_64.toml
@@ -16,4 +16,9 @@ memory_regions = [
     [0xfec0_0000, 0x1000, 0x17],      # IO APIC		4K	0b10111 R|W|DEVICE
     [0xfee0_0000, 0x1000, 0x17],      # Local APIC	4K	0b10111 R|W|DEVICE
     [0xfed0_0000, 0x1000, 0x17],      # HPET 		4K  0b10111 R|W|DEVICE
-]
+]
+
+# Emu_devices
+# Name Base-Ipa Ipa_len Alloc-Irq Emu-Type EmuConfig
+emu_devices = [
+]

Original file line number	Diff line number	Diff line change
`@@ -11,3 +11,8 @@ memory_regions = [`
`11`	`11`	`[0x0c00_0000, 0x21_0000, 0x13], # PLIC 0x21_0000 0b10011 R\|W\|DEVICE`
`12`	`12`	`[0x1000_0000, 0x1000, 0x13], # UART 4K 0b10011 R\|W\|DEVICE`
`13`	`13`	`]`
	`14`	`+`
	`15`	`+# Emu_devices`
	`16`	`+# Name Base-Ipa Ipa_len Alloc-Irq Emu-Type EmuConfig`
	`17`	`+emu_devices = [`
	`18`	`+]`