Blackfin: decouple unrelated cache settings to get exact behavior

The current cache options don't really represent the hardware features.
They end up setting different aspects of the hardware so that the end
result is to turn on/off the cache.  Unfortunately, when we hit cache
problems with the hardware, it's difficult to test different settings to
root cause the problem.  The current settings also don't cleanly allow for
different caching behaviors with different regions of memory.

So split the configure options such that they properly reflect the settings
that are applied to the hardware.

Signed-off-by: Jie Zhang <jie.zhang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

1 files changed, 39 insertions, 18 deletions

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 8140a2fc8bbd..220635a1ebdd 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -907,23 +907,41 @@ endchoice
 
 
 comment "Cache Support"
+
 config BFIN_ICACHE
         bool "Enable ICACHE"
+        default y
+config BFIN_ICACHE_LOCK
+        bool "Enable Instruction Cache Locking"
+        depends on BFIN_ICACHE
+        default n
+config BFIN_EXTMEM_ICACHEABLE
+        bool "Enable ICACHE for external memory"
+        depends on BFIN_ICACHE
+        default y
+config BFIN_L2_ICACHEABLE
+        bool "Enable ICACHE for L2 SRAM"
+        depends on BFIN_ICACHE
+        depends on BF54x || BF561
+        default n
+
 config BFIN_DCACHE
         bool "Enable DCACHE"
+        default y
 config BFIN_DCACHE_BANKA
         bool "Enable only 16k BankA DCACHE - BankB is SRAM"
         depends on BFIN_DCACHE && !BF531
         default n
-config BFIN_ICACHE_LOCK
-        bool "Enable Instruction Cache Locking"
-
-choice
-        prompt "External memory cache policy"
+config BFIN_EXTMEM_DCACHEABLE
+        bool "Enable DCACHE for external memory"
         depends on BFIN_DCACHE
-        default BFIN_WB if !SMP
-        default BFIN_WT if SMP
-config BFIN_WB
+        default y
+choice
+        prompt "External memory DCACHE policy"
+        depends on BFIN_EXTMEM_DCACHEABLE
+        default BFIN_EXTMEM_WRITEBACK if !SMP
+        default BFIN_EXTMEM_WRITETHROUGH if SMP
+config BFIN_EXTMEM_WRITEBACK
         bool "Write back"
         depends on !SMP
         help
@@ -941,7 +959,7 @@ config BFIN_WB
           If you are unsure of the options and you want to be safe,
           then go with Write Through.
 
-config BFIN_WT
+config BFIN_EXTMEM_WRITETHROUGH
         bool "Write through"
         help
           Write Back Policy:
@@ -960,23 +978,26 @@ config BFIN_WT
 
 endchoice
 
+config BFIN_L2_DCACHEABLE
+        bool "Enable DCACHE for L2 SRAM"
+        depends on BFIN_DCACHE
+        depends on BF54x || BF561
+        default n
 choice
-        prompt "L2 SRAM cache policy"
-        depends on (BF54x || BF561)
-        default BFIN_L2_WT
-config BFIN_L2_WB
+        prompt "L2 SRAM DCACHE policy"
+        depends on BFIN_L2_DCACHEABLE
+        default BFIN_L2_WRITEBACK
+config BFIN_L2_WRITEBACK
         bool "Write back"
         depends on !SMP
 
-config BFIN_L2_WT
+config BFIN_L2_WRITETHROUGH
         bool "Write through"
         depends on !SMP
-
-config BFIN_L2_NOT_CACHED
-        bool "Not cached"
-
 endchoice
 
+
+comment "Memory Protection Unit"
 config MPU
         bool "Enable the memory protection unit (EXPERIMENTAL)"
         default n