x86_64 virtio:get irqnum support for x86_64 virtio dev

modules/axconfig/src/platform/pc-x86.toml

@@ -21,11 +21,10 @@ mmio-regions = [
     ["0xfec0_0000", "0x1000"],      # IO APIC
     ["0xfed0_0000", "0x1000"],      # HPET
     ["0xfee0_0000", "0x1000"],      # Local APIC
+    ["0xe_0000", "0x2_0000"],       # ACPI
 ]
 # VirtIO MMIO regions with format (`base_paddr`, `size`).
 virtio-mmio-regions = []
-# Base physical address of the PCIe ECAM space (should read from ACPI 'MCFG' table).
-pci-ecam-base = "0xb000_0000"
 # End PCI bus number.
 pci-bus-end = "0xff"
 # PCI device memory ranges (not used on x86).

modules/axdriver/src/bus/pci.rs

@@ -1,5 +1,5 @@
 use crate::{prelude::*, AllDevices};
-use axhal::mem::phys_to_virt;
+use axhal::mem::{phys_to_virt, PhysAddr};
 use driver_pci::{
     BarInfo, Cam, Command, DeviceFunction, HeaderType, MemoryBarType, PciRangeAllocator, PciRoot,
 };
@@ -84,7 +84,14 @@ fn config_pci_device(
 
 impl AllDevices {
     pub(crate) fn probe_bus_devices(&mut self) {
-        let base_vaddr = phys_to_virt(axconfig::PCI_ECAM_BASE.into());
+        cfg_if::cfg_if! {
+            if #[cfg(target_arch = "x86_64")] {
+                let pci_ecam_base = PhysAddr::from(axhal::get_ecam_address().unwrap() as usize);
+            } else {
+                let pci_ecam_base = axconfig::PCI_ECAM_BASE.into();
+            }
+        }
+        let base_vaddr = phys_to_virt(pci_ecam_base);
         let mut root = unsafe { PciRoot::new(base_vaddr.as_mut_ptr(), Cam::Ecam) };
 
         // PCI 32-bit MMIO space

modules/axhal/Cargo.toml

@@ -50,6 +50,8 @@ x86 = "0.52"
 x86_64 = "0.14"
 x2apic = "0.4"
 raw-cpuid = "11.0"
+acpi = "4.1.1"
+aml = "0.16.4"
 
 [target.'cfg(any(target_arch = "riscv32", target_arch = "riscv64"))'.dependencies]
 riscv = "0.10"

modules/axhal/src/arch/x86_64/mod.rs

@@ -14,6 +14,7 @@ use x86_64::instructions::interrupts;
 pub use self::context::{ExtendedState, FxsaveArea, TaskContext, TrapFrame};
 pub use self::gdt::GdtStruct;
 pub use self::idt::IdtStruct;
+pub use self::trap::{IRQ_VECTOR_END, IRQ_VECTOR_START};
 pub use x86_64::structures::tss::TaskStateSegment;
 
 /// Allows the current CPU to respond to interrupts.

modules/axhal/src/arch/x86_64/trap.rs

@@ -4,8 +4,10 @@ use super::context::TrapFrame;
 
 core::arch::global_asm!(include_str!("trap.S"));
 
-const IRQ_VECTOR_START: u8 = 0x20;
-const IRQ_VECTOR_END: u8 = 0xff;
+/// start value of irq vector
+pub const IRQ_VECTOR_START: u8 = 0x20;
+/// end value of irq vector
+pub const IRQ_VECTOR_END: u8 = 0xff;
 
 #[no_mangle]
 fn x86_trap_handler(tf: &mut TrapFrame) {

modules/axhal/src/lib.rs

@@ -77,3 +77,6 @@ pub use self::platform::platform_init;
 
 #[cfg(feature = "smp")]
 pub use self::platform::platform_init_secondary;
+
+#[cfg(target_arch = "x86_64")]
+pub use self::platform::acpi::get_ecam_address;