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

Commit 941a956b authored by Andre Przywara's avatar Andre Przywara Committed by Jean Delvare
Browse files

hwmon: (fam15h_power) Increase output resolution 



On high CPU load the accumulating values in the running_avg_cap
register are very low (below 10), so averaging them too early leads
to unnecessary poor output resolution. Since we pretend to output
micro-Watt we better keep all the bits we have as long as possible.

Signed-off-by: default avatarAndre Przywara <andre.przywara@amd.com>
Signed-off-by: default avatarAndreas Herrmann <andreas.herrmann3@amd.com>
Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent fc0900cb

drivers/hwmon/fam15h_power.c

+4 −4
Original line number Diff line number Diff line
@@ -61,14 +61,14 @@ static ssize_t show_power(struct device *dev, 
				  REG_TDP_RUNNING_AVERAGE, &val);

	running_avg_capture = (val >> 4) & 0x3fffff;

	running_avg_capture = sign_extend32(running_avg_capture, 21);

	running_avg_range = val & 0xf;

	running_avg_range = (val & 0xf) + 1;



	pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5),

				  REG_TDP_LIMIT3, &val);



	tdp_limit = val >> 16;

	curr_pwr_watts = tdp_limit + data->base_tdp -

		(s32)(running_avg_capture >> (running_avg_range + 1));

	curr_pwr_watts = (tdp_limit + data->base_tdp) << running_avg_range;

	curr_pwr_watts -= running_avg_capture;

	curr_pwr_watts *= data->tdp_to_watts;



	/*
@@ -78,7 +78,7 @@ static ssize_t show_power(struct device *dev, 
	 * scaling factor 1/(2^16).  For conversion we use

	 * (10^6)/(2^16) = 15625/(2^10)

	 */

	curr_pwr_watts = (curr_pwr_watts * 15625) >> 10;

	curr_pwr_watts = (curr_pwr_watts * 15625) >> (10 + running_avg_range);

	return sprintf(buf, "%u\n", (unsigned int) curr_pwr_watts);

}

static DEVICE_ATTR(power1_input, S_IRUGO, show_power, NULL);