Merge pull request #1062 from FrameworkComputer/marigold.error_recovery

marigold: execute the error recovery during the system power on

Author: JohnAZoidberg

zephyr/program/framework/include/cypress_pd_common.h

@@ -57,7 +57,7 @@
 #define CCG_MUX_CFG_REG			0x0041
 #define CCG_DEINIT_PORT_REG		0x0042
 #elif defined(CONFIG_PD_CHIP_CCG6)
-#define CCG_DPM_CMD_REG			0x004C
+#define CCG_DPM_CMD_REG			0x004B
 #define CCG_MUX_CFG_REG			0x004D
 #define CCG_DEINIT_PORT_REG		0x004E
 #ifdef CONFIG_PD_CCG6_CUSTOMIZE_BATT_MESSAGE
@@ -693,30 +693,6 @@ void exit_tbt_mode(int controller);
  */
 int check_tbt_mode(int controller);
 
-#ifdef CONFIG_PD_CCG6_ERROR_RECOVERY
-/**
- * Function can cmd PD to do disconnect both ports.
- *
- * @param controller	PD chip controller
- * @return int
- */
-int cypd_reconnect_port_disable(int controller);
-
-/**
- * Function can cmd PD to do connect both ports.
- *
- * @param controller	PD chip controller
- * @return int
- */
-int cypd_reconnect_port_enable(int controller);
-
-/**
- * Delay 100 MSEC execution PD event CCG_EVT_PORT_DISABLE
- */
-void cypd_reconnect(void);
-
-#endif /* CONFIG_PD_CCG6_ERROR_RECOVERY */
-
 #ifdef CONFIG_PD_CCG6_CUSTOMIZE_BATT_MESSAGE
 /**
  * Set battery_cap info to PD

zephyr/program/framework/marigold/project.conf

@@ -50,6 +50,7 @@ CONFIG_PLATFORM_EC_8042_AUX=y
 # PD
 CONFIG_PD_COMMON_VBUS_CONTROL=n
 CONFIG_PD_USB_PID=0x001A
+CONFIG_PD_CCG6_ERROR_RECOVERY=y
 
 # System
 CONFIG_PLATFORM_EC_SYSTEM_JUMP_RW_SUPPORT=y

zephyr/program/framework/src/cypd_ccg6.c

@@ -308,24 +308,46 @@ int board_set_active_charge_port(int charge_port)
 #endif /* CONFIG_PD_COMMON_VBUS_CONTROL */
 
 #ifdef CONFIG_PD_CCG6_ERROR_RECOVERY
-
 /*****************************************************************
  * Error Recovery Functions
  ****************************************************************/
 
-static bool reconnect_flag;
-void cypd_set_error_recovery(void)
+static void perform_error_recovery(int controller)
 {
 	int i;
-
-	for (i = 0;  i < PD_CHIP_COUNT; i++) {
-		/* We use port reconnect (0x2C) to replace error recovery (0xC1) for GRL issue.
-		 * GRL FV 3.1.2.3.
-		 * 0xC0 means no recovery.
-		 */
-		cypd_write_reg8_wait_ack(i, CCG_SYS_PWR_STATE, 0xC0);
+	uint8_t data[2] = {0x00, CCG_PD_USER_CMD_TYPEC_ERR_RECOVERY};
+	uint32_t batt_os_percentage = get_system_percentage();
+
+	if (controller < 2)
+		for (i = 0; i < 2; i++) {
+			if (!((controller*2 + i) == get_active_charge_pd_port() &&
+				battery_get_disconnect_state() != BATTERY_NOT_DISCONNECTED)) {
+
+				data[0] = PORT_TO_CONTROLLER_PORT(i);
+				cypd_write_reg_block(PORT_TO_CONTROLLER(i),
+									CCG_DPM_CMD_REG,
+									data, 2);
+			}
+		}
+	else {
+		/* Hard reset all ports that are not supplying power in dead battery mode */
+		for (i = 0; i < PD_PORT_COUNT; i++) {
+			if (!(i == get_active_charge_pd_port() &&
+			    battery_get_disconnect_state() != BATTERY_NOT_DISCONNECTED)) {
+
+				if ((pd_port_states[i].c_state == CCG_STATUS_SOURCE) &&
+				   (batt_os_percentage < 3) && (i == get_active_charge_pd_port()))
+					continue;
+
+				data[0] = PORT_TO_CONTROLLER_PORT(i);
+				cypd_write_reg_block(PORT_TO_CONTROLLER(i),
+									CCG_DPM_CMD_REG,
+									data, 2);
+			}
+		}
 	}
 }
+#endif /* CONFIG_PD_CCG6_ERROR_RECOVERY */
 
 void update_system_power_state(int controller)
 {
@@ -342,16 +364,12 @@ void update_system_power_state(int 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_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);
@@ -361,132 +379,27 @@ void update_system_power_state(int controller)
 	case POWER_S3S0:
 	case POWER_S0ixS0: /* S0ix -> S0 */
 		if (pre_state != CCG_POWERSTATE_S0) {
-			cypd_set_error_recovery();
 			cypd_set_power_state(CCG_POWERSTATE_S0, controller);
+#ifdef CONFIG_PD_CCG6_ERROR_RECOVERY
+			/* only execute the error recovery when the system power on */
+			if (pre_state != CCG_POWERSTATE_S0ix)
+				perform_error_recovery(controller);
+#endif
 		}
 		pre_state = CCG_POWERSTATE_S0;
-
-		if (reconnect_flag) {
-			CPRINTS("CYPD reconnect");
-			cypd_reconnect();
-			reconnect_flag = false;
-		}
-		break;
-	default:
 		break;
-	}
-}
-
-int cypd_reconnect_port_disable(int controller)
-{
-	int rv;
-	uint8_t pd_status_reg[4];
-	int port_power_role;
-	int portEnable = 0; /* default disable all port*/
-	bool battery_can_discharge = (battery_is_present() == BP_YES) &
-			battery_get_disconnect_state();
-
-	/* check the first port's status */
-	rv = cypd_read_reg_block(controller, CCG_PD_STATUS_REG(0), pd_status_reg, 4);
-	if (rv != EC_SUCCESS)
-		CPRINTS("CCG_PD_STATUS_REG failed");
-
-	port_power_role = pd_status_reg[1] & BIT(0);
-	/* Does not disable the source port */
-	if (port_power_role == PD_ROLE_SINK && (pd_status_reg[1] & BIT(2)) == BIT(2))
-		portEnable |= BIT(0);
-
-	/* check the second port's status */
-	rv = cypd_read_reg_block(controller, CCG_PD_STATUS_REG(1), pd_status_reg, 4);
-	if (rv != EC_SUCCESS)
-		CPRINTS("CCG_PD_STATUS_REG failed");
-
-	port_power_role = pd_status_reg[1] & BIT(0);
-	/* Does not disable the source port */
-	if (port_power_role == PD_ROLE_SINK && (pd_status_reg[1] & BIT(2)) == BIT(2))
-		portEnable |= BIT(1);
-
-	/* If there is DC, just force reconnect port. */
-	if (battery_can_discharge)
-		portEnable = 0x0;
-
-	rv = cypd_write_reg8(controller, CCG_PDPORT_ENABLE_REG, portEnable);
-	if (rv != EC_SUCCESS)
-		return rv;
-
-	CPRINTS("disable controller: %d, Port: 0x%02x", controller, portEnable);
-
-	return rv;
-}
-
-int cypd_reconnect_port_enable(int controller)
-{
-	int rv;
-
-	rv = cypd_write_reg8(controller, CCG_PDPORT_ENABLE_REG, 3);
-	if (rv != EC_SUCCESS)
-		return rv;
-
-	CPRINTS("enable controller: %d", controller);
-
-	return rv;
-}
-
-void cypd_reconnect(void)
-{
-	int events;
-
-	/* trigger port reconnect, will check ac status while disable port */
-	events = task_wait_event_mask(TASK_EVENT_TIMER, 100*MSEC);
-	if (events & TASK_EVENT_TIMER)
-		task_set_event(TASK_ID_CYPD, CCG_EVT_PORT_DISABLE);
-}
-#else
-
-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:
-	case POWER_S5:
-	case POWER_S3S5:
-	case POWER_S4S5:
-		/* 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_S0ix:
 	case POWER_S0S0ix: /* S0 -> S0ix */
 		/* Do not update the same state again */
