From 3b5ea47dbff0c934b7b979bcc772427a2404ed3d Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Fri, 30 Oct 2015 17:56:57 +0800 Subject: 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 Cc: Borislav Petkov Cc: Guenter Roeck Cc: Peter Zijlstra Cc: Ingo Molnar Signed-off-by: Guenter Roeck --- drivers/hwmon/fam15h_power.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'drivers/hwmon/fam15h_power.c') 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 #include #include +#include MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor"); MODULE_AUTHOR("Andreas Herrmann "); @@ -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; } -- cgit v1.2.3-58-ga151