diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-12-04 08:22:11 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-04 08:22:11 +0100 |
commit | 6e8a0d11a088ed51b1b649d3a1127a7bda3700a0 (patch) | |
tree | ccf75bf36c8dd5c5f0dce18be8f5cb8c9ad59079 /arch/sh/kernel/cpu/init.c | |
parent | sh: Drop associative writes for SH-4 cache flushes. (diff) | |
download | linux-6e8a0d11a088ed51b1b649d3a1127a7bda3700a0.tar.xz linux-6e8a0d11a088ed51b1b649d3a1127a7bda3700a0.zip |
sh: Make associative cache writes fatal on all SH-4A parts.
Now that associative cache writes are no longer needed by the SH-4/SH-4A
cache flush code, associative write support can be explicitly disabled
for all SH-4A parts. This makes any associative write throw an exception,
as this behaviour can not be assumed to exist on future parts.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/init.c')
-rw-r--r-- | arch/sh/kernel/cpu/init.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c index ad9dfff9427c..89b4b76c0d76 100644 --- a/arch/sh/kernel/cpu/init.c +++ b/arch/sh/kernel/cpu/init.c @@ -75,16 +75,11 @@ static void __init expmask_init(void) /* * Future proofing. * - * Disable support for slottable sleep instruction - * and non-nop instructions in the rte delay slot. + * Disable support for slottable sleep instruction, non-nop + * instructions in the rte delay slot, and associative writes to + * the memory-mapped cache array. */ - 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; + expmask &= ~(EXPMASK_RTEDS | EXPMASK_BRDSSLP | EXPMASK_MMCAW); __raw_writel(expmask, EXPMASK); ctrl_barrier(); |