sjm
/
zc706
forked from M-Labs/zynq-rs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cache: add the required barriers

This commit is contained in:
Astro 2020-06-18 00:48:41 +02:00
parent f50018092c
commit ae739146c5
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libcortex_a9/src/cache.rs
View File

@ -1,3 +1,5 @@
use super::asm::{dmb, dsb};
/// Invalidate TLBs /// Invalidate TLBs
#[inline(always)] #[inline(always)]
pub fn tlbiall() { pub fn tlbiall() {
@ -107,15 +109,19 @@ pub fn dccimvac(addr: usize) {
/// Data cache clean and invalidate for an object. /// Data cache clean and invalidate for an object.
pub fn dcci<T>(object: &T) { pub fn dcci<T>(object: &T) {
dmb();
for addr in object_cache_line_addrs(object) { for addr in object_cache_line_addrs(object) {
dccimvac(addr); dccimvac(addr);
} }
dsb();
} }
pub fn dcci_slice<T>(slice: &[T]) { pub fn dcci_slice<T>(slice: &[T]) {
dmb();
for addr in slice_cache_line_addrs(slice) { for addr in slice_cache_line_addrs(slice) {
dccimvac(addr); dccimvac(addr);
} }
dsb();
} }
/// Data cache clean by memory virtual address. /// Data cache clean by memory virtual address.
@ -128,18 +134,22 @@ pub fn dccmvac(addr: usize) {
/// Data cache clean for an object. /// Data cache clean for an object.
pub fn dcc<T>(object: &T) { pub fn dcc<T>(object: &T) {
dmb();
for addr in object_cache_line_addrs(object) { for addr in object_cache_line_addrs(object) {
dccmvac(addr); dccmvac(addr);
} }
dsb();
} }
/// Data cache clean for an object. Panics if not properly /// Data cache clean for an object. Panics if not properly
/// aligned and properly sized to be contained in an exact number of /// aligned and properly sized to be contained in an exact number of
/// cache lines. /// cache lines.
pub fn dcc_slice<T>(slice: &[T]) { pub fn dcc_slice<T>(slice: &[T]) {
dmb();
for addr in slice_cache_line_addrs(slice) { for addr in slice_cache_line_addrs(slice) {
dccmvac(addr); dccmvac(addr);
} }
dsb();
} }
/// Data cache invalidate by memory virtual address. This and /// Data cache invalidate by memory virtual address. This and
@ -158,9 +168,11 @@ pub unsafe fn dci<T>(object: &mut T) {
assert_eq!(first_addr & CACHE_LINE_MASK, 0, "dci object first_addr must be aligned"); assert_eq!(first_addr & CACHE_LINE_MASK, 0, "dci object first_addr must be aligned");
assert_eq!(beyond_addr & CACHE_LINE_MASK, 0, "dci object beyond_addr must be aligned"); assert_eq!(beyond_addr & CACHE_LINE_MASK, 0, "dci object beyond_addr must be aligned");
dmb();
for addr in (first_addr..beyond_addr).step_by(CACHE_LINE) { for addr in (first_addr..beyond_addr).step_by(CACHE_LINE) {
dcimvac(addr); dcimvac(addr);
} }
dsb();
} }
pub unsafe fn dci_slice<T>(slice: &mut [T]) { pub unsafe fn dci_slice<T>(slice: &mut [T]) {
@ -170,7 +182,9 @@ pub unsafe fn dci_slice<T>(slice: &mut [T]) {
assert_eq!(first_addr & CACHE_LINE_MASK, 0, "dci slice first_addr must be aligned"); assert_eq!(first_addr & CACHE_LINE_MASK, 0, "dci slice first_addr must be aligned");
assert_eq!(beyond_addr & CACHE_LINE_MASK, 0, "dci slice beyond_addr must be aligned"); assert_eq!(beyond_addr & CACHE_LINE_MASK, 0, "dci slice beyond_addr must be aligned");
dmb();
for addr in (first_addr..beyond_addr).step_by(CACHE_LINE) { for addr in (first_addr..beyond_addr).step_by(CACHE_LINE) {
dcimvac(addr); dcimvac(addr);
} }
dsb();
} }