Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b5ea47d authored by Huang Rui's avatar Huang Rui Committed by Guenter Roeck
Browse files

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: default avatarHuang 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: default avatarGuenter Roeck <linux@roeck-us.net>
parent 46f29c2b

drivers/hwmon/fam15h_power.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/bitops.h>

#include <linux/bitops.h>

#include <asm/processor.h>

#include <asm/processor.h>

#include <asm/msr.h>





MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor");

MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor");

MODULE_AUTHOR("Andreas Herrmann <herrmann.der.user@googlemail.com>");

MODULE_AUTHOR("Andreas Herrmann <herrmann.der.user@googlemail.com>");
@@ -44,6 +45,8 @@ MODULE_LICENSE("GPL"); 
#define FAM15H_MIN_NUM_ATTRS		2

#define FAM15H_MIN_NUM_ATTRS		2

#define FAM15H_NUM_GROUPS		2

#define FAM15H_NUM_GROUPS		2





#define MSR_F15H_CU_MAX_PWR_ACCUMULATOR	0xc001007b



struct fam15h_power_data {

struct fam15h_power_data {

	struct pci_dev *pdev;

	struct pci_dev *pdev;

	unsigned int tdp_to_watts;

	unsigned int tdp_to_watts;
@@ -52,6 +55,8 @@ struct fam15h_power_data { 
	unsigned int cpu_pwr_sample_ratio;

	unsigned int cpu_pwr_sample_ratio;

	const struct attribute_group *groups[FAM15H_NUM_GROUPS];

	const struct attribute_group *groups[FAM15H_NUM_GROUPS];

	struct attribute_group group;

	struct attribute_group group;

	/* maximum accumulated power of a compute unit */

	u64 max_cu_acc_power;

};

};





static ssize_t show_power(struct device *dev,

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;

	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;

	return 0;

}

}