From: Len Brown <lenb@kernel.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org, Zhang Rui <rui.zhang@intel.com>,
Len Brown <len.brown@intel.com>,
linux-pm@vger.kernel.org
Subject: [PATCH 09/18] powercap/intel_rapl: Simplify rapl_find_package()
Date: Wed, 1 May 2019 00:24:18 -0400 [thread overview]
Message-ID: <b7a7b6e72e76510dc8dedb3e1b8b20de7cdca432.1556657368.git.len.brown@intel.com> (raw)
In-Reply-To: <6f53f0e494d743c79e18f6e3a98085711e6ddd0c.1556657368.git.len.brown@intel.com>
From: Zhang Rui <rui.zhang@intel.com>
Syntax only, no functional or semantic change.
Simplify how the code to discover a package is called.
Rename find_package_by_id() to rapl_find_package_domain()
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: linux-pm@vger.kernel.org
---
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 4347f15165f8..3c3c0c23180b 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_domain(int cpu)
{
+ int id = topology_physical_package_id(cpu);
struct rapl_package *rp;
list_for_each_entry(rp, &rapl_packages, plist) {
@@ -1300,7 +1301,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_domain(0);
power_zone = powercap_register_zone(&rd->power_zone, control_type,
"psys", NULL,
@@ -1456,8 +1457,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;
@@ -1466,7 +1468,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 */
@@ -1497,12 +1499,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_domain(cpu);
if (!rp) {
- rp = rapl_add_package(cpu, pkgid);
+ rp = rapl_add_package(cpu);
if (IS_ERR(rp))
return PTR_ERR(rp);
}
@@ -1512,11 +1513,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_domain(cpu);
if (!rp)
return 0;
--
2.18.0-rc0
next prev parent reply other threads:[~2019-05-01 4:25 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-01 4:24 [PATCH 0/18] v4 multi-die/package topology support Len Brown
2019-05-01 4:24 ` [PATCH 01/18] x86 topology: Fix doc typo Len Brown
2019-05-01 4:24 ` [PATCH 02/18] topology: Simplify cputopology.txt formatting and wording Len Brown
2019-05-01 4:24 ` [PATCH 03/18] x86 smpboot: Rename match_die() to match_pkg() Len Brown
2019-05-01 4:24 ` [PATCH 04/18] x86 topology: Add CPUID.1F multi-die/package support Len Brown
2019-05-01 4:24 ` [PATCH 05/18] x86 topology: Create topology_max_die_per_package() Len Brown
2019-05-01 4:24 ` [PATCH 06/18] cpu topology: Export die_id Len Brown
2019-05-01 4:24 ` [PATCH 07/18] x86 topology: Define topology_die_id() Len Brown
2019-05-01 4:24 ` [PATCH 08/18] x86 topology: Define topology_logical_die_id() Len Brown
2019-05-01 4:24 ` Len Brown [this message]
2019-05-01 4:24 ` [PATCH 10/18] powercap/intel_rapl: Support multi-die/package Len Brown
2019-05-01 4:24 ` [PATCH 11/18] thermal/x86_pkg_temp_thermal: " Len Brown
2019-05-01 4:24 ` [PATCH 12/18] powercap/intel_rapl: update rapl domain name and debug messages Len Brown
2019-05-01 4:24 ` [PATCH 13/18] hwmon/coretemp: Support multi-die/package Len Brown
2019-05-04 2:58 ` Len Brown
2019-05-01 4:24 ` [PATCH 14/18] topology: Create package_cpus sysfs attribute Len Brown
2019-05-01 4:24 ` [PATCH 15/18] topology: Create core_cpus and die_cpus sysfs attributes Len Brown
2019-05-01 4:24 ` [PATCH 16/18] perf/x86/intel/uncore: Support multi-die/package Len Brown
2019-05-01 4:24 ` [PATCH 17/18] perf/x86/intel/rapl: " Len Brown
2019-05-06 11:48 ` Ingo Molnar
2019-05-06 17:28 ` Len Brown
2019-05-06 19:49 ` Ingo Molnar
2019-05-01 4:24 ` [PATCH 18/18] perf/x86/intel/cstate: " Len Brown
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=b7a7b6e72e76510dc8dedb3e1b8b20de7cdca432.1556657368.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--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
all inboxes | Powered by JetHome®