aarch64: fix bus address for mailbox property

Author: equation314

bootloader/Cargo.lock

@@ -10,7 +10,7 @@ fixedvec = "0.2.3"
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
 aarch64 = { git = "https://github.com/rcore-os/aarch64", version = "2.7.0" }
-bcm2837 = { git = "https://github.com/rcore-os/bcm2837", version = "1.0.0" }
+bcm2837 = { git = "https://github.com/rcore-os/bcm2837", version = "2.0.0" }
 
 [build-dependencies]
 cc = "1.0"

bootloader/Cargo.toml

@@ -2,28 +2,16 @@ use aarch64::addr::{PhysAddr, VirtAddr};
 use aarch64::paging::{memory_attribute::*, Page, PageTable, PageTableAttribute, PageTableFlags as EF, PhysFrame};
 use aarch64::paging::{Size1GiB, Size2MiB, Size4KiB};
 use aarch64::{asm::*, barrier, regs::*};
-use bcm2837::consts::RAW_IO_BASE;
+use bcm2837::addr::{phys_to_virt, virt_to_phys, PHYSICAL_IO_BASE};
 use core::ptr;
 use fixedvec::FixedVec;
 use xmas_elf::program::{ProgramHeader64, Type};
 
 const PAGE_SIZE: usize = 4096;
 const ALIGN_2MB: u64 = 0x200000;
 
-const PHYSICAL_MEMORY_OFFSET: u64 = 0xFFFF_0000_0000_0000;
-
 global_asm!(include_str!("boot.S"));
 
