* [lm-sensors] [PATCH 1/3] MAINTAINERS: Fix up entry for Dell laptop SMM driver @ 2014-11-30 21:00 ` Guenter Roeck 0 siblings, 0 replies; 16+ messages in thread From: Guenter Roeck @ 2014-11-30 21:00 UTC (permalink / raw) To: Greg Kroah-Hartman; +Cc: Arnd Bergmann, lm-sensors, linux-kernel, Guenter Roeck Mark driver as maintained. Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 0ff630d..a67e223 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2918,6 +2918,7 @@ F: drivers/platform/x86/dell-laptop.c DELL LAPTOP SMM DRIVER M: Guenter Roeck <linux@roeck-us.net> +S: Maintained F: drivers/char/i8k.c F: include/uapi/linux/i8k.h -- 1.9.1 _______________________________________________ lm-sensors mailing list lm-sensors@lm-sensors.org http://lists.lm-sensors.org/mailman/listinfo/lm-sensors ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 1/3] MAINTAINERS: Fix up entry for Dell laptop SMM driver @ 2014-11-30 21:00 ` Guenter Roeck 0 siblings, 0 replies; 16+ messages in thread From: Guenter Roeck @ 2014-11-30 21:00 UTC (permalink / raw) To: Greg Kroah-Hartman; +Cc: Arnd Bergmann, lm-sensors, linux-kernel, Guenter Roeck Mark driver as maintained. Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 0ff630d..a67e223 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2918,6 +2918,7 @@ F: drivers/platform/x86/dell-laptop.c DELL LAPTOP SMM DRIVER M: Guenter Roeck <linux@roeck-us.net> +S: Maintained F: drivers/char/i8k.c F: include/uapi/linux/i8k.h -- 1.9.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [lm-sensors] [PATCH 2/3] i8k: Rework error retries 2014-11-30 21:00 ` Guenter Roeck @ 2014-11-30 21:00 ` Guenter Roeck -1 siblings, 0 replies; 16+ messages in thread From: Guenter Roeck @ 2014-11-30 21:00 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Arnd Bergmann, lm-sensors, linux-kernel, Guenter Roeck, Pali Rohár SW5zdGVhZCBvZiByZXR1cm5pbmcgYSBwcmV2aW91cyB2YWx1ZSBpZiB0aGUgU01NIGNvZGUgcmV0 dXJucwphbiBlcnJvciB3aGVuIHRyeWluZyB0byByZWFkIGEgdGVtcGVyYXR1cmUsIHJldHJ5IG9u Y2UuCklmIHRoYXQgZmFpbHMgYWdhaW4sIHJldHVybiAtRU5PREFUQS4gQWxzbyByZXR1cm4gLUVO T0RBVEEgaWYgYW4KYXR0ZW1wdCBpcyBtYWRlIHRvIHJlYWQgdGhlIEdQVSB0ZW1wZXJhdHVyZSBi dXQgdGhlIEdQVSBpcwpjdXJyZW50bHkgdHVybmVkIG9mZi4KCkRyb3AgdGhlIEk4S19URU1QRVJB VFVSRV9CVUcgZGVmaW5pdGlvbiBhbmQgaGFuZGxlIHRoZSByZWxhdGVkIGJ1Zwp1bmNvbmRpdGlv bmFsbHkuCgpDYzogUGFsaSBSb2jDoXIgPHBhbGkucm9oYXJAZ21haWwuY29tPgpTaWduZWQtb2Zm LWJ5OiBHdWVudGVyIFJvZWNrIDxsaW51eEByb2Vjay11cy5uZXQ+Ci0tLQpBcHBsaWVzIG9uIHRv cCBvZiBQYWxpJ3MgcGF0Y2ggc2VyaWVzLiAKCiBkcml2ZXJzL2NoYXIvaThrLmMgfCA0NyArKysr KysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDI0IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvY2hhci9pOGsuYyBiL2RyaXZlcnMvY2hhci9pOGsuYwppbmRleCAzNDY0MTkyLi5jZGIyZGM3 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2NoYXIvaThrLmMKKysrIGIvZHJpdmVycy9jaGFyL2k4ay5j CkBAIC01LDcgKzUsNyBAQAogICoKICAqIEh3bW9uIGludGVncmF0aW9uOgogICogQ29weXJpZ2h0 IChDKSAyMDExICBKZWFuIERlbHZhcmUgPGpkZWx2YXJlQHN1c2UuZGU+Ci0gKiBDb3B5cmlnaHQg KEMpIDIwMTMgIEd1ZW50ZXIgUm9lY2sgPGxpbnV4QHJvZWNrLXVzLm5ldD4KKyAqIENvcHlyaWdo dCAoQykgMjAxMywgMjAxNCAgR3VlbnRlciBSb2VjayA8bGludXhAcm9lY2stdXMubmV0PgogICoK ICAqIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBp dCBhbmQvb3IgbW9kaWZ5IGl0CiAgKiB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFs IFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUKQEAgLTIwLDYgKzIwLDcgQEAKIAog I2RlZmluZSBwcl9mbXQoZm10KSBLQlVJTERfTU9ETkFNRSAiOiAiIGZtdAogCisjaW5jbHVkZSA8 bGludXgvZGVsYXkuaD4KICNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KICNpbmNsdWRlIDxsaW51 eC90eXBlcy5oPgogI2luY2x1ZGUgPGxpbnV4L2luaXQuaD4KQEAgLTU5LDggKzYwLDYgQEAKICNk ZWZpbmUgSThLX1BPV0VSX0FDCQkweDA1CiAjZGVmaW5lIEk4S19QT1dFUl9CQVRURVJZCTB4MDEK IAotI2RlZmluZSBJOEtfVEVNUEVSQVRVUkVfQlVHCTEKLQogc3RhdGljIERFRklORV9NVVRFWChp OGtfbXV0ZXgpOwogc3RhdGljIGNoYXIgYmlvc192ZXJzaW9uWzRdOwogc3RhdGljIHN0cnVjdCBk ZXZpY2UgKmk4a19od21vbl9kZXY7CkBAIC0zMDAsMzkgKzI5OSw0MSBAQCBzdGF0aWMgaW50IGk4 a19nZXRfdGVtcF90eXBlKGludCBzZW5zb3IpCiAvKgogICogUmVhZCB0aGUgY3B1IHRlbXBlcmF0 dXJlLgogICovCi1zdGF0aWMgaW50IGk4a19nZXRfdGVtcChpbnQgc2Vuc29yKQorc3RhdGljIGlu dCBfaThrX2dldF90ZW1wKGludCBzZW5zb3IpCiB7Ci0Jc3RydWN0IHNtbV9yZWdzIHJlZ3MgPSB7 IC5lYXggPSBJOEtfU01NX0dFVF9URU1QLCB9OwotCWludCByYzsKLQlpbnQgdGVtcDsKKwlzdHJ1 Y3Qgc21tX3JlZ3MgcmVncyA9IHsKKwkJLmVheCA9IEk4S19TTU1fR0VUX1RFTVAsCisJCS5lYngg PSBzZW5zb3IgJiAweGZmLAorCX07CiAKLSNpZmRlZiBJOEtfVEVNUEVSQVRVUkVfQlVHCi0Jc3Rh dGljIGludCBwcmV2WzRdID0geyBJOEtfTUFYX1RFTVArMSwgSThLX01BWF9URU1QKzEsIEk4S19N QVhfVEVNUCsxLCBJOEtfTUFYX1RFTVArMSB9OwotI2VuZGlmCi0JcmVncy5lYnggPSBzZW5zb3Ig JiAweGZmOwotCXJjID0gaThrX3NtbSgmcmVncyk7Ci0JaWYgKHJjIDwgMCkKLQkJcmV0dXJuIHJj OworCXJldHVybiBpOGtfc21tKCZyZWdzKSA/IDogcmVncy5lYXggJiAweGZmOworfQogCi0JdGVt cCA9IHJlZ3MuZWF4ICYgMHhmZjsKK3N0YXRpYyBpbnQgaThrX2dldF90ZW1wKGludCBzZW5zb3Ip Cit7CisJaW50IHRlbXAgPSBfaThrX2dldF90ZW1wKHNlbnNvcik7CiAKLSNpZmRlZiBJOEtfVEVN UEVSQVRVUkVfQlVHCiAJLyoKIAkgKiBTb21ldGltZXMgdGhlIHRlbXBlcmF0dXJlIHNlbnNvciBy ZXR1cm5zIDB4OTksIHdoaWNoIGlzIG91dCBvZiByYW5nZS4KLQkgKiBJbiB0aGlzIGNhc2Ugd2Ug cmV0dXJuIChvbmNlKSB0aGUgcHJldmlvdXMgY2FjaGVkIHZhbHVlLiBGb3IgZXhhbXBsZToKKwkg KiBJbiB0aGlzIGNhc2Ugd2UgcmV0cnkgKG9uY2UpIGJlZm9yZSByZXR1cm5pbmcgYW4gZXJyb3Iu CiAJICMgMTAwMzY1NTEzNyAwMDAwMDA1OCAwMDAwNWE0YgogCSAjIDEwMDM2NTUxMzggMDAwMDAw OTkgMDAwMDNhODAgPC0tLSAweDk5ID0gMTUzIGRlZ3JlZXMKIAkgIyAxMDAzNjU1MTM5IDAwMDAw MDU0IDAwMDA1YzUyCiAJICovCi0JaWYgKHRlbXAgPiBJOEtfTUFYX1RFTVApIHsKLQkJdGVtcCA9 IHByZXZbc2Vuc29yXTsKLQkJcHJldltzZW5zb3JdID0gSThLX01BWF9URU1QKzE7Ci0JfSBlbHNl IHsKLQkJcHJldltzZW5zb3JdID0gdGVtcDsKKwlpZiAodGVtcCA9PSAweDk5KSB7CisJCW1zbGVl cCgxMDApOworCQl0ZW1wID0gX2k4a19nZXRfdGVtcChzZW5zb3IpOwogCX0KKwkvKgorCSAqIFJl dHVybiAtRU5PREFUQSBmb3IgYWxsIGludmFsaWQgdGVtcGVyYXR1cmVzLgorCSAqCisJICogS25v d24gaW5zdGFuY2VzIGFyZSB0aGUgMHg5OSB2YWx1ZSBhcyBzZWVuIGFib3ZlIGFzIHdlbGwgYXMK KwkgKiAweGMxICgxOTMpLCB3aGljaCBtYXkgYmUgcmV0dXJuZWQgd2hlbiB0cnlpbmcgdG8gcmVh ZCB0aGUgR1BVCisJICogdGVtcGVyYXR1cmUgaWYgdGhlIHN5c3RlbSBzdXBwb3J0cyBhIEdQVSBh bmQgaXQgaXMgY3VycmVudGx5CisJICogdHVybmVkIG9mZi4KKwkgKi8KIAlpZiAodGVtcCA+IEk4 S19NQVhfVEVNUCkKIAkJcmV0dXJuIC1FTk9EQVRBOwotI2VuZGlmCiAKIAlyZXR1cm4gdGVtcDsK IH0KLS0gCjEuOS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KbG0tc2Vuc29ycyBtYWlsaW5nIGxpc3QKbG0tc2Vuc29yc0BsbS1zZW5zb3JzLm9yZwpo dHRwOi8vbGlzdHMubG0tc2Vuc29ycy5vcmcvbWFpbG1hbi9saXN0aW5mby9sbS1zZW5zb3Jz ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 2/3] i8k: Rework error retries @ 2014-11-30 21:00 ` Guenter Roeck 0 siblings, 0 replies; 16+ messages in thread From: Guenter Roeck @ 2014-11-30 21:00 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Arnd Bergmann, lm-sensors, linux-kernel, Guenter Roeck, Pali Rohár Instead of returning a previous value if the SMM code returns an error when trying to read a temperature, retry once. If that fails again, return -ENODATA. Also return -ENODATA if an attempt is made to read the GPU temperature but the GPU is currently turned off. Drop the I8K_TEMPERATURE_BUG definition and handle the related bug unconditionally. Cc: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- Applies on top of Pali's patch series. drivers/char/i8k.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c index 3464192..cdb2dc7 100644 --- a/drivers/char/i8k.c +++ b/drivers/char/i8k.c @@ -5,7 +5,7 @@ * * Hwmon integration: * Copyright (C) 2011 Jean Delvare <jdelvare@suse.de> - * Copyright (C) 2013 Guenter Roeck <linux@roeck-us.net> + * Copyright (C) 2013, 2014 Guenter Roeck <linux@roeck-us.net> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -20,6 +20,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/delay.h> #include <linux/module.h> #include <linux/types.h> #include <linux/init.h> @@ -59,8 +60,6 @@ #define I8K_POWER_AC 0x05 #define I8K_POWER_BATTERY 0x01 -#define I8K_TEMPERATURE_BUG 1 - static DEFINE_MUTEX(i8k_mutex); static char bios_version[4]; static struct device *i8k_hwmon_dev; @@ -300,39 +299,41 @@ static int i8k_get_temp_type(int sensor) /* * Read the cpu temperature. */ -static int i8k_get_temp(int sensor) +static int _i8k_get_temp(int sensor) { - struct smm_regs regs = { .eax = I8K_SMM_GET_TEMP, }; - int rc; - int temp; + struct smm_regs regs = { + .eax = I8K_SMM_GET_TEMP, + .ebx = sensor & 0xff, + }; -#ifdef I8K_TEMPERATURE_BUG - static int prev[4] = { I8K_MAX_TEMP+1, I8K_MAX_TEMP+1, I8K_MAX_TEMP+1, I8K_MAX_TEMP+1 }; -#endif - regs.ebx = sensor & 0xff; - rc = i8k_smm(®s); - if (rc < 0) - return rc; + return i8k_smm(®s) ? : regs.eax & 0xff; +} - temp = regs.eax & 0xff; +static int i8k_get_temp(int sensor) +{ + int temp = _i8k_get_temp(sensor); -#ifdef I8K_TEMPERATURE_BUG /* * Sometimes the temperature sensor returns 0x99, which is out of range. - * In this case we return (once) the previous cached value. For example: + * In this case we retry (once) before returning an error. # 1003655137 00000058 00005a4b # 1003655138 00000099 00003a80 <--- 0x99 = 153 degrees # 1003655139 00000054 00005c52 */ - if (temp > I8K_MAX_TEMP) { - temp = prev[sensor]; - prev[sensor] = I8K_MAX_TEMP+1; - } else { - prev[sensor] = temp; + if (temp == 0x99) { + msleep(100); + temp = _i8k_get_temp(sensor); } + /* + * Return -ENODATA for all invalid temperatures. + * + * Known instances are the 0x99 value as seen above as well as + * 0xc1 (193), which may be returned when trying to read the GPU + * temperature if the system supports a GPU and it is currently + * turned off. + */ if (temp > I8K_MAX_TEMP) return -ENODATA; -#endif return temp; } -- 1.9.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [lm-sensors] [PATCH 2/3] i8k: Rework error retries 2014-11-30 21:00 ` Guenter Roeck @ 2014-12-01 19:45 ` Pali Rohár -1 siblings, 0 replies; 16+ messages in thread From: Pali Rohár @ 2014-12-01 19:45 UTC (permalink / raw) To: Guenter Roeck; +Cc: Greg Kroah-Hartman, Arnd Bergmann, lm-sensors, linux-kernel [-- Attachment #1.1: Type: Text/Plain, Size: 855 bytes --] On Sunday 30 November 2014 22:00:39 Guenter Roeck wrote: > Instead of returning a previous value if the SMM code returns > an error when trying to read a temperature, retry once. > If that fails again, return -ENODATA. Also return -ENODATA if > an attempt is made to read the GPU temperature but the GPU is > currently turned off. > > Drop the I8K_TEMPERATURE_BUG definition and handle the related > bug unconditionally. > > Cc: Pali Rohár <pali.rohar@gmail.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- > Applies on top of Pali's patch series. > > drivers/char/i8k.c | 47 > ++++++++++++++++++++++++----------------------- 1 file > changed, 24 insertions(+), 23 deletions(-) > Working fine GPU temp (turned on or off). Tested-by: Pali Rohár <pali.rohar@gmail.com> -- Pali Rohár pali.rohar@gmail.com [-- Attachment #1.2: This is a digitally signed message part. --] [-- Type: application/pgp-signature, Size: 198 bytes --] [-- Attachment #2: Type: text/plain, Size: 153 bytes --] _______________________________________________ lm-sensors mailing list lm-sensors@lm-sensors.org http://lists.lm-sensors.org/mailman/listinfo/lm-sensors ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/3] i8k: Rework error retries @ 2014-12-01 19:45 ` Pali Rohár 0 siblings, 0 replies; 16+ messages in thread From: Pali Rohár @ 2014-12-01 19:45 UTC (permalink / raw) To: Guenter Roeck; +Cc: Greg Kroah-Hartman, Arnd Bergmann, lm-sensors, linux-kernel [-- Attachment #1: Type: Text/Plain, Size: 855 bytes --] On Sunday 30 November 2014 22:00:39 Guenter Roeck wrote: > Instead of returning a previous value if the SMM code returns > an error when trying to read a temperature, retry once. > If that fails again, return -ENODATA. Also return -ENODATA if > an attempt is made to read the GPU temperature but the GPU is > currently turned off. > > Drop the I8K_TEMPERATURE_BUG definition and handle the related > bug unconditionally. > > Cc: Pali Rohár <pali.rohar@gmail.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- > Applies on top of Pali's patch series. > > drivers/char/i8k.c | 47 > ++++++++++++++++++++++++----------------------- 1 file > changed, 24 insertions(+), 23 deletions(-) > Working fine GPU temp (turned on or off). Tested-by: Pali Rohár <pali.rohar@gmail.com> -- Pali Rohár pali.rohar@gmail.com [-- Attachment #2: This is a digitally signed message part. --] [-- Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [lm-sensors] [PATCH 2/3] i8k: Rework error retries 2014-12-01 19:45 ` Pali Rohár @ 2014-12-01 20:15 ` Guenter Roeck -1 siblings, 0 replies; 16+ messages in thread From: Guenter Roeck @ 2014-12-01 20:15 UTC (permalink / raw) To: Pali Rohár Cc: Greg Kroah-Hartman, Arnd Bergmann, lm-sensors, linux-kernel On Mon, Dec 01, 2014 at 08:45:59PM +0100, Pali Rohár wrote: > On Sunday 30 November 2014 22:00:39 Guenter Roeck wrote: > > Instead of returning a previous value if the SMM code returns > > an error when trying to read a temperature, retry once. > > If that fails again, return -ENODATA. Also return -ENODATA if > > an attempt is made to read the GPU temperature but the GPU is > > currently turned off. > > > > Drop the I8K_TEMPERATURE_BUG definition and handle the related > > bug unconditionally. > > > > Cc: Pali Rohár <pali.rohar@gmail.com> > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > > --- > > Applies on top of Pali's patch series. > > > > drivers/char/i8k.c | 47 > > ++++++++++++++++++++++++----------------------- 1 file > > changed, 24 insertions(+), 23 deletions(-) > > > > Working fine GPU temp (turned on or off). > > Tested-by: Pali Rohár <pali.rohar@gmail.com> > Thanks a lot for testing! Guenter _______________________________________________ lm-sensors mailing list lm-sensors@lm-sensors.org http://lists.lm-sensors.org/mailman/listinfo/lm-sensors ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/3] i8k: Rework error retries @ 2014-12-01 20:15 ` Guenter Roeck 0 siblings, 0 replies; 16+ messages in thread From: Guenter Roeck @ 2014-12-01 20:15 UTC (permalink / raw) To: Pali Rohár Cc: Greg Kroah-Hartman, Arnd Bergmann, lm-sensors, linux-kernel On Mon, Dec 01, 2014 at 08:45:59PM +0100, Pali Rohár wrote: > On Sunday 30 November 2014 22:00:39 Guenter Roeck wrote: > > Instead of returning a previous value if the SMM code returns > > an error when trying to read a temperature, retry once. > > If that fails again, return -ENODATA. Also return -ENODATA if > > an attempt is made to read the GPU temperature but the GPU is > > currently turned off. > > > > Drop the I8K_TEMPERATURE_BUG definition and handle the related > > bug unconditionally. > > > > Cc: Pali Rohár <pali.rohar@gmail.com> > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > > --- > > Applies on top of Pali's patch series. > > > > drivers/char/i8k.c | 47 > > ++++++++++++++++++++++++----------------------- 1 file > > changed, 24 insertions(+), 23 deletions(-) > > > > Working fine GPU temp (turned on or off). > > Tested-by: Pali Rohár <pali.rohar@gmail.com> > Thanks a lot for testing! Guenter ^ permalink raw reply [flat|nested] 16+ messages in thread
* [lm-sensors] [PATCH 3/3] i8k: Add support for Dell XPS 13 2014-11-30 21:00 ` Guenter Roeck @ 2014-11-30 21:00 ` Guenter Roeck -1 siblings, 0 replies; 16+ messages in thread From: Guenter Roeck @ 2014-11-30 21:00 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Arnd Bergmann, lm-sensors, linux-kernel, Guenter Roeck, Pali Rohár WFBTIDEzIGRvZXMgbm90IHN1cHBvcnQgdHVyYm8gc3BlZWQsIHNvIGl0cyBpbml0aWFsaXphdGlv biBkYXRhCm1hdGNoZXMgdGhhdCBvZiBYUFMgTTE0MC4gTWFrZSBYUFMgaW5pdGlhbGl6YXRpb24g ZGF0YSBnZW5lcmljLAphbmQgYWRkIHN1cHBvcnQgZm9yIFhQUyAxMy4KCkNjOiBQYWxpIFJvaMOh ciA8cGFsaS5yb2hhckBnbWFpbC5jb20+ClNpZ25lZC1vZmYtYnk6IEd1ZW50ZXIgUm9lY2sgPGxp bnV4QHJvZWNrLXVzLm5ldD4KLS0tCkFwcGxpZXMgb24gdG9wIG9mIFBhbGkncyBwYXRjaCBzZXJp ZXMuIAoKIGRyaXZlcnMvY2hhci9pOGsuYyB8IDE0ICsrKysrKysrKysrLS0tCiAxIGZpbGUgY2hh bmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2NoYXIvaThrLmMgYi9kcml2ZXJzL2NoYXIvaThrLmMKaW5kZXggY2RiMmRjNy4uNmQyY2Fh OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9jaGFyL2k4ay5jCisrKyBiL2RyaXZlcnMvY2hhci9pOGsu YwpAQCAtNzA1LDcgKzcwNSw3IEBAIGVudW0gaThrX2NvbmZpZ3MgewogCURFTExfTEFUSVRVREVf RTY1NDAsCiAJREVMTF9QUkVDSVNJT05fNDkwLAogCURFTExfU1RVRElPLAotCURFTExfWFBTX00x NDAsCisJREVMTF9YUFMsCiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGk4a19jb25maWdfZGF0 YSBpOGtfY29uZmlnX2RhdGFbXSA9IHsKQEAgLTcyNSw3ICs3MjUsNyBAQCBzdGF0aWMgY29uc3Qg c3RydWN0IGk4a19jb25maWdfZGF0YSBpOGtfY29uZmlnX2RhdGFbXSA9IHsKIAkJLmZhbl9tdWx0 ID0gMSwKIAkJLmZhbl9tYXggPSBJOEtfRkFOX0hJR0gsCiAJfSwKLQlbREVMTF9YUFNfTTE0MF0g PSB7CisJW0RFTExfWFBTXSA9IHsKIAkJLmZhbl9tdWx0ID0gMSwKIAkJLmZhbl9tYXggPSBJOEtf RkFOX0hJR0gsCiAJfSwKQEAgLTgyOSwxMiArODI5LDIwIEBAIHN0YXRpYyBzdHJ1Y3QgZG1pX3N5 c3RlbV9pZCBpOGtfZG1pX3RhYmxlW10gX19pbml0ZGF0YSA9IHsKIAkJLmRyaXZlcl9kYXRhID0g KHZvaWQgKikmaThrX2NvbmZpZ19kYXRhW0RFTExfU1RVRElPXSwKIAl9LAogCXsKKwkJLmlkZW50 ID0gIkRlbGwgWFBTIDEzIiwKKwkJLm1hdGNoZXMgPSB7CisJCQlETUlfTUFUQ0goRE1JX1NZU19W RU5ET1IsICJEZWxsIEluYy4iKSwKKwkJCURNSV9NQVRDSChETUlfUFJPRFVDVF9OQU1FLCAiWFBT MTMiKSwKKwkJfSwKKwkJLmRyaXZlcl9kYXRhID0gKHZvaWQgKikmaThrX2NvbmZpZ19kYXRhW0RF TExfWFBTXSwKKwl9LAorCXsKIAkJLmlkZW50ID0gIkRlbGwgWFBTIE0xNDAiLAogCQkubWF0Y2hl cyA9IHsKIAkJCURNSV9NQVRDSChETUlfU1lTX1ZFTkRPUiwgIkRlbGwgSW5jLiIpLAogCQkJRE1J X01BVENIKERNSV9QUk9EVUNUX05BTUUsICJNWEMwNTEiKSwKIAkJfSwKLQkJLmRyaXZlcl9kYXRh ID0gKHZvaWQgKikmaThrX2NvbmZpZ19kYXRhW0RFTExfWFBTX00xNDBdLAorCQkuZHJpdmVyX2Rh dGEgPSAodm9pZCAqKSZpOGtfY29uZmlnX2RhdGFbREVMTF9YUFNdLAogCX0sCiAJeyB9CiB9Owot LSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpsbS1zZW5zb3JzIG1haWxpbmcgbGlzdApsbS1zZW5zb3JzQGxtLXNlbnNvcnMub3JnCmh0dHA6 Ly9saXN0cy5sbS1zZW5zb3JzLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xtLXNlbnNvcnM ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 3/3] i8k: Add support for Dell XPS 13 @ 2014-11-30 21:00 ` Guenter Roeck 0 siblings, 0 replies; 16+ messages in thread From: Guenter Roeck @ 2014-11-30 21:00 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Arnd Bergmann, lm-sensors, linux-kernel, Guenter Roeck, Pali Rohár XPS 13 does not support turbo speed, so its initialization data matches that of XPS M140. Make XPS initialization data generic, and add support for XPS 13. Cc: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- Applies on top of Pali's patch series. drivers/char/i8k.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c index cdb2dc7..6d2caa9 100644 --- a/drivers/char/i8k.c +++ b/drivers/char/i8k.c @@ -705,7 +705,7 @@ enum i8k_configs { DELL_LATITUDE_E6540, DELL_PRECISION_490, DELL_STUDIO, - DELL_XPS_M140, + DELL_XPS, }; static const struct i8k_config_data i8k_config_data[] = { @@ -725,7 +725,7 @@ static const struct i8k_config_data i8k_config_data[] = { .fan_mult = 1, .fan_max = I8K_FAN_HIGH, }, - [DELL_XPS_M140] = { + [DELL_XPS] = { .fan_mult = 1, .fan_max = I8K_FAN_HIGH, }, @@ -829,12 +829,20 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = { .driver_data = (void *)&i8k_config_data[DELL_STUDIO], }, { + .ident = "Dell XPS 13", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "XPS13"), + }, + .driver_data = (void *)&i8k_config_data[DELL_XPS], + }, + { .ident = "Dell XPS M140", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_PRODUCT_NAME, "MXC051"), }, - .driver_data = (void *)&i8k_config_data[DELL_XPS_M140], + .driver_data = (void *)&i8k_config_data[DELL_XPS], }, { } }; -- 1.9.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [lm-sensors] [PATCH 3/3] i8k: Add support for Dell XPS 13 2014-11-30 21:00 ` Guenter Roeck @ 2014-12-01 12:36 ` Jean Delvare -1 siblings, 0 replies; 16+ messages in thread From: Jean Delvare @ 2014-12-01 12:36 UTC (permalink / raw) To: Guenter Roeck Cc: Greg Kroah-Hartman, Pali Rohár, linux-kernel, Arnd Bergmann, lm-sensors T24gU3VuLCAzMCBOb3YgMjAxNCAxMzowMDo0MCAtMDgwMCwgR3VlbnRlciBSb2VjayB3cm90ZToK PiBYUFMgMTMgZG9lcyBub3Qgc3VwcG9ydCB0dXJibyBzcGVlZCwgc28gaXRzIGluaXRpYWxpemF0 aW9uIGRhdGEKPiBtYXRjaGVzIHRoYXQgb2YgWFBTIE0xNDAuIE1ha2UgWFBTIGluaXRpYWxpemF0 aW9uIGRhdGEgZ2VuZXJpYywKPiBhbmQgYWRkIHN1cHBvcnQgZm9yIFhQUyAxMy4KPiAKPiBDYzog UGFsaSBSb2jDoXIgPHBhbGkucm9oYXJAZ21haWwuY29tPgo+IFNpZ25lZC1vZmYtYnk6IEd1ZW50 ZXIgUm9lY2sgPGxpbnV4QHJvZWNrLXVzLm5ldD4KPiAtLS0KPiBBcHBsaWVzIG9uIHRvcCBvZiBQ YWxpJ3MgcGF0Y2ggc2VyaWVzLiAKPiAKPiAgZHJpdmVycy9jaGFyL2k4ay5jIHwgMTQgKysrKysr KysrKystLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25z KC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvY2hhci9pOGsuYyBiL2RyaXZlcnMvY2hhci9p OGsuYwo+IGluZGV4IGNkYjJkYzcuLjZkMmNhYTkgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9jaGFy L2k4ay5jCj4gKysrIGIvZHJpdmVycy9jaGFyL2k4ay5jCj4gQEAgLTcwNSw3ICs3MDUsNyBAQCBl bnVtIGk4a19jb25maWdzIHsKPiAgCURFTExfTEFUSVRVREVfRTY1NDAsCj4gIAlERUxMX1BSRUNJ U0lPTl80OTAsCj4gIAlERUxMX1NUVURJTywKPiAtCURFTExfWFBTX00xNDAsCj4gKwlERUxMX1hQ UywKPiAgfTsKPiAgCj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaThrX2NvbmZpZ19kYXRhIGk4a19j b25maWdfZGF0YVtdID0gewo+IEBAIC03MjUsNyArNzI1LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVj dCBpOGtfY29uZmlnX2RhdGEgaThrX2NvbmZpZ19kYXRhW10gPSB7Cj4gIAkJLmZhbl9tdWx0ID0g MSwKPiAgCQkuZmFuX21heCA9IEk4S19GQU5fSElHSCwKPiAgCX0sCj4gLQlbREVMTF9YUFNfTTE0 MF0gPSB7Cj4gKwlbREVMTF9YUFNdID0gewo+ICAJCS5mYW5fbXVsdCA9IDEsCj4gIAkJLmZhbl9t YXggPSBJOEtfRkFOX0hJR0gsCj4gIAl9LAo+IEBAIC04MjksMTIgKzgyOSwyMCBAQCBzdGF0aWMg c3RydWN0IGRtaV9zeXN0ZW1faWQgaThrX2RtaV90YWJsZVtdIF9faW5pdGRhdGEgPSB7Cj4gIAkJ LmRyaXZlcl9kYXRhID0gKHZvaWQgKikmaThrX2NvbmZpZ19kYXRhW0RFTExfU1RVRElPXSwKPiAg CX0sCj4gIAl7Cj4gKwkJLmlkZW50ID0gIkRlbGwgWFBTIDEzIiwKPiArCQkubWF0Y2hlcyA9IHsK PiArCQkJRE1JX01BVENIKERNSV9TWVNfVkVORE9SLCAiRGVsbCBJbmMuIiksCj4gKwkJCURNSV9N QVRDSChETUlfUFJPRFVDVF9OQU1FLCAiWFBTMTMiKSwKPiArCQl9LAo+ICsJCS5kcml2ZXJfZGF0 YSA9ICh2b2lkICopJmk4a19jb25maWdfZGF0YVtERUxMX1hQU10sCj4gKwl9LAo+ICsJewo+ICAJ CS5pZGVudCA9ICJEZWxsIFhQUyBNMTQwIiwKPiAgCQkubWF0Y2hlcyA9IHsKPiAgCQkJRE1JX01B VENIKERNSV9TWVNfVkVORE9SLCAiRGVsbCBJbmMuIiksCj4gIAkJCURNSV9NQVRDSChETUlfUFJP RFVDVF9OQU1FLCAiTVhDMDUxIiksCj4gIAkJfSwKPiAtCQkuZHJpdmVyX2RhdGEgPSAodm9pZCAq KSZpOGtfY29uZmlnX2RhdGFbREVMTF9YUFNfTTE0MF0sCj4gKwkJLmRyaXZlcl9kYXRhID0gKHZv aWQgKikmaThrX2NvbmZpZ19kYXRhW0RFTExfWFBTXSwKPiAgCX0sCj4gIAl7IH0KPiAgfTsKCkxv b2tzIHJlYXNvbmFibGUuCgpSZXZpZXdlZC1ieTogSmVhbiBEZWx2YXJlIDxqZGVsdmFyZUBzdXNl LmRlPgoKLS0gCkplYW4gRGVsdmFyZQpTVVNFIEwzIFN1cHBvcnQKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxtLXNlbnNvcnMgbWFpbGluZyBsaXN0Cmxt LXNlbnNvcnNAbG0tc2Vuc29ycy5vcmcKaHR0cDovL2xpc3RzLmxtLXNlbnNvcnMub3JnL21haWxt YW4vbGlzdGluZm8vbG0tc2Vuc29ycw= ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [lm-sensors] [PATCH 3/3] i8k: Add support for Dell XPS 13 @ 2014-12-01 12:36 ` Jean Delvare 0 siblings, 0 replies; 16+ messages in thread From: Jean Delvare @ 2014-12-01 12:36 UTC (permalink / raw) To: Guenter Roeck Cc: Greg Kroah-Hartman, Pali Rohár, linux-kernel, Arnd Bergmann, lm-sensors On Sun, 30 Nov 2014 13:00:40 -0800, Guenter Roeck wrote: > XPS 13 does not support turbo speed, so its initialization data > matches that of XPS M140. Make XPS initialization data generic, > and add support for XPS 13. > > Cc: Pali Rohár <pali.rohar@gmail.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- > Applies on top of Pali's patch series. > > drivers/char/i8k.c | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c > index cdb2dc7..6d2caa9 100644 > --- a/drivers/char/i8k.c > +++ b/drivers/char/i8k.c > @@ -705,7 +705,7 @@ enum i8k_configs { > DELL_LATITUDE_E6540, > DELL_PRECISION_490, > DELL_STUDIO, > - DELL_XPS_M140, > + DELL_XPS, > }; > > static const struct i8k_config_data i8k_config_data[] = { > @@ -725,7 +725,7 @@ static const struct i8k_config_data i8k_config_data[] = { > .fan_mult = 1, > .fan_max = I8K_FAN_HIGH, > }, > - [DELL_XPS_M140] = { > + [DELL_XPS] = { > .fan_mult = 1, > .fan_max = I8K_FAN_HIGH, > }, > @@ -829,12 +829,20 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = { > .driver_data = (void *)&i8k_config_data[DELL_STUDIO], > }, > { > + .ident = "Dell XPS 13", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), > + DMI_MATCH(DMI_PRODUCT_NAME, "XPS13"), > + }, > + .driver_data = (void *)&i8k_config_data[DELL_XPS], > + }, > + { > .ident = "Dell XPS M140", > .matches = { > DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), > DMI_MATCH(DMI_PRODUCT_NAME, "MXC051"), > }, > - .driver_data = (void *)&i8k_config_data[DELL_XPS_M140], > + .driver_data = (void *)&i8k_config_data[DELL_XPS], > }, > { } > }; Looks reasonable. Reviewed-by: Jean Delvare <jdelvare@suse.de> -- Jean Delvare SUSE L3 Support ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [lm-sensors] [PATCH 3/3] i8k: Add support for Dell XPS 13 2014-12-01 12:36 ` Jean Delvare @ 2014-12-01 16:22 ` Guenter Roeck -1 siblings, 0 replies; 16+ messages in thread From: Guenter Roeck @ 2014-12-01 16:22 UTC (permalink / raw) To: Jean Delvare Cc: Greg Kroah-Hartman, Pali Rohár, linux-kernel, Arnd Bergmann, lm-sensors On Mon, Dec 01, 2014 at 01:36:45PM +0100, Jean Delvare wrote: > On Sun, 30 Nov 2014 13:00:40 -0800, Guenter Roeck wrote: > > XPS 13 does not support turbo speed, so its initialization data > > matches that of XPS M140. Make XPS initialization data generic, > > and add support for XPS 13. > > > > Cc: Pali Rohár <pali.rohar@gmail.com> > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > > --- [ ... ] > > Looks reasonable. > > Reviewed-by: Jean Delvare <jdelvare@suse.de> > Thanks a lot for the reviews! Guenter _______________________________________________ lm-sensors mailing list lm-sensors@lm-sensors.org http://lists.lm-sensors.org/mailman/listinfo/lm-sensors ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [lm-sensors] [PATCH 3/3] i8k: Add support for Dell XPS 13 @ 2014-12-01 16:22 ` Guenter Roeck 0 siblings, 0 replies; 16+ messages in thread From: Guenter Roeck @ 2014-12-01 16:22 UTC (permalink / raw) To: Jean Delvare Cc: Greg Kroah-Hartman, Pali Rohár, linux-kernel, Arnd Bergmann, lm-sensors On Mon, Dec 01, 2014 at 01:36:45PM +0100, Jean Delvare wrote: > On Sun, 30 Nov 2014 13:00:40 -0800, Guenter Roeck wrote: > > XPS 13 does not support turbo speed, so its initialization data > > matches that of XPS M140. Make XPS initialization data generic, > > and add support for XPS 13. > > > > Cc: Pali Rohár <pali.rohar@gmail.com> > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > > --- [ ... ] > > Looks reasonable. > > Reviewed-by: Jean Delvare <jdelvare@suse.de> > Thanks a lot for the reviews! Guenter ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [lm-sensors] [PATCH 1/3] MAINTAINERS: Fix up entry for Dell laptop SMM driver 2014-11-30 21:00 ` Guenter Roeck @ 2014-12-01 11:34 ` Jean Delvare -1 siblings, 0 replies; 16+ messages in thread From: Jean Delvare @ 2014-12-01 11:34 UTC (permalink / raw) To: Guenter Roeck; +Cc: Greg Kroah-Hartman, linux-kernel, Arnd Bergmann, lm-sensors On Sun, 30 Nov 2014 13:00:38 -0800, Guenter Roeck wrote: > Mark driver as maintained. > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- > MAINTAINERS | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 0ff630d..a67e223 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -2918,6 +2918,7 @@ F: drivers/platform/x86/dell-laptop.c > > DELL LAPTOP SMM DRIVER > M: Guenter Roeck <linux@roeck-us.net> > +S: Maintained > F: drivers/char/i8k.c > F: include/uapi/linux/i8k.h > Reviewed-by: Jean Delvare <jdelvare@suse.de> -- Jean Delvare SUSE L3 Support _______________________________________________ lm-sensors mailing list lm-sensors@lm-sensors.org http://lists.lm-sensors.org/mailman/listinfo/lm-sensors ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [lm-sensors] [PATCH 1/3] MAINTAINERS: Fix up entry for Dell laptop SMM driver @ 2014-12-01 11:34 ` Jean Delvare 0 siblings, 0 replies; 16+ messages in thread From: Jean Delvare @ 2014-12-01 11:34 UTC (permalink / raw) To: Guenter Roeck; +Cc: Greg Kroah-Hartman, linux-kernel, Arnd Bergmann, lm-sensors On Sun, 30 Nov 2014 13:00:38 -0800, Guenter Roeck wrote: > Mark driver as maintained. > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- > MAINTAINERS | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 0ff630d..a67e223 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -2918,6 +2918,7 @@ F: drivers/platform/x86/dell-laptop.c > > DELL LAPTOP SMM DRIVER > M: Guenter Roeck <linux@roeck-us.net> > +S: Maintained > F: drivers/char/i8k.c > F: include/uapi/linux/i8k.h > Reviewed-by: Jean Delvare <jdelvare@suse.de> -- Jean Delvare SUSE L3 Support ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2014-12-01 20:17 UTC | newest] Thread overview: 16+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-11-30 21:00 [lm-sensors] [PATCH 1/3] MAINTAINERS: Fix up entry for Dell laptop SMM driver Guenter Roeck 2014-11-30 21:00 ` Guenter Roeck 2014-11-30 21:00 ` [lm-sensors] [PATCH 2/3] i8k: Rework error retries Guenter Roeck 2014-11-30 21:00 ` Guenter Roeck 2014-12-01 19:45 ` [lm-sensors] " Pali Rohár 2014-12-01 19:45 ` Pali Rohár 2014-12-01 20:15 ` [lm-sensors] " Guenter Roeck 2014-12-01 20:15 ` Guenter Roeck 2014-11-30 21:00 ` [lm-sensors] [PATCH 3/3] i8k: Add support for Dell XPS 13 Guenter Roeck 2014-11-30 21:00 ` Guenter Roeck 2014-12-01 12:36 ` [lm-sensors] " Jean Delvare 2014-12-01 12:36 ` Jean Delvare 2014-12-01 16:22 ` Guenter Roeck 2014-12-01 16:22 ` Guenter Roeck 2014-12-01 11:34 ` [lm-sensors] [PATCH 1/3] MAINTAINERS: Fix up entry for Dell laptop SMM driver Jean Delvare 2014-12-01 11:34 ` Jean Delvare
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.