diff options
| author | Huang Rui <ray.huang@amd.com> | 2015-10-30 17:56:57 +0800 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2015-10-31 15:43:41 -0700 |
| commit | 3b5ea47dbff0c934b7b979bcc772427a2404ed3d (patch) | |
| tree | 9d07f8fd9830c53d74b29f7beb51749ca715173f /drivers/hwmon | |
| parent | 46f29c2b494600cd326b84f87f5765e80fffface (diff) | |
| download | linux-3b5ea47dbff0c934b7b979bcc772427a2404ed3d.tar.gz linux-3b5ea47dbff0c934b7b979bcc772427a2404ed3d.tar.bz2 linux-3b5ea47dbff0c934b7b979bcc772427a2404ed3d.zip | |
hwmon: (fam15h_power) Add max compute unit accumulated power
This patch adds a member in fam15h_power_data which specifies the
maximum accumulated power in a compute unit.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/fam15h_power.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index a46e166cdd7e..5f7067d7b625 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -26,6 +26,7 @@ #include <linux/pci.h> #include <linux/bitops.h> #include <asm/processor.h> +#include <asm/msr.h> MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor"); MODULE_AUTHOR("Andreas Herrmann <herrmann.der.user@googlemail.com>"); @@ -44,6 +45,8 @@ MODULE_LICENSE("GPL"); #define FAM15H_MIN_NUM_ATTRS 2 #define FAM15H_NUM_GROUPS 2 +#define MSR_F15H_CU_MAX_PWR_ACCUMULATOR 0xc001007b + struct fam15h_power_data { struct pci_dev *pdev; unsigned int tdp_to_watts; @@ -52,6 +55,8 @@ struct fam15h_power_data { unsigned int cpu_pwr_sample_ratio; const struct attribute_group *groups[FAM15H_NUM_GROUPS]; struct attribute_group group; + /* maximum accumulated power of a compute unit */ + u64 max_cu_acc_power; }; static ssize_t show_power(struct device *dev, @@ -241,6 +246,13 @@ static int fam15h_power_init_data(struct pci_dev *f4, */ data->cpu_pwr_sample_ratio = ecx; + if (rdmsrl_safe(MSR_F15H_CU_MAX_PWR_ACCUMULATOR, &tmp)) { + pr_err("Failed to read max compute unit power accumulator MSR\n"); + return -ENODEV; + } + + data->max_cu_acc_power = tmp; + return 0; } |