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

Commit cb5ff2d2 authored by Richard Cochran's avatar Richard Cochran Committed by Ingo Molnar
Browse files

irqchip/armada-370-xp: Convert to hotplug state machine 



Install the callbacks via the state machine.

Signed-off-by: default avatarRichard Cochran <rcochran@linutronix.de>
Signed-off-by: default avatarAnna-Maria Gleixner <anna-maria@linutronix.de>
Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160713153333.330661455@linutronix.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 6c034d17

drivers/irqchip/irq-armada-370-xp.c

+15 −29
Original line number Diff line number Diff line
@@ -344,40 +344,22 @@ static void armada_mpic_send_doorbell(const struct cpumask *mask, 
	writel((map << 8) | irq, main_int_base +

		ARMADA_370_XP_SW_TRIG_INT_OFFS);

}

#endif



static int armada_xp_mpic_secondary_init(struct notifier_block *nfb,

					 unsigned long action, void *hcpu)

static int armada_xp_mpic_starting_cpu(unsigned int cpu)

{

	if (action == CPU_STARTING || action == CPU_STARTING_FROZEN) {

	armada_xp_mpic_perf_init();

	armada_xp_mpic_smp_cpu_init();

	return 0;

}



	return NOTIFY_OK;

}



static struct notifier_block armada_370_xp_mpic_cpu_notifier = {

	.notifier_call = armada_xp_mpic_secondary_init,

	.priority = 100,

};



static int mpic_cascaded_secondary_init(struct notifier_block *nfb,

					unsigned long action, void *hcpu)

static int mpic_cascaded_starting_cpu(unsigned int cpu)

{

	if (action == CPU_STARTING || action == CPU_STARTING_FROZEN) {

	armada_xp_mpic_perf_init();

	enable_percpu_irq(parent_irq, IRQ_TYPE_NONE);

	return 0;

}



	return NOTIFY_OK;

}



static struct notifier_block mpic_cascaded_cpu_notifier = {

	.notifier_call = mpic_cascaded_secondary_init,

	.priority = 100,

};

#endif /* CONFIG_SMP */



static const struct irq_domain_ops armada_370_xp_mpic_irq_ops = {

	.map = armada_370_xp_mpic_irq_map,

	.xlate = irq_domain_xlate_onecell,
@@ -595,11 +577,15 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node, 
		set_handle_irq(armada_370_xp_handle_irq);

#ifdef CONFIG_SMP

		set_smp_cross_call(armada_mpic_send_doorbell);

		register_cpu_notifier(&armada_370_xp_mpic_cpu_notifier);

		cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_ARMADA_XP_STARTING,

					  "AP_IRQ_ARMADA_XP_STARTING",

					  armada_xp_mpic_starting_cpu, NULL);

#endif

	} else {

#ifdef CONFIG_SMP

		register_cpu_notifier(&mpic_cascaded_cpu_notifier);

		cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_ARMADA_CASC_STARTING,

					  "AP_IRQ_ARMADA_CASC_STARTING",

					  mpic_cascaded_starting_cpu, NULL);

#endif

		irq_set_chained_handler(parent_irq,

					armada_370_xp_mpic_handle_cascade_irq);

include/linux/cpuhotplug.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ enum cpuhp_state { 
	CPUHP_AP_IRQ_GIC_STARTING,

	CPUHP_AP_IRQ_GICV3_STARTING,

	CPUHP_AP_IRQ_HIP04_STARTING,

	CPUHP_AP_IRQ_ARMADA_XP_STARTING,

	CPUHP_AP_IRQ_ARMADA_CASC_STARTING,

	CPUHP_AP_NOTIFY_STARTING,

	CPUHP_AP_ONLINE,

	CPUHP_TEARDOWN_CPU,