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
  ...

2 files changed, 98 insertions, 79 deletions

diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c
index d83ab82672e4..2de4cad9c5ed 100644
--- a/drivers/hwtracing/coresight/coresight-etm3x.c
+++ b/drivers/hwtracing/coresight/coresight-etm3x.c
@@ -51,6 +51,8 @@ module_param_named(boot_enable, boot_enable, int, S_IRUGO);
 static int etm_count;
 static struct etm_drvdata *etmdrvdata[NR_CPUS];
 
+static enum cpuhp_state hp_online;
+
 /*
  * Memory mapped writes to clear os lock are not supported on some processors
  * and OS lock must be unlocked before any memory mapped access on such
@@ -481,8 +483,7 @@ static int etm_enable_sysfs(struct coresight_device *csdev)
 
         /*
          * Configure the ETM only if the CPU is online.  If it isn't online
-         * hw configuration will take place when 'CPU_STARTING' is received
-         * in @etm_cpu_callback.
+         * hw configuration will take place on the local CPU during bring up.
          */
         if (cpu_online(drvdata->cpu)) {
                 ret = smp_call_function_single(drvdata->cpu,
@@ -641,47 +642,44 @@ static const struct coresight_ops etm_cs_ops = {
         .source_ops     = &etm_source_ops,
 };
 
-static int etm_cpu_callback(struct notifier_block *nfb, unsigned long action,
-                            void *hcpu)
+static int etm_online_cpu(unsigned int cpu)
 {
-        unsigned int cpu = (unsigned long)hcpu;
-
         if (!etmdrvdata[cpu])
-                goto out;
+                return 0;
 
-        switch (action & (~CPU_TASKS_FROZEN)) {
-        case CPU_STARTING:
-                spin_lock(&etmdrvdata[cpu]->spinlock);
-                if (!etmdrvdata[cpu]->os_unlock) {
-                        etm_os_unlock(etmdrvdata[cpu]);
-                        etmdrvdata[cpu]->os_unlock = true;
-                }
-
-                if (local_read(&etmdrvdata[cpu]->mode))
-                        etm_enable_hw(etmdrvdata[cpu]);
-                spin_unlock(&etmdrvdata[cpu]->spinlock);
-                break;
+        if (etmdrvdata[cpu]->boot_enable && !etmdrvdata[cpu]->sticky_enable)
+                coresight_enable(etmdrvdata[cpu]->csdev);
+        return 0;
+}
 
-        case CPU_ONLINE:
-                if (etmdrvdata[cpu]->boot_enable &&
-                    !etmdrvdata[cpu]->sticky_enable)
-                        coresight_enable(etmdrvdata[cpu]->csdev);
-                break;
+static int etm_starting_cpu(unsigned int cpu)
+{
+        if (!etmdrvdata[cpu])
+                return 0;
 
-        case CPU_DYING:
-                spin_lock(&etmdrvdata[cpu]->spinlock);
-                if (local_read(&etmdrvdata[cpu]->mode))
-                        etm_disable_hw(etmdrvdata[cpu]);
-                spin_unlock(&etmdrvdata[cpu]->spinlock);
-                break;
+        spin_lock(&etmdrvdata[cpu]->spinlock);
+        if (!etmdrvdata[cpu]->os_unlock) {
+                etm_os_unlock(etmdrvdata[cpu]);
+                etmdrvdata[cpu]->os_unlock = true;
         }
-out:
-        return NOTIFY_OK;
+
+        if (local_read(&etmdrvdata[cpu]->mode))
+                etm_enable_hw(etmdrvdata[cpu]);
+        spin_unlock(&etmdrvdata[cpu]->spinlock);
+        return 0;
 }
 
-static struct notifier_block etm_cpu_notifier = {
-        .notifier_call = etm_cpu_callback,
-};
+static int etm_dying_cpu(unsigned int cpu)
+{
+        if (!etmdrvdata[cpu])
+                return 0;
+
+        spin_lock(&etmdrvdata[cpu]->spinlock);
+        if (local_read(&etmdrvdata[cpu]->mode))
+                etm_disable_hw(etmdrvdata[cpu]);
+        spin_unlock(&etmdrvdata[cpu]->spinlock);
+        return 0;
+}
 
 static bool etm_arch_supported(u8 arch)
 {
@@ -806,9 +804,17 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id)
                                      etm_init_arch_data,  drvdata, 1))
                 dev_err(dev, "ETM arch init failed\n");
 
-        if (!etm_count++)
-                register_hotcpu_notifier(&etm_cpu_notifier);
-
+        if (!etm_count++) {
+                cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING,
+                                          "AP_ARM_CORESIGHT_STARTING",
+                                          etm_starting_cpu, etm_dying_cpu);
+                ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
+                                                "AP_ARM_CORESIGHT_ONLINE",
+                                                etm_online_cpu, NULL);
+                if (ret < 0)
+                        goto err_arch_supported;
+                hp_online = ret;
+        }
         put_online_cpus();
 
         if (etm_arch_supported(drvdata->arch) == false) {
@@ -839,7 +845,6 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id)
 
         pm_runtime_put(&adev->dev);
         dev_info(dev, "%s initialized\n", (char *)id->data);
