sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "arch/armv7ar: use robust code sequences for cache maintenance"

Browse Source 
This reverts commit 69fd539886.

Signed-off-by: zhangyuan21 <zhangyuan21@xiaomi.com>
This commit is contained in:
zhangyuan21 2023-04-27 18:12:21 +08:00 committed by Xiang Xiao
parent 5945f080b9
commit 4a4386c822
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/src/armv7-a/arm_cache.c
View File

@ -216,8 +216,8 @@ size_t up_get_dcache_linesize(void)
void up_invalidate_dcache(uintptr_t start, uintptr_t end) void up_invalidate_dcache(uintptr_t start, uintptr_t end)
{ {
l2cc_invalidate(start, end);
cp15_invalidate_dcache(start, end); cp15_invalidate_dcache(start, end);
l2cc_invalidate(start, end);
} }
/**************************************************************************** /****************************************************************************
@ -241,8 +241,8 @@ void up_invalidate_dcache_all(void)
{ {
#ifdef CONFIG_ARCH_L2CACHE #ifdef CONFIG_ARCH_L2CACHE
irqstate_t flags = enter_critical_section(); irqstate_t flags = enter_critical_section();
l2cc_invalidate_all();
cp15_invalidate_dcache_all(); cp15_invalidate_dcache_all();
l2cc_invalidate_all();
leave_critical_section(flags); leave_critical_section(flags);
#else #else
cp15_invalidate_dcache_all(); cp15_invalidate_dcache_all();
@ -338,15 +338,14 @@ void up_flush_dcache(uintptr_t start, uintptr_t end)
{ {
if ((end - start) < cp15_cache_size()) if ((end - start) < cp15_cache_size())
{ {
cp15_clean_dcache(start, end); cp15_flush_dcache(start, end);
} }
else else
{ {
cp15_clean_dcache_all(); cp15_flush_dcache_all();
} }
l2cc_flush(start, end); l2cc_flush(start, end);
cp15_invalidate_dcache(start, end);
} }
/**************************************************************************** /****************************************************************************
@ -373,9 +372,8 @@ void up_flush_dcache(uintptr_t start, uintptr_t end)
void up_flush_dcache_all(void) void up_flush_dcache_all(void)
{ {
cp15_clean_dcache_all(); cp15_flush_dcache_all();
l2cc_flush_all(); l2cc_flush_all();
cp15_invalidate_dcache_all();
} }
/**************************************************************************** /****************************************************************************

12
arch/arm/src/armv7-r/arm_cache.c
View File

@ -216,8 +216,8 @@ size_t up_get_dcache_linesize(void)
void up_invalidate_dcache(uintptr_t start, uintptr_t end) void up_invalidate_dcache(uintptr_t start, uintptr_t end)
{ {
l2cc_invalidate(start, end);
cp15_invalidate_dcache(start, end); cp15_invalidate_dcache(start, end);
l2cc_invalidate(start, end);
} }
/**************************************************************************** /****************************************************************************
@ -241,8 +241,8 @@ void up_invalidate_dcache_all(void)
{ {
#ifdef CONFIG_ARCH_L2CACHE #ifdef CONFIG_ARCH_L2CACHE
irqstate_t flags = enter_critical_section(); irqstate_t flags = enter_critical_section();
l2cc_invalidate_all();
cp15_invalidate_dcache_all(); cp15_invalidate_dcache_all();
l2cc_invalidate_all();
leave_critical_section(flags); leave_critical_section(flags);
#else #else
cp15_invalidate_dcache_all(); cp15_invalidate_dcache_all();
@ -338,15 +338,14 @@ void up_flush_dcache(uintptr_t start, uintptr_t end)
{ {
if ((end - start) < cp15_cache_size()) if ((end - start) < cp15_cache_size())
{ {
cp15_clean_dcache(start, end); cp15_flush_dcache(start, end);
} }
else else
{ {
cp15_clean_dcache_all(); cp15_flush_dcache_all();
} }
l2cc_flush(start, end); l2cc_flush(start, end);
cp15_invalidate_dcache(start, end);
} }
/**************************************************************************** /****************************************************************************
@ -373,9 +372,8 @@ void up_flush_dcache(uintptr_t start, uintptr_t end)
void up_flush_dcache_all(void) void up_flush_dcache_all(void)
{ {
cp15_clean_dcache_all(); cp15_flush_dcache_all();
l2cc_flush_all(); l2cc_flush_all();
cp15_invalidate_dcache_all();
} }
/**************************************************************************** /****************************************************************************