From 649100ad202f681632c6c1a949cb65cbe3fca482 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Tue, 31 Jan 2017 15:10:10 -0800 Subject: [PATCH] google/eve: Fix keyboard backlight enable in wake from G3 The WAK_STS bit is not set in a wake from G3, so the check for this bit needs to only be done when checking for a wake from S3. This change correctly enables the keyboard backlight in wake from G3 and only does not enable it during a wake from S3. BUG=chrome-os-partner:58666 TEST=Use Refresh+Power to issue hard reset and ensure that the keyboard backlight turns on like it does when waking from S5. Also force enter hibernate with Alt+VolumeUp+H and then power back up and ensure that the keyboard backlight is enabled when booting. Change-Id: I44045950e38aa5e5ae96a79385d604791852c7e6 Signed-off-by: Duncan Laurie Reviewed-on: https://review.coreboot.org/18280 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/mainboard/google/eve/bootblock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mainboard/google/eve/bootblock.c b/src/mainboard/google/eve/bootblock.c index baca9c895c..872825f408 100644 --- a/src/mainboard/google/eve/bootblock.c +++ b/src/mainboard/google/eve/bootblock.c @@ -34,7 +34,7 @@ void bootblock_mainboard_init(void) uint32_t pm1_sts = inl(ACPI_BASE_ADDRESS + PM1_STS); /* Turn on keyboard backlight to indicate we are booting */ - if ((pm1_sts & WAK_STS) && (acpi_sleep_from_pm1(pm1_cnt) != ACPI_S3)) + if (!((pm1_sts & WAK_STS) && (acpi_sleep_from_pm1(pm1_cnt) == ACPI_S3))) google_chromeec_kbbacklight(75); early_config_gpio();