diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-06-17 18:05:05 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-01-03 03:32:48 +0000 |
| commit | 7fc829044c78b9e7b92d511183aea2b61e461aca (patch) | |
| tree | 37db300f1066eb00ba5adc19a07ac1ce152406f1 | |
| parent | 1676fff2a36011956eaa7a5a6c892bb9ddc31e4d (diff) | |
| download | kernel_samsung_smdk4412-7fc829044c78b9e7b92d511183aea2b61e461aca.zip kernel_samsung_smdk4412-7fc829044c78b9e7b92d511183aea2b61e461aca.tar.gz kernel_samsung_smdk4412-7fc829044c78b9e7b92d511183aea2b61e461aca.tar.bz2 | |
hwmon: (coretemp) Improve support for TjMax detection on Atom CPUs
commit 41e58a1f2b90c88d94b4bd84beb9927a4c2704e9 upstream.
Atom CPUs don't have a register to retrieve TjMax. Detection so far was
incomplete. Use the X86 model ID to improve it.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/hwmon/coretemp.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 7750fd4..04fe5a7 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -190,6 +190,24 @@ static ssize_t show_temp(struct device *dev, return tdata->valid ? sprintf(buf, "%d\n", tdata->temp) : -EAGAIN; } +struct tjmax { + char const *id; + int tjmax; +}; + +static struct tjmax __cpuinitconst tjmax_table[] = { + { "CPU D410", 100000 }, + { "CPU D425", 100000 }, + { "CPU D510", 100000 }, + { "CPU D525", 100000 }, + { "CPU N450", 100000 }, + { "CPU N455", 100000 }, + { "CPU N470", 100000 }, + { "CPU N475", 100000 }, + { "CPU 230", 100000 }, + { "CPU 330", 125000 }, +}; + static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev) { /* The 100C is default for both mobile and non mobile CPUs */ @@ -200,6 +218,13 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev) int err; u32 eax, edx; struct pci_dev *host_bridge; + int i; + + /* explicit tjmax table entries override heuristics */ + for (i = 0; i < ARRAY_SIZE(tjmax_table); i++) { + if (strstr(c->x86_model_id, tjmax_table[i].id)) + return tjmax_table[i].tjmax; + } /* Early chips have no MSR for TjMax */ |