boot: flush cache-line

This commit is contained in:
Astro 2019-11-18 01:13:57 +01:00
parent ef6d0ff3f1
commit 85f29ace6b
2 changed files with 29 additions and 8 deletions

View File

@ -1,7 +1,7 @@
use r0::zero_bss; use r0::zero_bss;
use vcell::VolatileCell; use vcell::VolatileCell;
use crate::regs::{RegisterR, RegisterW, RegisterRW}; use crate::regs::{RegisterR, RegisterW, RegisterRW};
use crate::cortex_a9::{asm, regs::*, mmu}; use crate::cortex_a9::{asm, regs::*, cache, mmu};
use crate::zynq::{slcr, mpcore}; use crate::zynq::{slcr, mpcore};
extern "C" { extern "C" {
@ -10,6 +10,7 @@ extern "C" {
static mut __stack_start: u32; static mut __stack_start: u32;
} }
/// `0` means: wait for initialization by core0
static mut CORE1_STACK: VolatileCell<u32> = VolatileCell::new(0); static mut CORE1_STACK: VolatileCell<u32> = VolatileCell::new(0);
#[link_section = ".text.boot"] #[link_section = ".text.boot"]
@ -99,10 +100,12 @@ fn l1_cache_init() {
dciall(); dciall();
} }
pub struct Core1; pub struct Core1<S: AsMut<[u32]>> {
pub stack: S,
}
impl Core1 { impl<S: AsMut<[u32]>> Core1<S> {
pub fn stop() { pub fn stop(&self) {
slcr::RegisterBlock::unlocked(|slcr| { slcr::RegisterBlock::unlocked(|slcr| {
slcr.a9_cpu_rst_ctrl.modify(|_, w| w.a9_rst1(true)); slcr.a9_cpu_rst_ctrl.modify(|_, w| w.a9_rst1(true));
slcr.a9_cpu_rst_ctrl.modify(|_, w| w.a9_clkstop1(true)); slcr.a9_cpu_rst_ctrl.modify(|_, w| w.a9_clkstop1(true));
@ -110,22 +113,32 @@ impl Core1 {
}); });
} }
pub fn start<T: AsMut<[u32]>>(mut stack: T) { /// Reset and start core1
// reset and stop (safe to repeat) ///
Self::stop(); /// The stack must not be in OCM because core1 still has to
/// initialize its MMU before it can access DDR.
pub fn start(stack: S) -> Self {
let mut core = Core1 { stack };
let stack = stack.as_mut(); // reset and stop (safe to repeat)
core.stop();
let stack = core.stack.as_mut();
let stack_start = &mut stack[stack.len() - 1]; let stack_start = &mut stack[stack.len() - 1];
unsafe { unsafe {
CORE1_STACK.set(stack_start as *mut _ as u32); CORE1_STACK.set(stack_start as *mut _ as u32);
} }
// Ensure stack pointer has been written // Ensure stack pointer has been written to cache
asm::dmb(); asm::dmb();
// Flush cache-line
cache::dccmvac(unsafe { &CORE1_STACK } as *const _ as u32);
// wake up core1 // wake up core1
slcr::RegisterBlock::unlocked(|slcr| { slcr::RegisterBlock::unlocked(|slcr| {
slcr.a9_cpu_rst_ctrl.modify(|_, w| w.a9_rst1(false)); slcr.a9_cpu_rst_ctrl.modify(|_, w| w.a9_rst1(false));
slcr.a9_cpu_rst_ctrl.modify(|_, w| w.a9_clkstop1(false)); slcr.a9_cpu_rst_ctrl.modify(|_, w| w.a9_clkstop1(false));
}); });
core
} }
} }

View File

@ -71,6 +71,14 @@ pub fn dccimva(addr: usize) {
} }
} }
/// clear cache line by virtual address to point of coherency (DCCMVAC)
#[inline]
pub fn dccmvac(addr: u32) {
unsafe {
asm!("mcr p15, 0, $0, c7, c10, 1" :: "r" (addr) :: "volatile");
}
}
/// The DCCIVMA (data cache clear and invalidate) applied to the /// The DCCIVMA (data cache clear and invalidate) applied to the
/// region of memory occupied by the argument. This does not modify /// region of memory occupied by the argument. This does not modify
/// the argument, but due to the invalidate part (only ever needed if /// the argument, but due to the invalidate part (only ever needed if