解决冲突

Author: Jomocool

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/driver/mod.rs

@@ -2,3 +2,4 @@ pub mod apic;
 mod c_adapter;
 pub mod hpet;
 pub mod tsc;
+pub mod video;

kernel/src/arch/x86_64/driver/tsc.rs

@@ -29,7 +29,7 @@ impl TSCManager {
     ///
     /// 目前由于未支持acpi pm timer, 因此调用该函数时，HPET应当完成初始化，否则将无法校准TSC
     ///
-    /// 参考 https://opengrok.ringotek.cn/xref/linux-6.1.9/arch/x86/kernel/tsc.c#1511
+    /// 参考 https://code.dragonos.org.cn/xref/linux-6.1.9/arch/x86/kernel/tsc.c#1511
     pub fn init() -> Result<(), SystemError> {
         let cpuid = x86::cpuid::CpuId::new();
         let feat = cpuid.get_feature_info().ok_or(SystemError::ENODEV)?;
@@ -57,7 +57,7 @@ impl TSCManager {
     ///
     /// - `early`：是否在早期初始化
     ///
-    /// 参考 https://opengrok.ringotek.cn/xref/linux-6.1.9/arch/x86/kernel/tsc.c#1438
+    /// 参考 https://code.dragonos.org.cn/xref/linux-6.1.9/arch/x86/kernel/tsc.c#1438
     fn determine_cpu_tsc_frequency(early: bool) -> Result<(), SystemError> {
         if unlikely(Self::cpu_khz() != 0 || Self::tsc_khz() != 0) {
             kwarn!("TSC and CPU frequency already determined");
@@ -237,7 +237,7 @@ impl TSCManager {
     /// 尝试使用PIT来校准tsc时间，并且返回tsc的频率（khz）。
     /// 如果失败，那么返回None
     ///
-    /// 参考 https://opengrok.ringotek.cn/xref/linux-6.1.9/arch/x86/kernel/tsc.c#389
+    /// 参考 https://code.dragonos.org.cn/xref/linux-6.1.9/arch/x86/kernel/tsc.c#389
     fn pit_calibrate_tsc(latch: u64, ms: u64, loopmin: u64) -> Option<u64> {
         // 当前暂时没写legacy pic的驱动，因此这里直接返回
         let has_legacy_pic = false;
@@ -307,7 +307,7 @@ impl TSCManager {
     ///
     /// - `Ok((tsc, ref))`：tsc和参考值
     ///
-    /// 参考 https://opengrok.ringotek.cn/xref/linux-6.1.9/arch/x86/kernel/tsc.c#317
+    /// 参考 https://code.dragonos.org.cn/xref/linux-6.1.9/arch/x86/kernel/tsc.c#317
     fn read_refs(hpet_enabled: bool) -> (u64, u64) {
         let thresh = if Self::tsc_khz() == 0 {
             Self::DEFAULT_THRESHOLD
@@ -335,7 +335,7 @@ impl TSCManager {
 
     /// 根据HPET的参考值计算tsc的频率
     ///
-    /// https://opengrok.ringotek.cn/xref/linux-6.1.9/arch/x86/kernel/tsc.c#339
+    /// https://code.dragonos.org.cn/xref/linux-6.1.9/arch/x86/kernel/tsc.c#339
     fn calc_hpet_ref(mut deltatsc: u64, ref1: u64, mut ref2: u64) -> u64 {
         if ref2 <= ref1 {
             ref2 += 0x100000000;

kernel/src/arch/x86_64/driver/video/mod.rs

@@ -0,0 +1,9 @@
+use system_error::SystemError;
+
+use crate::driver::video::fbdev::vesafb::vesafb_early_init;
+
+/// 在内存管理初始化之前，初始化视频驱动（架构相关）
+pub fn arch_video_early_init() -> Result<(), SystemError> {
+    vesafb_early_init()?;
+    return Ok(());
+}

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/ipc/signal.rs

@@ -536,7 +536,7 @@ fn handle_signal(
     oldset: &SigSet,
     frame: &mut TrapFrame,
 ) -> Result<i32, SystemError> {
-    // TODO 这里要补充一段逻辑，好像是为了保证引入线程之后的地址空间不会出问题。详见https://opengrok.ringotek.cn/xref/linux-6.1.9/arch/mips/kernel/signal.c#830
+    // TODO 这里要补充一段逻辑，好像是为了保证引入线程之后的地址空间不会出问题。详见https://code.dragonos.org.cn/xref/linux-6.1.9/arch/mips/kernel/signal.c#830
 
     // 设置栈帧
     return setup_frame(sig, sigaction, info, oldset, frame);

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;
         }