Merge main into dev

crates/driver_block/Cargo.toml

@@ -17,4 +17,4 @@ default = []
 [dependencies]
 log = "0.4"
 driver_common = { path = "../driver_common" }
-bcm2835-sdhci = { git = "https://github.com/lhw2002426/bcm2835-sdhci.git", rev = "e974f16", optional = true }
+bcm2835-sdhci = { git = "https://github.com/lhw2002426/bcm2835-sdhci.git", rev = "bf07a72", optional = true }

modules/ruxhal/src/platform/aarch64_raspi/mod.rs

@@ -42,14 +42,18 @@ extern "C" {
     fn rust_main_secondary(cpu_id: usize);
 }
 
-pub(crate) unsafe extern "C" fn rust_entry(cpu_id: usize, dtb: usize) {
+pub(crate) unsafe extern "C" fn rust_entry(cpu_id: usize) {
     crate::mem::clear_bss();
     crate::arch::set_exception_vector_base(exception_vector_base as usize);
     crate::arch::write_page_table_root0(0.into()); // disable low address access
+    unsafe {
+        // Set the physical address of the dtb file to 0x03000000 in config.txt
+        dtb::init(crate::mem::phys_to_virt(0x03000000.into()).as_ptr());
+    }
     crate::cpu::init_primary(cpu_id);
     super::aarch64_common::pl011::init_early();
     super::aarch64_common::generic_timer::init_early();
-    rust_main(cpu_id, dtb);
+    rust_main(cpu_id, 0x03000000);
 }
 
 #[cfg(feature = "smp")]

platforms/aarch64-raspi4.toml

@@ -18,6 +18,7 @@ kernel-base-vaddr = "0xffff_0000_0008_0000"
 phys-virt-offset = "0xffff_0000_0000_0000"
 # MMIO regions with format (`base_paddr`, `size`).
 mmio-regions = [
+    ["0xFE34_0000", "0x1000"],      # SD card 
     ["0xFE20_1000", "0x1000"],      # PL011 UART
     ["0xFF84_1000", "0x8000"],      # GICv2
 ]

scripts/make/raspi4.mk

@@ -89,6 +89,6 @@ openocd:
 ## Start GDB session
 ##------------------------------------------------------------------------------
 gdb: RUSTC_MISC_ARGS += -C debuginfo=2
-gdb: $(KERNEL_ELF)
+gdb: $(OUT_ELF)
 	$(call color_header, "Launching GDB")
-	@$(DOCKER_GDB) gdb-multiarch -q $(KERNEL_ELF)
+	@$(DOCKER_GDB) gdb-multiarch -q $(OUT_ELF)