Merge pull request #557 from FrameworkComputer/hx20-hx30

merge pull request

Author: kiram9

board/hx30/board.h

@@ -176,6 +176,7 @@
 #define CONFIG_USB_PD_REV30
 #define CONFIG_USB_PD_EXTENDED_MESSAGES
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
+#define CONFIG_USB_PD_VBUS_CTRL_BY_PD_CHIP
 
 /* Charger parameter */
 #define CONFIG_CHARGER_ISL9241

board/hx30/cypress5525.c

@@ -95,6 +95,7 @@ static int pd_port0_1_5A;
 static int pd_port1_1_5A;
 static int pd_port2_1_5A;
 static int pd_port3_1_5A;
+static int ac_port = -1;
 
 void set_pd_fw_update(bool update)
 {
@@ -228,6 +229,7 @@ int cypd_write_reg8_wait_ack(int controller, int reg, int data)
 {
 	int rv = EC_SUCCESS;
 	int intr_status;
+	int event;
 	rv = cypd_write_reg8(controller, reg, data);
 	if (rv != EC_SUCCESS)
 		CPRINTS("Write Reg8 0x%x fail!", reg);
@@ -237,7 +239,30 @@ int cypd_write_reg8_wait_ack(int controller, int reg, int data)
 		return EC_ERROR_INVAL;
 	}
 	rv = cypd_get_int(controller, &intr_status);
+	if (rv != EC_SUCCESS)
+		return rv;
 	if (intr_status & CYP5525_DEV_INTR) {
+		CPRINTS("data = %d", data);
+		if (data == CYP5525_AC_AT_PORT) {
+			rv = cypd_read_reg8(controller, CYP5525_RESPONSE_REG, &event);
+			CPRINTS("event = %d", event);
+			if (rv != EC_SUCCESS)
+				CPRINTS("fail to read response");
+			switch (event) {
+			case CYPD_RESPONSE_AC_AT_P0:
+				ac_port = (controller * 2) + 0;
+				break;
+			case CYPD_RESPONSE_AC_AT_P1:
+				ac_port = (controller * 2) + 1;
+				break;
+			case CYPD_RESPONSE_NO_AC:
+			case CYPD_RESPONSE_EC_MODE:
+				ac_port = -1;
+				break;
+			}
+			CPRINTS("ac_port = %d", ac_port);
+		} else
+			CPRINTS("unknown event");
 		cypd_clear_int(controller, CYP5525_DEV_INTR);
 	}
 	usleep(50);
@@ -1745,6 +1770,27 @@ static void update_power_limit_deferred(void)
 }
 DECLARE_DEFERRED(update_power_limit_deferred);
 
