diff options
| author |  Zhang Rui <rui.zhang@intel.com>
| 2020-10-13 15:42:41 +0800 |
|---|---|---|
| committer |  Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| 2020-10-16 17:35:36 +0200 |
| commit | f1e8d7560d3051b38f73a0cf6acc1b0bf5305ad9 (patch) | |
| tree | f585f43c5fac9f2f864029402f7e1da33e48b9a1 /include/linux/intel_rapl.h | |
| parent | powercap/intel_rapl: Fix domain detection (diff) | |
| download | linux-f1e8d7560d3051b38f73a0cf6acc1b0bf5305ad9.tar.gz linux-f1e8d7560d3051b38f73a0cf6acc1b0bf5305ad9.tar.bz2 linux-f1e8d7560d3051b38f73a0cf6acc1b0bf5305ad9.zip | |
powercap/intel_rapl: enumerate Psys RAPL domain together with package RAPL domain
On multi-package systems, the Psys MSR is only valid for CPUs on
specific package (master package). The current code makes the
assumption that package 0 is the master package, but this is not
true on new platforms like SPR.
Fix the problem by emuerating the Psys RAPL domain for every
package, so CPUs in slave packages will read 0 for the Psys energy
counter and only CPUs in master packages can get a valid reading
and register the Psys RAPL domain.
The sysfs I/F for the Psys RAPL domain is not changed.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
[ rjw: Subject and changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/intel_rapl.h')
| -rw-r--r-- | include/linux/intel_rapl.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/intel_rapl.h b/include/linux/intel_rapl.h index 3582176a1eca..50b8398ffd21 100644 --- a/include/linux/intel_rapl.h +++ b/include/linux/intel_rapl.h @@ -79,8 +79,10 @@ struct rapl_power_limit { struct rapl_package; +#define RAPL_DOMAIN_NAME_LENGTH 16 + struct rapl_domain { - const char *name; + char name[RAPL_DOMAIN_NAME_LENGTH]; enum rapl_domain_type id; u64 regs[RAPL_DOMAIN_REG_MAX]; struct powercap_zone power_zone; @@ -152,7 +154,4 @@ struct rapl_package *rapl_find_package_domain(int cpu, struct rapl_if_priv *priv struct rapl_package *rapl_add_package(int cpu, struct rapl_if_priv *priv); void rapl_remove_package(struct rapl_package *rp); -int rapl_add_platform_domain(struct rapl_if_priv *priv); -void rapl_remove_platform_domain(struct rapl_if_priv *priv); - #endif /* __INTEL_RAPL_H__ */ |