-/// Convert physical address to virtual address
-const fn phys_to_virt(paddr: u64) -> u64 {
-    PHYSICAL_MEMORY_OFFSET + paddr
-}
-
-/// Convert virtual address to physical address
-const fn virt_to_phys(vaddr: u64) -> u64 {
-    vaddr - PHYSICAL_MEMORY_OFFSET
-}
-
 // TODO: set segments permission
 fn create_page_table(start_paddr: usize, end_paddr: usize) {
     #[repr(align(4096))]
@@ -46,14 +34,14 @@ fn create_page_table(start_paddr: usize, end_paddr: usize) {
     // normal memory
     for frame in PhysFrame::<Size2MiB>::range_of(start_paddr as u64, end_paddr as u64) {
         let paddr = frame.start_address();
-        let vaddr = VirtAddr::new(phys_to_virt(paddr.as_u64()));
+        let vaddr = VirtAddr::new(phys_to_virt(paddr.as_u64() as usize) as u64);
         let page = Page::<Size2MiB>::containing_address(vaddr);
         p2[page.p2_index()].set_block::<Size2MiB>(paddr, block_flags, MairNormal::attr_value());
     }
     // device memory
-    for frame in PhysFrame::<Size2MiB>::range_of(RAW_IO_BASE as u64, 0x4000_0000) {
+    for frame in PhysFrame::<Size2MiB>::range_of(PHYSICAL_IO_BASE as u64, 0x4000_0000) {
         let paddr = frame.start_address();
-        let vaddr = VirtAddr::new(phys_to_virt(paddr.as_u64()));
+        let vaddr = VirtAddr::new(phys_to_virt(paddr.as_u64() as usize) as u64);
         let page = Page::<Size2MiB>::containing_address(vaddr);
         p2[page.p2_index()].set_block::<Size2MiB>(paddr, block_flags | EF::PXN, MairDevice::attr_value());
     }
@@ -133,7 +121,7 @@ pub fn map_kernel(kernel_start: usize, segments: &FixedVec<ProgramHeader64>) {
 
         unsafe {
             let src = (kernel_start as u64 + offset) as *const u8;
-            let dst = virt_to_phys(virt_addr) as *mut u8;
+            let dst = virt_to_phys(virt_addr as usize) as *mut u8;
             ptr::copy(src, dst, file_size as usize);
             ptr::write_bytes(dst.offset(file_size as isize), 0, (mem_size - file_size) as usize);
         }
@@ -146,6 +134,6 @@ pub fn map_kernel(kernel_start: usize, segments: &FixedVec<ProgramHeader64>) {
         }
     }
 
-    create_page_table(0, RAW_IO_BASE);
+    create_page_table(0, PHYSICAL_IO_BASE);
     enable_mmu();
 }

bootloader/src/arch/aarch64/mod.rs

@@ -87,7 +87,7 @@ riscv = { git = "https://github.com/rcore-os/riscv", features = ["inline-asm"] }
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
 aarch64 = { git = "https://github.com/rcore-os/aarch64", version = "2.7.0" }
-bcm2837 = { git = "https://github.com/rcore-os/bcm2837", version = "1.0.0", optional = true }
+bcm2837 = { git = "https://github.com/rcore-os/bcm2837", version = "2.0.0", optional = true }
 
 [target.'cfg(target_arch = "mips")'.dependencies]
 mips = "^0.2.0"

kernel/Cargo.lock

@@ -3,8 +3,10 @@
 //! (ref: https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface)
 
 use super::fb::FramebufferInfo;
+use crate::memory::virt_to_phys;
 use aarch64::asm;
 use alloc::string::String;
+use bcm2837::addr::phys_to_bus;
 use bcm2837::mailbox::{Mailbox, MailboxChannel};
 use core::mem;
 use lazy_static::lazy_static;
@@ -185,15 +187,18 @@ macro_rules! send_request {
             end_tag: RPI_FIRMWARE_PROPERTY_END,
         });
 
-        let start = &req as *const _ as u32;
-        let end = start + req.0.buf_size;
+        let start = &req as *const _ as usize;
+        let end = start + req.0.buf_size as usize;
         {
             // flush data cache around mailbox accesses
             let mut mbox = MAILBOX.lock();
-            asm::flush_dcache_range(start as usize, end as usize);
-            mbox.write(MailboxChannel::Property, start);
+            asm::flush_dcache_range(start, end);
+            mbox.write(
+                MailboxChannel::Property,
+                phys_to_bus(virt_to_phys(start) as u32),
+            );
             mbox.read(MailboxChannel::Property);
-            asm::flush_dcache_range(start as usize, end as usize);
+            asm::flush_dcache_range(start, end);
         }
 
         match req.0.req_resp_code {

kernel/Cargo.toml

@@ -1,6 +1,6 @@
 //! Raspberry PI 3 Model B/B+
 
-use bcm2837::atags::Atags;
+use bcm2837::{addr::bus_to_phys, atags::Atags};
 
 pub mod emmc;
 #[path = "../../../../drivers/gpu/fb.rs"]
@@ -12,9 +12,6 @@ pub mod timer;
 
 use fb::{ColorConfig, FramebufferResult};
 
-pub const IO_REMAP_BASE: usize = bcm2837::consts::IO_BASE;
-pub const IO_REMAP_END: usize = bcm2837::consts::KERNEL_OFFSET + 0x4000_1000;
-
 /// Initialize serial port before other initializations.
 pub fn init_serial_early() {
     serial::init();
@@ -68,7 +65,7 @@ pub fn probe_fb_info(width: u32, height: u32, depth: u32) -> FramebufferResult {
         ))?;
     }
 
-    let paddr = info.bus_addr & !0xC0000000;
+    let paddr = bus_to_phys(info.bus_addr);
     let vaddr = crate::memory::phys_to_virt(paddr as usize);
     if vaddr == 0 {
         Err(format!(

kernel/src/arch/aarch64/board/raspi3/mailbox.rs

@@ -2,7 +2,7 @@
 
 use crate::consts::MEMORY_OFFSET;
 use crate::memory::{init_heap, virt_to_phys, FRAME_ALLOCATOR};
-use aarch64::{paging::frame::PhysFrame, asm::ttbr_el1_write};
+use aarch64::{asm::ttbr_el1_write, paging::frame::PhysFrame};
 use log::*;
 use rcore_memory::PAGE_SIZE;