From: Viresh Kumar <viresh.kumar@linaro.org>
To: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: linux-kernel@vger.kernel.org, rt@linutronix.de,
tglx@linutronix.de, "Rafael J. Wysocki" <rjw@rjwysocki.net>,
linux-pm@vger.kernel.org
Subject: Re: [PATCH 01/22] cpufreq/acpi-cpufreq: Convert to hotplug state machine
Date: Mon, 28 Nov 2016 10:45:20 +0530 [thread overview]
Message-ID: <20161128051520.GA9104@vireshk-i7> (raw)
In-Reply-To: <20161126231350.10321-2-bigeasy@linutronix.de>
On 27-11-16, 00:13, Sebastian Andrzej Siewior wrote:
> Install the callbacks via the state machine.
>
> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Cc: linux-pm@vger.kernel.org
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> ---
> drivers/cpufreq/acpi-cpufreq.c | 93 ++++++++++++++++++++----------------------
> 1 file changed, 45 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
> index 297e9128fe9f..2c29cbaca7b5 100644
> --- a/drivers/cpufreq/acpi-cpufreq.c
> +++ b/drivers/cpufreq/acpi-cpufreq.c
> @@ -536,46 +536,33 @@ static void free_acpi_perf_data(void)
> free_percpu(acpi_perf_data);
> }
>
> -static int boost_notify(struct notifier_block *nb, unsigned long action,
> - void *hcpu)
> +static int cpufreq_boost_online(unsigned int cpu)
> +{
> + const struct cpumask *cpumask;
> +
> + cpumask = get_cpu_mask(cpu);
> + /*
> + * On the CPU_UP path we simply keep the boost-disable flag
> + * in sync with the current global state.
> + */
> + boost_set_msrs(acpi_cpufreq_driver.boost_enabled, cpumask);
> + return 0;
> +}
> +
> +static int cpufreq_boost_down_prep(unsigned int cpu)
> {
> - unsigned cpu = (long)hcpu;
> const struct cpumask *cpumask;
>
> cpumask = get_cpu_mask(cpu);
>
> /*
> * Clear the boost-disable bit on the CPU_DOWN path so that
> - * this cpu cannot block the remaining ones from boosting. On
> - * the CPU_UP path we simply keep the boost-disable flag in
> - * sync with the current global state.
> + * this cpu cannot block the remaining ones from boosting.
> */
> -
> - switch (action) {
> - case CPU_DOWN_FAILED:
> - case CPU_DOWN_FAILED_FROZEN:
> - case CPU_ONLINE:
> - case CPU_ONLINE_FROZEN:
> - boost_set_msrs(acpi_cpufreq_driver.boost_enabled, cpumask);
> - break;
> -
> - case CPU_DOWN_PREPARE:
> - case CPU_DOWN_PREPARE_FROZEN:
> - boost_set_msrs(1, cpumask);
> - break;
> -
> - default:
> - break;
> - }
> -
> - return NOTIFY_OK;
> + boost_set_msrs(1, cpumask);
> + return 0;
> }
>
> -
> -static struct notifier_block boost_nb = {
> - .notifier_call = boost_notify,
> -};
> -
> /*
> * acpi_cpufreq_early_init - initialize ACPI P-States library
> *
> @@ -922,37 +909,47 @@ static struct cpufreq_driver acpi_cpufreq_driver = {
> .attr = acpi_cpufreq_attr,
> };
>
> +static enum cpuhp_state acpi_cpufreq_online;
> +
> static void __init acpi_cpufreq_boost_init(void)
> {
> - if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
> - msrs = msrs_alloc();
> + int ret;
>
> - if (!msrs)
> - return;
> + if (!(boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)))
> + return;
>
> - acpi_cpufreq_driver.set_boost = set_boost;
> - acpi_cpufreq_driver.boost_enabled = boost_state(0);
> + msrs = msrs_alloc();
>
> - cpu_notifier_register_begin();
> + if (!msrs)
> + return;
>
> - /* Force all MSRs to the same value */
> - boost_set_msrs(acpi_cpufreq_driver.boost_enabled,
> - cpu_online_mask);
Why isn't this required anymore ?
> + acpi_cpufreq_driver.set_boost = set_boost;
> + acpi_cpufreq_driver.boost_enabled = boost_state(0);
>
> - __register_cpu_notifier(&boost_nb);
> -
> - cpu_notifier_register_done();
> + /*
> + * This calls the online callback on all online cpu and forces all
> + * MSRs to the same value.
> + */
> + ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "cpufreq/acpi:online",
> + cpufreq_boost_online, cpufreq_boost_down_prep);
> + if (ret < 0) {
> + pr_err("acpi_cpufreq: failed to register hotplug callbacks\n");
> + msrs_free(msrs);
If 'msrs = NULL' is required to be done in the _exit() routine, then it should
be done here as well. Right?
> + return;
> }
> + acpi_cpufreq_online = ret;
> }
>
> static void acpi_cpufreq_boost_exit(void)
> {
> - if (msrs) {
> - unregister_cpu_notifier(&boost_nb);
> + if (!msrs)
> + return;
>
> - msrs_free(msrs);
> - msrs = NULL;
> - }
> + if (acpi_cpufreq_online >= 0)
> + cpuhp_remove_state_nocalls(acpi_cpufreq_online);
> +
> + msrs_free(msrs);
> + msrs = NULL;
> }
>
> static int __init acpi_cpufreq_init(void)
> --
> 2.10.2
--
viresh
next prev parent reply other threads:[~2016-11-28 5:15 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-26 23:13 cpu hotplug: convert more drivers (batch #6 and last) Sebastian Andrzej Siewior
2016-11-26 23:13 ` [PATCH 01/22] cpufreq/acpi-cpufreq: Convert to hotplug state machine Sebastian Andrzej Siewior
2016-11-28 5:15 ` Viresh Kumar [this message]
2016-11-28 9:49 ` Sebastian Andrzej Siewior
2016-11-28 9:51 ` [PATCH 01/22 v2] " Sebastian Andrzej Siewior
2016-11-28 9:54 ` Viresh Kumar
2016-11-28 12:46 ` Rafael J. Wysocki
2016-11-26 23:13 ` [PATCH 02/22] cpufreq/acpi-cpufreq: drop rdmsr_on_cpus() usage Sebastian Andrzej Siewior
2016-11-28 9:52 ` [PATCH 02/22 v2] " Sebastian Andrzej Siewior
2016-11-28 9:54 ` Viresh Kumar
2016-11-26 23:13 ` [PATCH 03/22] idle/intel: Remove superfluous SMP fuction call Sebastian Andrzej Siewior
2016-11-26 23:13 ` [PATCH 04/22] idle/intel: Convert to hotplug state machine Sebastian Andrzej Siewior
2016-11-28 17:29 ` Thomas Gleixner
2016-11-29 9:40 ` Sebastian Andrzej Siewior
2016-11-29 9:51 ` [PATCH 04/22 v2] " Sebastian Andrzej Siewior
2016-11-26 23:13 ` [PATCH 05/22] oprofile/nmi timer: " Sebastian Andrzej Siewior
2016-12-02 0:09 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior
2016-11-26 23:13 ` [PATCH 06/22] tracing/rb: " Sebastian Andrzej Siewior
2016-12-02 0:10 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior
2016-12-07 11:15 ` [linux-next] tracing/rb: NULL pointer dereference at trace_rb_cpu_prepare() Tetsuo Handa
2016-12-07 13:31 ` [PATCH] tracing/rb: init the CPU mask on allocation Sebastian Andrzej Siewior
2016-12-07 13:43 ` [tip:smp/hotplug] tracing/rb: Init " tip-bot for Sebastian Andrzej Siewior
2016-12-07 14:33 ` [PATCH] tracing/rb: init " Tetsuo Handa
2016-11-26 23:13 ` [PATCH 07/22] mm/vmstat: Drop get_online_cpus() from init_cpu_node_state/vmstat_cpu_dead() Sebastian Andrzej Siewior
2016-11-28 9:24 ` Michal Hocko
2016-12-02 0:10 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior
2016-11-26 23:13 ` [PATCH 08/22] mm/vmstat: Avoid on each online CPU loops Sebastian Andrzej Siewior
2016-11-28 9:28 ` Michal Hocko
2016-11-29 14:08 ` Thomas Gleixner
2016-11-29 14:44 ` Michal Hocko
2016-11-29 14:51 ` [PATCH 08/22 v2] " Sebastian Andrzej Siewior
2016-11-29 15:20 ` Michal Hocko
2016-12-02 0:11 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior
2016-11-26 23:13 ` [PATCH 09/22] mm/vmstat: Convert to hotplug state machine Sebastian Andrzej Siewior
2016-11-29 14:52 ` [PATCH 09/22 v2] " Sebastian Andrzej Siewior
2016-12-02 0:11 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior
2016-11-26 23:13 ` [PATCH 10/22] mm/zsmalloc: " Sebastian Andrzej Siewior
2016-12-02 0:12 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior
2016-11-26 23:13 ` [PATCH 11/22] mm/zswap: Convert dst-mem " Sebastian Andrzej Siewior
2016-12-02 0:12 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior
2016-11-26 23:13 ` [PATCH 12/22] mm/zswap: Convert pool " Sebastian Andrzej Siewior
2016-12-02 0:13 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior
2016-11-26 23:13 ` [PATCH 13/22] iommu/vt-d: Convert " Sebastian Andrzej Siewior
2016-12-02 0:13 ` [tip:smp/hotplug] " tip-bot for Anna-Maria Gleixner
2016-11-26 23:13 ` [PATCH 14/22] mm/compaction: " Sebastian Andrzej Siewior
2016-12-02 0:14 ` [tip:smp/hotplug] " tip-bot for Anna-Maria Gleixner
2016-11-26 23:13 ` [PATCH 15/22] arm64/cpuinfo: Make hotplug notifier symmetric Sebastian Andrzej Siewior
2016-11-29 17:22 ` Suzuki K Poulose
2016-12-02 0:14 ` [tip:smp/hotplug] " tip-bot for Anna-Maria Gleixner
2016-11-26 23:13 ` [PATCH 16/22] arm64/cpuinfo: Convert to hotplug state machine Sebastian Andrzej Siewior
2016-11-29 17:26 ` Suzuki K Poulose
2016-12-02 0:15 ` [tip:smp/hotplug] " tip-bot for Anna-Maria Gleixner
2016-11-26 23:13 ` [PATCH 17/22] KVM/PPC/Book3S HV: " Sebastian Andrzej Siewior
2016-12-02 0:15 ` [tip:smp/hotplug] " tip-bot for Anna-Maria Gleixner
2016-11-26 23:13 ` [PATCH 18/22] zram: " Sebastian Andrzej Siewior
2016-12-02 0:16 ` [tip:smp/hotplug] " tip-bot for Anna-Maria Gleixner
2016-11-26 23:13 ` [PATCH 19/22] soc/fsl/qbman: " Sebastian Andrzej Siewior
2016-12-02 0:16 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior
2016-11-26 23:13 ` [PATCH 20/22] " Sebastian Andrzej Siewior
2016-12-02 0:17 ` [tip:smp/hotplug] " tip-bot for Sebastian Andrzej Siewior
2016-11-26 23:13 ` [PATCH 21/22] staging/lustre/libcfs: " Sebastian Andrzej Siewior
2016-12-02 10:18 ` [PATCH 21/22 v2] " Sebastian Andrzej Siewior
2016-12-02 10:42 ` Greg Kroah-Hartman
2016-12-02 11:00 ` [PATCH 21/22 v3] " Sebastian Andrzej Siewior
2016-11-26 23:13 ` [PATCH 22/22] Remove obsolete cpu hotplug register / unregister functions Sebastian Andrzej Siewior
2016-12-21 19:19 [patch 00/10] cpu/hotplug: Final cleanup Thomas Gleixner
2016-12-21 19:19 ` [patch 01/10] ARM: imx: mmcd: Fix broken cpu hotplug handling Thomas Gleixner
2016-12-22 20:18 ` [tip:smp/urgent] ARM/imx/mmcd: " tip-bot for Thomas Gleixner
2016-12-25 10:02 ` tip-bot for Thomas Gleixner
2016-12-21 19:19 ` [patch 02/10] cpu/hotplug: Prevent overwriting of callbacks Thomas Gleixner
2016-12-22 11:07 ` Thomas Gleixner
2016-12-26 23:04 ` ojab
2016-12-26 23:12 ` ojab
2016-12-22 20:21 ` [tip:smp/urgent] " tip-bot for Thomas Gleixner
2016-12-25 10:04 ` tip-bot for Thomas Gleixner
2016-12-21 19:19 ` [patch 03/10] scsi/bnx2fc: Convert to hotplug state machine Thomas Gleixner
2016-12-22 20:21 ` [tip:smp/urgent] " tip-bot for Sebastian Andrzej Siewior
2016-12-25 10:05 ` tip-bot for Sebastian Andrzej Siewior
2016-12-21 19:19 ` [patch 04/10] scsi/bnx2i: " Thomas Gleixner
2016-12-22 20:22 ` [tip:smp/urgent] " tip-bot for Sebastian Andrzej Siewior
2016-12-25 10:05 ` tip-bot for Sebastian Andrzej Siewior
2016-12-21 19:19 ` [patch 05/10] staging/lustre/libcfs: " Thomas Gleixner
2016-12-22 20:22 ` [tip:smp/urgent] " tip-bot for Anna-Maria Gleixner
2016-12-25 10:06 ` tip-bot for Anna-Maria Gleixner
2016-12-21 19:19 ` [patch 06/10] cpu/hotplug: Remove obsolete cpu hotplug register/unregister functions Thomas Gleixner
2016-12-22 20:23 ` [tip:smp/urgent] " tip-bot for Thomas Gleixner
2016-12-25 10:06 ` tip-bot for Thomas Gleixner
2016-12-21 19:19 ` [patch 07/10] cpu/hotplug: Cleanup state names Thomas Gleixner
2016-12-22 20:23 ` [tip:smp/urgent] " tip-bot for Thomas Gleixner
2016-12-25 10:07 ` tip-bot for Thomas Gleixner
2016-12-21 19:19 ` [patch 08/10] coresight: etm3/4x: Consolidate hotplug state space Thomas Gleixner
2016-12-22 16:30 ` Mathieu Poirier
2016-12-22 20:24 ` [tip:smp/urgent] coresight/etm3/4x: " tip-bot for Thomas Gleixner
2016-12-25 10:07 ` tip-bot for Thomas Gleixner
2016-12-21 19:19 ` [patch 09/10] irqchip/gic: " Thomas Gleixner
2016-12-22 20:24 ` [tip:smp/urgent] " tip-bot for Thomas Gleixner
2016-12-25 10:08 ` tip-bot for Thomas Gleixner
2016-12-21 19:19 ` [patch 10/10] irqchip/armada-xp: " Thomas Gleixner
2016-12-21 20:22 ` Thomas Petazzoni
2016-12-21 20:27 ` Thomas Gleixner
2016-12-22 20:25 ` [tip:smp/urgent] " tip-bot for Thomas Gleixner
2016-12-25 10:08 ` tip-bot for Thomas Gleixner
2016-12-22 17:59 ` [patch 00/10] cpu/hotplug: Final cleanup Sam Ravnborg
2016-12-27 11:17 ` Thomas Gleixner
2016-12-27 19:41 ` Sam Ravnborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161128051520.GA9104@vireshk-i7 \
--to=viresh.kumar@linaro.org \
--cc=bigeasy@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=rt@linutronix.de \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).