From 46f29c2b494600cd326b84f87f5765e80fffface Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Fri, 30 Oct 2015 17:56:56 +0800 Subject: [PATCH] hwmon: (fam15h_power) Enable power1_input on AMD Carrizo This patch enables power1_input attribute for Carrizo platform. Signed-off-by: Huang Rui Cc: Borislav Petkov Cc: Guenter Roeck Cc: Peter Zijlstra Cc: Ingo Molnar Signed-off-by: Guenter Roeck --- drivers/hwmon/fam15h_power.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index 2d899fd75f2a..a46e166cdd7e 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -115,8 +115,11 @@ static int fam15h_power_init_attrs(struct pci_dev *pdev, { int n = FAM15H_MIN_NUM_ATTRS; struct attribute **fam15h_power_attrs; + struct cpuinfo_x86 *c = &boot_cpu_data; - if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf) + if (c->x86 == 0x15 && + (c->x86_model <= 0xf || + (c->x86_model >= 0x60 && c->x86_model <= 0x6f))) n += 1; fam15h_power_attrs = devm_kcalloc(&pdev->dev, n, @@ -128,7 +131,9 @@ static int fam15h_power_init_attrs(struct pci_dev *pdev, n = 0; fam15h_power_attrs[n++] = &dev_attr_power1_crit.attr; - if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf) + if (c->x86 == 0x15 && + (c->x86_model <= 0xf || + (c->x86_model >= 0x60 && c->x86_model <= 0x6f))) fam15h_power_attrs[n++] = &dev_attr_power1_input.attr; data->group.attrs = fam15h_power_attrs; -- 2.20.1