Fam16h,M30h(Mullins) and Fam15hM30h(Kaveri) processors can report 'power_crit' value. So, adding their respective device ids.
Also, according to BKDGs, the 'TdpRunAvgAccCap' that show_power() uses is valid only on Fam15h, Models 0x0-0xF. On all other processors the field is 'Reserved'. So, return error if we are on any other family/model. Impact on lm-sensors is minimal. On such families, instead of reporting Current power value as '0', we now have: power1: N/A Signed-off-by: Aravind Gopalakrishnan <[email protected]> --- drivers/hwmon/fam15h_power.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index 4a7cbfa..b69bf7d 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -57,6 +57,10 @@ static ssize_t show_power(struct device *dev, struct fam15h_power_data *data = dev_get_drvdata(dev); struct pci_dev *f4 = data->pdev; + /* The value TdpRunAvgAccCap is valid only on F15h, Models 0x0-0xF */ + if (boot_cpu_data.x86 != 0x15 || boot_cpu_data.x86_model > 0x0) + return -ENOSYS; + pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5), REG_TDP_RUNNING_AVERAGE, &val); running_avg_capture = (val >> 4) & 0x3fffff; @@ -216,7 +220,9 @@ static int fam15h_power_probe(struct pci_dev *pdev, static const struct pci_device_id fam15h_power_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F4) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) }, {} }; MODULE_DEVICE_TABLE(pci, fam15h_power_id_table); -- 2.0.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
