CHROMIUM: chromeos_acpi: Enable USB wake from S3
authorSameer Nanda <snanda@chromium.org>
Wed, 13 Feb 2013 00:57:00 +0000 (16:57 -0800)
committerChromeBot <chrome-bot@google.com>
Wed, 15 May 2013 23:16:22 +0000 (16:16 -0700)
Enable wake from USB devices for x86. Confirmed working on link.
Should likely work on lumpy as well.

BUG=chromium:240942
TEST=Connect a USB keyboard to external USB port. Suspend device using
"powerd_suspend" or idle suspend. After the system has suspended, hit a
key on USB keyboard. The system should resume.

Signed-off-by: Sameer Nanda <snanda@chromium.org>
Change-Id: Ia06b996a67abbf7943d081bf56f01db08292ccba
Reviewed-on: https://gerrit.chromium.org/gerrit/43152
Reviewed-by: Benson Leung <bleung@chromium.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
drivers/platform/x86/chromeos_acpi.c

index 1af5ed7..37afad3 100644 (file)
@@ -763,6 +763,7 @@ static struct chromeos_vbc chromeos_vbc_nvram = {
 static int __init chromeos_acpi_init(void)
 {
        int ret = 0;
+       acpi_status status;
 
        if (acpi_disabled)
                return -ENODEV;
@@ -787,6 +788,12 @@ static int __init chromeos_acpi_init(void)
        }
        printk(MY_INFO "installed%s\n",
               chromeos_on_legacy_firmware() ? " (legacy mode)" : "");
+
+       printk(MY_INFO "chromeos_acpi: enabling S3 USB wake\n");
+       status = acpi_evaluate_object(NULL, "\\S3UE", NULL, NULL);
+       if (!ACPI_SUCCESS(status))
+               printk(MY_INFO "chromeos_acpi: failed to enable S3 USB wake\n");
+
        return 0;
 }