| Message ID | 20160818125731.27256-13-bigeasy@linutronix.de (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On 08/18/2016 02:57 PM, Sebastian Andrzej Siewior wrote: > Install the callbacks via the state machine. > > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: linux-pm@vger.kernel.org > Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> > --- [ ... ] > - > mutex_lock(&cpuidle_lock); > > dev = per_cpu(cpuidle_devices, cpu); > if (!dev || !dev->coupled) > goto out; > > - switch (action & ~CPU_TASKS_FROZEN) { > - case CPU_UP_PREPARE: > - case CPU_DOWN_PREPARE: > - cpuidle_coupled_prevent_idle(dev->coupled); > - break; > - case CPU_ONLINE: > - case CPU_DEAD: > - cpuidle_coupled_update_online_cpus(dev->coupled); > - /* Fall through */ > - case CPU_UP_CANCELED: > - case CPU_DOWN_FAILED: > - cpuidle_coupled_allow_idle(dev->coupled); > - break; > - } > - > + cpuidle_coupled_update_online_cpus(dev->coupled); > + cpuidle_coupled_allow_idle(dev->coupled); > out: > mutex_unlock(&cpuidle_lock); > - return NOTIFY_OK; > + return 0; You can remove the useless label 'out': if (dev && dev->coupled) { cpuidle_coupled_update_online_cpus(dev->coupled); cpuidle_coupled_allow_idle(dev->coupled); } > } > > -static struct notifier_block cpuidle_coupled_cpu_notifier = { > - .notifier_call = cpuidle_coupled_cpu_notify, > -}; > +static int coupled_cpu_up_prepare(unsigned int cpu) > +{ > + struct cpuidle_device *dev; > + > + mutex_lock(&cpuidle_lock); > + > + dev = per_cpu(cpuidle_devices, cpu); > + if (!dev || !dev->coupled) > + goto out; > + > + cpuidle_coupled_prevent_idle(dev->coupled); > +out: > + mutex_unlock(&cpuidle_lock); > + return 0; Same comment here. > +} > > static int __init cpuidle_coupled_init(void) > { > - return register_cpu_notifier(&cpuidle_coupled_cpu_notifier); > + int ret; > + > + ret = cpuhp_setup_state_nocalls(CPUHP_CPUIDLE_COUPLED_PREPARE, > + "CPUIDLE_COUPLED_PREPARE", > + coupled_cpu_up_prepare, > + coupled_cpu_online); > + if (ret) > + goto err; There is nothing to undo here. if (ret) return ret; > + ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, > + "CPUIDLE_COUPLED_ONLINE", > + coupled_cpu_online, > + coupled_cpu_up_prepare); > + if (ret < 0) > + goto err; if (ret) cpuhp_remove_state_nocalls( CPUHP_CPUIDLE_COUPLED_PREPARE); return ret; > + return 0; > +err: > + cpuhp_remove_state_nocalls(CPUHP_CPUIDLE_COUPLED_PREPARE); > + return ret; ^^^^^ zaaap !
diff --git a/drivers/cpuidle/coupled.c b/drivers/cpuidle/coupled.c index d5657d50ac40..11efd9743e88 100644 --- a/drivers/cpuidle/coupled.c +++ b/drivers/cpuidle/coupled.c @@ -749,65 +749,58 @@ static void cpuidle_coupled_allow_idle(struct cpuidle_coupled *coupled) put_cpu(); } -/** - * cpuidle_coupled_cpu_notify - notifier called during hotplug transitions - * @nb: notifier block - * @action: hotplug transition - * @hcpu: target cpu number - * - * Called when a cpu is brought on or offline using hotplug. Updates the - * coupled cpu set appropriately - */ -static int cpuidle_coupled_cpu_notify(struct notifier_block *nb, - unsigned long action, void *hcpu) +static int coupled_cpu_online(unsigned int cpu) { - int cpu = (unsigned long)hcpu; struct cpuidle_device *dev; - switch (action & ~CPU_TASKS_FROZEN) { - case CPU_UP_PREPARE: - case CPU_DOWN_PREPARE: - case CPU_ONLINE: - case CPU_DEAD: - case CPU_UP_CANCELED: - case CPU_DOWN_FAILED: - break; - default: - return NOTIFY_OK; - } - mutex_lock(&cpuidle_lock); dev = per_cpu(cpuidle_devices, cpu); if (!dev || !dev->coupled) goto out; - switch (action & ~CPU_TASKS_FROZEN) { - case CPU_UP_PREPARE: - case CPU_DOWN_PREPARE: - cpuidle_coupled_prevent_idle(dev->coupled); - break; - case CPU_ONLINE: - case CPU_DEAD: - cpuidle_coupled_update_online_cpus(dev->coupled); - /* Fall through */ - case CPU_UP_CANCELED: - case CPU_DOWN_FAILED: - cpuidle_coupled_allow_idle(dev->coupled); - break; - } - + cpuidle_coupled_update_online_cpus(dev->coupled); + cpuidle_coupled_allow_idle(dev->coupled); out: mutex_unlock(&cpuidle_lock); - return NOTIFY_OK; + return 0; } -static struct notifier_block cpuidle_coupled_cpu_notifier = { - .notifier_call = cpuidle_coupled_cpu_notify, -}; +static int coupled_cpu_up_prepare(unsigned int cpu) +{ + struct cpuidle_device *dev; + + mutex_lock(&cpuidle_lock); + + dev = per_cpu(cpuidle_devices, cpu); + if (!dev || !dev->coupled) + goto out; + + cpuidle_coupled_prevent_idle(dev->coupled); +out: + mutex_unlock(&cpuidle_lock); + return 0; +} static int __init cpuidle_coupled_init(void) { - return register_cpu_notifier(&cpuidle_coupled_cpu_notifier); + int ret; + + ret = cpuhp_setup_state_nocalls(CPUHP_CPUIDLE_COUPLED_PREPARE, + "CPUIDLE_COUPLED_PREPARE", + coupled_cpu_up_prepare, + coupled_cpu_online); + if (ret) + goto err; + ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, + "CPUIDLE_COUPLED_ONLINE", + coupled_cpu_online, + coupled_cpu_up_prepare); + if (ret < 0) + goto err; + return 0; +err: + cpuhp_remove_state_nocalls(CPUHP_CPUIDLE_COUPLED_PREPARE); + return ret; } core_initcall(cpuidle_coupled_init); diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 6a08fd142b8c..9e50a7b3bbcd 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -31,6 +31,7 @@ enum cpuhp_state { CPUHP_SLAB_PREPARE, CPUHP_RCUTREE_PREP, CPUHP_MD_RAID5_PREPARE, + CPUHP_CPUIDLE_COUPLED_PREPARE, CPUHP_NOTIFY_PREPARE, CPUHP_TIMERS_DEAD, CPUHP_BRINGUP_CPU,
Install the callbacks via the state machine. Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: linux-pm@vger.kernel.org Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- drivers/cpuidle/coupled.c | 81 +++++++++++++++++++++------------------------- include/linux/cpuhotplug.h | 1 + 2 files changed, 38 insertions(+), 44 deletions(-)