summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm64/Kconfig19
-rw-r--r--arch/arm64/mm/proc.S13
2 files changed, 31 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 8912034a5d0e..ae7d259140ce 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -456,6 +456,25 @@ config ARM64_16K_PAGES
requires applications compiled with 16K (or a multiple of 16K)
aligned segments.
+config ARM64_DCACHE_DISABLE
+ bool "Disable CPU Data Caches"
+ help
+ Disable CPU data cache usage by setting the SCTLR[C] bit during
+ kernel initialization. This will result in a considerable
+ performance impact, but may be useful in certain situations.
+
+ If you are not sure what to do, select 'N' here.
+
+config ARM64_ICACHE_DISABLE
+ bool "Disable CPU Instruction Caches"
+ help
+ Disable CPU instruction cache usage by setting the SCTLR[I]
+ bit during kernel initialization. This will result in a
+ considerable performance impact, but may be useful in certain
+ situations.
+
+ If you are not sure what to do, select 'N' here.
+
config ARM64_64K_PAGES
bool "64KB"
help
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index f62f0356a3bf..f0dd47a5a532 100644
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -273,5 +273,16 @@ ENDPROC(__cpu_setup)
*/
.type crval, #object
crval:
+#ifdef CONFIG_ARM64_ICACHE_DISABLE
+#define CR_IBIT 0
+#else
+#define CR_IBIT 0x1000
+#endif
+
+#ifdef CONFIG_ARM64_DCACHE_DISABLE
+#define CR_CBIT 0
+#else
+#define CR_CBIT 0x4
+#endif
.word 0xfcffffff // clear
- .word 0x34d5d91d // set
+ .word 0x34d5d91d | CR_IBIT | CR_CBIT // set