+int check_power_on_port(void)
+{
+	int rv;
+
+	/* only read CYPD when it ready */
+	if (pd_chip_config[0].state != CYP5525_STATE_READY)
+		return -1;
+
+	CPRINTS("READ C0");
+	rv = cypd_write_reg8_wait_ack(0, CYP5525_CUST_C_CTRL_CONTROL_REG, CYP5525_AC_AT_PORT);
+	if (rv != EC_SUCCESS)
+		return -1;
+	if (ac_port >= 0)
+		return ac_port;
+	CPRINTS("READ C1");
+	rv = cypd_write_reg8_wait_ack(1, CYP5525_CUST_C_CTRL_CONTROL_REG, CYP5525_AC_AT_PORT);
+	if (rv != EC_SUCCESS)
+		return -1;
+	return ac_port;
+}
+
 /**
  * Set active charge port -- only one port can be active at a time.
  *
@@ -1758,6 +1804,20 @@ int board_set_active_charge_port(int charge_port)
 {
 	CPRINTS("start change port = %d, prev_charge_port = %d", charge_port, prev_charge_port);
 
+	/* if no battery, EC should not control C_CTRL */
+	if (board_batt_is_present() != BP_YES) {
+		/* check if CYPD ready */
+		if (charge_port == -1)
+			return EC_ERROR_TRY_AGAIN;
+
+		/* store current port and update power limit */
+		CPRINTS("No batt, no change");
+		prev_charge_port = charge_port;
+		hook_call_deferred(&update_power_limit_deferred_data, 100 * MSEC);
+		CPRINTS("Updating %s port %d", __func__, charge_port);
+		return EC_SUCCESS;
+	}
+
 	/* port need change, stop all power and ready to switch. */
 	if (prev_charge_port != -1 && prev_charge_port != charge_port) {
 		update_soc_power_limit(false, true);

board/hx30/cypress5525.h

@@ -140,6 +140,8 @@
 #define CYP5525_P0_CY_P1_OFF			0xA2
 #define CYP5525_P0P1_TURN_OFF_C_CTRL	0xA3
 
+#define CYP5525_AC_AT_PORT				0xC4
+
 /************************************************
  *	PD COMMAND DEFINITION
  * See 001-97863_0N_V.pdf from cypress for the HPI
@@ -192,6 +194,10 @@ enum cypd_response {
 	CYPD_RESPONSE_DISCOVER_MODE_RESPONSE = 0x1A,
 	CYPD_RESPONSE_CABLE_COMM_NOT_ALLOWED = 0x1B,
 	CYPD_RESPONSE_EXT_SNK_CAP = 0x1C,
+	CYPD_RESPONSE_AC_AT_P0 = 0x33,
+	CYPD_RESPONSE_AC_AT_P1 = 0x34,
+	CYPD_RESPONSE_NO_AC = 0x35,
+	CYPD_RESPONSE_EC_MODE = 0x36,
 	CYPD_RESPONSE_FWCT_IDENT_INVALID = 0x40,
 	CYPD_RESPONSE_FWCT_INVALID_GUID = 0x41,
 	CYPD_RESPONSE_FWCT_INVALID_VERSION = 0x42,
@@ -479,4 +485,13 @@ void cypd_ppm_port_clear(void);
 
 int cypd_check_typec_port(int controller, int port);
 
+/**
+ * When chromebook power by ac only, the vbus is enabled by CYPD.
+ * EC should not control it.
+ * EC should read active port from CYPD and sync active port.
+ *
+ * @return active port
+ */
+int check_power_on_port(void);
+
 #endif	/* __CROS_EC_CYPRESS5525_H */

common/charge_manager.c

@@ -575,6 +575,18 @@ static void charge_manager_get_best_charge_port(int *new_port,
 	int best_port_power = -1, candidate_port_power;
 	int i, j;
 
+#ifdef CONFIG_USB_PD_VBUS_CTRL_BY_PD_CHIP
+	/* If system initially power on w/o dc, CYPD will control C_CTRL */
+	if ((charge_port == CHARGE_SUPPLIER_NONE) && (board_batt_is_present() != BP_YES)) {
+		*new_port = check_power_on_port();
+		CPRINTS("NO DC, choose AC by CYPD: %d", *new_port);
+		*new_supplier = CHARGE_SUPPLIER_PD;
+		if (*new_port == -1)
+			*new_supplier = CHARGE_SUPPLIER_NONE;
+		return;
+	}
+#endif /* CONFIG_USB_PD_VBUS_CTRL_BY_PD_CHIP */
+
 	/* Skip port selection on OVERRIDE_DONT_CHARGE. */
 	if (override_port != OVERRIDE_DONT_CHARGE) {
 		/*

include/charge_manager.h

@@ -315,4 +315,6 @@ __override_proto
 void board_fill_source_power_info(int port,
 				  struct ec_response_usb_pd_power_info *r);
 
+extern int check_power_on_port(void);
+
 #endif /* __CROS_EC_CHARGE_MANAGER_H */

include/config.h

@@ -4315,6 +4315,12 @@
 /* Define if tcpc on the board supports VBUS measurement */
 #undef CONFIG_USB_PD_VBUS_MEASURE_TCPC
 
+/*
+ * Define if system use stand alone pd solution.
+ * For stand alone solution, PD control VBUS itself, and will notify ec.
+ */
+#undef CONFIG_USB_PD_VBUS_CTRL_BY_PD_CHIP
+
 /* Define the type-c port controller I2C base address. */
 #define CONFIG_TCPC_I2C_BASE_ADDR_FLAGS 0x4E