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

hwmon: (fam15h_power) Update running_avg_capture bit field to 28 



On Carrizo and later platforms, running_avg_capture bit field is
extended to 4:31 (28 bits) from 4:25.

Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent d83e92b3

drivers/hwmon/fam15h_power.c

+13 −2
Original line number Diff line number Diff line
@@ -59,8 +59,19 @@ static ssize_t show_power(struct device *dev, 


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

				  REG_TDP_RUNNING_AVERAGE, &val);



	/*

	 * On Carrizo and later platforms, TdpRunAvgAccCap bit field

	 * is extended to 4:31 from 4:25.

	 */

	if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60) {

		running_avg_capture = val >> 4;

		running_avg_capture = sign_extend32(running_avg_capture, 27);

	} else {

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

		running_avg_capture = sign_extend32(running_avg_capture, 21);

	}



	running_avg_range = (val & 0xf) + 1;



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