msi-laptop: Add MSI Wind U90/U100 support

Add MSI Wind U90/U100 to DMI table and add some missing EC features
support such as basic fan control, turbo and ECO modes and touchpad
state. Tested on MSI Wind U100.

Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>

diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index 0bf94b5c27448da263cfee64c0757eb2c31a2aa3..28bcbb21d120795fb3603cb9edf30124ca10e397 100644 (file)
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
@@ -82,8 +82,19 @@
 #define MSI_STANDARD_EC_SCM_LOAD_ADDRESS       0x2d
 #define MSI_STANDARD_EC_SCM_LOAD_MASK          (1 << 0)
 
-#define MSI_STANDARD_EC_TOUCHPAD_ADDRESS       0xe4
+#define MSI_STANDARD_EC_FUNCTIONS_ADDRESS      0xe4
+/* Power LED is orange - Turbo mode */
+#define MSI_STANDARD_EC_TURBO_MASK             (1 << 1)
+/* Power LED is green - ECO mode */
+#define MSI_STANDARD_EC_ECO_MASK               (1 << 3)
+/* Touchpad is turned on */
 #define MSI_STANDARD_EC_TOUCHPAD_MASK          (1 << 4)
+/* If this bit != bit 1, turbo mode can't be toggled */
+#define MSI_STANDARD_EC_TURBO_COOLDOWN_MASK    (1 << 7)
+
+#define MSI_STANDARD_EC_FAN_ADDRESS            0x33
+/* If zero, fan rotates at maximal speed */
+#define MSI_STANDARD_EC_AUTOFAN_MASK           (1 << 0)
 
 #ifdef CONFIG_PM_SLEEP
 static int msi_laptop_resume(struct device *device);
@@ -435,18 +446,115 @@ static ssize_t store_auto_brightness(struct device *dev,
        return count;
 }
 
+static ssize_t show_touchpad(struct device *dev,
+       struct device_attribute *attr, char *buf)
+{
+
+       u8 rdata;
+       int result;
+
+       result = ec_read(MSI_STANDARD_EC_FUNCTIONS_ADDRESS, &rdata);
+       if (result < 0)
+               return result;
+
+       return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_TOUCHPAD_MASK));
+}
+
+static ssize_t show_turbo(struct device *dev,
+       struct device_attribute *attr, char *buf)
+{
+
+       u8 rdata;
+       int result;
+
+       result = ec_read(MSI_STANDARD_EC_FUNCTIONS_ADDRESS, &rdata);
+       if (result < 0)
+               return result;
+
+       return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_TURBO_MASK));
+}
+
+static ssize_t show_eco(struct device *dev,
+       struct device_attribute *attr, char *buf)
+{
+
+       u8 rdata;
+       int result;
+
+       result = ec_read(MSI_STANDARD_EC_FUNCTIONS_ADDRESS, &rdata);
+       if (result < 0)
+               return result;
+
+       return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_ECO_MASK));
+}
+
+static ssize_t show_turbo_cooldown(struct device *dev,
+       struct device_attribute *attr, char *buf)
+{
+
+       u8 rdata;
+       int result;
+
+       result = ec_read(MSI_STANDARD_EC_FUNCTIONS_ADDRESS, &rdata);
+       if (result < 0)
+               return result;
+
+       return sprintf(buf, "%i\n", (!!(rdata & MSI_STANDARD_EC_TURBO_MASK)) |
+               (!!(rdata & MSI_STANDARD_EC_TURBO_COOLDOWN_MASK) << 1));
+}
+
+static ssize_t show_auto_fan(struct device *dev,
+       struct device_attribute *attr, char *buf)
+{
+
+       u8 rdata;
+       int result;
+
+       result = ec_read(MSI_STANDARD_EC_FAN_ADDRESS, &rdata);
+       if (result < 0)
+               return result;
+
+       return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_AUTOFAN_MASK));
+}
+
+static ssize_t store_auto_fan(struct device *dev,
+       struct device_attribute *attr, const char *buf, size_t count)
+{
+
+       int enable, result;
+
+       if (sscanf(buf, "%i", &enable) != 1 || (enable != (enable & 1)))
+               return -EINVAL;
+
+       result = ec_write(MSI_STANDARD_EC_FAN_ADDRESS, enable);
+       if (result < 0)
+               return result;
+
+       return count;
+}
+
 static DEVICE_ATTR(lcd_level, 0644, show_lcd_level, store_lcd_level);
 static DEVICE_ATTR(auto_brightness, 0644, show_auto_brightness,
                   store_auto_brightness);
 static DEVICE_ATTR(bluetooth, 0444, show_bluetooth, NULL);
 static DEVICE_ATTR(wlan, 0444, show_wlan, NULL);
 static DEVICE_ATTR(threeg, 0444, show_threeg, NULL);
+static DEVICE_ATTR(touchpad, 0444, show_touchpad, NULL);
+static DEVICE_ATTR(turbo_mode, 0444, show_turbo, NULL);
+static DEVICE_ATTR(eco_mode, 0444, show_eco, NULL);
+static DEVICE_ATTR(turbo_cooldown, 0444, show_turbo_cooldown, NULL);
+static DEVICE_ATTR(auto_fan, 0644, show_auto_fan, store_auto_fan);
 
 static struct attribute *msipf_attributes[] = {
        &dev_attr_lcd_level.attr,
        &dev_attr_auto_brightness.attr,
        &dev_attr_bluetooth.attr,
        &dev_attr_wlan.attr,
+       &dev_attr_touchpad.attr,
+       &dev_attr_turbo_mode.attr,
+       &dev_attr_eco_mode.attr,
+       &dev_attr_turbo_cooldown.attr,
+       &dev_attr_auto_fan.attr,
        NULL
 };
 
@@ -590,6 +698,16 @@ static struct dmi_system_id __initdata msi_dmi_table[] = {
                .driver_data = &quirk_load_scm_model,
                .callback = dmi_check_cb
        },
+       {
+               .ident = "MSI U90/U100",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR,
+                               "MICRO-STAR INTERNATIONAL CO., LTD"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "U90/U100"),
+               },
+               .driver_data = &quirk_load_scm_ro_model,
+               .callback = dmi_check_cb
+       },
        { }
 };
 
@@ -679,7 +797,7 @@ static void msi_send_touchpad_key(struct work_struct *ignored)
        u8 rdata;
        int result;
 
-       result = ec_read(MSI_STANDARD_EC_TOUCHPAD_ADDRESS, &rdata);
+       result = ec_read(MSI_STANDARD_EC_FUNCTIONS_ADDRESS, &rdata);
        if (result < 0)
                return;
 
@@ -1069,3 +1187,4 @@ MODULE_ALIAS("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-N051:*");
 MODULE_ALIAS("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-N014:*");
 MODULE_ALIAS("dmi:*:svnMicro-StarInternational*:pnCR620:*");
 MODULE_ALIAS("dmi:*:svnMicro-StarInternational*:pnU270series:*");
+MODULE_ALIAS("dmi:*:svnMICRO-STARINTERNATIONAL*:pnU90/U100:*");