summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-01-17 10:13:16 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2016-01-20 08:39:42 +0900
commitcefca48ca7f1c46bf2e3a64a40fa0c1aaf575a42 (patch)
tree8c67c5310d55c4a2f5aa53914c73e85b8720b64f
parent25d4eb8091f4c410987c139161d3621e0fb1fbca (diff)
downloadtalos-obmc-uboot-cefca48ca7f1c46bf2e3a64a40fa0c1aaf575a42.tar.gz
talos-obmc-uboot-cefca48ca7f1c46bf2e3a64a40fa0c1aaf575a42.zip
ARM: uniphier: refactor outer cache operation slightly
Improve readability without changing the behavior. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r--arch/arm/mach-uniphier/cache_uniphier.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/cache_uniphier.c b/arch/arm/mach-uniphier/cache_uniphier.c
index b4ca8b6934..4a79966659 100644
--- a/arch/arm/mach-uniphier/cache_uniphier.c
+++ b/arch/arm/mach-uniphier/cache_uniphier.c
@@ -67,7 +67,9 @@ static void uniphier_cache_maint_range(u32 start, u32 end, u32 operation)
*/
start = start & ~(SSC_LINE_SIZE - 1);
- if (start == 0 && end >= (u32)(-SSC_LINE_SIZE)) {
+ size = end - start;
+
+ if (unlikely(size >= (u32)(-SSC_LINE_SIZE))) {
/* this means cache operation for all range */
uniphier_cache_maint_all(operation);
return;
@@ -77,7 +79,7 @@ static void uniphier_cache_maint_range(u32 start, u32 end, u32 operation)
* If end address is not aligned to cache-line,
* do cache operation for the last cache-line
*/
- size = (end - start + SSC_LINE_SIZE - 1) & ~(SSC_LINE_SIZE - 1);
+ size = ALIGN(size, SSC_LINE_SIZE);
while (size) {
u32 chunk_size = size > SSC_RANGE_OP_MAX_SIZE ?
OpenPOWER on IntegriCloud