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

Merge "xlat_table_v2: Fix enable WARMBOOT_ENABLE_DCACHE_EARLY config" into integration

This commit is contained in:
Soby Mathew 2019-10-21 12:10:16 +00:00 committed by TrustedFirmware Code Review
parent 942bb52e99 0e7a0540d7
commit 937f669872
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;