summaryrefslogtreecommitdiffstats
path: root/arch/mips/au1000
diff options
context:
space:
mode:
authorSergei Shtylyov2006-05-26 17:44:54 +0200
committerRalf Baechle2006-06-06 01:15:13 +0200
commit9370b35175ca43fad7d24bc7b391473f3becbee8 (patch)
tree4d1f3e7a0708c86da26720288711f8702b00b601 /arch/mips/au1000
parent[MIPS] Print more information if we're struck by a machine check exception. (diff)
downloadkernel-qcow2-linux-9370b35175ca43fad7d24bc7b391473f3becbee8.tar.gz
kernel-qcow2-linux-9370b35175ca43fad7d24bc7b391473f3becbee8.tar.xz
kernel-qcow2-linux-9370b35175ca43fad7d24bc7b391473f3becbee8.zip
[MIPS] Save write-only Config.OD from being clobbered
Save the Config.OD bit from being clobbered by coherency_setup(). This bit, when set, fixes various errata in the early steppings of Au1x00 SOCs. Unfortunately, the bit was write-only on the most early of them. In addition, also restore the bit after a wakeup from sleep. Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/au1000')
-rw-r--r--arch/mips/au1000/common/sleeper.S5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/mips/au1000/common/sleeper.S b/arch/mips/au1000/common/sleeper.S
index 44dac3b0df3b..683d9da84b66 100644
--- a/arch/mips/au1000/common/sleeper.S
+++ b/arch/mips/au1000/common/sleeper.S
@@ -112,6 +112,11 @@ sdsleep:
mtc0 k0, CP0_PAGEMASK
lw k0, 0x14(sp)
mtc0 k0, CP0_CONFIG
+
+ /* We need to catch the ealry Alchemy SOCs with
+ * the write-only Config[OD] bit and set it back to one...
+ */
+ jal au1x00_fixup_config_od
lw $1, PT_R1(sp)
lw $2, PT_R2(sp)
lw $3, PT_R3(sp)