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

Commit d978e755 authored by Zhang Rui's avatar Zhang Rui Committed by Rafael J. Wysocki
Browse files

intel_rapl: support 64 bit register 



RAPL MMIO interface uses 64 bit registers, thus force use 64 bit register
for all the RAPL code.

Reviewed-by: default avatarPandruvada, Srinivas <srinivas.pandruvada@intel.com>
Tested-by: default avatarPandruvada, Srinivas <srinivas.pandruvada@intel.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 3382388d

drivers/powercap/intel_rapl_common.c

+3 −3
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static int rapl_read_data_raw(struct rapl_domain *rd, 
	ra.mask = rp->mask;



	if (rd->rp->priv->read_raw(cpu, &ra)) {

		pr_debug("failed to read reg 0x%x on cpu %d\n", ra.reg, cpu);

		pr_debug("failed to read reg 0x%llx on cpu %d\n", ra.reg, cpu);

		return -EIO;

	}
@@ -749,7 +749,7 @@ static int rapl_check_unit_core(struct rapl_package *rp, int cpu) 
	ra.reg = rp->priv->reg_unit;

	ra.mask = ~0;

	if (rp->priv->read_raw(cpu, &ra)) {

		pr_err("Failed to read power unit REG 0x%x on CPU %d, exit.\n",

		pr_err("Failed to read power unit REG 0x%llx on CPU %d, exit.\n",

		       rp->priv->reg_unit, cpu);

		return -ENODEV;

	}
@@ -777,7 +777,7 @@ static int rapl_check_unit_atom(struct rapl_package *rp, int cpu) 
	ra.reg = rp->priv->reg_unit;

	ra.mask = ~0;

	if (rp->priv->read_raw(cpu, &ra)) {

		pr_err("Failed to read power unit REG 0x%x on CPU %d, exit.\n",

		pr_err("Failed to read power unit REG 0x%llx on CPU %d, exit.\n",

		       rp->priv->reg_unit, cpu);

		return -ENODEV;

	}

drivers/powercap/intel_rapl_msr.c

+7 −4
Original line number Diff line number Diff line
@@ -84,8 +84,10 @@ static int rapl_cpu_down_prep(unsigned int cpu) 


static int rapl_msr_read_raw(int cpu, struct reg_action *ra)

{

	if (rdmsrl_safe_on_cpu(cpu, ra->reg, &ra->value)) {

		pr_debug("failed to read msr 0x%x on cpu %d\n", ra->reg, cpu);

	u32 msr = (u32)ra->reg;



	if (rdmsrl_safe_on_cpu(cpu, msr, &ra->value)) {

		pr_debug("failed to read msr 0x%x on cpu %d\n", msr, cpu);

		return -EIO;

	}

	ra->value &= ra->mask;
@@ -95,16 +97,17 @@ static int rapl_msr_read_raw(int cpu, struct reg_action *ra) 
static void rapl_msr_update_func(void *info)

{

	struct reg_action *ra = info;

	u32 msr = (u32)ra->reg;

	u64 val;



	ra->err = rdmsrl_safe(ra->reg, &val);

	ra->err = rdmsrl_safe(msr, &val);

	if (ra->err)

		return;



	val &= ~ra->mask;

	val |= ra->value;



	ra->err = wrmsrl_safe(ra->reg, val);

	ra->err = wrmsrl_safe(msr, val);

}



static int rapl_msr_write_raw(int cpu, struct reg_action *ra)

include/linux/intel_rapl.h

+4 −4
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct rapl_package; 
struct rapl_domain {

	const char *name;

	enum rapl_domain_type id;

	int regs[RAPL_DOMAIN_REG_MAX];

	u64 regs[RAPL_DOMAIN_REG_MAX];

	struct powercap_zone power_zone;

	struct rapl_domain_data rdd;

	struct rapl_power_limit rpl[NR_POWER_LIMITS];
@@ -89,7 +89,7 @@ struct rapl_domain { 
};



struct reg_action {

	u32 reg;

	u64 reg;

	u64 mask;

	u64 value;

	int err;
@@ -113,8 +113,8 @@ struct rapl_if_priv { 
	struct powercap_control_type *control_type;

	struct rapl_domain *platform_rapl_domain;

	enum cpuhp_state pcap_rapl_online;

	u32 reg_unit;

	u32 regs[RAPL_DOMAIN_MAX][RAPL_DOMAIN_REG_MAX];

	u64 reg_unit;

	u64 regs[RAPL_DOMAIN_MAX][RAPL_DOMAIN_REG_MAX];

	int (*read_raw)(int cpu, struct reg_action *ra);

	int (*write_raw)(int cpu, struct reg_action *ra);

};