mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
hwmon fixes for v4.5-rc2
- Use bit mask to calculate tdp limit in fam15h_power driver - Black-list Dell Studio XPS 8000 in dell-smm driver -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJWq3qUAAoJEMsfJm/On5mBBj0P/iEMQUe6ncPDn38hYIBdlCgr oloEfG1w/U2r3+KXHQq5fYrYtYFeKd9OuN+UyxkZNq0lma05rDOkWcvfJAGJDcM7 oBqNlwR7MBdXJG2tg+mVCBrQqhsYv9baj/KhxgoRqnxGkgkmHBjZmH9ATEE2Fg+w 28wbW+p6CQ7sZ7suF4m0T+CF37mfAZYuTRtD+Rtuy6LK37pQFw9nyEDuf+Wq1Qzz 3dDMu0kY+v4tjb7pWqXX9KlxFuyv9bBSZlxIh/d7Fo1Q+Oi95NuV6HMTA8BN0UoG 0VRoJgXflcDJat1Ebmw9kpgVltpNl84FqnXlDqwxYjdlZxSvJ85QVWPzcWDdBceK UxE42/RMjmRHAbxHohtzYYlCrdQI3wjAEPNJFCf6gvmAP6a9yb/TSXHXHCHYsiXL aPSUd0O0KLaK8n7aQTX0nBaeMXbAQ/9PKMpXocLxXM3mGw95cjLj49YsfPk/kLjh 9qVUEDe8yzZlyyhuSRnxhGjv2xc5ICm5M09PloVdUvroVpWPRDMH4rZ78Y8pHLuw GQj95m8dzsc5h3BK+igYLex85kkKewQ4hVcjs0mgAHqLodJOo5ltm0vWwruPML3W hUfEgKxvHsxu0sGaOCSdqEAE6liv/3/0JJY9vCkHCoP9fSBtJDGEACR61z8Ge7WU 3WGXUffez9x8+RjwNBBh =gBAg -----END PGP SIGNATURE----- Merge tag 'hwmon-for-linus-v4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Pull hwmon fixes from Guenter Roeck: - Use bit mask to calculate tdp limit in fam15h_power driver - Black-list Dell Studio XPS 8000 in dell-smm driver * tag 'hwmon-for-linus-v4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (fam15h_power) Add bit masking for tdp_limit hwmon: (dell-smm) Blacklist Dell Studio XPS 8000
This commit is contained in:
commit
f51d4d7826
2 changed files with 20 additions and 1 deletions
|
@ -930,6 +930,17 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = {
|
|||
MODULE_DEVICE_TABLE(dmi, i8k_dmi_table);
|
||||
|
||||
static struct dmi_system_id i8k_blacklist_dmi_table[] __initdata = {
|
||||
{
|
||||
/*
|
||||
* CPU fan speed going up and down on Dell Studio XPS 8000
|
||||
* for unknown reasons.
|
||||
*/
|
||||
.ident = "Dell Studio XPS 8000",
|
||||
.matches = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Studio XPS 8000"),
|
||||
},
|
||||
},
|
||||
{
|
||||
/*
|
||||
* CPU fan speed going up and down on Dell Studio XPS 8100
|
||||
|
|
|
@ -90,7 +90,15 @@ static ssize_t show_power(struct device *dev,
|
|||
pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5),
|
||||
REG_TDP_LIMIT3, &val);
|
||||
|
||||
tdp_limit = val >> 16;
|
||||
/*
|
||||
* On Carrizo and later platforms, ApmTdpLimit bit field
|
||||
* is extended to 16:31 from 16:28.
|
||||
*/
|
||||
if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60)
|
||||
tdp_limit = val >> 16;
|
||||
else
|
||||
tdp_limit = (val >> 16) & 0x1fff;
|
||||
|
||||
curr_pwr_watts = ((u64)(tdp_limit +
|
||||
data->base_tdp)) << running_avg_range;
|
||||
curr_pwr_watts -= running_avg_capture;
|
||||
|
|
Loading…
Reference in a new issue