Commit 017b3064 authored by Yunfeng Ye's avatar Yunfeng Ye Committed by Xiaolong Wang
Browse files

powercap: intel_rapl: Use topology interface in rapl_init_domains() 

mainline inclusion
from mainline-v5.12-rc1
commit 65348ba2
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I92135

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=65348ba259e27ad4b69459ef477facd4c702bbf6



--------------------------------

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

Use topology_physical_package_id(cpu) instead.

Intel-SIG: commit 65348ba2 powercap: intel_rapl: Use topology interface in rapl_init_domains().
Backport a dependency of Intel RAPL driver support on TPMI.

Signed-off-by: default avatarYunfeng Ye <yeyunfeng@huawei.com>
[ rjw: Changelog edits ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
[ Xiaolong Wang: amend commit log ]
Signed-off-by: default avatarXiaolong Wang <xiaolong.wang@intel.com>
parent e90b6336

drivers/powercap/intel_rapl_common.c

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,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]);