Merge branch 'for-linus' into for-3.18/core

Moving patches from for-linus to 3.18 instead, pull in this changes
that will go to Linus today.

8 files changed, 102 insertions, 31 deletions

diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/acpi_cmos_rtc.c
index 2da8660262e5..81dc75033f15 100644
--- a/drivers/acpi/acpi_cmos_rtc.c
+++ b/drivers/acpi/acpi_cmos_rtc.c
@@ -33,7 +33,7 @@ acpi_cmos_rtc_space_handler(u32 function, acpi_physical_address address,
                       void *handler_context, void *region_context)
 {
         int i;
-        u8 *value = (u8 *)&value64;
+        u8 *value = (u8 *)value64;
 
         if (address > 0xff || !value64)
                 return AE_BAD_PARAMETER;
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 9dfec48dd4e5..fddc1e86f9d0 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -610,7 +610,7 @@ static int acpi_lpss_suspend_late(struct device *dev)
         return acpi_dev_suspend_late(dev);
 }
 
-static int acpi_lpss_restore_early(struct device *dev)
+static int acpi_lpss_resume_early(struct device *dev)
 {
         int ret = acpi_dev_resume_early(dev);
 
@@ -650,15 +650,15 @@ static int acpi_lpss_runtime_resume(struct device *dev)
 static struct dev_pm_domain acpi_lpss_pm_domain = {
         .ops = {
 #ifdef CONFIG_PM_SLEEP
-                .suspend_late = acpi_lpss_suspend_late,
-                .restore_early = acpi_lpss_restore_early,
                 .prepare = acpi_subsys_prepare,
                 .complete = acpi_subsys_complete,
                 .suspend = acpi_subsys_suspend,
-                .resume_early = acpi_subsys_resume_early,
+                .suspend_late = acpi_lpss_suspend_late,
+                .resume_early = acpi_lpss_resume_early,
                 .freeze = acpi_subsys_freeze,
                 .poweroff = acpi_subsys_suspend,
-                .poweroff_late = acpi_subsys_suspend_late,
+                .poweroff_late = acpi_lpss_suspend_late,
+                .restore_early = acpi_lpss_resume_early,
 #endif
 #ifdef CONFIG_PM_RUNTIME
                 .runtime_suspend = acpi_lpss_runtime_suspend,
diff --git a/drivers/acpi/acpica/nsprepkg.c b/drivers/acpi/acpica/nsprepkg.c
index 68f725839eb6..1b13b921dda9 100644
--- a/drivers/acpi/acpica/nsprepkg.c
+++ b/drivers/acpi/acpica/nsprepkg.c
@@ -316,6 +316,45 @@ acpi_ns_check_package(struct acpi_evaluate_info *info,
                     acpi_ns_check_package_list(info, package, elements, count);
                 break;
 
+        case ACPI_PTYPE2_UUID_PAIR:
+
+                /* The package must contain pairs of (UUID + type) */
+
+                if (count & 1) {
+                        expected_count = count + 1;
+                        goto package_too_small;
+                }
+
+                while (count > 0) {
+                        status = acpi_ns_check_object_type(info, elements,
+                                                           package->ret_info.
+                                                           object_type1, 0);
+                        if (ACPI_FAILURE(status)) {
+                                return (status);
+                        }
+
+                        /* Validate length of the UUID buffer */
+
+                        if ((*elements)->buffer.length != 16) {
+                                ACPI_WARN_PREDEFINED((AE_INFO,
+                                                      info->full_pathname,
+                                                      info->node_flags,
+                                                      "Invalid length for UUID Buffer"));
+                                return (AE_AML_OPERAND_VALUE);
+                        }
+
+                        status = acpi_ns_check_object_type(info, elements + 1,
+                                                           package->ret_info.
+                                                           object_type2, 0);
+                        if (ACPI_FAILURE(status)) {
+                                return (status);
+                        }
+
+                        elements += 2;
+                        count -= 2;
+                }
+                break;
+
         default:
 
                 /* Should not get here if predefined info table is correct */
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 1c162e7be045..5fdfe65fe165 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -534,20 +534,6 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
                         " invalid.\n");
         }
 
-        /*
-         * When fully charged, some batteries wrongly report
-         * capacity_now = design_capacity instead of = full_charge_capacity
-         */
-        if (battery->capacity_now > battery->full_charge_capacity
-            && battery->full_charge_capacity != ACPI_BATTERY_VALUE_UNKNOWN) {
-                if (battery->capacity_now != battery->design_capacity)
-                        printk_once(KERN_WARNING FW_BUG
-                                "battery: reported current charge level (%d) "
-                                "is higher than reported maximum charge level (%d).\n",
-                                battery->capacity_now, battery->full_charge_capacity);
-                battery->capacity_now = battery->full_charge_capacity;
-        }
-
         if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)
             && battery->capacity_now >= 0 && battery->capacity_now <= 100)
                 battery->capacity_now = (battery->capacity_now *
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 9922cc46b15c..cb6066c809ea 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1030,6 +1030,10 @@ static struct dmi_system_id ec_dmi_table[] __initdata = {
         DMI_MATCH(DMI_SYS_VENDOR, "Quanta"),
         DMI_MATCH(DMI_PRODUCT_NAME, "TW9/SW9"),}, NULL},
         {
+        ec_flag_msi, "Clevo W350etq", {
+        DMI_MATCH(DMI_SYS_VENDOR, "CLEVO CO."),
+        DMI_MATCH(DMI_PRODUCT_NAME, "W35_37ET"),}, NULL},
+        {
         ec_validate_ecdt, "ASUS hardware", {
         DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL},
         {
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 3dca36d4ad26..17f9ec501972 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1071,9 +1071,9 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
 
         if (pr->id == 0 && cpuidle_get_driver() == &acpi_idle_driver) {
 
-                cpuidle_pause_and_lock();
                 /* Protect against cpu-hotplug */
                 get_online_cpus();
+                cpuidle_pause_and_lock();
 
                 /* Disable all cpuidle devices */
                 for_each_online_cpu(cpu) {
@@ -1100,8 +1100,8 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
                                 cpuidle_enable_device(dev);
                         }
                 }
-                put_online_cpus();
                 cpuidle_resume_and_unlock();
+                put_online_cpus();
         }
 
         return 0;
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 9a9298994e26..3bf7764659a4 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -667,8 +667,14 @@ static ssize_t
 acpi_device_sun_show(struct device *dev, struct device_attribute *attr,
                      char *buf) {
         struct acpi_device *acpi_dev = to_acpi_device(dev);
+        acpi_status status;
+        unsigned long long sun;
+
+        status = acpi_evaluate_integer(acpi_dev->handle, "_SUN", NULL, &sun);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
 
-        return sprintf(buf, "%lu\n", acpi_dev->pnp.sun);
+        return sprintf(buf, "%llu\n", sun);
 }
 static DEVICE_ATTR(sun, 0444, acpi_device_sun_show, NULL);
 
@@ -690,7 +696,6 @@ static int acpi_device_setup_files(struct acpi_device *dev)
 {
         struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
         acpi_status status;
-        unsigned long long sun;
         int result = 0;
 
         /*
@@ -731,14 +736,10 @@ static int acpi_device_setup_files(struct acpi_device *dev)
         if (dev->pnp.unique_id)
                 result = device_create_file(&dev->dev, &dev_attr_uid);
 
-        status = acpi_evaluate_integer(dev->handle, "_SUN", NULL, &sun);
-        if (ACPI_SUCCESS(status)) {
-                dev->pnp.sun = (unsigned long)sun;
+        if (acpi_has_method(dev->handle, "_SUN")) {
                 result = device_create_file(&dev->dev, &dev_attr_sun);
                 if (result)
                         goto end;
-        } else {
-                dev->pnp.sun = (unsigned long)-1;
         }
 
         if (acpi_has_method(dev->handle, "_STA")) {
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 826884392e6b..fcbda105616e 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -82,9 +82,9 @@ module_param(allow_duplicates, bool, 0644);
  * For Windows 8 systems: used to decide if video module
  * should skip registering backlight interface of its own.
  */
-static int use_native_backlight_param = 1;
+static int use_native_backlight_param = -1;
 module_param_named(use_native_backlight, use_native_backlight_param, int, 0444);
-static bool use_native_backlight_dmi = false;
+static bool use_native_backlight_dmi = true;
 
 static int register_count;
 static struct mutex video_list_lock;
@@ -417,6 +417,12 @@ static int __init video_set_use_native_backlight(const struct dmi_system_id *d)
         return 0;
 }
 
+static int __init video_disable_native_backlight(const struct dmi_system_id *d)
+{
+        use_native_backlight_dmi = false;
+        return 0;
+}
+
 static struct dmi_system_id video_dmi_table[] __initdata = {
         /*
          * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
@@ -720,6 +726,41 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
                 DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook 8780w"),
                 },
         },
+
+        /*
+         * These models have a working acpi_video backlight control, and using
+         * native backlight causes a regression where backlight does not work
+         * when userspace is not handling brightness key events. Disable
+         * native_backlight on these to fix this:
+         * https://bugzilla.kernel.org/show_bug.cgi?id=81691
+         */
+        {
+         .callback = video_disable_native_backlight,
+         .ident = "ThinkPad T420",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T420"),
+                },
+        },
+        {
+         .callback = video_disable_native_backlight,
+         .ident = "ThinkPad T520",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T520"),
+                },
+        },
+
+        /* The native backlight controls do not work on some older machines */
+        {
+         /* https://bugs.freedesktop.org/show_bug.cgi?id=81515 */
+         .callback = video_disable_native_backlight,
+         .ident = "HP ENVY 15 Notebook",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY 15 Notebook PC"),
+                },
+        },
         {}
 };