summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/cache_v7.c
diff options
context:
space:
mode:
authorValentine Barshak <valentine.barshak@cogentembedded.com>2015-03-20 18:16:17 +0300
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-04-16 13:53:26 +0200
commit9ba379ade789e41cc4132d622315f3f021a47b9b (patch)
tree9591843c0f8f3166760f6c07c1d0fe83e49d8e4e /arch/arm/cpu/armv7/cache_v7.c
parent82f681d67d3545cbc2250bdf7ecf2d06e7369e2b (diff)
downloadblackbird-obmc-uboot-9ba379ade789e41cc4132d622315f3f021a47b9b.tar.gz
blackbird-obmc-uboot-9ba379ade789e41cc4132d622315f3f021a47b9b.zip
ARM: cpu: Add ARMv7 barrier operations support
This enables ARMv7 barrier operations support when march=armv7-a is enabled. Using CP15 barriers causes U-Boot bootm command crash when transferring control to the loaded image on Renesas R8A7794 Cortex A7 CPU. Using ARMv7 barrier operations instead of the deprecated CP15 barriers helps to avoid these issues. Signed-off-by: Valentine Barshak <valentine.barshak+renesas@cogentembedded.com> Signed-off-by: Vladimir Barinov <vladimir.barinov+renesas@cogentembedded.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Diffstat (limited to 'arch/arm/cpu/armv7/cache_v7.c')
-rw-r--r--arch/arm/cpu/armv7/cache_v7.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/cpu/armv7/cache_v7.c b/arch/arm/cpu/armv7/cache_v7.c
index 0f9d8377ed..e8ee875981 100644
--- a/arch/arm/cpu/armv7/cache_v7.c
+++ b/arch/arm/cpu/armv7/cache_v7.c
@@ -68,7 +68,7 @@ static void v7_inval_dcache_level_setway(u32 level, u32 num_sets,
}
}
/* DSB to make sure the operation is complete */
- CP15DSB;
+ DSB;
}
static void v7_clean_inval_dcache_level_setway(u32 level, u32 num_sets,
@@ -96,7 +96,7 @@ static void v7_clean_inval_dcache_level_setway(u32 level, u32 num_sets,
}
}
/* DSB to make sure the operation is complete */
- CP15DSB;
+ DSB;
}
static void v7_maint_dcache_level_setway(u32 level, u32 operation)
@@ -215,7 +215,7 @@ static void v7_dcache_maint_range(u32 start, u32 stop, u32 range_op)
}
/* DSB to make sure the operation is complete */
- CP15DSB;
+ DSB;
}
/* Invalidate TLB */
@@ -228,9 +228,9 @@ static void v7_inval_tlb(void)
/* Invalidate entire instruction TLB */
asm volatile ("mcr p15, 0, %0, c8, c5, 0" : : "r" (0));
/* Full system DSB - make sure that the invalidation is complete */
- CP15DSB;
+ DSB;
/* Full system ISB - make sure the instruction stream sees it */
- CP15ISB;
+ ISB;
}
void invalidate_dcache_all(void)
@@ -343,10 +343,10 @@ void invalidate_icache_all(void)
asm volatile ("mcr p15, 0, %0, c7, c5, 6" : : "r" (0));
/* Full system DSB - make sure that the invalidation is complete */
- CP15DSB;
+ DSB;
/* ISB - make sure the instruction stream sees it */
- CP15ISB;
+ ISB;
}
#else
void invalidate_icache_all(void)
OpenPOWER on IntegriCloud