Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d83c39de authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman
Browse files

i8k: Support additional temperature sensors 



The SMM API suggests that more than one temperature sensor is supported,
so add support for them. Currently only supported for hwmon interface.

Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 82ba1d3f

drivers/char/i8k.c

+45 −19
Original line number Original line Diff line number Diff line
@@ -69,8 +69,11 @@ static struct device *i8k_hwmon_dev; 
static u32 i8k_hwmon_flags;

static u32 i8k_hwmon_flags;





#define I8K_HWMON_HAVE_TEMP1	(1 << 0)

#define I8K_HWMON_HAVE_TEMP1	(1 << 0)

#define I8K_HWMON_HAVE_FAN1	(1 << 1)

#define I8K_HWMON_HAVE_TEMP2	(1 << 1)

#define I8K_HWMON_HAVE_FAN2	(1 << 2)

#define I8K_HWMON_HAVE_TEMP3	(1 << 2)

#define I8K_HWMON_HAVE_TEMP4	(1 << 3)

#define I8K_HWMON_HAVE_FAN1	(1 << 4)

#define I8K_HWMON_HAVE_FAN2	(1 << 5)





MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");

MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");

MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops");

MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops");
@@ -286,7 +289,7 @@ static int i8k_get_temp(int sensor) 
	int temp;

	int temp;





#ifdef I8K_TEMPERATURE_BUG

#ifdef I8K_TEMPERATURE_BUG

	static int prev;

	static int prev[4];

#endif

#endif

	regs.ebx = sensor & 0xff;

	regs.ebx = sensor & 0xff;

	rc = i8k_smm(&regs);

	rc = i8k_smm(&regs);
@@ -304,10 +307,10 @@ static int i8k_get_temp(int sensor) 
	 # 1003655139 00000054 00005c52

	 # 1003655139 00000054 00005c52

	 */

	 */

	if (temp > I8K_MAX_TEMP) {

	if (temp > I8K_MAX_TEMP) {

		temp = prev;

		temp = prev[sensor];

		prev = I8K_MAX_TEMP;

		prev[sensor] = I8K_MAX_TEMP;

	} else {

	} else {

		prev = temp;

		prev[sensor] = temp;

	}

	}

#endif

#endif
@@ -482,12 +485,13 @@ static ssize_t i8k_hwmon_show_temp(struct device *dev, 
				   struct device_attribute *devattr,

				   struct device_attribute *devattr,

				   char *buf)

				   char *buf)

{

{

	int cpu_temp;

	int index = to_sensor_dev_attr(devattr)->index;

	int temp;





	cpu_temp = i8k_get_temp(0);

	temp = i8k_get_temp(index);

	if (cpu_temp < 0)

	if (temp < 0)

		return cpu_temp;

		return temp;

	return sprintf(buf, "%d\n", cpu_temp * 1000);

	return sprintf(buf, "%d\n", temp * 1000);

}

}





static ssize_t i8k_hwmon_show_fan(struct device *dev,

static ssize_t i8k_hwmon_show_fan(struct device *dev,
@@ -517,7 +521,10 @@ static ssize_t i8k_hwmon_show_label(struct device *dev, 
	return sprintf(buf, "%s\n", labels[index]);

	return sprintf(buf, "%s\n", labels[index]);

}

}





static DEVICE_ATTR(temp1_input, S_IRUGO, i8k_hwmon_show_temp, NULL);

static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 0);

static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 1);

static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 2);

static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 3);

static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, i8k_hwmon_show_fan, NULL,

static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, i8k_hwmon_show_fan, NULL,

			  I8K_FAN_LEFT);

			  I8K_FAN_LEFT);

static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, i8k_hwmon_show_fan, NULL,

static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, i8k_hwmon_show_fan, NULL,
@@ -527,12 +534,15 @@ static SENSOR_DEVICE_ATTR(fan1_label, S_IRUGO, i8k_hwmon_show_label, NULL, 1); 
static SENSOR_DEVICE_ATTR(fan2_label, S_IRUGO, i8k_hwmon_show_label, NULL, 2);

static SENSOR_DEVICE_ATTR(fan2_label, S_IRUGO, i8k_hwmon_show_label, NULL, 2);





static struct attribute *i8k_attrs[] = {

static struct attribute *i8k_attrs[] = {

	&dev_attr_temp1_input.attr,			/* 0 */

	&sensor_dev_attr_temp1_input.dev_attr.attr,	/* 0 */

	&sensor_dev_attr_temp1_label.dev_attr.attr,	/* 1 */

	&sensor_dev_attr_temp1_label.dev_attr.attr,	/* 1 */

	&sensor_dev_attr_fan1_input.dev_attr.attr,	/* 2 */

	&sensor_dev_attr_temp2_input.dev_attr.attr,	/* 2 */

	&sensor_dev_attr_fan1_label.dev_attr.attr,	/* 3 */

	&sensor_dev_attr_temp3_input.dev_attr.attr,	/* 3 */

	&sensor_dev_attr_fan2_input.dev_attr.attr,	/* 4 */

	&sensor_dev_attr_temp4_input.dev_attr.attr,	/* 4 */

	&sensor_dev_attr_fan2_label.dev_attr.attr,	/* 5 */

	&sensor_dev_attr_fan1_input.dev_attr.attr,	/* 5 */

	&sensor_dev_attr_fan1_label.dev_attr.attr,	/* 6 */

	&sensor_dev_attr_fan2_input.dev_attr.attr,	/* 7 */

	&sensor_dev_attr_fan2_label.dev_attr.attr,	/* 8 */

	NULL

	NULL

};

};
@@ -542,10 +552,16 @@ static umode_t i8k_is_visible(struct kobject *kobj, struct attribute *attr, 
	if ((index == 0 || index == 1) &&

	if ((index == 0 || index == 1) &&

	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP1))

	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP1))

		return 0;

		return 0;

	if ((index == 2 || index == 3) &&

	if (index == 2 && !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP2))

		return 0;

	if (index == 3 && !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP3))

		return 0;

	if (index == 4 && !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP4))

		return 0;

	if ((index == 5 || index == 6) &&

	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN1))

	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN1))

		return 0;

		return 0;

	if ((index == 4 || index == 5) &&

	if ((index == 7 || index == 8) &&

	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN2))

	    !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN2))

		return 0;

		return 0;
@@ -568,6 +584,16 @@ static int __init i8k_init_hwmon(void) 
	err = i8k_get_temp(0);

	err = i8k_get_temp(0);

	if (err >= 0)

	if (err >= 0)

		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP1;

		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP1;

	/* check for additional temperature sensors */

	err = i8k_get_temp(1);

	if (err >= 0)

		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP2;

	err = i8k_get_temp(2);

	if (err >= 0)

		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP3;

	err = i8k_get_temp(3);

	if (err >= 0)

		i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP4;





	/* Left fan attributes, if left fan is present */

	/* Left fan attributes, if left fan is present */

	err = i8k_get_fan_status(I8K_FAN_LEFT);

	err = i8k_get_fan_status(I8K_FAN_LEFT);