From patchwork Tue Nov 22 21:16:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 9442183 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F38BA605EE for ; Tue, 22 Nov 2016 21:18:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E27B1204C1 for ; Tue, 22 Nov 2016 21:18:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D70F420564; Tue, 22 Nov 2016 21:18:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE532204C1 for ; Tue, 22 Nov 2016 21:18:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933713AbcKVVSo (ORCPT ); Tue, 22 Nov 2016 16:18:44 -0500 Received: from Galois.linutronix.de ([146.0.238.70]:60993 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932992AbcKVVSn (ORCPT ); Tue, 22 Nov 2016 16:18:43 -0500 Received: from localhost ([127.0.0.1] helo=[127.0.1.1]) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1c9IQ5-0002I3-77; Tue, 22 Nov 2016 22:16:01 +0100 Message-Id: <20161122211438.595830572@linutronix.de> User-Agent: quilt/0.63-1 Date: Tue, 22 Nov 2016 21:16:00 -0000 From: Thomas Gleixner To: LKML Cc: Rafael Wysocki , x86@kernel.org, Peter Zijlstra , linux-pm@vger.kernel.org, Srinivas Pandruvada , Jacob Pan , Sebastian Andrzej Siewior Subject: [patch 3/5] powercap/intel rapl: Convert to hotplug state machine References: <20161122210518.079483154@linutronix.de> MIME-Version: 1.0 Content-Disposition: inline; filename=powercapintel_rapl_Convert_to_hotplug_state_machine.patch Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sebastian Andrzej Siewior Install the callbacks via the state machine as a first step. The init/exit code is a duplicate of the hotplug code. This is cleaned up in a consecutive patch. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner --- drivers/powercap/intel_rapl.c | 94 +++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 45 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/powercap/intel_rapl.c +++ b/drivers/powercap/intel_rapl.c @@ -1603,50 +1603,48 @@ static int rapl_add_package(int cpu) * associated domains. Cooling devices are handled accordingly at * per-domain level. */ -static int rapl_cpu_callback(struct notifier_block *nfb, - unsigned long action, void *hcpu) +static int rapl_cpu_online(unsigned int cpu) +{ + struct rapl_package *rp; + int phy_package_id; + + phy_package_id = topology_physical_package_id(cpu); + + rp = find_package_by_id(phy_package_id); + if (rp) + rp->nr_cpus++; + else + rapl_add_package(cpu); + return 0; +} + +static int rapl_cpu_down_prep(unsigned int cpu) { - unsigned long cpu = (unsigned long)hcpu; int phy_package_id; struct rapl_package *rp; int lead_cpu; phy_package_id = topology_physical_package_id(cpu); - switch (action) { - case CPU_ONLINE: - case CPU_ONLINE_FROZEN: - case CPU_DOWN_FAILED: - case CPU_DOWN_FAILED_FROZEN: - rp = find_package_by_id(phy_package_id); - if (rp) - ++rp->nr_cpus; - else - rapl_add_package(cpu); - break; - case CPU_DOWN_PREPARE: - case CPU_DOWN_PREPARE_FROZEN: - rp = find_package_by_id(phy_package_id); - if (!rp) - break; - if (--rp->nr_cpus == 0) - rapl_remove_package(rp); - else if (cpu == rp->lead_cpu) { - /* choose another active cpu in the package */ - lead_cpu = cpumask_any_but(topology_core_cpumask(cpu), cpu); - if (lead_cpu < nr_cpu_ids) - rp->lead_cpu = lead_cpu; - else /* should never go here */ - pr_err("no active cpu available for package %d\n", - phy_package_id); + rp = find_package_by_id(phy_package_id); + if (!rp) + return 0; + if (--rp->nr_cpus == 0) { + rapl_remove_package(rp); + } else if (cpu == rp->lead_cpu) { + /* choose another active cpu in the package */ + lead_cpu = cpumask_any_but(topology_core_cpumask(cpu), cpu); + if (lead_cpu < nr_cpu_ids) { + rp->lead_cpu = lead_cpu; + } else { + /* should never go here */ + pr_err("no active cpu available for package %d\n", + phy_package_id); } } - - return NOTIFY_OK; + return 0; } -static struct notifier_block rapl_cpu_notifier = { - .notifier_call = rapl_cpu_callback, -}; +static enum cpuhp_state pcap_rapl_online; static int __init rapl_init(void) { @@ -1663,36 +1661,42 @@ static int __init rapl_init(void) rapl_defaults = (struct rapl_defaults *)id->driver_data; - cpu_notifier_register_begin(); - /* prevent CPU hotplug during detection */ get_online_cpus(); ret = rapl_detect_topology(); if (ret) - goto done; + goto err; if (rapl_register_powercap()) { - rapl_cleanup_data(); ret = -ENODEV; - goto done; + goto err_cleanup; } - __register_hotcpu_notifier(&rapl_cpu_notifier); -done: + ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, + "powercap/rapl:online", + rapl_cpu_online, rapl_cpu_down_prep); + if (ret < 0) + goto err_unreg; + pcap_rapl_online = ret; put_online_cpus(); - cpu_notifier_register_done(); + return 0; +err_unreg: + rapl_unregister_powercap(); + +err_cleanup: + rapl_cleanup_data(); +err: + put_online_cpus(); return ret; } static void __exit rapl_exit(void) { - cpu_notifier_register_begin(); get_online_cpus(); - __unregister_hotcpu_notifier(&rapl_cpu_notifier); + cpuhp_remove_state(pcap_rapl_online); rapl_unregister_powercap(); rapl_cleanup_data(); put_online_cpus(); - cpu_notifier_register_done(); } module_init(rapl_init);