Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull smp hotplug updates from Thomas Gleixner:
 "This is the next part of the hotplug rework.

   - Convert all notifiers with a priority assigned

   - Convert all CPU_STARTING/DYING notifiers

     The final removal of the STARTING/DYING infrastructure will happen
     when the merge window closes.

  Another 700 hundred line of unpenetrable maze gone :)"

* 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (70 commits)
  timers/core: Correct callback order during CPU hot plug
  leds/trigger/cpu: Move from CPU_STARTING to ONLINE level
  powerpc/numa: Convert to hotplug state machine
  arm/perf: Fix hotplug state machine conversion
  irqchip/armada: Avoid unused function warnings
  ARC/time: Convert to hotplug state machine
  clocksource/atlas7: Convert to hotplug state machine
  clocksource/armada-370-xp: Convert to hotplug state machine
  clocksource/exynos_mct: Convert to hotplug state machine
  clocksource/arm_global_timer: Convert to hotplug state machine
  rcu: Convert rcutree to hotplug state machine
  KVM/arm/arm64/vgic-new: Convert to hotplug state machine
  smp/cfd: Convert core to hotplug state machine
  x86/x2apic: Convert to CPU hotplug state machine
  profile: Convert to hotplug state machine
  timers/core: Convert to hotplug state machine
  hrtimer: Convert to hotplug state machine
  x86/tboot: Convert to hotplug state machine
  arm64/armv8 deprecated: Convert to hotplug state machine
  hwtracing/coresight-etm4x: Convert to hotplug state machine
  ...

1 files changed, 18 insertions, 30 deletions

diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c
index 98f22d2eb563..f927b8dc6edd 100644
--- a/arch/arc/kernel/time.c
+++ b/arch/arc/kernel/time.c
@@ -296,30 +296,23 @@ static irqreturn_t timer_irq_handler(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static int arc_timer_cpu_notify(struct notifier_block *self,
-                                unsigned long action, void *hcpu)
+
+static int arc_timer_starting_cpu(unsigned int cpu)
 {
         struct clock_event_device *evt = this_cpu_ptr(&arc_clockevent_device);
 
         evt->cpumask = cpumask_of(smp_processor_id());
 
-        switch (action & ~CPU_TASKS_FROZEN) {
-        case CPU_STARTING:
-                clockevents_config_and_register(evt, arc_timer_freq,
-                                                0, ULONG_MAX);
-                enable_percpu_irq(arc_timer_irq, 0);
-                break;
-        case CPU_DYING:
-                disable_percpu_irq(arc_timer_irq);
-                break;
-        }
-
-        return NOTIFY_OK;
+        clockevents_config_and_register(evt, arc_timer_freq, 0, ARC_TIMER_MAX);
+        enable_percpu_irq(arc_timer_irq, 0);
+        return 0;
 }
 
-static struct notifier_block arc_timer_cpu_nb = {
-        .notifier_call = arc_timer_cpu_notify,
-};
+static int arc_timer_dying_cpu(unsigned int cpu)
+{
+        disable_percpu_irq(arc_timer_irq);
+        return 0;
+}
 
 /*
  * clockevent setup for boot CPU
@@ -329,12 +322,6 @@ static int __init arc_clockevent_setup(struct device_node *node)
         struct clock_event_device *evt = this_cpu_ptr(&arc_clockevent_device);
         int ret;
 
-        ret = register_cpu_notifier(&arc_timer_cpu_nb);
-        if (ret) {
-                pr_err("Failed to register cpu notifier");
-                return ret;
-        }
-
         arc_timer_irq = irq_of_parse_and_map(node, 0);
         if (arc_timer_irq <= 0) {
                 pr_err("clockevent: missing irq");
@@ -347,11 +334,6 @@ static int __init arc_clockevent_setup(struct device_node *node)
                 return ret;
         }
 
-        evt->irq = arc_timer_irq;
-        evt->cpumask = cpumask_of(smp_processor_id());
-        clockevents_config_and_register(evt, arc_timer_freq,
-                                        0, ARC_TIMER_MAX);
-
         /* Needs apriori irq_set_percpu_devid() done in intc map function */
         ret = request_percpu_irq(arc_timer_irq, timer_irq_handler,
                                  "Timer0 (per-cpu-tick)", evt);
@@ -360,8 +342,14 @@ static int __init arc_clockevent_setup(struct device_node *node)
                 return ret;
         }
 
-        enable_percpu_irq(arc_timer_irq, 0);
-
+        ret = cpuhp_setup_state(CPUHP_AP_ARC_TIMER_STARTING,
+                                "AP_ARC_TIMER_STARTING",
+                                arc_timer_starting_cpu,
+                                arc_timer_dying_cpu);
+        if (ret) {
+                pr_err("Failed to setup hotplug state");
+                return ret;
+        }
         return 0;
 }