Commit 66d29985 authored by Jayachandran C's avatar Jayachandran C Committed by Ralf Baechle

MIPS: Netlogic: Merge some of XLR/XLP wakup code

Create a common NMI and reset handler in smpboot.S and use this for
both XLR and XLP.  In the earlier code, the woken up CPUs would
busy wait until released, switch this to wakeup by NMI.

The initial wakeup code or XLR and XLP are differ since they are
started from different bootloaders (XLP from u-boot and XLR from
netlogic bootloader). But in both platforms the woken up CPUs wait
and are released by sending an NMI.

Add support for starting XLR and XLP in 1/2/4 threads per core.
Signed-off-by: default avatarJayachandran C <jayachandranc@netlogicmicro.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2970/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 8da24631
...@@ -38,19 +38,39 @@ ...@@ -38,19 +38,39 @@
/* /*
* Common SMP definitions * Common SMP definitions
*/ */
#define RESET_VEC_PHYS 0x1fc00000
#define RESET_DATA_PHYS (RESET_VEC_PHYS + (1<<10))
#define BOOT_THREAD_MODE 0
#define BOOT_NMI_LOCK 4
#define BOOT_NMI_HANDLER 8
#ifndef __ASSEMBLY__
struct irq_desc; struct irq_desc;
extern struct plat_smp_ops nlm_smp_ops; extern struct plat_smp_ops nlm_smp_ops;
extern char nlm_reset_entry[], nlm_reset_entry_end[]; extern char nlm_reset_entry[], nlm_reset_entry_end[];
void nlm_smp_function_ipi_handler(unsigned int irq, struct irq_desc *desc); void nlm_smp_function_ipi_handler(unsigned int irq, struct irq_desc *desc);
void nlm_smp_resched_ipi_handler(unsigned int irq, struct irq_desc *desc); void nlm_smp_resched_ipi_handler(unsigned int irq, struct irq_desc *desc);
void nlm_smp_irq_init(void); void nlm_smp_irq_init(void);
void prom_pre_boot_secondary_cpus(void); void nlm_boot_secondary_cpus(void);
int nlm_wakeup_secondary_cpus(u32 wakeup_mask); int nlm_wakeup_secondary_cpus(u32 wakeup_mask);
void nlm_boot_smp_nmi(void); void nlm_rmiboot_preboot(void);
static inline void
nlm_set_nmi_handler(void *handler)
{
char *reset_data;
reset_data = (char *)CKSEG1ADDR(RESET_DATA_PHYS);
*(int64_t *)(reset_data + BOOT_NMI_HANDLER) = (long)handler;
}
/* /*
* Misc. * Misc.
*/ */
unsigned int nlm_get_cpu_frequency(void);
extern unsigned long nlm_common_ebase; extern unsigned long nlm_common_ebase;
unsigned int nlm_get_cpu_frequency(void); extern int nlm_threads_per_core;
extern uint32_t nlm_cpumask, nlm_coremask;
#endif
#endif /* _NETLOGIC_COMMON_H_ */ #endif /* _NETLOGIC_COMMON_H_ */
...@@ -35,17 +35,14 @@ ...@@ -35,17 +35,14 @@
#ifndef _NLM_HAL_XLP_H #ifndef _NLM_HAL_XLP_H
#define _NLM_HAL_XLP_H #define _NLM_HAL_XLP_H
#define RESET_VEC_PHYS 0x1fc00000
#define RESET_DATA_PHYS (RESET_VEC_PHYS + (1<<10))
#define BOOT_THREAD_MODE 0
#define PIC_UART_0_IRQ 17 #define PIC_UART_0_IRQ 17
#define PIC_UART_1_IRQ 18 #define PIC_UART_1_IRQ 18
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* SMP support functions */ /* SMP support functions */
void nlm_boot_core0_siblings(void); void xlp_boot_core0_siblings(void);
void xlp_wakeup_secondary_cpus(void);
void xlp_mmu_init(void); void xlp_mmu_init(void);
void nlm_hal_init(void); void nlm_hal_init(void);
......
...@@ -40,6 +40,8 @@ struct uart_port; ...@@ -40,6 +40,8 @@ struct uart_port;
unsigned int nlm_xlr_uart_in(struct uart_port *, int); unsigned int nlm_xlr_uart_in(struct uart_port *, int);
void nlm_xlr_uart_out(struct uart_port *, int, int); void nlm_xlr_uart_out(struct uart_port *, int, int);
/* SMP helpers */
void xlr_wakeup_secondary_cpus(void);
/* XLS B silicon "Rook" */ /* XLS B silicon "Rook" */
static inline unsigned int nlm_chip_is_xls_b(void) static inline unsigned int nlm_chip_is_xls_b(void)
......
obj-y += irq.o time.o obj-y += irq.o time.o
obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SMP) += smp.o smpboot.o
obj-$(CONFIG_EARLY_PRINTK) += earlycons.o obj-$(CONFIG_EARLY_PRINTK) += earlycons.o
...@@ -47,10 +47,12 @@ ...@@ -47,10 +47,12 @@
#if defined(CONFIG_CPU_XLP) #if defined(CONFIG_CPU_XLP)
#include <asm/netlogic/xlp-hal/iomap.h> #include <asm/netlogic/xlp-hal/iomap.h>
#include <asm/netlogic/xlp-hal/xlp.h>
#include <asm/netlogic/xlp-hal/pic.h> #include <asm/netlogic/xlp-hal/pic.h>
#elif defined(CONFIG_CPU_XLR) #elif defined(CONFIG_CPU_XLR)
#include <asm/netlogic/xlr/iomap.h> #include <asm/netlogic/xlr/iomap.h>
#include <asm/netlogic/xlr/pic.h> #include <asm/netlogic/xlr/pic.h>
#include <asm/netlogic/xlr/xlr.h>
#else #else
#error "Unknown CPU" #error "Unknown CPU"
#endif #endif
...@@ -125,10 +127,10 @@ void nlm_cpus_done(void) ...@@ -125,10 +127,10 @@ void nlm_cpus_done(void)
* Boot all other cpus in the system, initialize them, and bring them into * Boot all other cpus in the system, initialize them, and bring them into
* the boot function * the boot function
*/ */
int nlm_cpu_unblock[NR_CPUS];
int nlm_cpu_ready[NR_CPUS]; int nlm_cpu_ready[NR_CPUS];
unsigned long nlm_next_gp; unsigned long nlm_next_gp;
unsigned long nlm_next_sp; unsigned long nlm_next_sp;
cpumask_t phys_cpu_present_map; cpumask_t phys_cpu_present_map;
void nlm_boot_secondary(int logical_cpu, struct task_struct *idle) void nlm_boot_secondary(int logical_cpu, struct task_struct *idle)
...@@ -142,7 +144,7 @@ void nlm_boot_secondary(int logical_cpu, struct task_struct *idle) ...@@ -142,7 +144,7 @@ void nlm_boot_secondary(int logical_cpu, struct task_struct *idle)
/* barrier */ /* barrier */
__sync(); __sync();
nlm_cpu_unblock[cpu] = 1; nlm_pic_send_ipi(nlm_pic_base, cpu, 1, 1);
} }
void __init nlm_smp_setup(void) void __init nlm_smp_setup(void)
...@@ -178,12 +180,81 @@ void __init nlm_smp_setup(void) ...@@ -178,12 +180,81 @@ void __init nlm_smp_setup(void)
(unsigned long)cpu_possible_map.bits[0]); (unsigned long)cpu_possible_map.bits[0]);
pr_info("Detected %i Slave CPU(s)\n", num_cpus); pr_info("Detected %i Slave CPU(s)\n", num_cpus);
nlm_set_nmi_handler(nlm_boot_secondary_cpus);
} }
void nlm_prepare_cpus(unsigned int max_cpus) void nlm_prepare_cpus(unsigned int max_cpus)
{ {
} }
static int nlm_parse_cpumask(u32 cpu_mask)
{
uint32_t core0_thr_mask, core_thr_mask;
int threadmode, i;
core0_thr_mask = cpu_mask & 0xf;
switch (core0_thr_mask) {
case 1:
nlm_threads_per_core = 1;
threadmode = 0;
break;
case 3:
nlm_threads_per_core = 2;
threadmode = 2;
break;
case 0xf:
nlm_threads_per_core = 4;
threadmode = 3;
break;
default:
goto unsupp;
}
/* Verify other cores CPU masks */
nlm_coremask = 1;
nlm_cpumask = core0_thr_mask;
for (i = 1; i < 8; i++) {
core_thr_mask = (cpu_mask >> (i * 4)) & 0xf;
if (core_thr_mask) {
if (core_thr_mask != core0_thr_mask)
goto unsupp;
nlm_coremask |= 1 << i;
nlm_cpumask |= core0_thr_mask << (4 * i);
}
}
return threadmode;
unsupp:
panic("Unsupported CPU mask %x\n", cpu_mask);
return 0;
}
int __cpuinit nlm_wakeup_secondary_cpus(u32 wakeup_mask)
{
unsigned long reset_vec;
char *reset_data;
int threadmode;
/* Update reset entry point with CPU init code */
reset_vec = CKSEG1ADDR(RESET_VEC_PHYS);
memcpy((void *)reset_vec, (void *)nlm_reset_entry,
(nlm_reset_entry_end - nlm_reset_entry));
/* verify the mask and setup core config variables */
threadmode = nlm_parse_cpumask(wakeup_mask);
/* Setup CPU init parameters */
reset_data = (char *)CKSEG1ADDR(RESET_DATA_PHYS);
*(int *)(reset_data + BOOT_THREAD_MODE) = threadmode;
#ifdef CONFIG_CPU_XLP
xlp_wakeup_secondary_cpus();
#else
xlr_wakeup_secondary_cpus();
#endif
return 0;
}
struct plat_smp_ops nlm_smp_ops = { struct plat_smp_ops nlm_smp_ops = {
.send_ipi_single = nlm_send_ipi_single, .send_ipi_single = nlm_send_ipi_single,
.send_ipi_mask = nlm_send_ipi_mask, .send_ipi_mask = nlm_send_ipi_mask,
......
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
#include <asm/asmmacro.h> #include <asm/asmmacro.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/netlogic/common.h>
#include <asm/netlogic/xlp-hal/iomap.h> #include <asm/netlogic/xlp-hal/iomap.h>
#include <asm/netlogic/xlp-hal/xlp.h> #include <asm/netlogic/xlp-hal/xlp.h>
#include <asm/netlogic/xlp-hal/sys.h> #include <asm/netlogic/xlp-hal/sys.h>
...@@ -67,11 +69,37 @@ ...@@ -67,11 +69,37 @@
mtcr t1, t0 mtcr t1, t0
.endm .endm
/*
* The cores can come start when they are woken up. This is also the NMI
* entry, so check that first.
*
* The data corresponding to reset is stored at RESET_DATA_PHYS location,
* this will have the thread mask (used when core is woken up) and the
* current NMI handler in case we reached here for an NMI.
*
* When a core or thread is newly woken up, it loops in a 'wait'. When
* the CPU really needs waking up, we send an NMI to it, with the NMI
* handler set to prom_boot_secondary_cpus
*/
.set noreorder .set noreorder
.set noat
.set arch=xlr /* for mfcr/mtcr, XLR is sufficient */ .set arch=xlr /* for mfcr/mtcr, XLR is sufficient */
__CPUINIT FEXPORT(nlm_reset_entry)
EXPORT(nlm_reset_entry) dmtc0 k0, $22, 6
dmtc0 k1, $22, 7
mfc0 k0, CP0_STATUS
li k1, 0x80000
and k1, k0, k1
beqz k1, 1f /* go to real reset entry */
nop
li k1, CKSEG1ADDR(RESET_DATA_PHYS) /* NMI */
ld k0, BOOT_NMI_HANDLER(k1)
jr k0
nop
1: /* Entry point on core wakeup */
mfc0 t0, CP0_EBASE, 1 mfc0 t0, CP0_EBASE, 1
mfc0 t1, CP0_EBASE, 1 mfc0 t1, CP0_EBASE, 1
srl t1, 5 srl t1, 5
...@@ -128,7 +156,7 @@ EXPORT(nlm_boot_siblings) ...@@ -128,7 +156,7 @@ EXPORT(nlm_boot_siblings)
ehb ehb
#endif #endif
2: beqz v0, 3f 2: beqz v0, 4f
nop nop
/* setup status reg */ /* setup status reg */
...@@ -140,17 +168,22 @@ EXPORT(nlm_boot_siblings) ...@@ -140,17 +168,22 @@ EXPORT(nlm_boot_siblings)
ori t1, ST0_KX ori t1, ST0_KX
#endif #endif
mtc0 t1, CP0_STATUS mtc0 t1, CP0_STATUS
/* mark CPU ready */
/* SETUP TLBs for a mapped kernel here */ PTR_LA t1, nlm_cpu_ready
PTR_LA t0, prom_pre_boot_secondary_cpus sll v1, v0, 2
jalr t0 PTR_ADDU t1, v1
li t2, 1
sw t2, 0(t1)
/* Wait until NMI hits */
3: wait
j 3b
nop nop
/* /*
* For the boot CPU, we have to restore registers and * For the boot CPU, we have to restore registers and
* return * return
*/ */
3: dmfc0 t0, $4, 2 /* restore SP from UserLocal */ 4: dmfc0 t0, $4, 2 /* restore SP from UserLocal */
li t1, 0xfadebeef li t1, 0xfadebeef
dmtc0 t1, $4, 2 /* restore SP from UserLocal */ dmtc0 t1, $4, 2 /* restore SP from UserLocal */
PTR_SUBU sp, t0, PT_SIZE PTR_SUBU sp, t0, PT_SIZE
...@@ -159,7 +192,7 @@ EXPORT(nlm_boot_siblings) ...@@ -159,7 +192,7 @@ EXPORT(nlm_boot_siblings)
nop nop
EXPORT(nlm_reset_entry_end) EXPORT(nlm_reset_entry_end)
EXPORT(nlm_boot_core0_siblings) /* "Master" (n0c0t0) cpu starts from here */ FEXPORT(xlp_boot_core0_siblings) /* "Master" cpu starts from here */
__config_lsu __config_lsu
dmtc0 sp, $4, 2 /* SP saved in UserLocal */ dmtc0 sp, $4, 2 /* SP saved in UserLocal */
SAVE_ALL SAVE_ALL
...@@ -173,34 +206,11 @@ EXPORT(nlm_boot_core0_siblings) /* "Master" (n0c0t0) cpu starts from here */ ...@@ -173,34 +206,11 @@ EXPORT(nlm_boot_core0_siblings) /* "Master" (n0c0t0) cpu starts from here */
/* call it */ /* call it */
jr t2 jr t2
nop nop
__FINIT /* not reached */
__CPUINIT __CPUINIT
NESTED(prom_pre_boot_secondary_cpus, 16, sp) NESTED(nlm_boot_secondary_cpus, 16, sp)
.set mips64 PTR_LA t1, nlm_next_sp
mfc0 a0, CP0_EBASE, 1 /* read ebase */
andi a0, 0x3ff /* a0 has the processor_id() */
sll t0, a0, 2 /* offset in cpu array */
PTR_LA t1, nlm_cpu_ready /* mark CPU ready */
PTR_ADDU t1, t0
li t2, 1
sw t2, 0(t1)
PTR_LA t1, nlm_cpu_unblock
PTR_ADDU t1, t0
1: lw t2, 0(t1) /* wait till unblocked */
bnez t2, 2f
nop
nop
nop
nop
nop
nop
j 1b
nop
2: PTR_LA t1, nlm_next_sp
PTR_L sp, 0(t1) PTR_L sp, 0(t1)
PTR_LA t1, nlm_next_gp PTR_LA t1, nlm_next_gp
PTR_L gp, 0(t1) PTR_L gp, 0(t1)
...@@ -213,5 +223,50 @@ NESTED(prom_pre_boot_secondary_cpus, 16, sp) ...@@ -213,5 +223,50 @@ NESTED(prom_pre_boot_secondary_cpus, 16, sp)
PTR_LA t0, smp_bootstrap PTR_LA t0, smp_bootstrap
jr t0 jr t0
nop nop
END(prom_pre_boot_secondary_cpus) END(nlm_boot_secondary_cpus)
__FINIT
/*
* In case of RMIboot bootloader which is used on XLR boards, the CPUs
* be already woken up and waiting in bootloader code.
* This will get them out of the bootloader code and into linux. Needed
* because the bootloader area will be taken and initialized by linux.
*/
__CPUINIT
NESTED(nlm_rmiboot_preboot, 16, sp)
mfc0 t0, $15, 1 # read ebase
andi t0, 0x1f # t0 has the processor_id()
andi t2, t0, 0x3 # thread no
sll t0, 2 # offset in cpu array
PTR_LA t1, nlm_cpu_ready # mark CPU ready
PTR_ADDU t1, t0
li t3, 1
sw t3, 0(t1)
bnez t2, 1f # skip thread programming
nop # for non zero hw threads
/*
* MMU setup only for first thread in core
*/
li t0, 0x400
mfcr t1, t0
li t2, 6 # XLR thread mode mask
nor t3, t2, zero
and t2, t1, t2 # t2 - current thread mode
li v0, CKSEG1ADDR(RESET_DATA_PHYS)
lw v1, BOOT_THREAD_MODE(v0) # v1 - new thread mode
sll v1, 1
beq v1, t2, 1f # same as request value
nop # nothing to do */
and t2, t1, t3 # mask out old thread mode
or t1, t2, v1 # put in new value
mtcr t1, t0 # update core control
1: wait
j 1b
nop
END(nlm_rmiboot_preboot)
__FINIT __FINIT
obj-y += setup.o platform.o nlm_hal.o obj-y += setup.o platform.o nlm_hal.o
obj-$(CONFIG_SMP) += smpboot.o wakeup.o obj-$(CONFIG_SMP) += wakeup.o
...@@ -51,6 +51,10 @@ ...@@ -51,6 +51,10 @@
unsigned long nlm_common_ebase = 0x0; unsigned long nlm_common_ebase = 0x0;
/* default to uniprocessor */
uint32_t nlm_coremask = 1, nlm_cpumask = 1;
int nlm_threads_per_core = 1;
static void nlm_linux_exit(void) static void nlm_linux_exit(void)
{ {
nlm_write_sys_reg(nlm_sys_base, SYS_CHIP_RESET, 1); nlm_write_sys_reg(nlm_sys_base, SYS_CHIP_RESET, 1);
......
...@@ -51,18 +51,20 @@ ...@@ -51,18 +51,20 @@
#include <asm/netlogic/xlp-hal/xlp.h> #include <asm/netlogic/xlp-hal/xlp.h>
#include <asm/netlogic/xlp-hal/sys.h> #include <asm/netlogic/xlp-hal/sys.h>
unsigned long secondary_entry; static void xlp_enable_secondary_cores(void)
uint32_t nlm_coremask;
unsigned int nlm_threads_per_core;
unsigned int nlm_threadmode;
static void nlm_enable_secondary_cores(unsigned int cores_bitmap)
{ {
uint32_t core, value, coremask; uint32_t core, value, coremask, syscoremask;
int count;
/* read cores in reset from SYS block */
syscoremask = nlm_read_sys_reg(nlm_sys_base, SYS_CPU_RESET);
/* update user specified */
nlm_coremask = nlm_coremask & (syscoremask | 1);
for (core = 1; core < 8; core++) { for (core = 1; core < 8; core++) {
coremask = 1 << core; coremask = 1 << core;
if ((cores_bitmap & coremask) == 0) if ((nlm_coremask & coremask) == 0)
continue; continue;
/* Enable CPU clock */ /* Enable CPU clock */
...@@ -76,74 +78,25 @@ static void nlm_enable_secondary_cores(unsigned int cores_bitmap) ...@@ -76,74 +78,25 @@ static void nlm_enable_secondary_cores(unsigned int cores_bitmap)
nlm_write_sys_reg(nlm_sys_base, SYS_CPU_RESET, value); nlm_write_sys_reg(nlm_sys_base, SYS_CPU_RESET, value);
/* Poll for CPU to mark itself coherent */ /* Poll for CPU to mark itself coherent */
count = 100000;
do { do {
value = nlm_read_sys_reg(nlm_sys_base, value = nlm_read_sys_reg(nlm_sys_base,
SYS_CPU_NONCOHERENT_MODE); SYS_CPU_NONCOHERENT_MODE);
} while ((value & coremask) != 0); } while ((value & coremask) != 0 && count-- > 0);
}
}
static void nlm_parse_cpumask(u32 cpu_mask)
{
uint32_t core0_thr_mask, core_thr_mask;
int i;
core0_thr_mask = cpu_mask & 0xf; if (count == 0)
switch (core0_thr_mask) { pr_err("Failed to enable core %d\n", core);
case 1:
nlm_threads_per_core = 1;
nlm_threadmode = 0;
break;
case 3:
nlm_threads_per_core = 2;
nlm_threadmode = 2;
break;
case 0xf:
nlm_threads_per_core = 4;
nlm_threadmode = 3;
break;
default:
goto unsupp;
} }
/* Verify other cores CPU masks */
nlm_coremask = 1;
for (i = 1; i < 8; i++) {
core_thr_mask = (cpu_mask >> (i * 4)) & 0xf;
if (core_thr_mask) {
if (core_thr_mask != core0_thr_mask)
goto unsupp;
nlm_coremask |= 1 << i;
}
}
return;
unsupp:
panic("Unsupported CPU mask %x\n", cpu_mask);
} }
int __cpuinit nlm_wakeup_secondary_cpus(u32 wakeup_mask) void xlp_wakeup_secondary_cpus(void)
{ {
unsigned long reset_vec; /*
unsigned int *reset_data; * In case of u-boot, the secondaries are in reset
* first wakeup core 0 threads
/* Update reset entry point with CPU init code */ */
reset_vec = CKSEG1ADDR(RESET_VEC_PHYS); xlp_boot_core0_siblings();
memcpy((void *)reset_vec, (void *)nlm_reset_entry,
(nlm_reset_entry_end - nlm_reset_entry)); /* now get other cores out of reset */
xlp_enable_secondary_cores();
/* verify the mask and setup core config variables */
nlm_parse_cpumask(wakeup_mask);
/* Setup CPU init parameters */
reset_data = (unsigned int *)CKSEG1ADDR(RESET_DATA_PHYS);
reset_data[BOOT_THREAD_MODE] = nlm_threadmode;
/* first wakeup core 0 siblings */
nlm_boot_core0_siblings();
/* enable the reset of the cores */
nlm_enable_secondary_cores(nlm_coremask);
return 0;
} }
obj-y += setup.o platform.o obj-y += setup.o platform.o
obj-$(CONFIG_SMP) += smpboot.o wakeup.o obj-$(CONFIG_SMP) += wakeup.o
...@@ -52,9 +52,14 @@ ...@@ -52,9 +52,14 @@
uint64_t nlm_io_base = DEFAULT_NETLOGIC_IO_BASE; uint64_t nlm_io_base = DEFAULT_NETLOGIC_IO_BASE;
uint64_t nlm_pic_base; uint64_t nlm_pic_base;
unsigned long nlm_common_ebase = 0x0;
struct psb_info nlm_prom_info; struct psb_info nlm_prom_info;
unsigned long nlm_common_ebase = 0x0;
/* default to uniprocessor */
uint32_t nlm_coremask = 1, nlm_cpumask = 1;
int nlm_threads_per_core = 1;
static void __init nlm_early_serial_setup(void) static void __init nlm_early_serial_setup(void)
{ {
struct uart_port s; struct uart_port s;
......
/*
* Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
* reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU
* General Public License (GPL) Version 2, available from the file
* COPYING in the main directory of this source tree, or the NetLogic
* license below:
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <linux/init.h>
#include <asm/asm.h>
#include <asm/asm-offsets.h>
#include <asm/regdef.h>
#include <asm/mipsregs.h>
/*
* Early code for secondary CPUs. This will get them out of the bootloader
* code and into linux. Needed because the bootloader area will be taken
* and initialized by linux.
*/
__CPUINIT
NESTED(prom_pre_boot_secondary_cpus, 16, sp)
.set mips64
mfc0 t0, $15, 1 # read ebase
andi t0, 0x1f # t0 has the processor_id()
sll t0, 2 # offset in cpu array
PTR_LA t1, nlm_cpu_ready # mark CPU ready
PTR_ADDU t1, t0
li t2, 1
sw t2, 0(t1)
PTR_LA t1, nlm_cpu_unblock
PTR_ADDU t1, t0
1: lw t2, 0(t1) # wait till unblocked
beqz t2, 1b
nop
PTR_LA t1, nlm_next_sp
PTR_L sp, 0(t1)
PTR_LA t1, nlm_next_gp
PTR_L gp, 0(t1)
PTR_LA t0, nlm_early_init_secondary
jalr t0
nop
PTR_LA t0, smp_bootstrap
jr t0
nop
END(prom_pre_boot_secondary_cpus)
/*
* NMI code, used for CPU wakeup, copied to reset entry
*/
EXPORT(nlm_reset_entry)
.set push
.set noat
.set mips64
.set noreorder
/* Clear the NMI and BEV bits */
MFC0 k0, CP0_STATUS
li k1, 0xffb7ffff
and k0, k0, k1
MTC0 k0, CP0_STATUS
PTR_LA k1, secondary_entry_point
PTR_L k0, 0(k1)
jr k0
nop
.set pop
EXPORT(nlm_reset_entry_end)
__FINIT
...@@ -48,21 +48,18 @@ ...@@ -48,21 +48,18 @@
#include <asm/netlogic/xlr/iomap.h> #include <asm/netlogic/xlr/iomap.h>
#include <asm/netlogic/xlr/pic.h> #include <asm/netlogic/xlr/pic.h>
unsigned long secondary_entry_point; int __cpuinit xlr_wakeup_secondary_cpus(void)
int __cpuinit nlm_wakeup_secondary_cpus(u32 wakeup_mask)
{ {
unsigned int i, boot_cpu; unsigned int i, boot_cpu;
void *reset_vec;
secondary_entry_point = (unsigned long)prom_pre_boot_secondary_cpus; /*
reset_vec = (void *)CKSEG1ADDR(0x1fc00000); * In case of RMI boot, hit with NMI to get the cores
memcpy(reset_vec, (void *)nlm_reset_entry, * from bootloader to linux code.
(nlm_reset_entry_end - nlm_reset_entry)); */
boot_cpu = hard_smp_processor_id(); boot_cpu = hard_smp_processor_id();
nlm_set_nmi_handler(nlm_rmiboot_preboot);
for (i = 0; i < NR_CPUS; i++) { for (i = 0; i < NR_CPUS; i++) {
if (i == boot_cpu || (wakeup_mask & (1u << i)) == 0) if (i == boot_cpu || (nlm_cpumask & (1u << i)) == 0)
continue; continue;
nlm_pic_send_ipi(nlm_pic_base, i, 1, 1); /* send NMI */ nlm_pic_send_ipi(nlm_pic_base, i, 1, 1); /* send NMI */
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment