aarch64: map framebuffer & set mem attr in bootloader

Author: equation314

bootloader/src/arch/aarch64/mod.rs

@@ -3,7 +3,7 @@ use aarch64::paging::{memory_attribute::*, PageTable, PageTableAttribute, PageTa
 use aarch64::paging::{Page, PhysFrame, Size1GiB, Size2MiB, Size4KiB};
 use aarch64::{asm::*, barrier, regs::*};
 use bcm2837::addr::{phys_to_virt, virt_to_phys};
-use bcm2837::addr::{PHYSICAL_IO_START, PHYSICAL_IO_END, PHYSICAL_MEMORY_OFFSET};
+use bcm2837::addr::{PHYSICAL_IO_END, PHYSICAL_IO_START, PHYSICAL_MEMORY_OFFSET};
 use bcm2837::atags::Atags;
 use bootinfo::BootInfo;
 use core::ptr;
@@ -15,6 +15,15 @@ const ALIGN_2MB: u64 = 0x200000;
 
 global_asm!(include_str!("boot.S"));
 
+fn map_2mib(p2: &mut PageTable, start: usize, end: usize, flag: EF, attr: PageTableAttribute) {
+    for frame in PhysFrame::<Size2MiB>::range_of(start as u64, end as u64) {
+        let paddr = frame.start_address();
+        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, flag, attr);
+    }
+}
+
 // TODO: set segments permission
 fn create_page_table(start_paddr: usize, end_paddr: usize) {
     #[repr(align(4096))]
@@ -35,19 +44,11 @@ fn create_page_table(start_paddr: usize, end_paddr: usize) {
 
     let block_flags = EF::default_block() | EF::UXN;
     // 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() as usize) as u64);
-        let page = Page::<Size2MiB>::containing_address(vaddr);
-        p2[page.p2_index()].set_block::<Size2MiB>(paddr, block_flags, MairNormal::attr_value());
-    }
+    map_2mib(p2, start_paddr, end_paddr, block_flags, MairNormal::attr_value());
+    // normal non-cacheable memory
+    map_2mib(p2, end_paddr, PHYSICAL_IO_START, block_flags | EF::PXN, MairNormalNonCacheable::attr_value());
     // device memory
-    for frame in PhysFrame::<Size2MiB>::range_of(PHYSICAL_IO_START as u64, PHYSICAL_IO_END as u64) {
-        let paddr = frame.start_address();
-        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());
-    }
+    map_2mib(p2, PHYSICAL_IO_START, PHYSICAL_IO_END, block_flags | EF::PXN, MairDevice::attr_value());
 
     p3[0].set_frame(frame_lvl2, EF::default_table(), PageTableAttribute::new(0, 0, 0));
     p3[1].set_block::<Size1GiB>(PhysAddr::new(PHYSICAL_IO_END as u64), block_flags | EF::PXN, MairDevice::attr_value());

kernel/src/drivers/console/mod.rs

@@ -13,12 +13,14 @@ lazy_static! {
 
 /// Initialize console driver
 pub fn init() {
-    if let Some(fb) = FRAME_BUFFER.lock().take() {
-        // FIXME: now take FrameBuffer out of global variable, then move into Console
-        let console = Console::on_frame_buffer(fb.fb_info.xres, fb.fb_info.yres, fb);
-        *CONSOLE.lock() = Some(console);
-        info!("console: init end");
-    } else {
-        warn!("console: init failed");
+    if cfg!(feature = "consolegraphic") {
+        if let Some(fb) = FRAME_BUFFER.lock().take() {
+            // FIXME: now take FrameBuffer out of global variable, then move into Console
+            let console = Console::on_frame_buffer(fb.fb_info.xres, fb.fb_info.yres, fb);
+            *CONSOLE.lock() = Some(console);
+            info!("console: init end");
+        } else {
+            warn!("console: init failed");
+        }
     }
 }

kernel/src/drivers/gpu/fb.rs

@@ -1,6 +1,6 @@
 //! Framebuffer
 
-use crate::fs::vga::{fb_bitfield, fb_fix_screeninfo, fb_var_screeninfo};
+use crate::fs::vga::{fb_fix_screeninfo, fb_var_screeninfo};
 use alloc::string::String;
 use core::fmt;
 use lazy_static::lazy_static;
@@ -55,7 +55,6 @@ pub enum ColorConfig {
     BGRA8888, // RPi3 B+ uses BGRA
     VgaPalette,
 }
-use self::ColorConfig::*;
 
 pub type FramebufferResult = Result<(FramebufferInfo, ColorConfig, usize), String>;
 

kernel/src/memory.rs

@@ -55,11 +55,13 @@ lazy_static! {
 }
 
 /// Convert physical address to virtual address
+// #[inline]
 pub const fn phys_to_virt(paddr: usize) -> usize {
     PHYSICAL_MEMORY_OFFSET + paddr
 }
 
 /// Convert virtual address to physical address
+// #[inline]
 pub const fn virt_to_phys(vaddr: usize) -> usize {
     vaddr - PHYSICAL_MEMORY_OFFSET
 }

kernel/src/syscall/mem.rs

@@ -56,12 +56,16 @@ impl Syscall<'_> {
             match &*file.path {
                 "/dev/fb0" => {
                     use crate::arch::board::fb::FRAME_BUFFER;
+                    let attr = prot.to_attr();
+                    #[cfg(feature = "board_raspi3")]
+                    let attr = attr.mmio(crate::arch::paging::MMIOType::NormalNonCacheable as u8);
+
                     if let Some(fb) = FRAME_BUFFER.lock().as_mut() {
                         self.vm().push(
                             addr,
                             addr + len,
-                            prot.to_attr(),
-                            Linear::new((fb.bus_addr() - addr) as isize),
+                            attr,
+                            Linear::new((crate::memory::virt_to_phys(fb.base_addr()) - addr) as isize),
                             "mmap_file",
                         );
                         info!("mmap for /dev/fb0");