Merge remote-tracking branch 'origin/main' into dyn

ZR233 · ZR233 · commit 2aab1527d5ba · 2025-06-24T16:20:52.000+08:00
diff --git a/axplat/src/mem.rs b/axplat/src/mem.rs
@@ -2,7 +2,7 @@
 
 use core::{fmt, ops::Range};
 
-use memory_addr::PhysAddr;
+use memory_addr::{PhysAddr, VirtAddr};
 
 bitflags::bitflags! {
     /// The flags of a physical memory region.
@@ -115,6 +115,12 @@ pub trait MemIf {
 
     /// Returns all device memory (MMIO) ranges on the platform.
     fn mmio_ranges() -> &'static [RawRange];
+
+    /// Translates a physical address to a virtual address.
+    fn phys_to_virt(paddr: PhysAddr) -> VirtAddr;
+
+    /// Translates a virtual address to a physical address.
+    fn virt_to_phys(vaddr: VirtAddr) -> PhysAddr;
 }
 
 /// Returns the total size of physical memory (RAM) on the platform.
diff --git a/platforms/axplat-aarch64-bsta1000b/src/mem.rs b/platforms/axplat-aarch64-bsta1000b/src/mem.rs
@@ -6,16 +6,10 @@ use crate::config::plat::{PHYS_MEMORY_BASE, PHYS_MEMORY_SIZE, PHYS_VIRT_OFFSET};
 
 struct MemIfImpl;
 
-#[allow(dead_code)]
-pub const fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
+pub(crate) const fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
     va!(paddr.as_usize() + PHYS_VIRT_OFFSET)
 }
 
-#[allow(dead_code)]
-pub const fn virt_to_phys(vaddr: VirtAddr) -> PhysAddr {
-    pa!(vaddr.as_usize() - PHYS_VIRT_OFFSET)
-}
-
 #[impl_plat_interface]
 impl MemIf for MemIfImpl {
     /// Returns all physical memory (RAM) ranges on the platform.
@@ -41,4 +35,14 @@ impl MemIf for MemIfImpl {
     fn mmio_ranges() -> &'static [RawRange] {
         &MMIO_RANGES
     }
+
+    /// Translates a physical address to a virtual address.
+    fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
+        phys_to_virt(paddr)
+    }
+
+    /// Translates a virtual address to a physical address.
+    fn virt_to_phys(vaddr: VirtAddr) -> PhysAddr {
+        pa!(vaddr.as_usize() - PHYS_VIRT_OFFSET)
+    }
 }
diff --git a/platforms/axplat-aarch64-bsta1000b/src/mp.rs b/platforms/axplat-aarch64-bsta1000b/src/mp.rs
@@ -1,5 +1,5 @@
 use crate::config::plat::CPU_ID_LIST;
-use crate::mem::virt_to_phys;
+use axplat::mem::virt_to_phys;
 use memory_addr::PhysAddr;
 
 /// Starts the given secondary CPU with its boot stack.
diff --git a/platforms/axplat-aarch64-phytium-pi/src/init.rs b/platforms/axplat-aarch64-phytium-pi/src/init.rs
@@ -2,7 +2,8 @@ use axplat::init::InitIf;
 
 #[allow(unused_imports)]
 use crate::config::devices::{GICC_PADDR, GICD_PADDR, TIMER_IRQ, UART_IRQ, UART_PADDR};
-use crate::{config::plat::PSCI_METHOD, mem::phys_to_virt};
+use crate::config::plat::PSCI_METHOD;
+use axplat::mem::phys_to_virt;
 
 struct InitIfImpl;
 
diff --git a/platforms/axplat-aarch64-phytium-pi/src/mem.rs b/platforms/axplat-aarch64-phytium-pi/src/mem.rs
@@ -6,15 +6,6 @@ use crate::config::plat::{PHYS_MEMORY_BASE, PHYS_MEMORY_SIZE, PHYS_VIRT_OFFSET};
 
 struct MemIfImpl;
 