-		if (pre_state != CCG_POWERSTATE_S3)
+		if (pre_state != CCG_POWERSTATE_S0ix)
 			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 */
-		if (pre_state != CCG_POWERSTATE_S0)
-			cypd_set_power_state(CCG_POWERSTATE_S0, controller);
-		pre_state = CCG_POWERSTATE_S0;
+		pre_state = CCG_POWERSTATE_S0ix;
 		break;
 	default:
 		break;
 	}
-
 }
 
-#endif /* PD_CCG6_ERROR_RECOVERY */
-
-
 /*****************************************************************
  * BB Retimer Functions
  ****************************************************************/

zephyr/program/framework/src/cypress_pd_common.c

@@ -1751,9 +1751,7 @@ static int ucsi_tunnel_disabled;
 void cypd_interrupt_handler_task(void *p)
 {
 	int i, j, evt;
-#ifdef CONFIG_PD_CCG6_ERROR_RECOVERY
-	int events;
-#endif /* CONFIG_PD_CCG6_ERROR_RECOVERY */
+
 	/* Initialize all charge suppliers to 0 */
 	for (i = 0; i < CHARGE_PORT_COUNT; i++) {
 		for (j = 0; j < CHARGE_SUPPLIER_COUNT; j++)
@@ -1804,29 +1802,6 @@ void cypd_interrupt_handler_task(void *p)
 			task_wait_event_mask(TASK_EVENT_TIMER,10);
 		}
 
-#ifdef CONFIG_PD_CCG6_ERROR_RECOVERY
-
-		if (evt & CCG_EVT_PORT_DISABLE) {
-			CPRINTS("CCG_EVT_PORT_DISABLE");
-			cypd_reconnect_port_disable(0);
-			cypd_reconnect_port_disable(1);
-			/*
-			 * In the specification section 4.2.3.14, stopping an active
-			 * PD port can take a long time (~1 second) in case VBus is
-			 * being provided andneeds to be discharged
-			 */
-			events = task_wait_event_mask(TASK_EVENT_TIMER, 1000*MSEC);
-			if (events & TASK_EVENT_TIMER)
-				task_set_event(TASK_ID_CYPD, CCG_EVT_PORT_ENABLE);
-		}
-
-		if (evt & CCG_EVT_PORT_ENABLE) {
-			CPRINTS("CCG_EVT_PORT_ENABLE");
-			cypd_reconnect_port_enable(0);
-			cypd_reconnect_port_enable(1);
-		}
-#endif /* CONFIG_PD_CCG6_ERROR_RECOVERY */
-
 		if (evt & CCG_EVT_PDO_INIT_0) {
 			/* update new PDO format to select pdo register */
 			cypd_pdo_init(0, 0, CCG_PD_CMD_SET_TYPEC_3A);