Merge pull request #205 from syswonder/dev

Merge new features to main for hvisor-v0.3 release

Author: Solicey

.gitignore

@@ -6,6 +6,9 @@
 /images/*
 /platform/*/*/image/kernel/*
 /platform/*/*/image/virtdisk/*
+/platform/*/*/image/bootloader/out
+/platform/*/*/image/iso/boot/kernel/*
+/platform/*/*/image/iso/boot/hvisor
 /tools/hvisor
 /tmp
 *.mod.[co]

Cargo.lock

@@ -23,7 +23,7 @@ heapless = { version = "0.8.0 "}
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
 aarch64-cpu = "9.4.0"
-psci = { version = "0.1.0", default-features = false, features = ["smc"]}
+psci = { version = "0.1.0", default-features = false, features = ["smc"] }
 
 [target.'cfg(target_arch = "riscv64")'.dependencies]
 sbi-rt = { version = "0.0.3", features = ["legacy"] }
@@ -38,10 +38,11 @@ riscv-pac = "0.2.0"
 loongArch64 = "0.2.5"
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
-x86 = "0.52.0"
+x86 = "=0.52.0"
 x86_64 = "=0.14.10"
-x2apic = "0.4.3"
-raw-cpuid = "10.7.0"
+x2apic = "=0.4.3"
+raw-cpuid = "=10.7.0"
+acpi = "=5.2.0"
 
 [features]
 ############# general ##############
@@ -60,6 +61,7 @@ imx_uart = []
 uart_16550 = []
 sifive_ccache = []
 eic7700_sysreg = []
+uart16550a = []
 
 ############## riscv64 #############
 # irqchip driver
@@ -80,6 +82,9 @@ loongson_uart = []
 loongson_3a5000 = []
 loongson_3a6000 = []
 
+############# x86_64 ###############
+graphics = []
+
 
 [profile.dev]
 # panic = "abort" # avoid cargo test failure, this is a bug of cargo

Cargo.toml

@@ -37,12 +37,43 @@
 		reg = <0x0 0x50000000 0x0 0x30000000>;
 	};
 
-	gic@8000000 {
+	intc@8000000 {
+		phandle = <0x01>;
+		interrupts = <0x01 0x09 0x04>;
+		reg = <0x00 0x8000000 0x00 0x10000 0x00 0x80a0000 0x00 0xf60000>;
+		#redistributor-regions = <0x01>;
 		compatible = "arm,gic-v3";
-		#interrupt-cells = <0x03>;
+		ranges;
+		#size-cells = <0x02>;
+		#address-cells = <0x02>;
 		interrupt-controller;
-		reg = <0x00 0x8000000 0x00 0x10000 0x00 0x80a0000 0x00 0xf60000>;
-		phandle = <0x01>;
+		#interrupt-cells = <0x03>;
+
+		its@8080000 {
+			phandle = <0x8006>;
+			reg = <0x00 0x8080000 0x00 0x20000>;
+			#msi-cells = <0x01>;
+			msi-controller;
+			compatible = "arm,gic-v3-its";
+		};
+	};
+
+	pcie@10000000 {
+		interrupt-map-mask = <0x1800 0x00 0x00 0x07>;
+		interrupt-map = <0x00 0x00 0x00 0x01 0x01 0x00 0x00 0x00 0x03 0x04 0x00 0x00 0x00 0x02 0x01 0x00 0x00 0x00 0x04 0x04 0x00 0x00 0x00 0x03 0x01 0x00 0x00 0x00 0x05 0x04 0x00 0x00 0x00 0x04 0x01 0x00 0x00 0x00 0x06 0x04 0x800 0x00 0x00 0x01 0x01 0x00 0x00 0x00 0x04 0x04 0x800 0x00 0x00 0x02 0x01 0x00 0x00 0x00 0x05 0x04 0x800 0x00 0x00 0x03 0x01 0x00 0x00 0x00 0x06 0x04 0x800 0x00 0x00 0x04 0x01 0x00 0x00 0x00 0x03 0x04 0x1000 0x00 0x00 0x01 0x01 0x00 0x00 0x00 0x05 0x04 0x1000 0x00 0x00 0x02 0x01 0x00 0x00 0x00 0x06 0x04 0x1000 0x00 0x00 0x03 0x01 0x00 0x00 0x00 0x03 0x04 0x1000 0x00 0x00 0x04 0x01 0x00 0x00 0x00 0x04 0x04 0x1800 0x00 0x00 0x01 0x01 0x00 0x00 0x00 0x06 0x04 0x1800 0x00 0x00 0x02 0x01 0x00 0x00 0x00 0x03 0x04 0x1800 0x00 0x00 0x03 0x01 0x00 0x00 0x00 0x04 0x04 0x1800 0x00 0x00 0x04 0x01 0x00 0x00 0x00 0x05 0x04>;
+		#interrupt-cells = <0x01>;
+		ranges = <0x1000000 0x00 0x00 0x00 0x3eff0000 0x00 0x10000
+		0x2000000 0x00 0x10000000 0x00 0x10000000 0x00 0x2eff0000
+		0x3000000 0x80 0x00 0x80 0x00 0x80 0x00>;
+		reg = <0x40 0x10000000 0x00 0x10000000>;
+		msi-map = <0x00 0x8006 0x00 0x10000>;
+		dma-coherent;
+		bus-range = <0x00 0xff>;
+		linux,pci-domain = <0x00>;
+		#size-cells = <0x02>;
+		#address-cells = <0x03>;
+		device_type = "pci";
+		compatible = "pci-host-ecam-generic";
 	};
 
 	apb-pclk {