1 files changed, 33 insertions, 3 deletions

diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c
index ad85421099cd..e932ebef4738 100644
--- a/arch/sh/kernel/cpu/init.c
+++ b/arch/sh/kernel/cpu/init.c
@@ -3,7 +3,7 @@
  *
  * CPU init code
  *
- * Copyright (C) 2002 - 2007  Paul Mundt
+ * Copyright (C) 2002 - 2009  Paul Mundt
  * Copyright (C) 2003  Richard Curnow
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -62,6 +62,37 @@ static void __init speculative_execution_init(void)
 #define speculative_execution_init()    do { } while (0)
 #endif
 
+#ifdef CONFIG_CPU_SH4A
+#define EXPMASK                 0xff2f0004
+#define EXPMASK_RTEDS           (1 << 0)
+#define EXPMASK_BRDSSLP         (1 << 1)
+#define EXPMASK_MMCAW           (1 << 4)
+
+static void __init expmask_init(void)
+{
+        unsigned long expmask = __raw_readl(EXPMASK);
+
+        /*
+         * Future proofing.
+         *
+         * Disable support for slottable sleep instruction
+         * and non-nop instructions in the rte delay slot.
+         */
+        expmask &= ~(EXPMASK_RTEDS | EXPMASK_BRDSSLP);
+
+        /*
+         * Enable associative writes to the memory-mapped cache array
+         * until the cache flush ops have been rewritten.
+         */
+        expmask |= EXPMASK_MMCAW;
+
+        __raw_writel(expmask, EXPMASK);
+        ctrl_barrier();
+}
+#else
+#define expmask_init()  do { } while (0)
+#endif
+
 /* 2nd-level cache init */
 void __uses_jump_to_uncached __attribute__ ((weak)) l2_cache_init(void)
 {
@@ -268,11 +299,9 @@ asmlinkage void __init sh_cpu_init(void)
         cache_init();
 
         if (raw_smp_processor_id() == 0) {
-#ifdef CONFIG_MMU
                 shm_align_mask = max_t(unsigned long,
                                        current_cpu_data.dcache.way_size - 1,
                                        PAGE_SIZE - 1);
-#endif
 
                 /* Boot CPU sets the cache shape */
                 detect_cache_shape();
@@ -321,4 +350,5 @@ asmlinkage void __init sh_cpu_init(void)
 #endif
 
         speculative_execution_init();
+        expmask_init();
 }