This patch adds a member in fam15h_power_data which specifies the compute unit accumulated power.
Signed-off-by: Huang Rui <[email protected]> --- drivers/hwmon/fam15h_power.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index fdfa18e..f5ff48f 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -43,7 +43,9 @@ MODULE_LICENSE("GPL"); #define REG_TDP_LIMIT3 0xe8 #define FAM15H_MIN_POWER_GROUPS 2 +#define MAX_CUS 8 +#define MSR_F15H_CU_PWR_ACCUMULATOR 0xc001007a #define MSR_F15H_CU_MAX_PWR_ACCUMULATOR 0xc001007b struct fam15h_power_data { @@ -54,6 +56,8 @@ struct fam15h_power_data { unsigned int cpu_pwr_sample_ratio; /* maximum accumulated power of a compute unit */ u64 max_cu_acc_power; + /* accumulated power of the compute units */ + u64 cu_acc_power[MAX_CUS]; }; static ssize_t show_power(struct device *dev, @@ -207,6 +211,7 @@ static int fam15h_power_resume(struct pci_dev *pdev) static int fam15h_power_init_data(struct pci_dev *f4, struct fam15h_power_data *data) { + int cu_num, cores_per_cu, cpu, cu; u32 val, eax, ebx, ecx, edx; u64 tmp; @@ -249,6 +254,21 @@ static int fam15h_power_init_data(struct pci_dev *f4, data->max_cu_acc_power = tmp; + cores_per_cu = amd_get_cores_per_cu(); + cu_num = boot_cpu_data.x86_max_cores / cores_per_cu; + + WARN_ON_ONCE(cu_num > MAX_CUS); + + for (cpu = 0; cpu < cu_num * cores_per_cu; cpu += cores_per_cu) { + cu = cpu / cores_per_cu; + if (rdmsrl_safe_on_cpu(cpu, MSR_F15H_CU_PWR_ACCUMULATOR, + &data->cu_acc_power[cu])) { + pr_err("Failed to read compute unit power accumulator MSR on core%d\n", + cpu); + return -ENODEV; + } + } + return 0; } @@ -258,6 +278,7 @@ static int fam15h_power_probe(struct pci_dev *pdev, struct fam15h_power_data *data; struct device *dev = &pdev->dev; struct device *hwmon_dev; + int ret; /* * though we ignore every other northbridge, we still have to @@ -273,11 +294,13 @@ static int fam15h_power_probe(struct pci_dev *pdev, if (!data) return -ENOMEM; - if (fam15h_power_init_attrs(pdev)) - return -ENOMEM; + ret = fam15h_power_init_attrs(pdev); + if (ret) + return ret; - if (fam15h_power_init_data(pdev, data)) - return -ENODEV; + ret = fam15h_power_init_data(pdev, data); + if (ret) + return ret; data->pdev = pdev; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
