Skip to content

GitLab

Commit 937f6698 authored by Soby Mathew's avatar Soby Mathew Committed by TrustedFirmware Code Review
Browse files

Merge "xlat_table_v2: Fix enable WARMBOOT_ENABLE_DCACHE_EARLY config" into integration

parents 942bb52e 0e7a0540
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
+2 -2
lib/xlat_tables_v2/xlat_tables_utils.c
View file @ 937f6698
...@@ -551,7 +551,7 @@ int xlat_change_mem_attributes_ctx(const xlat_ctx_t *ctx, uintptr_t base_va, ...@@ -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, ...@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment