Revert "Clear the wake source flag to avoid the wrong pwoer state"

This reverts commit 4d24126.

EC code doesn't return the POWER_G3 state, so when we forcing_shutdown
and the flag is cleared early, it need to wait 10s down to S5G3 state.
If users press the power button, system won't power on and LED turn on,
it will cause the users confuse.

So we need to seprate the custom_forcing from common forcing_shutdown,
to keep pch power and avoid impact by common forcing_shutdwon.

Signed-off-by: Josh Tsai <josh_tsai@compal.corp-partner.google.com>

Author: Josh Tsai

board/hx20/power_sequence.c

@@ -36,6 +36,7 @@
 #define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ## args)
 
 static int forcing_shutdown;  /* Forced shutdown in progress? */
+static int custom_forcing_shutdown;
 
 /*
  * define wake source for keep PCH power
@@ -75,10 +76,8 @@ 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 */
-		*host_get_customer_memmap(0x02) = 0x00;
-		system_set_bbram(SYSTEM_BBRAM_IDX_VPRO_STATUS, 0);
 	}
 }
 
@@ -114,8 +113,10 @@ int keep_pch_power(void)
 
 	system_get_bbram(SYSTEM_BBRAM_IDX_VPRO_STATUS, &vpro_change);
 
-	if (forcing_shutdown)
+	if (custom_forcing_shutdown && power_get_state() == POWER_S5G3) {
+		custom_forcing_shutdown = 0;
 		return false;
+	}
 	else if (version & BIT(0) && extpower_is_present() && vpro_change)
 		return true;
 #ifdef CONFIG_EMI_REGION1
@@ -397,11 +398,9 @@ enum power_state power_handle_state(enum power_state state)
 	case POWER_S5:
 		CPRINTS("PH S5");
 
-		if (forcing_shutdown) {
+		if (custom_forcing_shutdown)
 			/* force shutdown process shouldn't keep PCH power */
-			forcing_shutdown = 0;
 			return POWER_S5G3;
-		}
 
 		if (power_s5_up || stress_test_enable) {
 			/* Wait S5 signal when power up from S5 */