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

Commit 6d22d85a authored by Paul Mackerras's avatar Paul Mackerras Committed by Linus Torvalds
Browse files

[PATCH] ppc64: fix for kexec boot issue 



The kexec boot is not successful on some power machines since all CPUs are
getting removed from global interrupt queue (GIQ) before kexec boot.  Some
systems always expect at least one CPU in GIQ.  Hence, this patch will make
sure that only secondary CPUs are removed from GIQ.

Signed-off-by: default avatarHaren Myneni <hbabu@us.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 48f1f532

arch/ppc64/kernel/machine_kexec.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -185,7 +185,7 @@ void kexec_copy_flush(struct kimage *image) 
void kexec_smp_down(void *arg)

void kexec_smp_down(void *arg)

{

{

	if (ppc_md.cpu_irq_down)

	if (ppc_md.cpu_irq_down)

		ppc_md.cpu_irq_down();

		ppc_md.cpu_irq_down(1);





	local_irq_disable();

	local_irq_disable();

	kexec_smp_wait();

	kexec_smp_wait();
@@ -232,7 +232,7 @@ static void kexec_prepare_cpus(void) 




	/* after we tell the others to go down */

	/* after we tell the others to go down */

	if (ppc_md.cpu_irq_down)

	if (ppc_md.cpu_irq_down)

		ppc_md.cpu_irq_down();

		ppc_md.cpu_irq_down(0);





	put_cpu();

	put_cpu();
@@ -255,7 +255,7 @@ static void kexec_prepare_cpus(void) 
	 */

	 */

	smp_release_cpus();

	smp_release_cpus();

	if (ppc_md.cpu_irq_down)

	if (ppc_md.cpu_irq_down)

		ppc_md.cpu_irq_down();

		ppc_md.cpu_irq_down(0);

	local_irq_disable();

	local_irq_disable();

}

}

arch/ppc64/kernel/mpic.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -794,10 +794,10 @@ void mpic_setup_this_cpu(void) 




/*

/*

 * XXX: someone who knows mpic should check this.

 * XXX: someone who knows mpic should check this.

 * do we need to eoi the ipi here (see xics comments)?

 * do we need to eoi the ipi including for kexec cpu here (see xics comments)?

 * or can we reset the mpic in the new kernel?

 * or can we reset the mpic in the new kernel?

 */

 */

void mpic_teardown_this_cpu(void)

void mpic_teardown_this_cpu(int secondary)

{

{

	struct mpic *mpic = mpic_primary;

	struct mpic *mpic = mpic_primary;

	unsigned long flags;

	unsigned long flags;

arch/ppc64/kernel/mpic.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -256,7 +256,7 @@ extern unsigned int mpic_irq_get_priority(unsigned int irq); 
extern void mpic_setup_this_cpu(void);

extern void mpic_setup_this_cpu(void);





/* Clean up for kexec (or cpu offline or ...) */

/* Clean up for kexec (or cpu offline or ...) */

extern void mpic_teardown_this_cpu(void);

extern void mpic_teardown_this_cpu(int secondary);





/* Request IPIs on primary mpic */

/* Request IPIs on primary mpic */

extern void mpic_request_ipis(void);

extern void mpic_request_ipis(void);

arch/ppc64/kernel/xics.c

+16 −15
Original line number Original line Diff line number Diff line
@@ -647,29 +647,30 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask) 
	}

	}

}

}





void xics_teardown_cpu(void)

void xics_teardown_cpu(int secondary)

{

{

	int cpu = smp_processor_id();

	int cpu = smp_processor_id();

	int status;





	ops->cppr_info(cpu, 0x00);

	ops->cppr_info(cpu, 0x00);

	iosync();

	iosync();





	/*

	 * Some machines need to have at least one cpu in the GIQ,

	 * so leave the master cpu in the group.

	 */

	if (secondary) {

		/*

		/*

		 * we need to EOI the IPI if we got here from kexec down IPI

		 * we need to EOI the IPI if we got here from kexec down IPI

		 *

		 *

	 * xics doesn't care if we duplicate an EOI as long as we

	 * don't EOI and raise priority.

	 *

		 * probably need to check all the other interrupts too

		 * probably need to check all the other interrupts too

		 * should we be flagging idle loop instead?

		 * should we be flagging idle loop instead?

		 * or creating some task to be scheduled?

		 * or creating some task to be scheduled?

		 */

		 */

		ops->xirr_info_set(cpu, XICS_IPI);

		ops->xirr_info_set(cpu, XICS_IPI);



		rtas_set_indicator(GLOBAL_INTERRUPT_QUEUE,

	status = rtas_set_indicator(GLOBAL_INTERRUPT_QUEUE,

			(1UL << interrupt_server_size) - 1 -

		(1UL << interrupt_server_size) - 1 - default_distrib_server, 0);

			default_distrib_server, 0);

	WARN_ON(status != 0);

	}

}

}





#ifdef CONFIG_HOTPLUG_CPU

#ifdef CONFIG_HOTPLUG_CPU

include/asm-ppc64/machdep.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ struct machdep_calls { 




	void		(*init_IRQ)(void);

	void		(*init_IRQ)(void);

	int		(*get_irq)(struct pt_regs *);

	int		(*get_irq)(struct pt_regs *);

	void		(*cpu_irq_down)(void);

	void		(*cpu_irq_down)(int secondary);





	/* PCI stuff */

	/* PCI stuff */

	void		(*pcibios_fixup)(void);

	void		(*pcibios_fixup)(void);