From: Yunfeng Ye <yeyunfeng@huawei.com>
Date: Sat, 23 Jan 2021 10:06:08 +0000 (-0500)
Subject: powercap: intel_rapl: Use topology interface in rapl_init_domains()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=65348ba259e27ad4b69459ef477facd4c702bbf6;p=linux.git

powercap: intel_rapl: Use topology interface in rapl_init_domains()

It's not a good idea to access the phys_proc_id of cpuinfo directly.

Use topology_physical_package_id(cpu) instead.

Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
[ rjw: Changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index b6c7bedf517eb..fdda2a7371861 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -547,7 +547,7 @@ static void rapl_init_domains(struct rapl_package *rp)
 
 		if (i == RAPL_DOMAIN_PLATFORM && rp->id > 0) {
 			snprintf(rd->name, RAPL_DOMAIN_NAME_LENGTH, "psys-%d",
-				cpu_data(rp->lead_cpu).phys_proc_id);
+				topology_physical_package_id(rp->lead_cpu));
 		} else
 			snprintf(rd->name, RAPL_DOMAIN_NAME_LENGTH, "%s",
 				rapl_domain_names[i]);