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

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

[PATCH] ppc64: global interrupt queue cleanup 



Move the code to set global interrupt queue membership to xics.c,
and remove no longer needed extern declarations.  Also call it on
all cpus (even the boot cpu) to prepare for kexec.

Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
Signed-off-by: default avatarR Sharada <sharada@in.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 25128092

arch/ppc64/kernel/pSeries_smp.c

+0 −7
Original line number Diff line number Diff line
@@ -326,13 +326,6 @@ static void __devinit smp_xics_setup_cpu(int cpu) 


	cpu_clear(cpu, of_spin_map);



	/*

	 * Put the calling processor into the GIQ.  This is really only

	 * necessary from a secondary thread as the OF start-cpu interface

	 * performs this function for us on primary threads.

	 */

	rtas_set_indicator(GLOBAL_INTERRUPT_QUEUE,

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

}



static DEFINE_SPINLOCK(timebase_lock);

arch/ppc64/kernel/xics.c

+12 −4
Original line number Diff line number Diff line
@@ -432,6 +432,7 @@ void xics_cause_IPI(int cpu) 
{

	ops->qirr_info(cpu, IPI_PRIORITY);

}

#endif /* CONFIG_SMP */



void xics_setup_cpu(void)

{
@@ -439,9 +440,17 @@ void xics_setup_cpu(void) 


	ops->cppr_info(cpu, 0xff);

	iosync();

}



#endif /* CONFIG_SMP */

	/*

	 * Put the calling processor into the GIQ.  This is really only

	 * necessary from a secondary thread as the OF start-cpu interface

	 * performs this function for us on primary threads.

	 *

	 * XXX: undo of teardown on kexec needs this too, as may hotplug

	 */

	rtas_set_indicator(GLOBAL_INTERRUPT_QUEUE,

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

}



void xics_init_IRQ(void)

{
@@ -563,8 +572,7 @@ void xics_init_IRQ(void) 
	for (; i < NR_IRQS; ++i)

		get_irq_desc(i)->handler = &xics_pic;



	ops->cppr_info(boot_cpuid, 0xff);

	iosync();

	xics_setup_cpu();



	ppc64_boot_msg(0x21, "XICS Done");

}

include/asm-ppc64/xics.h

+0 −3
Original line number Diff line number Diff line
@@ -30,7 +30,4 @@ struct xics_ipi_struct { 


extern struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;



extern unsigned int default_distrib_server;

extern unsigned int interrupt_server_size;



#endif /* _PPC64_KERNEL_XICS_H */