-
         if (boot_enable) {
                 coresight_enable(drvdata->csdev);
                 drvdata->boot_enable = true;
@@ -848,8 +853,11 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id)
         return 0;
 
 err_arch_supported:
-        if (--etm_count == 0)
-                unregister_hotcpu_notifier(&etm_cpu_notifier);
+        if (--etm_count == 0) {
+                cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING);
+                if (hp_online)
+                        cpuhp_remove_state_nocalls(hp_online);
+        }
         return ret;
 }
 
diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
index 462f0dc15757..1a5e0d14c1dd 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x.c
@@ -48,6 +48,8 @@ static int etm4_count;
 static struct etmv4_drvdata *etmdrvdata[NR_CPUS];
 static void etm4_set_default(struct etmv4_config *config);
 
+static enum cpuhp_state hp_online;
+
 static void etm4_os_unlock(struct etmv4_drvdata *drvdata)
 {
         /* Writing any value to ETMOSLAR unlocks the trace registers */
@@ -673,47 +675,44 @@ void etm4_config_trace_mode(struct etmv4_config *config)
         config->addr_acc[ETM_DEFAULT_ADDR_COMP + 1] = addr_acc;
 }
 
-static int etm4_cpu_callback(struct notifier_block *nfb, unsigned long action,
-                            void *hcpu)
+static int etm4_online_cpu(unsigned int cpu)
 {
-        unsigned int cpu = (unsigned long)hcpu;
-
         if (!etmdrvdata[cpu])
-                goto out;
-
-        switch (action & (~CPU_TASKS_FROZEN)) {
-        case CPU_STARTING:
-                spin_lock(&etmdrvdata[cpu]->spinlock);
-                if (!etmdrvdata[cpu]->os_unlock) {
-                        etm4_os_unlock(etmdrvdata[cpu]);
-                        etmdrvdata[cpu]->os_unlock = true;
-                }
-
-                if (local_read(&etmdrvdata[cpu]->mode))
-                        etm4_enable_hw(etmdrvdata[cpu]);
-                spin_unlock(&etmdrvdata[cpu]->spinlock);
-                break;
+                return 0;
 
-        case CPU_ONLINE:
-                if (etmdrvdata[cpu]->boot_enable &&
-                        !etmdrvdata[cpu]->sticky_enable)
-                        coresight_enable(etmdrvdata[cpu]->csdev);
-                break;
+        if (etmdrvdata[cpu]->boot_enable && !etmdrvdata[cpu]->sticky_enable)
+                coresight_enable(etmdrvdata[cpu]->csdev);
+        return 0;
+}
 
-        case CPU_DYING:
-                spin_lock(&etmdrvdata[cpu]->spinlock);
-                if (local_read(&etmdrvdata[cpu]->mode))
-                        etm4_disable_hw(etmdrvdata[cpu]);
-                spin_unlock(&etmdrvdata[cpu]->spinlock);
-                break;
+static int etm4_starting_cpu(unsigned int cpu)
+{
+        if (!etmdrvdata[cpu])
+                return 0;
+
+        spin_lock(&etmdrvdata[cpu]->spinlock);
+        if (!etmdrvdata[cpu]->os_unlock) {
+                etm4_os_unlock(etmdrvdata[cpu]);
+                etmdrvdata[cpu]->os_unlock = true;
         }
-out:
-        return NOTIFY_OK;
+
+        if (local_read(&etmdrvdata[cpu]->mode))
+                etm4_enable_hw(etmdrvdata[cpu]);
+        spin_unlock(&etmdrvdata[cpu]->spinlock);
+        return 0;
 }
 
-static struct notifier_block etm4_cpu_notifier = {
-        .notifier_call = etm4_cpu_callback,
-};
+static int etm4_dying_cpu(unsigned int cpu)
+{
+        if (!etmdrvdata[cpu])
+                return 0;
+
+        spin_lock(&etmdrvdata[cpu]->spinlock);
+        if (local_read(&etmdrvdata[cpu]->mode))
+                etm4_disable_hw(etmdrvdata[cpu]);
+        spin_unlock(&etmdrvdata[cpu]->spinlock);
+        return 0;
+}
 
 static void etm4_init_trace_id(struct etmv4_drvdata *drvdata)
 {
@@ -767,8 +766,17 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
                                 etm4_init_arch_data,  drvdata, 1))
                 dev_err(dev, "ETM arch init failed\n");
 
-        if (!etm4_count++)
-                register_hotcpu_notifier(&etm4_cpu_notifier);
+        if (!etm4_count++) {
+                cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CORESIGHT4_STARTING,
+                                          "AP_ARM_CORESIGHT4_STARTING",
+                                          etm4_starting_cpu, etm4_dying_cpu);
+                ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
+                                                "AP_ARM_CORESIGHT4_ONLINE",
+                                                etm4_online_cpu, NULL);
+                if (ret < 0)
+                        goto err_arch_supported;
+                hp_online = ret;
+        }
 
         put_online_cpus();
 
@@ -809,8 +817,11 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
         return 0;
 
 err_arch_supported:
-        if (--etm4_count == 0)
-                unregister_hotcpu_notifier(&etm4_cpu_notifier);
+        if (--etm4_count == 0) {
+                cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT4_STARTING);
+                if (hp_online)
+                        cpuhp_remove_state_nocalls(hp_online);
+        }
         return ret;
 }