Iris: change the FP power button behavior (#867)

* Iris: change the FP power button behavior

change the PB force shutdown behavior
now if hold the PB over than 4s will direct execution force shutdown
over than 20s still execution EC reset

Signed-off-by: LeoCX_Tsai <[email protected]>

* Iris: remove json code

Signed-off-by: LeoCX_Tsai <[email protected]>

* Iris: remove unused function

Signed-off-by: LeoCX_Tsai <[email protected]>

---------

Signed-off-by: LeoCX_Tsai <[email protected]>

Author: LeoCX-Tsai

board/hx30/power_button_x86.c

@@ -58,8 +58,8 @@
  */
 #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		(1 * SECOND)	/*  20s - (T1 + 16s hold) */
-#define PWRBTN_DELAY_T3		(1 * SECOND)	/*  11s - (T1 + 6s hold) */
+#define PWRBTN_DELAY_T2		(1 * MSEC)	/*  (T1 + 16s hold) */
+#define PWRBTN_DELAY_T3		(1 * SECOND)	/*  1s + (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
@@ -446,10 +446,12 @@ static void state_machine(uint64_t tnow)
 		if (power_button_is_pressed()) {
 			tnext_state = tnow + PWRBTN_WAIT_HOLD;
 			if (!gpio_get_level(GPIO_ON_OFF_FP_L)) {
-				if (++hold_check < PWRBTN_FP_HOLD_COUNT)
-					break;
 
-				hold_check = 0;
+				if (!chipset_in_state(CHIPSET_STATE_ANY_OFF)) {
+					CPRINTS("PB held press 4s execute force shutdown");
+					chipset_force_shutdown(CHIPSET_SHUTDOWN_G3);
+				}
+
 				tnext_state = tnow + PWRBTN_STATE_DELAY;
 				pwrbtn_state = PWRBTN_STATE_NEED_SHUTDOWN;
 			} else if (!gpio_get_level(GPIO_ON_OFF_BTN_L)) {
@@ -499,13 +501,19 @@ static void state_machine(uint64_t tnow)
 
 		if (power_button_is_pressed()) {
 			if (!gpio_get_level(GPIO_ON_OFF_FP_L)) {
+				tnext_state = tnow + PWRBTN_WAIT_HOLD;
+				if (++hold_check < PWRBTN_FP_HOLD_COUNT)
+					break;
+
+				hold_check = 0;
 				tnext_state = tnow + PWRBTN_DELAY_T2;
 				pwrbtn_state = PWRBTN_STATE_NEED_RESET;
 			} else if (!gpio_get_level(GPIO_ON_OFF_BTN_L)) {
 				tnext_state = tnow + PWRBTN_DELAY_T3;
 				pwrbtn_state = PWRBTN_STATE_NEED_BATT_CUTOFF;
 			}
 		} else {
+			hold_check = 0;
 			power_button_released(tnow);
 		}
 

board/hx30/power_sequence.c

@@ -36,7 +36,6 @@
 #define CPUTS(outstr) cputs(CC_CHIPSET, outstr)
 #define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ## args)
 
-static int forcing_shutdown;  /* Forced shutdown in progress? */
 static int custom_forcing_shutdown;
 
 /*
@@ -80,7 +79,6 @@ void chipset_force_shutdown(enum chipset_shutdown_reason reason)
 	 */
 	if (!chipset_in_state(CHIPSET_STATE_ANY_OFF)) {
 		report_ap_reset(reason);
-		forcing_shutdown = 1;
 		custom_forcing_shutdown = 1;
 		chipset_force_g3();
 		/* we need to clear the wake source to avoid the wrong power state */
@@ -92,17 +90,10 @@ void chipset_force_shutdown(enum chipset_shutdown_reason reason)
 void chipset_handle_espi_reset_assert(void)
 {
 	/*
-	 * If eSPI_Reset# pin is asserted without SLP_SUS# being asserted, then
-	 * it means that there is an unexpected power loss (global reset
-	 * event). In this case, check if shutdown was being forced by pressing
-	 * power button. If yes, release power button.
+	 * remove unused function, because we still need
+	 * keep PB state when PCH_RESET or chip set shutdown
+	 * for next PB action(EC chip Reset)
 	 */
-	if ((power_get_signals() & IN_PCH_SLP_SUS_DEASSERTED) &&
-		forcing_shutdown) {
-		power_button_pch_release();
-		forcing_shutdown = 0;
-
-	}
 }
 
 /*