Merge pull request #618 from FrameworkComputer/hx30.PB_behavior

Iris: modify main board power button behavior

Author: kiram9

board/hx30/power_button_x86.c

@@ -56,14 +56,10 @@
  *    to host    v                      v
  *     @S0   make code             break code
  */
-#define PWRBTN_DELAY_T0    (32 * MSEC)  /* 32ms (PCH requires >16ms) */
-#define PWRBTN_DELAY_T1    (4 * SECOND - PWRBTN_DELAY_T0)  /* 4 secs - t0 */
-#define PWRBTN_DELAY_T4 \
-	(8 * SECOND - PWRBTN_DELAY_T1 - PWRBTN_DELAY_T0)  /* 8 secs - t1 */
-#define PWRBTN_DELAY_T2 \
-	(20 * SECOND - PWRBTN_DELAY_T4 - PWRBTN_DELAY_T1)  /* 20 secs - t4 */
-#define PWRBTN_DELAY_T3 \
-	(10 * SECOND - PWRBTN_DELAY_T4 - PWRBTN_DELAY_T1)  /* 10 secs - t4 */
+#define PWRBTN_DELAY_T0		(32 * MSEC)  /* 32ms (PCH requires >16ms) */
+#define PWRBTN_DELAY_T1		(4 * SECOND - PWRBTN_DELAY_T0)  /* 4 secs - t0 */
+#define PWRBTN_DELAY_T2		(10 * SECOND)	/* 20s - (T1 + 6s hold) */
+#define PWRBTN_DELAY_T3		(1 * SECOND)	/*  11s - (T1 + 6s hold) */
 /*
  * Length of time to stretch initial power button press to give chipset a
  * chance to wake up (~100ms) and react to the press (~16ms).  Also used as
@@ -76,6 +72,8 @@
 #define PWRBTN_RETRY_COUNT  200				 /* base on PWRBTN_WAIT_RSMRST 1 count = 20ms */
 #define PWRBTN_WAIT_RELEASE (100 * MSEC)
 #define PWRBTN_STATE_DELAY  (1 * MSEC)       /* debounce for the state change */
+#define PWRBTN_WAIT_HOLD	(1000 * MSEC)
+#define PWRBTN_HOLD_COUNT	6	/* base on PWRBTN_WAIT_HOLD 1 count = 1000ms */
 
 enum power_button_state {
 	/* Button up; state machine idle */
@@ -138,6 +136,9 @@ static uint64_t tnext_state;
 /* retry for the PWRBTN_WAIT_RSMRST */
 static int rsmrst_retry = 0;
 
+/* check for the hold state */
+static int hold_check;
+
 /*
  * Record the time when power button task starts. It can be used by any code
  * path that needs to compare the current time with power button task start time
@@ -441,9 +442,17 @@ static void state_machine(uint64_t tnow)
 	case PWRBTN_STATE_HELD:
 
 		if (power_button_is_pressed()) {
-			tnext_state = tnow + PWRBTN_DELAY_T4;
+			tnext_state = tnow + PWRBTN_WAIT_HOLD;
+			if (++hold_check < PWRBTN_HOLD_COUNT)
+				break;
+
+			hold_check = 0;
+			tnext_state = tnow + PWRBTN_STATE_DELAY;
 			pwrbtn_state = PWRBTN_STATE_NEED_SHUTDOWN;
 		} else {
+			CPRINTS("PB held press 4~10s execute force shutdown");
+			chipset_force_shutdown(CHIPSET_SHUTDOWN_G3);
+			hold_check = 0;
 			power_button_released(tnow);
 		}
 
@@ -476,10 +485,6 @@ static void state_machine(uint64_t tnow)
 		break;
 	case PWRBTN_STATE_NEED_SHUTDOWN:
 
-		if (!chipset_in_state(CHIPSET_STATE_ANY_OFF)) {
-			CPRINTS("PB held press 8s execute force shutdown");
-			chipset_force_shutdown(CHIPSET_SHUTDOWN_G3);
-		}
 
 		if (power_button_is_pressed()) {
 			if (!gpio_get_level(GPIO_ON_OFF_FP_L)) {