diff options
| author | Jayachandran C | 2013-06-10 08:41:04 +0200 |
|---|---|---|
| committer | Ralf Baechle | 2013-06-13 17:46:42 +0200 |
| commit | 919f9abb3723f088290c62648b12fbfc7600d923 (patch) | |
| tree | 00d1373418b59a086874a31a9cb5fefb16985cb9 /arch/mips/netlogic/xlr | |
| parent | MIPS: Netlogic: Add nlm_get_boot_data() helper (diff) | |
| download | kernel-qcow2-linux-919f9abb3723f088290c62648b12fbfc7600d923.tar.gz kernel-qcow2-linux-919f9abb3723f088290c62648b12fbfc7600d923.tar.xz kernel-qcow2-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/xlr')
| -rw-r--r-- | arch/mips/netlogic/xlr/setup.c | 1 | ||||
| -rw-r--r-- | arch/mips/netlogic/xlr/wakeup.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c index 7e27f8591867..214d123b79fa 100644 --- a/arch/mips/netlogic/xlr/setup.c +++ b/arch/mips/netlogic/xlr/setup.c @@ -211,6 +211,7 @@ void __init prom_init(void) /* Update reset entry point with CPU init code */ reset_vec = (void *)CKSEG1ADDR(RESET_VEC_PHYS); + memset(reset_vec, 0, RESET_VEC_SIZE); memcpy(reset_vec, (void *)nlm_reset_entry, (nlm_reset_entry_end - nlm_reset_entry)); diff --git a/arch/mips/netlogic/xlr/wakeup.c b/arch/mips/netlogic/xlr/wakeup.c index 3ebf7411d67b..c06e4c9f0478 100644 --- a/arch/mips/netlogic/xlr/wakeup.c +++ b/arch/mips/netlogic/xlr/wakeup.c @@ -53,6 +53,7 @@ int __cpuinit xlr_wakeup_secondary_cpus(void) { struct nlm_soc_info *nodep; unsigned int i, j, boot_cpu; + volatile u32 *cpu_ready = nlm_get_boot_data(BOOT_CPU_READY); /* * In case of RMI boot, hit with NMI to get the cores @@ -71,7 +72,7 @@ int __cpuinit xlr_wakeup_secondary_cpus(void) nodep->coremask = 1; for (i = 1; i < NLM_CORES_PER_NODE; i++) { for (j = 1000000; j > 0; j--) { - if (nlm_cpu_ready[i * NLM_THREADS_PER_CORE]) + if (cpu_ready[i * NLM_THREADS_PER_CORE]) break; udelay(10); } |