[coreboot-gerrit] New patch to review for coreboot: aecdaf2 kirby: pit: Fix up wakeup_need_reset

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Tue Dec 3 23:56:05 CET 2013


Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4421

-gerrit

commit aecdaf292cc293938c0692014fdaf30ad2b42786
Author: Gabe Black <gabeblack at google.com>
Date:   Wed Jul 31 23:40:55 2013 -0700

    kirby: pit: Fix up wakeup_need_reset
    
    In a previous commit the contents of wakeup_need_reset were removed because
    the GPIO it referred to wasn't connected to anything on pit. I didn't realize
    at that time that that could have been because we hadn't tried getting
    suspend/resume working on pit and hadn't updated that file. On snow, the GPIO
    is the recovery mode pin. This change updates pit to have the right GPIO,
    kirby to read that GPIO, and makes the comments for both pit and kirby more
    explicit and spells out the fact that this is the recovery mode GPIO.
    
    Having a check here at all may still be a holdover from snow that isn't
    applicable to pit or kirby, but since there is a parallel as far as the
    recovery mode GPIO we might as well make them match while waiting for more
    information.
    
    Change-Id: Ic1f3f605a0fddf89e8f5668c7a8df30bdfb91d94
    Signed-off-by: Gabe Black <gabeblack at google.com>
    Reviewed-on: https://gerrit.chromium.org/gerrit/64164
    Reviewed-by: Ronald G. Minnich <rminnich at chromium.org>
    Commit-Queue: Gabe Black <gabeblack at chromium.org>
    Tested-by: Gabe Black <gabeblack at chromium.org>
---
 src/mainboard/google/kirby/wakeup.c | 4 +++-
 src/mainboard/google/pit/wakeup.c   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mainboard/google/kirby/wakeup.c b/src/mainboard/google/kirby/wakeup.c
index 43bad6f..02305b5 100644
--- a/src/mainboard/google/kirby/wakeup.c
+++ b/src/mainboard/google/kirby/wakeup.c
@@ -22,6 +22,8 @@
 
 int wakeup_need_reset(void)
 {
-	return 0;
+	/* The "wake up" event is not reliable (known as "bad wakeup") and needs
+	 * reset if the TPM reset mask GPIO value is high. */
+	return gpio_get_value(GPIO_X06);
 }
 
diff --git a/src/mainboard/google/pit/wakeup.c b/src/mainboard/google/pit/wakeup.c
index a82b632..02305b5 100644
--- a/src/mainboard/google/pit/wakeup.c
+++ b/src/mainboard/google/pit/wakeup.c
@@ -23,7 +23,7 @@
 int wakeup_need_reset(void)
 {
 	/* The "wake up" event is not reliable (known as "bad wakeup") and needs
-	 * reset if GPIO value is high. */
-	return gpio_get_value(GPIO_Y10);
+	 * reset if the TPM reset mask GPIO value is high. */
+	return gpio_get_value(GPIO_X06);
 }
 



More information about the coreboot-gerrit mailing list