Commit-ID: 7d88eb695a1f5f67820e02999b949d5cfa080442 Gitweb: http://git.kernel.org/tip/7d88eb695a1f5f67820e02999b949d5cfa080442 Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 13 Jul 2016 17:16:36 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 15 Jul 2016 10:40:23 +0200
arm/perf: Convert to hotplug state machine Straight forward conversion w/o bells and whistles. Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Anna-Maria Gleixner <[email protected]> Reviewed-by: Sebastian Andrzej Siewior <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Will Deacon <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]> --- drivers/perf/arm_pmu.c | 36 +++++++++++++++--------------------- include/linux/cpuhotplug.h | 1 + include/linux/perf/arm_pmu.h | 1 - 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index 140436a..ae9fc6c 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -691,24 +691,15 @@ static int cpu_pmu_request_irq(struct arm_pmu *cpu_pmu, irq_handler_t handler) * UNKNOWN at reset, the PMU must be explicitly reset to avoid reading * junk values out of them. */ -static int cpu_pmu_notify(struct notifier_block *b, unsigned long action, - void *hcpu) +static int arm_perf_starting_cpu(unsigned int cpu) { - int cpu = (unsigned long)hcpu; - struct arm_pmu *pmu = container_of(b, struct arm_pmu, hotplug_nb); - - if ((action & ~CPU_TASKS_FROZEN) != CPU_STARTING) - return NOTIFY_DONE; - - if (!cpumask_test_cpu(cpu, &pmu->supported_cpus)) - return NOTIFY_DONE; - - if (pmu->reset) - pmu->reset(pmu); - else - return NOTIFY_DONE; - - return NOTIFY_OK; + if (!__oprofile_cpu_pmu) + return 0; + if (!cpumask_test_cpu(cpu, &__oprofile_cpu_pmu->supported_cpus)) + return 0; + if (__oprofile_cpu_pmu->reset) + __oprofile_cpu_pmu->reset(__oprofile_cpu_pmu); + return 0; } #ifdef CONFIG_CPU_PM @@ -819,8 +810,9 @@ static int cpu_pmu_init(struct arm_pmu *cpu_pmu) if (!cpu_hw_events) return -ENOMEM; - cpu_pmu->hotplug_nb.notifier_call = cpu_pmu_notify; - err = register_cpu_notifier(&cpu_pmu->hotplug_nb); + err = cpuhp_setup_state_nocalls(CPUHP_AP_PERF_ARM_STARTING, + "AP_PERF_ARM_STARTING", + arm_perf_starting_cpu, NULL); if (err) goto out_hw_events; @@ -858,7 +850,7 @@ static int cpu_pmu_init(struct arm_pmu *cpu_pmu) return 0; out_unregister: - unregister_cpu_notifier(&cpu_pmu->hotplug_nb); + cpuhp_remove_state_nocalls(CPUHP_AP_PERF_ARM_STARTING); out_hw_events: free_percpu(cpu_hw_events); return err; @@ -867,7 +859,7 @@ out_hw_events: static void cpu_pmu_destroy(struct arm_pmu *cpu_pmu) { cpu_pm_pmu_unregister(cpu_pmu); - unregister_cpu_notifier(&cpu_pmu->hotplug_nb); + cpuhp_remove_state_nocalls(CPUHP_AP_PERF_ARM_STARTING); free_percpu(cpu_pmu->hw_events); } @@ -1027,6 +1019,8 @@ int arm_pmu_device_probe(struct platform_device *pdev, if (ret) goto out_destroy; + WARN(__oprofile_cpu_pmu, "%s(): missing PMU strucure for CPU-hotplug\n", + __func__); if (!__oprofile_cpu_pmu) __oprofile_cpu_pmu = pmu; diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 4c63cb3..a5b6a65 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -35,6 +35,7 @@ enum cpuhp_state { CPUHP_AP_PERF_X86_CSTATE_STARTING, CPUHP_AP_PERF_XTENSA_STARTING, CPUHP_AP_ARM_VFP_STARTING, + CPUHP_AP_PERF_ARM_STARTING, CPUHP_AP_NOTIFY_STARTING, CPUHP_AP_ONLINE, CPUHP_TEARDOWN_CPU, diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h index d28ac05..e6ed34e 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -109,7 +109,6 @@ struct arm_pmu { DECLARE_BITMAP(pmceid_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS); struct platform_device *plat_device; struct pmu_hw_events __percpu *hw_events; - struct notifier_block hotplug_nb; struct notifier_block cpu_pm_nb; };
