metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Make memory map accessible to MMU setup code

This commit is contained in:
Berkus Decker 2019-03-10 15:57:22 +02:00
parent 53c6139f20
commit 3644bcc18f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/arch/aarch64/memory/mod.rs
View File

@ -144,7 +144,7 @@ pub mod kernel_mem_range {
} }
} }
use kernel_mem_range::*; pub use kernel_mem_range::*;
/// A virtual memory layout that is agnostic of the paging granularity that the /// A virtual memory layout that is agnostic of the paging granularity that the
/// hardware MMU will use. /// hardware MMU will use.
@ -246,7 +246,9 @@ static KERNEL_VIRTUAL_LAYOUT: [Descriptor; 5] = [
/// ///
/// If the address is not covered in VIRTUAL_LAYOUT, return a default for normal /// If the address is not covered in VIRTUAL_LAYOUT, return a default for normal
/// cacheable DRAM. /// cacheable DRAM.
fn get_virt_addr_properties(virt_addr: usize) -> Result<(usize, AttributeFields), &'static str> { pub fn get_virt_addr_properties(
virt_addr: usize,
) -> Result<(usize, AttributeFields), &'static str> {
if virt_addr > map::END { if virt_addr > map::END {
return Err("Address out of range."); return Err("Address out of range.");
} }

1
src/arch/aarch64/mmu.rs
View File

@ -26,6 +26,7 @@
//! MMU initialisation. //! MMU initialisation.
//! [ARMv8 memory addressing](https://static.docs.arm.com/100940/0100/armv8_a_address%20translation_100940_0100_en.pdf) //! [ARMv8 memory addressing](https://static.docs.arm.com/100940/0100/armv8_a_address%20translation_100940_0100_en.pdf)
use crate::arch::aarch64::memory::{get_virt_addr_properties, AttributeFields};
use crate::println; use crate::println;
use cortex_a::{barrier, regs::*}; use cortex_a::{barrier, regs::*};
use register::register_bitfields; use register::register_bitfields;