Merge pull request #496 from FrameworkComputer/hx30.cover_prevent_power_on

Modified the behavior when EC trigger the prevent power on

Author: kiram9

board/hx30/board.h

@@ -751,6 +751,7 @@ void cancel_board_power_off(void);
 
 /* power sequence */
 int board_chipset_power_on(void);
+void update_prevent_power_on_flag(int status);
 
 int board_get_version(void);
 

board/hx30/power_button_x86.c

@@ -170,6 +170,7 @@ static void set_pwrbtn_to_pch(int high, int init)
 	if (chipset_in_state(CHIPSET_STATE_ANY_OFF) && !high &&
 		(charge_want_shutdown() || charge_prevent_power_on(!init))) {
 		CPRINTS("PB PCH pwrbtn ignored due to battery level");
+		update_prevent_power_on_flag(1);
 		high = 1;
 	}
 #endif
@@ -311,8 +312,6 @@ static void state_machine(uint64_t tnow)
 			pwrbtn_state = PWRBTN_STATE_WAS_OFF;
 			msleep(20);
 			set_pwrbtn_to_pch(0, 0);
-			power_button_enable_led(1);
-
 		} else {
 			/*
 			 * when in preOS still need send power button signal
@@ -401,7 +400,6 @@ static void state_machine(uint64_t tnow)
 				}
 				msleep(20);
 				set_pwrbtn_to_pch(0, 1);
-				power_button_enable_led(1);
 			}
 
 			tnext_state = get_time().val + PWRBTN_INITIAL_US;

board/hx30/power_sequence.c

@@ -186,6 +186,12 @@ void chipset_throttle_cpu(int throttle)
 		gpio_set_level(GPIO_EC_PROCHOT_L, !throttle);
 }
 
+static int system_prevent_power_on_flag;
+void update_prevent_power_on_flag(int status)
+{
+	system_prevent_power_on_flag = status;
+}
+
 int board_chipset_power_on(void)
 {
 	/*gpio_set_level(GPIO_VS_ON, 1); Todo fix vson noboot*/
@@ -240,7 +246,14 @@ int board_chipset_power_on(void)
 	}
 
 	msleep(50);
-	return true;
+
+	/**
+	 *  if EC doesn't assert the power button signal vai prevent power on,
+	 *  the power state should return to G3 state
+	 */
+	CPRINTS("Power on flag: %d", system_prevent_power_on_flag);
+	power_button_enable_led(!system_prevent_power_on_flag);
+	return !system_prevent_power_on_flag;
 }
 
 enum power_state power_chipset_init(void)
@@ -505,6 +518,7 @@ enum power_state power_handle_state(enum power_state state)
 
 			return POWER_S5;
 		} else {
+			system_prevent_power_on_flag = 0;
 			return POWER_G3;
 		}
 		break;