Commit 6b8d6422 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner

ia64/mca: Convert to hotplug state machine

Install the callbacks via the state machine and let the core invoke
the callbacks on the already online CPUs.
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-ia64@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160906170457.32393-5-bigeasy@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent a4fa9cc2
...@@ -1890,7 +1890,7 @@ ia64_mca_cpu_init(void *cpu_data) ...@@ -1890,7 +1890,7 @@ ia64_mca_cpu_init(void *cpu_data)
PAGE_KERNEL))); PAGE_KERNEL)));
} }
static void ia64_mca_cmc_vector_adjust(void *dummy) static int ia64_mca_cpu_online(unsigned int cpu)
{ {
unsigned long flags; unsigned long flags;
...@@ -1898,25 +1898,9 @@ static void ia64_mca_cmc_vector_adjust(void *dummy) ...@@ -1898,25 +1898,9 @@ static void ia64_mca_cmc_vector_adjust(void *dummy)
if (!cmc_polling_enabled) if (!cmc_polling_enabled)
ia64_mca_cmc_vector_enable(NULL); ia64_mca_cmc_vector_enable(NULL);
local_irq_restore(flags); local_irq_restore(flags);
return 0;
} }
static int mca_cpu_callback(struct notifier_block *nfb,
unsigned long action,
void *hcpu)
{
switch (action) {
case CPU_ONLINE:
case CPU_ONLINE_FROZEN:
ia64_mca_cmc_vector_adjust(NULL);
break;
}
return NOTIFY_OK;
}
static struct notifier_block mca_cpu_notifier = {
.notifier_call = mca_cpu_callback
};
/* /*
* ia64_mca_init * ia64_mca_init
* *
...@@ -2111,15 +2095,13 @@ ia64_mca_late_init(void) ...@@ -2111,15 +2095,13 @@ ia64_mca_late_init(void)
if (!mca_init) if (!mca_init)
return 0; return 0;
register_hotcpu_notifier(&mca_cpu_notifier);
/* Setup the CMCI/P vector and handler */ /* Setup the CMCI/P vector and handler */
setup_timer(&cmc_poll_timer, ia64_mca_cmc_poll, 0UL); setup_timer(&cmc_poll_timer, ia64_mca_cmc_poll, 0UL);
/* Unmask/enable the vector */ /* Unmask/enable the vector */
cmc_polling_enabled = 0; cmc_polling_enabled = 0;
schedule_work(&cmc_enable_work); cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "ia64/mca:online",
ia64_mca_cpu_online, NULL);
IA64_MCA_DEBUG("%s: CMCI/P setup and enabled.\n", __func__); IA64_MCA_DEBUG("%s: CMCI/P setup and enabled.\n", __func__);
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment