Merge pull request #458 from FrameworkComputer/hx30_DVT2_PD_ACONLY

[fix] reconnect PD port if connect Sink device when ac only

Author: kiram9

board/hx30/cypress5525.c

@@ -430,6 +430,14 @@ void cypd_set_error_recovery(void)
 	}
 }
 
+static bool reconnect_flag;
+
+static void reconnect_port_deferred(void)
+{
+	cypd_aconly_reconnect();
+}
+DECLARE_DEFERRED(reconnect_port_deferred);
+
 void update_system_power_state(void)
 {
 
@@ -440,6 +448,7 @@ void update_system_power_state(void)
 	case POWER_S5G3:
 	case POWER_S3S5:
 		cypd_set_power_state(CYP5525_POWERSTATE_S5);
+		reconnect_flag = true;
 		break;
 	/* wait PD FW stable */
 	/*case POWER_S0S0ix:
@@ -449,9 +458,12 @@ void update_system_power_state(void)
 	default:
 		cypd_set_error_recovery();
 		cypd_set_power_state(CYP5525_POWERSTATE_S0);
+		if (reconnect_flag) {
+			reconnect_flag = false;
+			CPRINTS("CYPD reconnect");
+			cypd_aconly_reconnect();
+		}
 		break;
-
-
 	}
 
 }
@@ -1232,7 +1244,7 @@ void cypd_reinitialize(void)
 
 void cypd_interrupt_handler_task(void *p)
 {
-	int i, j, evt;
+	int i, j, evt, events;
 	cypd_int_task_id = task_get_current();
 
 	/* Initialize all charge suppliers to 0 */
@@ -1270,6 +1282,25 @@ void cypd_interrupt_handler_task(void *p)
 			}
 		}
 
+		if (evt & CYPD_EVT_PORT_DISABLE) {
+			CPRINTS("CYPD_EVT_PORT_DISABLE");
+			cypd_reconnect_port_disable(0, 0);
+			cypd_reconnect_port_disable(1, 0);
+			cypd_reconnect_port_disable(0, 1);
+			cypd_reconnect_port_disable(1, 1);
+			events = task_wait_event_mask(TASK_EVENT_TIMER, 300*MSEC);
+			if (events & TASK_EVENT_TIMER)
+				cypd_enque_evt(CYPD_EVT_PORT_ENABLE, 0);
+		}
+
+		if (evt & CYPD_EVT_PORT_ENABLE) {
+			CPRINTS("CYPD_EVT_PORT_ENABLE");
+			cypd_reconnect_port_enable(0, 0);
+			cypd_reconnect_port_enable(1, 0);
+			cypd_reconnect_port_enable(0, 1);
+			cypd_reconnect_port_enable(1, 1);
+		}
+
 		if (evt & CYPD_EVT_S_CHANGE) {
 			update_system_power_state();
 		}
@@ -1311,6 +1342,81 @@ void cypd_interrupt_handler_task(void *p)
 	}
 }
 
+int cypd_reconnect_port_disable(int controller, int port)
+{
+	int rv;
+	uint8_t pd_status_reg[4];
+	int port_pd_state, port_power_role, data;
+
+	rv = cypd_read_reg_block(controller, CYP5525_PD_STATUS_REG(port), pd_status_reg, 4);
+	if (rv != EC_SUCCESS)
+		CPRINTS("CYP5525_PD_STATUS_REG failed");
+
+	port_pd_state = pd_status_reg[1] & BIT(2);
+	port_power_role = pd_status_reg[1] & BIT(0);
+
+	if (port_power_role == PD_ROLE_SINK && port_pd_state)
+		return EC_SUCCESS;
+
+	rv = cypd_read_reg8(controller, CYP5525_PDPORT_ENABLE_REG, &data);
+	if (rv != EC_SUCCESS)
+		return rv;
+
+	data &= ~BIT(port);
+
+	rv = cypd_write_reg8(controller, CYP5525_PDPORT_ENABLE_REG, data);
+	if (rv != EC_SUCCESS)
+		return rv;
+
+	CPRINTS("disable controller: %d, Port: %d", controller, port);
+
+	return rv;
+}
+
+int cypd_reconnect_port_enable(int controller, int port)
+{
+	int rv;
+	uint8_t pd_status_reg[4];
+	int port_pd_state, port_power_role, data;
+
+	rv = cypd_read_reg_block(controller, CYP5525_PD_STATUS_REG(port), pd_status_reg, 4);
+	if (rv != EC_SUCCESS)
+		CPRINTS("CYP5525_PD_STATUS_REG failed");
+
+	port_pd_state = pd_status_reg[1] & BIT(2);
+	port_power_role = pd_status_reg[1] & BIT(0);
+
+	if (port_power_role == PD_ROLE_SINK && port_pd_state)
+		return EC_SUCCESS;
+
+	rv = cypd_read_reg8(controller, CYP5525_PDPORT_ENABLE_REG, &data);
+	if (rv != EC_SUCCESS)
+		return rv;
+
+	data |= BIT(port);
+
+	rv = cypd_write_reg8(controller, CYP5525_PDPORT_ENABLE_REG, data);
+	if (rv != EC_SUCCESS)
+		return rv;
+
+	CPRINTS("enable controller: %d, Port: %d", controller, port);
+
+	return rv;
+}
+
+void cypd_aconly_reconnect(void)
+{
+	int batt_status, events;
+
+	battery_status(&batt_status);
+
+	if (extpower_is_present() && battery_is_present() != BP_YES) {
+		events = task_wait_event_mask(TASK_EVENT_TIMER, 100*MSEC);
+		if (events & TASK_EVENT_TIMER)
+			cypd_enque_evt(CYPD_EVT_PORT_DISABLE, 0);
+	}
+}
+
 int cypd_get_pps_power_budget(void)
 {
 	/* TODO:

board/hx30/cypress5525.h

@@ -404,7 +404,9 @@ enum pd_task_evt {
 	CYPD_EVT_UCSI_POLL_CTRL_0 = BIT(7),
 	CYPD_EVT_UCSI_POLL_CTRL_1 = BIT(8),
 	CYPD_EVT_RETIMER_PWR = BIT(9),
-	CYPD_EVT_UPDATE_PWRSTAT = BIT(10)
+	CYPD_EVT_UPDATE_PWRSTAT = BIT(10),
+	CYPD_EVT_PORT_ENABLE = BIT(11),
+	CYPD_EVT_PORT_DISABLE = BIT(12)
 };
 
 /* PD CHIP */
@@ -457,4 +459,10 @@ int cypd_get_active_charging_port(void);
 void set_pd_fw_update(bool update);
 
 void cypd_charger_init_complete(void);
+
+void cypd_aconly_reconnect(void);
+
+int cypd_reconnect_port_enable(int controller, int port);
+
+int cypd_reconnect_port_disable(int controller, int port);
 #endif	/* __CROS_EC_CYPRESS5525_H */