Merge pull request #1049 from FrameworkComputer/marigold.pd_system_power_state

marigold: update the system power state correctly

Author: JohnAZoidberg

zephyr/program/framework/marigold/src/power_sequence.c

@@ -462,6 +462,7 @@ enum power_state power_handle_state(enum power_state state)
 		resume_ms_flag = 0;
 		system_in_s0ix = 0;
 		lpc_s0ix_resume_restore_masks();
+		cypd_set_power_active();
 		/* Call hooks now that rails are up */
 		hook_notify(HOOK_CHIPSET_RESUME);
 		return POWER_S0;
@@ -471,6 +472,7 @@ enum power_state power_handle_state(enum power_state state)
 		system_in_s0ix = 1;
 		CPRINTS("PH S0->S0ix");
 		lpc_s0ix_suspend_clear_masks();
+		cypd_set_power_active();
 		/* Call hooks before we remove power rails */
 		hook_notify(HOOK_CHIPSET_SUSPEND);
 		return POWER_S0ix;

zephyr/program/framework/src/cypd_ccg6.c

@@ -330,46 +330,51 @@ void cypd_set_error_recovery(void)
 void update_system_power_state(int controller)
 {
 	enum power_state ps = power_get_state();
+	/* CCG6 does not support power state G3, just for initial state */
+	static uint8_t pre_state = CCG_POWERSTATE_G3;
 
 	switch (ps) {
 	case POWER_G3:
 	case POWER_S5G3:
-		cypd_set_power_state(CCG_POWERSTATE_G3, controller);
-		break;
 	case POWER_S5:
 	case POWER_S3S5:
 	case POWER_S4S5:
-		cypd_set_power_state(CCG_POWERSTATE_S5, controller);
+		/* Do not update the same state again */
+		if (pre_state != CCG_POWERSTATE_S5)
+			cypd_set_power_state(CCG_POWERSTATE_S5, controller);
+
+		pre_state = CCG_POWERSTATE_S5;
 		reconnect_flag = true;
 		break;
 	case POWER_S3:
 	case POWER_S4S3:
 	case POWER_S5S3:
 	case POWER_S0S3:
-	case POWER_S0ixS3: /* S0ix -> S3 */
-		cypd_set_power_state(CCG_POWERSTATE_S3, controller);
+	case POWER_S0ix:
+	case POWER_S0S0ix: /* S0 -> S0ix */
+		/* Do not update the same state again */
+		if (pre_state != CCG_POWERSTATE_S3)
+			cypd_set_power_state(CCG_POWERSTATE_S3, controller);
+		pre_state = CCG_POWERSTATE_S3;
 		break;
 	case POWER_S0:
 	case POWER_S3S0:
 	case POWER_S0ixS0: /* S0ix -> S0 */
-		cypd_set_error_recovery();
-		cypd_set_power_state(CCG_POWERSTATE_S0, controller);
+		if (pre_state != CCG_POWERSTATE_S0) {
+			cypd_set_error_recovery();
+			cypd_set_power_state(CCG_POWERSTATE_S0, controller);
+		}
+		pre_state = CCG_POWERSTATE_S0;
+
 		if (reconnect_flag) {
 			CPRINTS("CYPD reconnect");
 			cypd_reconnect();
 			reconnect_flag = false;
 		}
 		break;
-	case POWER_S0ix:
-	case POWER_S3S0ix: /* S3 -> S0ix */
-	case POWER_S0S0ix: /* S0 -> S0ix */
-		cypd_set_power_state(CCG_POWERSTATE_S0ix, controller);
-		break;
-
 	default:
 		break;
 	}
-
 }
 
 int cypd_reconnect_port_disable(int controller)
@@ -441,35 +446,38 @@ void cypd_reconnect(void)
 void update_system_power_state(int controller)
 {
 	enum power_state ps = power_get_state();
+	/* CCG6 does not support power state G3, just for initial state */
+	static uint8_t pre_state = CCG_POWERSTATE_G3;
 
 	switch (ps) {
 	case POWER_G3:
 	case POWER_S5G3:
-		cypd_set_power_state(CCG_POWERSTATE_G3, controller);
-		break;
 	case POWER_S5:
 	case POWER_S3S5:
 	case POWER_S4S5:
-		cypd_set_power_state(CCG_POWERSTATE_S5, controller);
+		/* Do not update the same state again */
+		if (pre_state != CCG_POWERSTATE_S5)
+			cypd_set_power_state(CCG_POWERSTATE_S5, controller);
+		pre_state = CCG_POWERSTATE_S5;
 		break;
 	case POWER_S3:
 	case POWER_S4S3:
 	case POWER_S5S3:
 	case POWER_S0S3:
-	case POWER_S0ixS3: /* S0ix -> S3 */
-		cypd_set_power_state(CCG_POWERSTATE_S3, controller);
+	case POWER_S0ix:
+	case POWER_S0S0ix: /* S0 -> S0ix */
+		/* Do not update the same state again */
+		if (pre_state != CCG_POWERSTATE_S3)
+			cypd_set_power_state(CCG_POWERSTATE_S3, controller);
+		pre_state = CCG_POWERSTATE_S3;
 		break;
 	case POWER_S0:
 	case POWER_S3S0:
 	case POWER_S0ixS0: /* S0ix -> S0 */
-		cypd_set_power_state(CCG_POWERSTATE_S0, controller);
+		if (pre_state != CCG_POWERSTATE_S0)
+			cypd_set_power_state(CCG_POWERSTATE_S0, controller);
+		pre_state = CCG_POWERSTATE_S0;
 		break;
-	case POWER_S0ix:
-	case POWER_S3S0ix: /* S3 -> S0ix */
-	case POWER_S0S0ix: /* S0 -> S0ix */
-		cypd_set_power_state(CCG_POWERSTATE_S0ix, controller);
-		break;
-
 	default:
 		break;
 	}