workaround hang issue with PD 0.0.1E

Signed-off-by: Kieran Levin <ktl@frame.work>

Author: kiram9

zephyr/program/lotus/include/cypress_pd_common.h

@@ -85,6 +85,10 @@
 	(0x1010 + ((x) * 0x1000))
 #define CCG_CURRENT_RDO_REG(x) \
 	(0x1014 + ((x) * 0x1000))
+#define CCG_ALT_MODE_CMD_REG(x) \
+	(0x101C + ((x) * 0x1000))
+#define CCG_APP_HW_CMD_REG(x) \
+	(0x1020 + ((x) * 0x1000))
 #define CCG_EVENT_MASK_REG(x) \
 	(0x1024 + ((x) * 0x1000))
 #define CCG_VDM_EC_CONTROL_REG(x) \
@@ -95,6 +99,10 @@
 	(0x1032 + ((x) * 0x1000))
 #define CCG_PORT_INTR_STATUS_REG(x) \
 	(0x1034 + ((x) * 0x1000))
+#define CCG_PORT_HOST_CAP_REG(x) \
+	(0x105C + ((x) * 0x1000))
+#define CCG_ALT_MODE_MASK_REG(x) \
+	(0x1060 + ((x) * 0x1000))
 #define SELECT_SINK_PDO_EPR_MASK(x) \
 	(0x1065 + ((x) * 0x1000))
 #define CCG_SINK_PPS_AVS_CTRL_REG(x) \
@@ -289,6 +297,7 @@ enum ccg_usermux_configuration {
 	CCG_PD_USER_MUX_CONFIG_ISOLATE = 0,
 	CCG_PD_USER_MUX_CONFIG_SAFE,
 	CCG_PD_USER_MUX_CONFIG_SS_ONLY,
+	CCG_PD_USER_MUX_CONFIG_DEINIT = 0x09,
 	CCG_PD_USER_MUX_CONFIG_DEBUG_ACCESSORY = 0x0A
 };
 
@@ -475,7 +484,7 @@ struct pd_chip_ucsi_info_t {
 
 int cypd_write_reg8(int controller, int reg, int data);
 
-int cypd_write_reg_block(int controller, int reg, void *data, int len);
+int cypd_write_reg_block(int controller, int reg, const void *data, int len);
 
 int cypd_read_reg_block(int controller, int reg, void *data, int len);
 
@@ -550,4 +559,6 @@ int cypd_get_ac_power(void);
  */
 void force_disable_epr_mode(void);
 
+void cypd_port_reset(void);
+
 #endif /* __CROS_EC_CYPRESS_PD_COMMON_H */

zephyr/program/lotus/src/board_host_command.c

@@ -173,6 +173,8 @@ static enum ec_status enter_non_acpi_mode(struct host_cmd_handler_args *args)
 
 	update_apu_ready(1);
 
+	cypd_port_reset();
+
 	/**
 	 * Even though the protocol returns EC_SUCCESS,
 	 * the system still does not update the power limit.

zephyr/program/lotus/src/cypress_pd_common.c

@@ -95,7 +95,7 @@ static void cypd_update_port_state(int controller, int port);
 static void cypd_pdo_reset_deferred(void);
 static void cypd_set_prepare_pdo(int controller, int port);
 
-int cypd_write_reg_block(int controller, int reg, void *data, int len)
+int cypd_write_reg_block(int controller, int reg, const void *data, int len)
 {
 	int rv;
 	uint16_t i2c_port = pd_chip_config[controller].i2c_port;
@@ -1262,43 +1262,33 @@ static void port_to_safe_mode(int port)
 	CPRINTS("P%d: Safe", port);
 
 }
-
-enum power_state pd_prev_power_state = POWER_G3;
+bool apu_not_initialized;
 void update_system_power_state(int controller)
 {
 	enum power_state ps = power_get_state();
-
 	switch (ps) {
 	case POWER_G3:
 	case POWER_S5G3:
-		pd_prev_power_state = POWER_G3;
 		cypd_set_power_state(CCG_POWERSTATE_G3, controller);
+		apu_not_initialized = true;
 		break;
 	case POWER_S5:
 	case POWER_S3S5:
 	case POWER_S4S5:
-		pd_prev_power_state = POWER_S5;
 		cypd_set_power_state(CCG_POWERSTATE_S5, controller);
+		apu_not_initialized = 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);
-		if (pd_prev_power_state < POWER_S3) {
-			perform_error_recovery(controller);
-			pd_prev_power_state = ps;
-		}
 		break;
 	case POWER_S0:
 	case POWER_S3S0:
 	case POWER_S0ixS0: /* S0ix -> S0 */
 		cypd_set_power_state(CCG_POWERSTATE_S0, controller);
-		if (pd_prev_power_state < POWER_S3) {
-			perform_error_recovery(controller);
-			pd_prev_power_state = ps;
-		}
 		break;
 	case POWER_S0ix:
 	case POWER_S3S0ix: /* S3 -> S0ix */
@@ -1317,6 +1307,16 @@ void cypd_set_power_active(void)
 	task_set_event(TASK_ID_CYPD, CCG_EVT_S_CHANGE);
 }
 
+void cypd_port_reset(void)
+{
+	if (apu_not_initialized) {
+		task_set_event(TASK_ID_CYPD, CCG_EVT_PLT_RESET);
+		apu_not_initialized = false;
+	}
+}
+
+
+
 #define CYPD_SETUP_CMDS_LEN 2
 static int cypd_setup(int controller)
 {
@@ -1421,6 +1421,7 @@ static void cypd_handle_state(int controller)
 			cypd_update_power_status(controller);
 
 			update_system_power_state(controller);
+
 			cypd_setup(controller);
 
 			/* After initial complete, update the type-c port state */
@@ -1853,6 +1854,10 @@ void cypd_interrupt_handler_task(void *p)
 		if (evt & CCG_EVT_UPDATE_PWRSTAT)
 			cypd_update_power_status(2);
 
+		if (evt & CCG_EVT_PLT_RESET) {
+			perform_error_recovery(2);
+		}
+
 
 		if (evt & (CCG_EVT_INT_CTRL_0 | CCG_EVT_INT_CTRL_1 |
 					CCG_EVT_STATE_CTRL_0 | CCG_EVT_STATE_CTRL_1)) {