From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Len Brown <lenb@kernel.org>
Cc: "the arch/x86 maintainers" <x86@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Zhang Rui <rui.zhang@intel.com>, Len Brown <len.brown@intel.com>,
Linux PM <linux-pm@vger.kernel.org>
Subject: Re: [PATCH 07/11] powercap/intel_rapl: simplify rapl_find_package()
Date: Tue, 19 Feb 2019 10:11:37 +0100 [thread overview]
Message-ID: <CAJZ5v0i1LigqFyg3tFrcOyJRehJyKJOyn7CSePOok=q+3zewpg@mail.gmail.com> (raw)
In-Reply-To: <c21fb21e1cd476b2806d5f88c96e8cc54d3fd08a.1550545163.git.len.brown@intel.com>
On Tue, Feb 19, 2019 at 4:41 AM Len Brown <lenb@kernel.org> wrote:
>
> From: Zhang Rui <rui.zhang@intel.com>
>
> Simplify how the code to discover a package is called.
> Rename find_package_by_id() to rapl_find_package()
>
> No functional change.
>
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> Signed-off-by: Len Brown <len.brown@intel.com>
> Cc: linux-pm@vger.kernel.org
> Signed-off-by: Len Brown <len.brown@intel.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> drivers/powercap/intel_rapl.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
> index 6cdb2c14eee4..6057d9695fed 100644
> --- a/drivers/powercap/intel_rapl.c
> +++ b/drivers/powercap/intel_rapl.c
> @@ -264,8 +264,9 @@ static struct powercap_control_type *control_type; /* PowerCap Controller */
> static struct rapl_domain *platform_rapl_domain; /* Platform (PSys) domain */
>
> /* caller to ensure CPU hotplug lock is held */
> -static struct rapl_package *find_package_by_id(int id)
> +static struct rapl_package *rapl_find_package(int cpu)
> {
> + int id = topology_physical_package_id(cpu);
> struct rapl_package *rp;
>
> list_for_each_entry(rp, &rapl_packages, plist) {
> @@ -1298,7 +1299,7 @@ static int __init rapl_register_psys(void)
> rd->rpl[0].name = pl1_name;
> rd->rpl[1].prim_id = PL2_ENABLE;
> rd->rpl[1].name = pl2_name;
> - rd->rp = find_package_by_id(0);
> + rd->rp = rapl_find_package(0);
>
> power_zone = powercap_register_zone(&rd->power_zone, control_type,
> "psys", NULL,
> @@ -1454,8 +1455,9 @@ static void rapl_remove_package(struct rapl_package *rp)
> }
>
> /* called from CPU hotplug notifier, hotplug lock held */
> -static struct rapl_package *rapl_add_package(int cpu, int pkgid)
> +static struct rapl_package *rapl_add_package(int cpu)
> {
> + int id = topology_physical_package_id(cpu);
> struct rapl_package *rp;
> int ret;
>
> @@ -1464,7 +1466,7 @@ static struct rapl_package *rapl_add_package(int cpu, int pkgid)
> return ERR_PTR(-ENOMEM);
>
> /* add the new package to the list */
> - rp->id = pkgid;
> + rp->id = id;
> rp->lead_cpu = cpu;
>
> /* check if the package contains valid domains */
> @@ -1495,12 +1497,11 @@ static struct rapl_package *rapl_add_package(int cpu, int pkgid)
> */
> static int rapl_cpu_online(unsigned int cpu)
> {
> - int pkgid = topology_physical_package_id(cpu);
> struct rapl_package *rp;
>
> - rp = find_package_by_id(pkgid);
> + rp = rapl_find_package(cpu);
> if (!rp) {
> - rp = rapl_add_package(cpu, pkgid);
> + rp = rapl_add_package(cpu);
> if (IS_ERR(rp))
> return PTR_ERR(rp);
> }
> @@ -1510,11 +1511,10 @@ static int rapl_cpu_online(unsigned int cpu)
>
> static int rapl_cpu_down_prep(unsigned int cpu)
> {
> - int pkgid = topology_physical_package_id(cpu);
> struct rapl_package *rp;
> int lead_cpu;
>
> - rp = find_package_by_id(pkgid);
> + rp = rapl_find_package(cpu);
> if (!rp)
> return 0;
>
> --
> 2.18.0-rc0
>
next prev parent reply other threads:[~2019-02-19 9:11 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-19 3:40 [PATCH 0/11] multi-die/package support Len Brown
2019-02-19 3:40 ` [PATCH 01/11] x86 topology: fix doc typo Len Brown
2019-02-19 3:40 ` [PATCH 02/11] topolgy: simplify cputopology.txt formatting and wording Len Brown
[not found] ` <9108bd98-e9f4-fee3-80c7-72d540c48291@infradead.org>
2019-02-19 20:33 ` [linux-drivers-review] " Brown, Len
2019-02-19 3:40 ` [PATCH 03/11] x86 topology: Add CPUID.1F multi-die/package support Len Brown
2019-02-19 16:49 ` Liang, Kan
2019-02-19 19:27 ` Brown, Len
2019-02-20 2:59 ` Like Xu
2019-02-20 6:10 ` Len Brown
2019-02-20 10:55 ` Peter Zijlstra
2019-02-20 15:08 ` Len Brown
2019-02-26 13:54 ` Peter Zijlstra
2019-02-28 15:59 ` Len Brown
2019-02-28 17:56 ` Peter Zijlstra
2019-02-24 10:04 ` Brice Goglin
2019-02-25 5:31 ` Like Xu
2019-02-25 8:08 ` Brown, Len
2019-02-19 3:40 ` [PATCH 04/11] cpu topology: export die_id Len Brown
2019-02-19 3:40 ` [PATCH 05/11] x86 topology: export die_siblings Len Brown
2019-02-19 16:56 ` Liang, Kan
2019-02-19 18:43 ` Brown, Len
2019-02-19 19:33 ` Liang, Kan
2019-02-20 10:58 ` Peter Zijlstra
2019-02-20 21:52 ` Brice Goglin
2019-02-21 7:41 ` Len Brown
2019-02-21 8:38 ` Brice Goglin
2019-02-19 3:40 ` [PATCH 06/11] x86 topology: define topology_unique_die_id() Len Brown
2019-02-19 3:40 ` [PATCH 07/11] powercap/intel_rapl: simplify rapl_find_package() Len Brown
2019-02-19 9:11 ` Rafael J. Wysocki [this message]
2019-02-19 3:40 ` [PATCH 08/11] powercap/intel_rapl: Support multi-die/package Len Brown
2019-02-19 9:10 ` Rafael J. Wysocki
2019-02-20 11:02 ` Peter Zijlstra
2019-02-21 5:44 ` Len Brown
2019-02-26 4:41 ` Len Brown
2019-02-26 6:55 ` Zhang Rui
2019-02-19 3:40 ` [PATCH 09/11] powercap/intel_rapl: update rapl domain name and debug messages Len Brown
2019-02-19 9:10 ` Rafael J. Wysocki
2019-02-19 3:40 ` [PATCH 10/11] thermal/x86_pkg_temp_thermal: Support multi-die/package Len Brown
2019-02-19 3:40 ` [PATCH 11/11] hwmon/coretemp: " Len Brown
2019-02-19 16:46 ` Guenter Roeck
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='CAJZ5v0i1LigqFyg3tFrcOyJRehJyKJOyn7CSePOok=q+3zewpg@mail.gmail.com' \
--to=rafael@kernel.org \
--cc=len.brown@intel.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
--cc=x86@kernel.org \
/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).