Commit 26a10f7f authored by Yunfeng Ye's avatar Yunfeng Ye Committed by Xiaolong Wang
Browse files

powercap: intel_rapl: Use topology interface in rapl_add_package() 

mainline inclusion
from mainline-v5.12-rc1
commit 88ffce95
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=88ffce95764603e13eda4be003ec919e124ec365



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

It's not a good idea to access phys_proc_id and cpu_die_id directly.

Use topology_physical_package_id(cpu) and topology_die_id(cpu)
instead.

Intel-SIG: commit 88ffce95 powercap: intel_rapl: Use topology interface in rapl_add_package()
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 234396ca

drivers/powercap/intel_rapl_common.c

+3 −3
Original line number Diff line number Diff line
@@ -1369,7 +1369,6 @@ struct rapl_package *rapl_add_package(int cpu, struct rapl_if_priv *priv) 
{

	int id = topology_logical_die_id(cpu);

	struct rapl_package *rp;

	struct cpuinfo_x86 *c = &cpu_data(cpu);

	int ret;



	if (!rapl_defaults)
@@ -1386,10 +1385,11 @@ struct rapl_package *rapl_add_package(int cpu, struct rapl_if_priv *priv) 


	if (topology_max_die_per_package() > 1)

		snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH,

			 "package-%d-die-%d", c->phys_proc_id, c->cpu_die_id);

			 "package-%d-die-%d",

			 topology_physical_package_id(cpu), topology_die_id(cpu));

	else

		snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH, "package-%d",

			 c->phys_proc_id);

			 topology_physical_package_id(cpu));



	/* check if the package contains valid domains */

	if (rapl_detect_domains(rp, cpu) || rapl_defaults->check_unit(rp, cpu)) {