summaryrefslogtreecommitdiffstats
path: root/arch/mips/netlogic/common/reset.S
diff options
context:
space:
mode:
authorJayachandran C <jchandra@broadcom.com>2013-06-10 08:41:04 +0200
committerRalf Baechle <ralf@linux-mips.org>2013-06-13 17:46:42 +0200
commit919f9abb3723f088290c62648b12fbfc7600d923 (patch)
tree00d1373418b59a086874a31a9cb5fefb16985cb9 /arch/mips/netlogic/common/reset.S
parentMIPS: Netlogic: Add nlm_get_boot_data() helper (diff)
downloadlinux-919f9abb3723f088290c62648b12fbfc7600d923.tar.xz
linux-919f9abb3723f088290c62648b12fbfc7600d923.zip
MIPS: Netlogic: move cpu_ready array to boot area
Move the nlm_cpu_ready[] array used by the cpu wakeup code to the boot area, along with rest of the boot parameter code. Signed-off-by: Jayachandran C <jchandra@broadcom.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/5425/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/netlogic/common/reset.S')
-rw-r--r--arch/mips/netlogic/common/reset.S6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/netlogic/common/reset.S b/arch/mips/netlogic/common/reset.S
index 98691d6b3bbe..b11691c629d0 100644
--- a/arch/mips/netlogic/common/reset.S
+++ b/arch/mips/netlogic/common/reset.S
@@ -216,8 +216,10 @@ EXPORT(nlm_boot_siblings)
ori t1, ST0_KX
#endif
mtc0 t1, CP0_STATUS
- /* mark CPU ready */
- PTR_LA t1, nlm_cpu_ready
+
+ /* mark CPU ready, careful here, previous mtcr trashed registers */
+ li t3, CKSEG1ADDR(RESET_DATA_PHYS)
+ ADDIU t1, t3, BOOT_CPU_READY
sll v1, v0, 2
PTR_ADDU t1, v1
li t2, 1