hwmon: (coretemp) Use PCI host bridge ID to identify CPU if necessary
Subsystems (2)
Guenter Roeck
maintainerPATCH 1/3 hwmon: (coretemp) Use PCI host bridge ID to identify CPU if necessary
Atom S12x0 CPUs are identified by the CPU host bridge ID. Add an override table based on PCI IDs as well as code to detect it.
PCI access functions can now be called with PCI disabled, so unlike previous attempts to use PCI IDs, the code no longer depends on it. If PCI is disabled, the CPU will not be identified correctly. Since it is unlikely that anything will work in this case, this is an acceptable limitation.
--- drivers/hwmon/coretemp.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-)
drivers/hwmon/coretemp.c +30 -3
@@ -36,6 +36,7 @@#include <linux/cpu.h> #include <linux/smp.h> #include <linux/moduleparam.h> +#include <linux/pci.h> #include <asm/msr.h> #include <asm/processor.h> #include <asm/cpu_device_id.h>
@@ -190,6 +191,17 @@ static ssize_t show_temp(struct device *dev,return tdata->valid ?sprintf (buf,"%d\n" , tdata->temp) : -EAGAIN ; } +struct tjmax_pci { +unsigned int device; +int tjmax; +}; + +static const struct tjmax_pci tjmax_pci_table[]__cpuinitconst = { + {0x0c72 ,102000 },/* Atom S1240 (Centerton) */ + {0x0c73 ,95000 },/* Atom S1220 (Centerton) */ + {0x0c75 ,95000 },/* Atom S1260 (Centerton) */ +}; +struct tjmax {char const *id;int tjmax;
@@ -222,8 +234,11 @@ static const struct tjmax_model tjmax_model_table[] = {* is undetectable by software */ { 0x27, ANY, 90000 }, /* Atom Medfield (Z2460) */ - { 0x35, ANY, 90000 }, /* Atom Clover Trail/Cloverview (Z2760) */ - { 0x36, ANY, 100000 }, /* Atom Cedar Trail/Cedarview (N2xxx, D2xxx) */ + { 0x35, ANY, 90000 }, /* Atom Clover Trail/Cloverview (Z27x0) */ + { 0x36, ANY, 100000 }, /* Atom Cedar Trail/Cedarview (N2xxx, D2xxx) + * Also matches S12x0 (stepping 9), covered by + * PCI table + */ };static int adjust_tjmax (struct cpuinfo_x86 *c,u32 id,struct device *dev)
@@ -236,8 +251,20 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)int err;u32 eax, edx;int i; +struct pci_dev *host_bridge =pci_get_bus_and_slot (0 ,PCI_DEVFN (0 ,0 )); + +/* +* Explicit tjmax table entries override heuristics. +* First try PCI host bridge IDs, followed by model ID strings +* and model/stepping information. +*/ +if (host_bridge && host_bridge->vendor =PCI_VENDOR_ID_INTEL ) { +for (i =0 ; i <ARRAY_SIZE (tjmax_pci_table); i++) { +if (host_bridge->device = tjmax_pci_table[i].device) +return tjmax_pci_table[i].tjmax; + } + } -/* 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;
Signature · 7 lines
1.7.9.7 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Guenter Roeck
maintainerPATCH 2/3 hwmon: (coretemp) Add PCI device ID for CE41x0 CPUs
Since we now have to use PCI IDs to detect CPU types anyway, use this mechanism to detect CE41x0 CPUs. Advantage is that it only requires a single entry and covers all variants of CE41x0, including those unknown to us.
--- drivers/hwmon/coretemp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/hwmon/coretemp.c +1 -3
@@ -197,6 +197,7 @@ struct tjmax_pci { };static const struct tjmax_pci tjmax_pci_table[]__cpuinitconst = { + {0x0708 ,110000 },/* CE41x0 (Sodaville ) */ {0x0c72 ,102000 },/* Atom S1240 (Centerton) */ {0x0c73 ,95000 },/* Atom S1220 (Centerton) */ {0x0c75 ,95000 },/* Atom S1260 (Centerton) */
@@ -210,9 +211,6 @@ struct tjmax {static const struct tjmax tjmax_table[] = { {"CPU 230" ,100000 },/* Model 0x1c, stepping 2 */ {"CPU 330" ,125000 },/* Model 0x1c, stepping 2 */ - {"CPU CE4110" ,110000 },/* Model 0x1c, stepping 10 Sodaville */ - {"CPU CE4150" ,110000 },/* Model 0x1c, stepping 10 */ - {"CPU CE4170" ,110000 },/* Model 0x1c, stepping 10 */ };struct tjmax_model {
Signature · 7 lines
1.7.9.7 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Guenter Roeck
maintainerPATCH 3/3 hwmon: (coretemp) Refine TjMax detection
In reply to Guenter RoeckIntel's turbostat code uses only 7 bits from MSR_IA32_TEMPERATURE_TARGET to read TjMax, and also only accepts it if the reported temperature is at least 85 degrees C. Play safe and do the same.
--- drivers/hwmon/coretemp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/coretemp.c +2 -2
@@ -368,12 +368,12 @@ static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)if (cpu_has_tjmax (c))dev_warn (dev,"Unable to read TjMax from CPU %u\n" , id); }else { - val = (eax >>16 ) &0xff ; + val = (eax >>16 ) &0x7f ;/* * If the TjMax is not plausible, an assumption * will be used */ -if (val) { +if (val >=85 ) {dev_dbg (dev,"TjMax is %d degrees C\n" , val);return val *1000 ; }
Signature · 7 lines
1.7.9.7 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors