riscv: 解析dtb，获取可用内存空间并添加到memblock (#486)

Author: fslongjin

kernel/Cargo.toml

@@ -44,6 +44,7 @@ smoltcp = { git = "https://git.mirrors.dragonos.org/DragonOS-Community/smoltcp.g
 system_error = { path = "crates/system_error" }
 unified-init = { path = "crates/unified-init" }
 virtio-drivers = { git = "https://git.mirrors.dragonos.org/DragonOS-Community/virtio-drivers.git", rev = "f1d1cbb" }
+fdt = "0.1.5"
 
 # target为x86_64时，使用下面的依赖
 [target.'cfg(target_arch = "x86_64")'.dependencies]
@@ -52,6 +53,11 @@ x86 = "0.52.0"
 x86_64 = "0.14.10"
 
 
+# target为riscv64时，使用下面的依赖
+[target.'cfg(target_arch = "riscv64")'.dependencies]
+
+
+
 # 构建时依赖项
 [build-dependencies]
 kernel_build = { path = "../build-scripts/kernel_build" }

kernel/src/arch/riscv64/init/mod.rs

@@ -1,16 +1,71 @@
 use core::intrinsics::unreachable;
 
-use crate::{init::init_before_mem_init, kinfo, mm::PhysAddr};
+use fdt::node::FdtNode;
+
+use crate::{
+    driver::open_firmware::fdt::open_firmware_fdt_driver,
+    init::{boot_params, init_before_mem_init},
+    kinfo,
+    mm::{PhysAddr, VirtAddr},
+    print, println,
+};
+
+#[derive(Debug)]
+pub struct ArchBootParams {
+    /// 启动时的fdt物理地址
+    pub fdt_paddr: PhysAddr,
+}
+
+impl ArchBootParams {
+    pub const DEFAULT: Self = ArchBootParams {
+        fdt_paddr: PhysAddr::new(0),
+    };
+}
 
 #[no_mangle]
 unsafe extern "C" fn kernel_main(hartid: usize, fdt_paddr: usize) -> ! {
     let fdt_paddr = PhysAddr::new(fdt_paddr);
     init_before_mem_init();
+    boot_params().write().arch.fdt_paddr = fdt_paddr;
     kinfo!(
         "DragonOS kernel is running on hart {}, fdt address:{:?}",
         hartid,
         fdt_paddr
     );
+
+    let fdt = fdt::Fdt::from_ptr(fdt_paddr.data() as *const u8).expect("Failed to parse fdt!");
+    print_node(fdt.find_node("/").unwrap(), 0);
+
+    parse_dtb();
+
     loop {}
     unreachable()
 }
+
+fn print_node(node: FdtNode<'_, '_>, n_spaces: usize) {
+    (0..n_spaces).for_each(|_| print!(" "));
+    println!("{}/", node.name);
+    node.properties().for_each(|p| {
+        (0..n_spaces + 4).for_each(|_| print!(" "));
+        println!("{}: {:?}", p.name, p.value);
+    });
+
+    for child in node.children() {
+        print_node(child, n_spaces + 4);
+    }
+}
+
+/// 解析fdt，获取内核启动参数
+unsafe fn parse_dtb() {
+    let fdt_paddr = boot_params().read().arch.fdt_paddr;
+    if fdt_paddr.is_null() {
+        panic!("Failed to get fdt address!");
+    }
+
+    open_firmware_fdt_driver()
+        .set_fdt_vaddr(VirtAddr::new(fdt_paddr.data()))
+        .unwrap();
+    open_firmware_fdt_driver()
+        .early_scan_device_tree()
+        .expect("Failed to scan device tree at boottime.");
+}

kernel/src/arch/riscv64/mm/mod.rs

@@ -53,7 +53,7 @@ impl MemoryManagementArch for RiscV64MMArch {
 
     const USER_STACK_START: crate::mm::VirtAddr = VirtAddr::new(0x0000_001f_ffa0_0000);
 
-    unsafe fn init() -> &'static [crate::mm::PhysMemoryArea] {
+    unsafe fn init() {
         todo!()
     }
 

kernel/src/arch/riscv64/mod.rs

@@ -1,7 +1,7 @@
 pub mod asm;
 pub mod cpu;
 pub mod driver;
-mod init;
+pub mod init;
 pub mod interrupt;
 pub mod ipc;
 mod kvm;

kernel/src/arch/x86_64/init/mod.rs

@@ -0,0 +1,6 @@
+#[derive(Debug)]
+pub struct ArchBootParams {}
+
+impl ArchBootParams {
+    pub const DEFAULT: Self = ArchBootParams {};
+}

kernel/src/arch/x86_64/mm/bump.rs

@@ -1,12 +1,12 @@
 use crate::{
-    kdebug,
     libs::align::{page_align_down, page_align_up},
     mm::{
-        allocator::bump::BumpAllocator, MemoryManagementArch, PhysAddr, PhysMemoryArea, VirtAddr,
+        allocator::bump::BumpAllocator, memblock::mem_block_manager, MemoryManagementArch,
+        PhysAddr, PhysMemoryArea, VirtAddr,
     },
 };
 
-use super::{X86_64MMBootstrapInfo, BOOTSTRAP_MM_INFO, PHYS_MEMORY_AREAS};
+use super::{X86_64MMBootstrapInfo, BOOTSTRAP_MM_INFO};
 
 impl<MMA: MemoryManagementArch> BumpAllocator<MMA> {
     pub unsafe fn arch_remain_areas(
@@ -23,7 +23,7 @@ impl<MMA: MemoryManagementArch> BumpAllocator<MMA> {
         let offset_end = page_align_down(kernel_code_start - 16384);
 
         // 把内核代码前的空间加入到可用内存区域中
-        for area in &PHYS_MEMORY_AREAS {
+        for area in mem_block_manager().to_iter() {
             let area_base = area.area_base_aligned().data();
             let area_end = area.area_end_aligned().data();
             if area_base >= offset_end {
@@ -44,7 +44,6 @@ impl<MMA: MemoryManagementArch> BumpAllocator<MMA> {
             ret_areas[res_count] =
                 PhysMemoryArea::new(PhysAddr::new(new_start), new_end - new_start);
 
-            kdebug!("new arch remain area: {:?}", ret_areas[res_count]);
             res_count += 1;
         }
 

kernel/src/arch/x86_64/mm/mod.rs

@@ -18,6 +18,7 @@ use crate::libs::printk::PrintkWriter;
 use crate::libs::spinlock::SpinLock;
 
 use crate::mm::allocator::page_frame::{FrameAllocator, PageFrameCount, PageFrameUsage};
+use crate::mm::memblock::mem_block_manager;
 use crate::mm::mmio_buddy::mmio_init;
 use crate::{
     arch::MMArch,
@@ -26,8 +27,8 @@ use crate::{
 
 use crate::mm::kernel_mapper::KernelMapper;
 use crate::mm::page::{PageEntry, PageFlags};
-use crate::mm::{MemoryManagementArch, PageTableKind, PhysAddr, PhysMemoryArea, VirtAddr};
-use crate::{kdebug, kinfo};
+use crate::mm::{MemoryManagementArch, PageTableKind, PhysAddr, VirtAddr};
+use crate::{kdebug, kinfo, kwarn};
 use system_error::SystemError;
 
 use core::arch::asm;
@@ -43,12 +44,6 @@ use super::kvm::vmx::vmx_asm_wrapper::vmx_vmread;
 pub type PageMapper =
     crate::mm::page::PageMapper<crate::arch::x86_64::mm::X86_64MMArch, LockedFrameAllocator>;
 
-/// @brief 用于存储物理内存区域的数组
-static mut PHYS_MEMORY_AREAS: [PhysMemoryArea; 512] = [PhysMemoryArea {
-    base: PhysAddr::new(0),
-    size: 0,
-}; 512];
-
 /// 初始的CR3寄存器的值，用于内存管理初始化时，创建的第一个内核页表的位置
 static mut INITIAL_CR3_VALUE: PhysAddr = PhysAddr::new(0);
 
@@ -121,7 +116,7 @@ impl MemoryManagementArch for X86_64MMArch {
     const USER_STACK_START: VirtAddr = VirtAddr::new(0x6ffff0a00000);
 
     /// @brief 获取物理内存区域
-    unsafe fn init() -> &'static [crate::mm::PhysMemoryArea] {
+    unsafe fn init() {
         extern "C" {
             fn _text();
             fn _etext();
@@ -147,12 +142,9 @@ impl MemoryManagementArch for X86_64MMArch {
         }
 
         // 初始化物理内存区域(从multiboot2中获取)
-        let areas_count =
-            Self::init_memory_area_from_multiboot2().expect("init memory area failed");
+        Self::init_memory_area_from_multiboot2().expect("init memory area failed");
 
         send_to_default_serial8250_port("x86 64 init end\n\0".as_bytes());
-
-        return &PHYS_MEMORY_AREAS[0..areas_count];
     }
 
     /// @brief 刷新TLB中，关于指定虚拟地址的条目
@@ -336,9 +328,24 @@ impl X86_64MMArch {
                 if mb2_mem_info[i].len == 0 {
                     continue;
                 }
+
                 total_mem_size += mb2_mem_info[i].len as usize;
-                PHYS_MEMORY_AREAS[areas_count].base = PhysAddr::new(mb2_mem_info[i].addr as usize);
-                PHYS_MEMORY_AREAS[areas_count].size = mb2_mem_info[i].len as usize;
+                // PHYS_MEMORY_AREAS[areas_count].base = PhysAddr::new(mb2_mem_info[i].addr as usize);
+                // PHYS_MEMORY_AREAS[areas_count].size = mb2_mem_info[i].len as usize;
+
+                mem_block_manager()
+                    .add_block(
+                        PhysAddr::new(mb2_mem_info[i].addr as usize),
+                        mb2_mem_info[i].len as usize,
+                    )
+                    .unwrap_or_else(|e| {
+                        kwarn!(
+                            "Failed to add memory block: base={:#x}, size={:#x}, error={:?}",
+                            mb2_mem_info[i].addr,
+                            mb2_mem_info[i].len,
+                            e
+                        );
+                    });
                 areas_count += 1;
             }
         }
@@ -412,9 +419,7 @@ unsafe fn allocator_init() {
     let phy_offset =
         unsafe { MMArch::virt_2_phys(VirtAddr::new(page_align_up(virt_offset))) }.unwrap();
 
-    kdebug!("PhysArea[0..10] = {:?}", &PHYS_MEMORY_AREAS[0..10]);
-    let mut bump_allocator =
-        BumpAllocator::<X86_64MMArch>::new(&PHYS_MEMORY_AREAS, phy_offset.data());
+    let mut bump_allocator = BumpAllocator::<X86_64MMArch>::new(phy_offset.data());
     kdebug!(
         "BumpAllocator created, offset={:?}",
         bump_allocator.offset()
@@ -450,7 +455,9 @@ unsafe fn allocator_init() {
         }
         kdebug!("Successfully emptied page table");
 
-        for area in PHYS_MEMORY_AREAS.iter() {
+        let total_num = mem_block_manager().total_initial_memory_regions();
+        for i in 0..total_num {
+            let area = mem_block_manager().get_initial_memory_region(i).unwrap();
             // kdebug!("area: base={:?}, size={:#x}, end={:?}", area.base, area.size, area.base + area.size);
             for i in 0..((area.size + MMArch::PAGE_SIZE - 1) / MMArch::PAGE_SIZE) {
                 let paddr = area.base.add(i * MMArch::PAGE_SIZE);

kernel/src/arch/x86_64/mod.rs

@@ -5,6 +5,7 @@ mod c_adapter;
 pub mod cpu;
 pub mod driver;
 pub mod fpu;
+pub mod init;
 pub mod interrupt;
 pub mod ipc;
 pub mod kvm;

kernel/src/driver/mod.rs

@@ -3,6 +3,7 @@ pub mod base;
 pub mod disk;
 pub mod keyboard;
 pub mod net;
+pub mod open_firmware;
 pub mod pci;
 pub mod timers;
 pub mod tty;