-pub const fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
-    va!(paddr.as_usize() + PHYS_VIRT_OFFSET)
-}
-
-#[allow(dead_code)]
-pub const fn virt_to_phys(vaddr: VirtAddr) -> PhysAddr {
-    pa!(vaddr.as_usize() - PHYS_VIRT_OFFSET)
-}
-
 #[impl_plat_interface]
 impl MemIf for MemIfImpl {
     /// Returns all physical memory (RAM) ranges on the platform.
@@ -40,4 +31,14 @@ impl MemIf for MemIfImpl {
     fn mmio_ranges() -> &'static [RawRange] {
         &MMIO_RANGES
     }
+
+    /// Translates a physical address to a virtual address.
+    fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
+        va!(paddr.as_usize() + PHYS_VIRT_OFFSET)
+    }
+
+    /// Translates a virtual address to a physical address.
+    fn virt_to_phys(vaddr: VirtAddr) -> PhysAddr {
+        pa!(vaddr.as_usize() - PHYS_VIRT_OFFSET)
+    }
 }
diff --git a/platforms/axplat-aarch64-phytium-pi/src/power.rs b/platforms/axplat-aarch64-phytium-pi/src/power.rs
@@ -13,7 +13,7 @@ impl PowerIf for PowerImpl {
         #[cfg(feature = "smp")]
         {
             use crate::config::plat::CPU_ID_LIST;
-            use crate::mem::virt_to_phys;
+            use axplat::mem::virt_to_phys;
 
             let entry = virt_to_phys(va!(crate::boot::_start_secondary as usize));
             axplat_aarch64_common::psci::cpu_on(
diff --git a/platforms/axplat-aarch64-qemu-virt/src/init.rs b/platforms/axplat-aarch64-qemu-virt/src/init.rs
@@ -3,7 +3,7 @@ use axplat::init::InitIf;
 #[allow(unused_imports)]
 use crate::config::devices::{GICC_PADDR, GICD_PADDR, RTC_PADDR, TIMER_IRQ, UART_IRQ, UART_PADDR};
 use crate::config::plat::PSCI_METHOD;
-use crate::mem::phys_to_virt;
+use axplat::mem::phys_to_virt;
 
 struct InitIfImpl;
 
@@ -36,7 +36,6 @@ impl InitIf for InitIfImpl {
     fn init_later(_cpu_id: usize, _dtb: usize) {
         #[cfg(feature = "irq")]
         {
-            use crate::mem::phys_to_virt;
             axplat_aarch64_common::gic::init_gicd(
                 phys_to_virt(pa!(GICD_PADDR)),
                 phys_to_virt(pa!(GICC_PADDR)),
diff --git a/platforms/axplat-aarch64-qemu-virt/src/mem.rs b/platforms/axplat-aarch64-qemu-virt/src/mem.rs
@@ -6,15 +6,6 @@ use crate::config::plat::{PHYS_MEMORY_BASE, PHYS_MEMORY_SIZE, PHYS_VIRT_OFFSET};
 
 struct MemIfImpl;
 
-pub const fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
-    va!(paddr.as_usize() + PHYS_VIRT_OFFSET)
-}
-
-#[allow(dead_code)]
-pub const fn virt_to_phys(vaddr: VirtAddr) -> PhysAddr {
-    pa!(vaddr.as_usize() - PHYS_VIRT_OFFSET)
-}
-
 #[impl_plat_interface]
 impl MemIf for MemIfImpl {
     /// Returns all physical memory (RAM) ranges on the platform.
@@ -40,4 +31,14 @@ impl MemIf for MemIfImpl {
     fn mmio_ranges() -> &'static [RawRange] {
         &MMIO_RANGES
     }
+
+    /// Translates a physical address to a virtual address.
+    fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
+        va!(paddr.as_usize() + PHYS_VIRT_OFFSET)
+    }
+
+    /// Translates a virtual address to a physical address.
+    fn virt_to_phys(vaddr: VirtAddr) -> PhysAddr {
+        pa!(vaddr.as_usize() - PHYS_VIRT_OFFSET)
+    }
 }
diff --git a/platforms/axplat-aarch64-qemu-virt/src/power.rs b/platforms/axplat-aarch64-qemu-virt/src/power.rs
@@ -12,7 +12,8 @@ impl PowerIf for PowerImpl {
     fn cpu_boot(cpu_id: usize, stack_top_paddr: usize) {
         #[cfg(feature = "smp")]
         {
-            let entry_paddr = crate::mem::virt_to_phys(va!(crate::boot::_start_secondary as usize));
+            let entry_paddr =
+                axplat::mem::virt_to_phys(va!(crate::boot::_start_secondary as usize));
             axplat_aarch64_common::psci::cpu_on(cpu_id, entry_paddr.as_usize(), stack_top_paddr);
         }
         #[cfg(not(feature = "smp"))]
diff --git a/platforms/axplat-aarch64-raspi/src/init.rs b/platforms/axplat-aarch64-raspi/src/init.rs
@@ -3,7 +3,7 @@ use axplat::init::InitIf;
 use crate::config::devices::UART_PADDR;
 #[cfg(feature = "irq")]
 use crate::config::devices::{GICC_PADDR, GICD_PADDR, TIMER_IRQ, UART_IRQ};
-use crate::mem::phys_to_virt;
+use axplat::mem::phys_to_virt;
 
 struct InitIfImpl;
 
@@ -33,7 +33,6 @@ impl InitIf for InitIfImpl {
     fn init_later(_cpu_id: usize, _dtb: usize) {
         #[cfg(feature = "irq")]
         {
-            use crate::mem::phys_to_virt;
             axplat_aarch64_common::gic::init_gicd(
                 phys_to_virt(pa!(GICD_PADDR)),
                 phys_to_virt(pa!(GICC_PADDR)),
diff --git a/platforms/axplat-aarch64-raspi/src/mem.rs b/platforms/axplat-aarch64-raspi/src/mem.rs
@@ -6,15 +6,6 @@ use crate::config::plat::{PHYS_MEMORY_BASE, PHYS_MEMORY_SIZE, PHYS_VIRT_OFFSET};
 
 struct MemIfImpl;
 
-pub const fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
-    va!(paddr.as_usize() + PHYS_VIRT_OFFSET)
-}
-
-#[allow(dead_code)]
-pub const fn virt_to_phys(vaddr: VirtAddr) -> PhysAddr {
-    pa!(vaddr.as_usize() - PHYS_VIRT_OFFSET)
-}
-
 #[impl_plat_interface]
 impl MemIf for MemIfImpl {
     /// Returns all physical memory (RAM) ranges on the platform.
@@ -40,4 +31,14 @@ impl MemIf for MemIfImpl {
     fn mmio_ranges() -> &'static [RawRange] {
         &MMIO_RANGES
     }
+
+    /// Translates a physical address to a virtual address.
+    fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
+        va!(paddr.as_usize() + PHYS_VIRT_OFFSET)
+    }
+
+    /// Translates a virtual address to a physical address.
+    fn virt_to_phys(vaddr: VirtAddr) -> PhysAddr {
+        pa!(vaddr.as_usize() - PHYS_VIRT_OFFSET)
+    }
 }
diff --git a/platforms/axplat-aarch64-raspi/src/mp.rs b/platforms/axplat-aarch64-raspi/src/mp.rs
@@ -1,4 +1,4 @@
-use crate::mem::{phys_to_virt, virt_to_phys};
+use axplat::mem::{phys_to_virt, virt_to_phys};
 use memory_addr::PhysAddr;
 
 static mut SECONDARY_STACK_TOP: usize = 0;
diff --git a/platforms/axplat-loongarch64-qemu-virt/src/boot.rs b/platforms/axplat-loongarch64-qemu-virt/src/boot.rs
@@ -14,7 +14,7 @@ unsafe fn init_boot_page_table() {
     unsafe {
         let l1_va = va!(&raw const BOOT_PT_L1 as usize);
         // 0x0000_0000_0000 ~ 0x0080_0000_0000, table
-        BOOT_PT_L0[0] = LA64PTE::new_table(crate::mem::virt_to_phys(l1_va));
+        BOOT_PT_L0[0] = LA64PTE::new_table(axplat::mem::virt_to_phys(l1_va));
         // 0x0000_0000..0x4000_0000, VPWXGD, 1G block
         BOOT_PT_L1[0] = LA64PTE::new_page(
             pa!(0),
@@ -43,7 +43,7 @@ fn enable_fp_simd() {
 
 fn init_mmu() {
     axcpu::init::init_mmu(
-        crate::mem::virt_to_phys(va!(&raw const BOOT_PT_L0 as usize)),
+        axplat::mem::virt_to_phys(va!(&raw const BOOT_PT_L0 as usize)),
         PHYS_VIRT_OFFSET,
     );
 }
diff --git a/platforms/axplat-loongarch64-qemu-virt/src/mem.rs b/platforms/axplat-loongarch64-qemu-virt/src/mem.rs
@@ -11,11 +11,6 @@ pub const fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
     va!(paddr.as_usize() + PHYS_VIRT_OFFSET)
 }
 
-#[allow(dead_code)]
-pub const fn virt_to_phys(vaddr: VirtAddr) -> PhysAddr {
-    pa!(vaddr.as_usize() - PHYS_VIRT_OFFSET)
-}
-
 #[impl_plat_interface]
 impl MemIf for MemIfImpl {
     /// Returns all physical memory (RAM) ranges on the platform.
@@ -41,4 +36,14 @@ impl MemIf for MemIfImpl {
     fn mmio_ranges() -> &'static [RawRange] {
         &MMIO_RANGES
     }
+
+    /// Translates a physical address to a virtual address.
+    fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
+        phys_to_virt(paddr)
+    }
+
+    /// Translates a virtual address to a physical address.
+    fn virt_to_phys(vaddr: VirtAddr) -> PhysAddr {
+        pa!(vaddr.as_usize() - PHYS_VIRT_OFFSET)
+    }
 }
diff --git a/platforms/axplat-riscv64-qemu-virt/src/console.rs b/platforms/axplat-riscv64-qemu-virt/src/console.rs
@@ -1,6 +1,6 @@
 use memory_addr::VirtAddr;
 
-use crate::mem::virt_to_phys;
+use axplat::mem::virt_to_phys;
 
 /// The maximum number of bytes that can be read at once.
 const MAX_RW_SIZE: usize = 256;
diff --git a/platforms/axplat-riscv64-qemu-virt/src/mem.rs b/platforms/axplat-riscv64-qemu-virt/src/mem.rs
@@ -6,16 +6,6 @@ use crate::config::plat::{KERNEL_BASE_PADDR, PHYS_MEMORY_SIZE, PHYS_VIRT_OFFSET}
 
 struct MemIfImpl;
 
-#[allow(dead_code)]
-pub const fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
-    va!(paddr.as_usize() + PHYS_VIRT_OFFSET)
-}
-
-#[allow(dead_code)]
-pub const fn virt_to_phys(vaddr: VirtAddr) -> PhysAddr {
-    pa!(vaddr.as_usize() - PHYS_VIRT_OFFSET)
-}
-
 #[impl_plat_interface]
 impl MemIf for MemIfImpl {
     /// Returns all physical memory (RAM) ranges on the platform.
@@ -43,4 +33,14 @@ impl MemIf for MemIfImpl {
     fn mmio_ranges() -> &'static [RawRange] {
         &MMIO_RANGES
     }
+
+    /// Translates a physical address to a virtual address.
+    fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
+        va!(paddr.as_usize() + PHYS_VIRT_OFFSET)
+    }
+
+    /// Translates a virtual address to a physical address.
+    fn virt_to_phys(vaddr: VirtAddr) -> PhysAddr {
+        pa!(vaddr.as_usize() - PHYS_VIRT_OFFSET)
+    }
 }
diff --git a/platforms/axplat-riscv64-qemu-virt/src/power.rs b/platforms/axplat-riscv64-qemu-virt/src/power.rs
@@ -19,7 +19,7 @@ impl PowerIf for PowerImpl {
                 warn!("HSM SBI extension is not supported for current SEE.");
                 return;
             }
-            let entry = crate::mem::virt_to_phys(va!(_start_secondary as usize));
+            let entry = axplat::mem::virt_to_phys(va!(_start_secondary as usize));
             sbi_rt::hart_start(_cpu_id, entry.as_usize(), _stack_top_paddr);
         }
     }
diff --git a/platforms/axplat-riscv64-qemu-virt/src/time.rs b/platforms/axplat-riscv64-qemu-virt/src/time.rs
@@ -14,7 +14,7 @@ pub(super) fn init_early() {
 
     #[cfg(feature = "rtc")]
     if RTC_PADDR != 0 {
-        use crate::mem::phys_to_virt;
+        use axplat::mem::phys_to_virt;
         use memory_addr::PhysAddr;
         use riscv_goldfish::Rtc;
 
diff --git a/platforms/axplat-x86-pc/src/apic.rs b/platforms/axplat-x86-pc/src/apic.rs
@@ -2,6 +2,7 @@
 
 use core::{cell::SyncUnsafeCell, mem::MaybeUninit};
 
+use axplat::mem::phys_to_virt;
 use kspin::SpinNoIrq;
 use lazyinit::LazyInit;
 use memory_addr::PhysAddr;
@@ -10,7 +11,6 @@ use x2apic::lapic::{LocalApic, LocalApicBuilder, xapic_base};
 use x86_64::instructions::port::Port;
 
 use self::vectors::*;
-use crate::mem::phys_to_virt;
 
 pub(super) mod vectors {
     pub const APIC_TIMER_VECTOR: u8 = 0xf0;
diff --git a/platforms/axplat-x86-pc/src/mem.rs b/platforms/axplat-x86-pc/src/mem.rs
@@ -13,10 +13,6 @@ const MAX_REGIONS: usize = 16;
 
 static RAM_REGIONS: LazyInit<Vec<RawRange, MAX_REGIONS>> = LazyInit::new();
 
-pub const fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
-    va!(paddr.as_usize() + PHYS_VIRT_OFFSET)
-}
-
 pub fn init(multiboot_info_ptr: usize) {
     let mut mm = MemIfImpl;
     let info = unsafe { Multiboot::from_ptr(multiboot_info_ptr as _, &mut mm).unwrap() };
@@ -36,7 +32,7 @@ struct MemIfImpl;
 
 impl MemoryManagement for MemIfImpl {
     unsafe fn paddr_to_slice(&self, addr: PAddr, size: usize) -> Option<&'static [u8]> {
-        let ptr = phys_to_virt(pa!(addr as usize)).as_ptr();
+        let ptr = Self::phys_to_virt(pa!(addr as usize)).as_ptr();
         Some(unsafe { core::slice::from_raw_parts(ptr, size) })
     }
 
@@ -65,4 +61,14 @@ impl MemIf for MemIfImpl {
     fn mmio_ranges() -> &'static [RawRange] {
         &MMIO_RANGES
     }
+
+    /// Translates a physical address to a virtual address.
+    fn phys_to_virt(paddr: PhysAddr) -> VirtAddr {
+        va!(paddr.as_usize() + PHYS_VIRT_OFFSET)
+    }
+
+    /// Translates a virtual address to a physical address.
+    fn virt_to_phys(vaddr: VirtAddr) -> PhysAddr {
+        pa!(vaddr.as_usize() - PHYS_VIRT_OFFSET)
+    }
 }
diff --git a/platforms/axplat-x86-pc/src/mp.rs b/platforms/axplat-x86-pc/src/mp.rs
@@ -19,7 +19,7 @@ unsafe fn setup_startup_page(stack_top: PhysAddr) {
     }
     const U64_PER_PAGE: usize = PAGE_SIZE_4K / 8;
 
-    let start_page_ptr = crate::mem::phys_to_virt(START_PAGE_PADDR).as_mut_ptr() as *mut u64;
+    let start_page_ptr = axplat::mem::phys_to_virt(START_PAGE_PADDR).as_mut_ptr() as *mut u64;
     let start_page = unsafe { core::slice::from_raw_parts_mut(start_page_ptr, U64_PER_PAGE) };
     unsafe {
         core::ptr::copy_nonoverlapping(

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ impl PowerIf for PowerImpl {`
`13`	`13`	`#[cfg(feature = "smp")]`
`14`	`14`	`{`
`15`	`15`	`use crate::config::plat::CPU_ID_LIST;`
`16`		`- use crate::mem::virt_to_phys;`
	`16`	`+ use axplat::mem::virt_to_phys;`
`17`	`17`
`18`	`18`	`let entry = virt_to_phys(va!(crate::boot::_start_secondary as usize));`
`19`	`19`	`axplat_aarch64_common::psci::cpu_on(`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ impl PowerIf for PowerImpl {`
`12`	`12`	`fn cpu_boot(cpu_id: usize, stack_top_paddr: usize) {`
`13`	`13`	`#[cfg(feature = "smp")]`
`14`	`14`	`{`
`15`		`- let entry_paddr = crate::mem::virt_to_phys(va!(crate::boot::_start_secondary as usize));`
	`15`	`+ let entry_paddr =`
	`16`	`+ axplat::mem::virt_to_phys(va!(crate::boot::_start_secondary as usize));`
`16`	`17`	`axplat_aarch64_common::psci::cpu_on(cpu_id, entry_paddr.as_usize(), stack_top_paddr);`
`17`	`18`	`}`
`18`	`19`	`#[cfg(not(feature = "smp"))]`