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

[sq] Disable some unused memory stuff

This commit is contained in:
Berkus Decker 2019-01-21 01:59:34 +02:00
parent 93ced19f29
commit 6cf5551efb
2 changed files with 55 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,15 @@
// mod arch::aarch64::memory // mod arch::aarch64::memory
mod area_frame_allocator; // mod area_frame_allocator;
mod paging; // mod paging;
pub use self::area_frame_allocator::AreaFrameAllocator; // pub use self::area_frame_allocator::AreaFrameAllocator;
pub type PhysicalAddress = usize; pub type PhysicalAddress = usize;
pub type VirtualAddress = usize; pub type VirtualAddress = usize;
use self::paging::PAGE_SIZE; // use self::paging::PAGE_SIZE;
pub const PAGE_SIZE: usize = 4096;
/** /**
* Frame is an addressable unit of the physical address space. * Frame is an addressable unit of the physical address space.

128
src/arch/aarch64/mod.rs
View File

@ -86,34 +86,6 @@ pub fn write_translation_table_base(base: PhysicalAddress) {
} }
} }
// Helper function similar to u-boot
pub fn write_ttbr_tcr_mair(el: u8, base: PhysicalAddress, tcr: u64, attr: u64) {
unsafe {
asm!("dsb sy" :::: "volatile");
}
match (el) {
1 => unsafe {
asm!("msr ttbr0_el1, $0
msr tcr_el1, $1
msr mair_el1, $2" :: "r"(base), "r"(tcr), "r"(attr) : "memory" : "volatile");
},
2 => unsafe {
asm!("msr ttbr0_el2, $0
msr tcr_el2, $1
msr mair_el2, $2" :: "r"(base), "r"(tcr), "r"(attr) : "memory" : "volatile");
},
3 => unsafe {
asm!("msr ttbr0_el3, $0
msr tcr_el3, $1
msr mair_el3, $2" :: "r"(base), "r"(tcr), "r"(attr) : "memory" : "volatile");
},
_ => loop {},
}
unsafe {
asm!("isb" :::: "volatile");
}
}
// Identity-map things for now. // Identity-map things for now.
// //
// > but more normal the simplest form is a table with 1024 32 bit entries starting at // > but more normal the simplest form is a table with 1024 32 bit entries starting at
@ -160,65 +132,65 @@ pub fn write_ttbr_tcr_mair(el: u8, base: PhysicalAddress, tcr: u64, attr: u64) {
// } // }
// } // }
bitflags! { // bitflags! {
pub struct MemType: u64 { // pub struct MemType: u64 {
const DEVICE_NGNRNE = 0 << 2; // const DEVICE_NGNRNE = 0 << 2;
const DEVICE_NGNRE = 1 << 2; // const DEVICE_NGNRE = 1 << 2;
const DEVICE_GRE = 2 << 2; // const DEVICE_GRE = 2 << 2;
const NORMAL_NC = 3 << 2; // const NORMAL_NC = 3 << 2;
const NORMAL = 4 << 2; // const NORMAL = 4 << 2;
const NS = 1 << 5; // const NS = 1 << 5;
const NON_SHARE = 0 << 8; // const NON_SHARE = 0 << 8;
const OUTER_SHARE = 2 << 8; // const OUTER_SHARE = 2 << 8;
const INNER_SHARE = 3 << 8; // const INNER_SHARE = 3 << 8;
const AF = 1 << 10; // const AF = 1 << 10;
const NG = 1 << 11; // const NG = 1 << 11;
const PXN = 1 << 53; // const PXN = 1 << 53;
const UXN = 1 << 54; // const UXN = 1 << 54;
} // }
} // }
struct MemMapRegion { // struct MemMapRegion {
virt: VirtualAddress, // virt: VirtualAddress,
phys: PhysicalAddress, // phys: PhysicalAddress,
size: usize, // size: usize,
attr: MemType, // MAIR flags // attr: MemType, // MAIR flags
} // }
impl MemMapRegion {} // impl MemMapRegion {}
fn setup_paging() { // fn setup_paging() {
// test if paging is enabled // // test if paging is enabled
// if so, loop here // // if so, loop here
// @todo // // @todo
// Check mmu and dcache states, loop forever on some setting // // Check mmu and dcache states, loop forever on some setting
write_ttbr_tcr_mair( // write_ttbr_tcr_mair(
1, // EL1 // 1, // EL1
read_translation_table_base(), // read_translation_table_base(),
read_translation_control(), // read_translation_control(),
read_mair(), // read_mair(),
); // );
let _bcm2837_mem_map: [MemMapRegion; 2] = [ // let _bcm2837_mem_map: [MemMapRegion; 2] = [
MemMapRegion { // MemMapRegion {
virt: 0x0000_0000, // virt: 0x0000_0000,
phys: 0x0000_0000, // phys: 0x0000_0000,
size: 0x3f00_0000, // size: 0x3f00_0000,
attr: MemType::NORMAL | MemType::INNER_SHARE, // attr: MemType::NORMAL | MemType::INNER_SHARE,
}, // },
MemMapRegion { // MemMapRegion {
virt: 0x3f00_0000, // virt: 0x3f00_0000,
phys: 0x3f00_0000, // phys: 0x3f00_0000,
size: 0x0100_0000, // size: 0x0100_0000,
attr: MemType::DEVICE_NGNRNE | MemType::NON_SHARE | MemType::PXN | MemType::UXN, // attr: MemType::DEVICE_NGNRNE | MemType::NON_SHARE | MemType::PXN | MemType::UXN,
}, // },
]; // ];
} // }
pub struct BcmHost; pub struct BcmHost;