hwmon: (k10temp) Display both Tctl and Tdie

With temperature offsets applied to some but not all CPU types,
display both Tdie and Tctl for those CPUs where the temperatures
may be different.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/k10temp.c b/k10temp.c
index 1e18830c3176946308468d6b32a8b0c8f7be143f..ae512182b9b866bbce47c6e7fd9082a31c2889db 100644 (file)
--- a/k10temp.c
+++ b/k10temp.c
@@ -81,6 +81,7 @@ struct k10temp_data {
        void (*read_tempreg)(struct pci_dev *pdev, u32 *regval);
        int temp_offset;
        u32 temp_adjust_mask;
+       bool show_tdie;
 };
 
 struct tctl_offset {
@@ -141,17 +142,24 @@ static void read_tempreg_nb_f17(struct pci_dev *pdev, u32 *regval)
                          F17H_M01H_REPORTED_TEMP_CTRL_OFFSET, regval);
 }
 
-static ssize_t temp1_input_show(struct device *dev,
-                               struct device_attribute *attr, char *buf)
+unsigned int get_raw_temp(struct k10temp_data *data)
 {
-       struct k10temp_data *data = dev_get_drvdata(dev);
-       u32 regval;
        unsigned int temp;
+       u32 regval;
 
        data->read_tempreg(data->pdev, &regval);
        temp = (regval >> 21) * 125;
        if (regval & data->temp_adjust_mask)
                temp -= 49000;
+       return temp;
+}
+
+static ssize_t temp1_input_show(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+       struct k10temp_data *data = dev_get_drvdata(dev);
+       unsigned int temp = get_raw_temp(data);
+
        if (temp > data->temp_offset)
                temp -= data->temp_offset;
        else
@@ -160,6 +168,23 @@ static ssize_t temp1_input_show(struct device *dev,
        return sprintf(buf, "%u\n", temp);
 }
 
+static ssize_t temp2_input_show(struct device *dev,
+                               struct device_attribute *devattr, char *buf)
+{
+       struct k10temp_data *data = dev_get_drvdata(dev);
+       unsigned int temp = get_raw_temp(data);
+
+       return sprintf(buf, "%u\n", temp);
+}
+
+static ssize_t temp_label_show(struct device *dev,
+                              struct device_attribute *devattr, char *buf)
+{
+       struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+
+       return sprintf(buf, "%s\n", attr->index ? "Tctl" : "Tdie");
+}
+
 static ssize_t temp1_max_show(struct device *dev,
                              struct device_attribute *attr, char *buf)
 {
@@ -188,16 +213,23 @@ static DEVICE_ATTR_RO(temp1_max);
 static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp_crit, NULL, 0);
 static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IRUGO, show_temp_crit, NULL, 1);
 
+static SENSOR_DEVICE_ATTR(temp1_label, 0444, temp_label_show, NULL, 0);
+static DEVICE_ATTR_RO(temp2_input);
+static SENSOR_DEVICE_ATTR(temp2_label, 0444, temp_label_show, NULL, 1);
+
 static umode_t k10temp_is_visible(struct kobject *kobj,
                                  struct attribute *attr, int index)
 {
        struct device *dev = container_of(kobj, struct device, kobj);
        struct k10temp_data *data = dev_get_drvdata(dev);
        struct pci_dev *pdev = data->pdev;
+       u32 reg;
 
-       if (index >= 2) {
-               u32 reg;
-
+       switch (index) {
+       case 0 ... 1:   /* temp1_input, temp1_max */
+       default:
+               break;
+       case 2 ... 3:   /* temp1_crit, temp1_crit_hyst */
                if (!data->read_htcreg)
                        return 0;
 
@@ -209,6 +241,11 @@ static umode_t k10temp_is_visible(struct kobject *kobj,
                data->read_htcreg(data->pdev, &reg);
                if (!(reg & HTC_ENABLE))
                        return 0;
+               break;
+       case 4 ... 6:   /* temp1_label, temp2_input, temp2_label */
+               if (!data->show_tdie)
+                       return 0;
+               break;
        }
        return attr->mode;
 }
@@ -218,6 +255,9 @@ static struct attribute *k10temp_attrs[] = {
        &dev_attr_temp1_max.attr,
        &sensor_dev_attr_temp1_crit.dev_attr.attr,
        &sensor_dev_attr_temp1_crit_hyst.dev_attr.attr,
+       &sensor_dev_attr_temp1_label.dev_attr.attr,
+       &dev_attr_temp2_input.attr,
+       &sensor_dev_attr_temp2_label.dev_attr.attr,
        NULL
 };
 
@@ -293,6 +333,7 @@ static int k10temp_probe(struct pci_dev *pdev,
        } else if (boot_cpu_data.x86 == 0x17) {
                data->temp_adjust_mask = 0x80000;
                data->read_tempreg = read_tempreg_nb_f17;
+               data->show_tdie = true;
        } else {
                data->read_htcreg = read_htcreg_pci;
                data->read_tempreg = read_tempreg_pci;