aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mm/cache-tauros2.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/mm/cache-tauros2.c b/arch/arm/mm/cache-tauros2.c
index 95eb524ce556..88255bea65e4 100644
--- a/arch/arm/mm/cache-tauros2.c
+++ b/arch/arm/mm/cache-tauros2.c
@@ -22,6 +22,11 @@
22#include <asm/cputype.h> 22#include <asm/cputype.h>
23#include <asm/hardware/cache-tauros2.h> 23#include <asm/hardware/cache-tauros2.h>
24 24
25/* CP15 PJ4 Control configuration register */
26#define CCR_L2C_PREFETCH_DISABLE BIT(24)
27#define CCR_L2C_ECC_ENABLE BIT(23)
28#define CCR_L2C_WAY7_4_DISABLE BIT(21)
29#define CCR_L2C_BURST8_ENABLE BIT(20)
25 30
26/* 31/*
27 * When Tauros2 is used on a CPU that supports the v7 hierarchical 32 * When Tauros2 is used on a CPU that supports the v7 hierarchical
@@ -182,18 +187,18 @@ static void enable_extra_feature(unsigned int features)
182 u = read_extra_features(); 187 u = read_extra_features();
183 188
184 if (features & CACHE_TAUROS2_PREFETCH_ON) 189 if (features & CACHE_TAUROS2_PREFETCH_ON)
185 u &= ~0x01000000; 190 u &= ~CCR_L2C_PREFETCH_DISABLE;
186 else 191 else
187 u |= 0x01000000; 192 u |= CCR_L2C_PREFETCH_DISABLE;
188 pr_info("Tauros2: %s L2 prefetch.\n", 193 pr_info("Tauros2: %s L2 prefetch.\n",
189 (features & CACHE_TAUROS2_PREFETCH_ON) 194 (features & CACHE_TAUROS2_PREFETCH_ON)
190 ? "Enabling" : "Disabling"); 195 ? "Enabling" : "Disabling");
191 196
192 if (features & CACHE_TAUROS2_LINEFILL_BURST8) 197 if (features & CACHE_TAUROS2_LINEFILL_BURST8)
193 u |= 0x00100000; 198 u |= CCR_L2C_BURST8_ENABLE;
194 else 199 else
195 u &= ~0x00100000; 200 u &= ~CCR_L2C_BURST8_ENABLE;
196 pr_info("Tauros2: %s line fill burt8.\n", 201 pr_info("Tauros2: %s burst8 line fill.\n",
197 (features & CACHE_TAUROS2_LINEFILL_BURST8) 202 (features & CACHE_TAUROS2_LINEFILL_BURST8)
198 ? "Enabling" : "Disabling"); 203 ? "Enabling" : "Disabling");
199 204