powercap: intel_rapl: Use topology interface in rapl_add_package()

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.

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 f079983..b6c7bed 100644 (file)
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -1310,7 +1310,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)
@@ -1327,10 +1326,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)) {