From 69db293aed1a54bc0c16c8a17e7f2420e593db4e Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Tue, 17 Jun 2014 17:07:27 -0700 Subject: [PATCH] libpayload arm64: Correct function names for tlb invalidation Correct function names to make them consistent with depthcharge calling convention BUG=None BRANCH=None TEST=Compiles successfully for rush Original-Change-Id: I0fd8f7f929c3fe268710362d1fc19f9e15c4a23b Original-Signed-off-by: Furquan Shaikh Original-Reviewed-on: https://chromium-review.googlesource.com/204423 Original-Reviewed-by: Aaron Durbin Original-Commit-Queue: Furquan Shaikh Original-Tested-by: Furquan Shaikh (cherry picked from commit 36008e728b840d85bb98225c7bb1420b993181de) Signed-off-by: Marc Jones Change-Id: I4b446da8f2c273385ee885c4870966e18ba2a7a6 Reviewed-on: http://review.coreboot.org/8122 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- payloads/libpayload/arch/arm64/cache.c | 6 +++--- payloads/libpayload/include/arm64/arch/cache.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/payloads/libpayload/arch/arm64/cache.c b/payloads/libpayload/arch/arm64/cache.c index f6faafa31d..05d6fb20ca 100644 --- a/payloads/libpayload/arch/arm64/cache.c +++ b/payloads/libpayload/arch/arm64/cache.c @@ -101,17 +101,17 @@ static void dcache_op_va(void const *addr, size_t len, enum dcache_op op) isb(); } -void dcache_clean_by_va(void const *addr, size_t len) +void dcache_clean_by_mva(void const *addr, size_t len) { dcache_op_va(addr, len, OP_DCCVAC); } -void dcache_clean_invalidate_by_va(void const *addr, size_t len) +void dcache_clean_invalidate_by_mva(void const *addr, size_t len) { dcache_op_va(addr, len, OP_DCCIVAC); } -void dcache_invalidate_by_va(void const *addr, size_t len) +void dcache_invalidate_by_mva(void const *addr, size_t len) { dcache_op_va(addr, len, OP_DCIVAC); } diff --git a/payloads/libpayload/include/arm64/arch/cache.h b/payloads/libpayload/include/arm64/arch/cache.h index d1fc1aa987..2d3175e871 100644 --- a/payloads/libpayload/include/arm64/arch/cache.h +++ b/payloads/libpayload/include/arm64/arch/cache.h @@ -209,13 +209,13 @@ static inline void write_sctlr_el3(uint32_t val) void dcache_clean_invalidate_all(void); /* dcache clean by virtual address to PoC */ -void dcache_clean_by_va(void const *addr, size_t len); +void dcache_clean_by_mva(void const *addr, size_t len); /* dcache clean and invalidate by virtual address to PoC */ -void dcache_clean_invalidate_by_va(void const *addr, size_t len); +void dcache_clean_invalidate_by_mva(void const *addr, size_t len); /* dcache invalidate by virtual address to PoC */ -void dcache_invalidate_by_va(void const *addr, size_t len); +void dcache_invalidate_by_mva(void const *addr, size_t len); void dcache_clean_all(void);