From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752914AbcGSG7m (ORCPT ); Tue, 19 Jul 2016 02:59:42 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44626 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752887AbcGSG7h (ORCPT ); Tue, 19 Jul 2016 02:59:37 -0400 Date: Mon, 18 Jul 2016 23:59:04 -0700 From: tip-bot for Richard Cochran Message-ID: Cc: rcochran@linutronix.de, bigeasy@linutronix.de, marc.zyngier@arm.com, torvalds@linux-foundation.org, peterz@infradead.org, jason@lakedaemon.net, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, anna-maria@linutronix.de, hpa@zytor.com Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, anna-maria@linutronix.de, hpa@zytor.com, rcochran@linutronix.de, bigeasy@linutronix.de, marc.zyngier@arm.com, torvalds@linux-foundation.org, jason@lakedaemon.net, peterz@infradead.org In-Reply-To: <20160713153333.163186301@linutronix.de> References: <20160713153333.163186301@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] irqchip/gicv3: Convert to hotplug state machine Git-Commit-ID: 6670a6d864653859229d2e921ea193a4a677dfea X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 6670a6d864653859229d2e921ea193a4a677dfea Gitweb: http://git.kernel.org/tip/6670a6d864653859229d2e921ea193a4a677dfea Author: Richard Cochran AuthorDate: Wed, 13 Jul 2016 17:16:05 +0000 Committer: Ingo Molnar CommitDate: Thu, 14 Jul 2016 09:34:28 +0200 irqchip/gicv3: Convert to hotplug state machine Install the callbacks via the state machine. Signed-off-by: Richard Cochran Signed-off-by: Anna-Maria Gleixner Reviewed-by: Sebastian Andrzej Siewior Acked-by: Jason Cooper Cc: Linus Torvalds Cc: Marc Zyngier Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: rt@linutronix.de Link: http://lkml.kernel.org/r/20160713153333.163186301@linutronix.de Signed-off-by: Ingo Molnar --- drivers/irqchip/irq-gic-v3.c | 22 +++++++--------------- include/linux/cpuhotplug.h | 1 + 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 2c5ba0e..6fc56c3 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -538,23 +538,13 @@ static void gic_cpu_init(void) } #ifdef CONFIG_SMP -static int gic_secondary_init(struct notifier_block *nfb, - unsigned long action, void *hcpu) + +static int gic_starting_cpu(unsigned int cpu) { - if (action == CPU_STARTING || action == CPU_STARTING_FROZEN) - gic_cpu_init(); - return NOTIFY_OK; + gic_cpu_init(); + return 0; } -/* - * Notifier for enabling the GIC CPU interface. Set an arbitrarily high - * priority because the GIC needs to be up before the ARM generic timers. - */ -static struct notifier_block gic_cpu_notifier = { - .notifier_call = gic_secondary_init, - .priority = 100, -}; - static u16 gic_compute_target_list(int *base_cpu, const struct cpumask *mask, unsigned long cluster_id) { @@ -634,7 +624,9 @@ static void gic_raise_softirq(const struct cpumask *mask, unsigned int irq) static void gic_smp_init(void) { set_smp_cross_call(gic_raise_softirq); - register_cpu_notifier(&gic_cpu_notifier); + cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_GICV3_STARTING, + "AP_IRQ_GICV3_STARTING", gic_starting_cpu, + NULL); } static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index edc8adf..d6e4a06 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -10,6 +10,7 @@ enum cpuhp_state { CPUHP_AP_OFFLINE, CPUHP_AP_SCHED_STARTING, CPUHP_AP_IRQ_GIC_STARTING, + CPUHP_AP_IRQ_GICV3_STARTING, CPUHP_AP_NOTIFY_STARTING, CPUHP_AP_ONLINE, CPUHP_TEARDOWN_CPU,