Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de300974 authored by Michael Ellerman's avatar Michael Ellerman Committed by Benjamin Herrenschmidt
Browse files

powerpc/smp: smp_ops->kick_cpu() should be able to fail 



When we start a cpu we use smp_ops->kick_cpu(), which currently
returns void, it should be able to fail. Convert it to return
int, and update all uses.

Convert all the current error cases to return -ENOENT, which is
what would eventually be returned by __cpu_up() currently when
it doesn't detect the cpu as coming up in time.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 6c5b59b9

arch/powerpc/include/asm/machdep.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct kimage; 
struct smp_ops_t {

	void  (*message_pass)(int target, int msg);

	int   (*probe)(void);

	void  (*kick_cpu)(int nr);

	int   (*kick_cpu)(int nr);

	void  (*setup_cpu)(int nr);

	void  (*bringup_done)(void);

	void  (*take_timebase)(void);

arch/powerpc/include/asm/smp.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ extern int smt_enabled_at_boot; 


extern int smp_mpic_probe(void);

extern void smp_mpic_setup_cpu(int cpu);

extern void smp_generic_kick_cpu(int nr);

extern int smp_generic_kick_cpu(int nr);



extern void smp_generic_give_timebase(void);

extern void smp_generic_take_timebase(void);

arch/powerpc/kernel/smp.c

+8 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ int smt_enabled_at_boot = 1; 
static void (*crash_ipi_function_ptr)(struct pt_regs *) = NULL;



#ifdef CONFIG_PPC64

void __devinit smp_generic_kick_cpu(int nr)

int __devinit smp_generic_kick_cpu(int nr)

{

	BUG_ON(nr < 0 || nr >= NR_CPUS);
@@ -106,6 +106,8 @@ void __devinit smp_generic_kick_cpu(int nr) 
	 */

	paca[nr].cpu_start = 1;

	smp_mb();



	return 0;

}

#endif
@@ -434,7 +436,11 @@ int __cpuinit __cpu_up(unsigned int cpu) 


	/* wake up cpus */

	DBG("smp: kicking cpu %d\n", cpu);

	smp_ops->kick_cpu(cpu);

	rc = smp_ops->kick_cpu(cpu);

	if (rc) {

		pr_err("smp: failed starting cpu %d (rc %d)\n", cpu, rc);

		return rc;

	}



	/*

	 * wait to see if the cpu made a callin (is actually up).

arch/powerpc/platforms/44x/iss4xx.c

+4 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static void __cpuinit smp_iss4xx_setup_cpu(int cpu) 
	mpic_setup_this_cpu();

}



static void __cpuinit smp_iss4xx_kick_cpu(int cpu)

static int __cpuinit smp_iss4xx_kick_cpu(int cpu)

{

	struct device_node *cpunode = of_get_cpu_node(cpu, NULL);

	const u64 *spin_table_addr_prop;
@@ -104,7 +104,7 @@ static void __cpuinit smp_iss4xx_kick_cpu(int cpu) 
					       NULL);

	if (spin_table_addr_prop == NULL) {

		pr_err("CPU%d: Can't start, missing cpu-release-addr !\n", cpu);

		return;

		return -ENOENT;

	}



	/* Assume it's mapped as part of the linear mapping. This is a bit
@@ -117,6 +117,8 @@ static void __cpuinit smp_iss4xx_kick_cpu(int cpu) 
	smp_wmb();

	spin_table[1] = __pa(start_secondary_47x);

	mb();



	return 0;

}



static struct smp_ops_t iss_smp_ops = {

arch/powerpc/platforms/85xx/smp.c

+4 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ extern void __early_start(void); 
#define NUM_BOOT_ENTRY		8

#define SIZE_BOOT_ENTRY		(NUM_BOOT_ENTRY * sizeof(u32))



static void __init

static int __init

smp_85xx_kick_cpu(int nr)

{

	unsigned long flags;
@@ -60,7 +60,7 @@ smp_85xx_kick_cpu(int nr) 


	if (cpu_rel_addr == NULL) {

		printk(KERN_ERR "No cpu-release-addr for cpu %d\n", nr);

		return;

		return -ENOENT;

	}



	/*
@@ -107,6 +107,8 @@ smp_85xx_kick_cpu(int nr) 
		iounmap(bptr_vaddr);



	pr_debug("waited %d msecs for CPU #%d.\n", n, nr);



	return 0;

}



static void __init