andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xlat_table_v2: Fix enable WARMBOOT_ENABLE_DCACHE_EARLY config 

The WARMBOOT_ENABLE_DCACHE_EARLY allows caches to be turned on early during
the boot. But the xlat_change_mem_attributes_ctx() API did not do the required
cache maintenance after the mmap tables are modified if
WARMBOOT_ENABLE_DCACHE_EARLY is enabled. This meant that when the caches are turned
off during power down, the tables in memory are accessed as part of cache
maintenance for power down, and the tables are not correct at this point which
results in a data abort.
This patch removes the optimization within xlat_change_mem_attributes_ctx()
when WARMBOOT_ENABLE_DCACHE_EARLY is enabled.

Signed-off-by: Artsem Artsemenka <artsem.artsemenka@arm.com>
Change-Id: I82de3decba87dd13e9856b5f3620a1c8571c8d87
This commit is contained in:
Artsem Artsemenka 2019-10-17 13:51:27 +01:00
parent 19adcb415c
commit 0e7a0540d7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/xlat_tables_v2/xlat_tables_utils.c
View File

@ -551,7 +551,7 @@ int xlat_change_mem_attributes_ctx(const xlat_ctx_t *ctx, uintptr_t base_va,
* before writing the new descriptor. * before writing the new descriptor.
*/ */
*entry = INVALID_DESC; *entry = INVALID_DESC;
#if !(HW_ASSISTED_COHERENCY || WARMBOOT_ENABLE_DCACHE_EARLY) #if !HW_ASSISTED_COHERENCY
dccvac((uintptr_t)entry); dccvac((uintptr_t)entry);
#endif #endif
/* Invalidate any cached copy of this mapping in the TLBs. */ /* Invalidate any cached copy of this mapping in the TLBs. */
@ -562,7 +562,7 @@ int xlat_change_mem_attributes_ctx(const xlat_ctx_t *ctx, uintptr_t base_va,
/* Write new descriptor */ /* Write new descriptor */
*entry = xlat_desc(ctx, new_attr, addr_pa, level); *entry = xlat_desc(ctx, new_attr, addr_pa, level);
#if !(HW_ASSISTED_COHERENCY || WARMBOOT_ENABLE_DCACHE_EARLY) #if !HW_ASSISTED_COHERENCY
dccvac((uintptr_t)entry); dccvac((uintptr_t)entry);
#endif #endif
base_va += PAGE_SIZE; base_va += PAGE_SIZE;