fwk: ucsi: support ucsi version 2.0

Josh-Tsai · quinchou77 · commit 62720a35a421 · 2025-10-13T11:35:00.000+08:00
ucsi2.0 increase the data sizes and commands, this change add those commands in the EC code to support it BRANCH=fwk-main BUG=https://app.clickup.com/t/86equ4vr1 TEST=UCSI driver does not show the YB in the device manager (v1.1) Signed-off-by: Josh Tsai <Josh_Tsai@compal.com> (cherry picked from commit 419a868)
diff --git a/zephyr/program/framework/include/customized_shared_memory.h b/zephyr/program/framework/include/customized_shared_memory.h
@@ -65,8 +65,9 @@
 #define EC_CUSTOMIZED_MEMMAP_UCSI_COMMAND	0x118
 #define EC_CUSTOMIZED_MEMMAP_UCSI_CTR_DATA_LEN	0x119
 #define EC_CUSTOMIZED_MEMMAP_UCSI_CTR_SPECIFIC	0x11A
-#define EC_CUSTOMIZED_MEMMAP_UCSI_MESSAGE_IN	0x120
+#define EC_CUSTOMIZED_MEMMAP_UCSI_MESSAGE_IN_V1	0x120
 #define EC_CUSTOMIZED_MEMMAP_UCSI_MESSAGE_OUT	0x130
+#define EC_CUSTOMIZED_MEMMAP_UCSI_MESSAGE_IN_V2	0x171
 
 
 #define EC_CUSTOMIZED_MEMMAP_SERIAL_STRCUT_INFO	0x140
diff --git a/zephyr/program/framework/include/cypress_pd_common.h b/zephyr/program/framework/include/cypress_pd_common.h
@@ -537,8 +537,9 @@ struct pd_chip_ucsi_info_t {
 		uint8_t data_len;
 		uint8_t data[6];
 	} control;
-	uint8_t message_in[16];
+	uint8_t message_in[34];
 	uint8_t message_out[16];
+	int message_in_length;
 	int read_tunnel_complete;
 	int write_tunnel_complete;
 	int wait_ack;
diff --git a/zephyr/program/framework/include/ucsi.h b/zephyr/program/framework/include/ucsi.h
@@ -20,29 +20,44 @@ enum ucsi_control {
 	CYPD_UCSI_SIGNAL_CONNECT_EVENT_TO_OS = 0x04
 };
 
-enum ucsi_command {
-	UCSI_CMD_RESERVE,
-	UCSI_CMD_PPM_RESET,
-	UCSI_CMD_CANCEL,
-	UCSI_CMD_CONNECTOR_RESET,
-	UCSI_CMD_ACK_CC_CI,
-	UCSI_CMD_SET_NOTIFICATION_ENABLE,
-	UCSI_CMD_GET_CAPABILITY,
-	UCSI_CMD_GET_CONNECTOR_CAPABILITY,
-	UCSI_CMD_SET_UOM,
-	UCSI_CMD_SET_UOR,
-	UCSI_CMD_SET_PDM,
-	UCSI_CMD_SET_PDR,
-	UCSI_CMD_GET_ALTERNATE_MODES,
-	UCSI_CMD_GET_CAM_SUPPORTED,
-	UCSI_CMD_GET_CURRENT_CAM,
-	UCSI_CMD_SET_NEW_CAM,
-	UCSI_CMD_GET_PDOS,
-	UCSI_CMD_GET_CABLE_PROPERTY,
-	UCSI_CMD_GET_CONNECTOR_STATUS,
-	UCSI_CMD_GET_ERROR_STATUS,
-	UCSI_CMD_SET_POWER_LEVEL,
-	UCSI_CMD_GET_PD_MESSAGE
+enum ucsi_commands {
+	/* UCSI 1.x */
+	UCSI_CMD_RESERVED = 0,
+	UCSI_CMD_PPM_RESET = 0x01,
+	UCSI_CMD_CANCEL = 0x02,
+	UCSI_CMD_CONNECTOR_RESET = 0x03,
+	UCSI_CMD_ACK_CC_CI = 0x04,
+	UCSI_CMD_SET_NOTIFICATION_ENABLE = 0x05,
+	UCSI_CMD_GET_CAPABILITY = 0x06,
+	UCSI_CMD_GET_CONNECTOR_CAPABILITY = 0x07,
+	UCSI_CMD_SET_CCOM = 0x08,
+	UCSI_CMD_SET_UOR = 0x09,
+	obsolete_UCSI_CMD_SET_PDM = 0x0A,
+	UCSI_CMD_SET_PDR = 0x0B,
+	UCSI_CMD_GET_ALTERNATE_MODES = 0x0C,
+	UCSI_CMD_GET_CAM_SUPPORTED = 0x0D,
+	UCSI_CMD_GET_CURRENT_CAM = 0x0E,
+	UCSI_CMD_SET_NEW_CAM = 0x0F,
+	UCSI_CMD_GET_PDOS = 0x10,
+	UCSI_CMD_GET_CABLE_PROPERTY = 0x11,
+	UCSI_CMD_GET_CONNECTOR_STATUS = 0x12,
+	UCSI_CMD_GET_ERROR_STATUS = 0x13,
+	UCSI_CMD_SET_POWER_LEVEL = 0x14,
+	UCSI_CMD_GET_PD_MESSAGE = 0x15,
+	/* UCSI 2.x */
+	UCSI_CMD_GET_ATTENTION_VDO = 0x16,
+	UCSI_CMD_reserved_0x17 = 0x17,
+	UCSI_CMD_GET_CAM_CS = 0x18,
+	UCSI_CMD_LPM_FW_UPDATE_REQUEST = 0x19,
+	UCSI_CMD_SECURITY_REQUEST = 0x1A,
+	UCSI_CMD_SET_RETIMER_MODE = 0x1B,
+	UCSI_CMD_SET_SINK_PATH = 0x1C,
+	/* UCSI 3.x */
+	UCSI_CMD_SET_PDOS = 0x1D,
+	UCSI_CMD_READ_POWER_LEVEL = 0x1E,
+	UCSI_CMD_CHUNKING_SUPPORT = 0x1F,
+	UCSI_CMD_VENDOR_CMD = 0x20,
+	UCSI_CMD_MAX,
 };
 
 /**
diff --git a/zephyr/program/framework/src/ucsi.c b/zephyr/program/framework/src/ucsi.c
@@ -108,7 +108,7 @@ int ucsi_write_tunnel(void)
 	case UCSI_CMD_GET_CONNECTOR_STATUS:
 	case UCSI_CMD_GET_CONNECTOR_CAPABILITY:
 	case UCSI_CMD_CONNECTOR_RESET:
-	case UCSI_CMD_SET_UOM:
+	case UCSI_CMD_SET_CCOM:
 	case UCSI_CMD_SET_UOR:
 	case UCSI_CMD_SET_PDR:
 	case UCSI_CMD_GET_CAM_SUPPORTED:
@@ -117,9 +117,11 @@ int ucsi_write_tunnel(void)
 	case UCSI_CMD_GET_CABLE_PROPERTY:
 	case UCSI_CMD_GET_ALTERNATE_MODES:
 	case UCSI_CMD_GET_CURRENT_CAM:
+	case UCSI_CMD_GET_CAM_CS:
 	case UCSI_CMD_SET_POWER_LEVEL:
 	case UCSI_CMD_GET_PD_MESSAGE:
 	case UCSI_CMD_GET_ERROR_STATUS:
+	case UCSI_CMD_GET_ATTENTION_VDO:
 
 		if (*command == UCSI_CMD_GET_ALTERNATE_MODES) {
 			offset = 1;
@@ -303,6 +305,8 @@ static int ucsi_check_all_pd_status(int operator)
 int ucsi_read_tunnel(int controller)
 {
 	int rv, port_indicator;
+	int message_in_max_length;
+	uint16_t *version = (uint16_t *)host_get_memmap(EC_CUSTOMIZED_MEMMAP_UCSI_VERSION);
 
 	if (ucsi_debug_enable && pd_chip_ucsi_info[controller].read_tunnel_complete == 1 &&
 		(pd_chip_ucsi_info[controller].cci & CCI_BUSY_FLAG) == 0) {
@@ -325,15 +329,17 @@ int ucsi_read_tunnel(int controller)
 		| (pd_ucsi_port_map[controller*2+port_indicator-1] << 1);
 	}
 
+	message_in_max_length = (*version < 0x0200) ? 16 : 34;
+
 	/* If data length is non zero, then get data */
 	if (pd_chip_ucsi_info[controller].cci & 0xFF00) {
 		rv = cypd_read_reg_block(controller, CCG_MESSAGE_IN_REG,
-			pd_chip_ucsi_info[controller].message_in, 16);
+			pd_chip_ucsi_info[controller].message_in, message_in_max_length);
 
 		if (rv != EC_SUCCESS)
 			CPRINTS("MESSAGE_IN_REG failed");
 	} else {
-		memset(pd_chip_ucsi_info[controller].message_in, 0, 16);
+		memset(pd_chip_ucsi_info[controller].message_in, 0, message_in_max_length);
 	}
 
 	if (ucsi_debug_enable) {
@@ -352,7 +358,8 @@ int ucsi_read_tunnel(int controller)
 			cci_reg & CCI_COMPLETE_FLAG ? "Complete " : ""
 			);
 		if (cci_reg & 0xFF00) {
-			cypd_print_buff("Message ", pd_chip_ucsi_info[controller].message_in, 16);
+			cypd_print_buff("Message ", pd_chip_ucsi_info[controller].message_in,
+						message_in_max_length);
 		}
 	}
 
@@ -457,6 +464,9 @@ void check_ucsi_event_from_host(void)
 {
 	void *message_in;
 	uint32_t *cci;
+	uint16_t *version = (uint16_t *)host_get_memmap(EC_CUSTOMIZED_MEMMAP_UCSI_VERSION);
+	int message_in_length;
+	int message_in_offset;
 	int i;
 	int rv;
 
@@ -534,8 +544,15 @@ void check_ucsi_event_from_host(void)
 		}
 
 		crec_msleep(2);
+		if (*version < 0x0200) {
+			message_in_offset = EC_CUSTOMIZED_MEMMAP_UCSI_MESSAGE_IN_V1;
+			message_in_length = 16;
+		} else {
+			message_in_offset = EC_CUSTOMIZED_MEMMAP_UCSI_MESSAGE_IN_V2;
+			message_in_length = 34;
+		}
 
-		memcpy(host_get_memmap(EC_CUSTOMIZED_MEMMAP_UCSI_MESSAGE_IN), message_in, 16);
+		memcpy(host_get_memmap(message_in_offset), message_in, message_in_length);
 		memcpy(host_get_memmap(EC_CUSTOMIZED_MEMMAP_UCSI_CONN_CHANGE), cci, 4);
 
 		/**
@@ -544,7 +561,7 @@ void check_ucsi_event_from_host(void)
 
 		/* override bNumConnectors to the total number of connectors on the system */
 		if (*host_get_memmap(EC_CUSTOMIZED_MEMMAP_UCSI_COMMAND) == UCSI_CMD_GET_CAPABILITY)
-			*host_get_memmap(EC_CUSTOMIZED_MEMMAP_UCSI_MESSAGE_IN + 4) = PD_PORT_COUNT;
+			*host_get_memmap(message_in_offset + 4) = PD_PORT_COUNT;
 
 		for (i = 0; i < PD_CHIP_COUNT; i++)
 			pd_chip_ucsi_info[i].read_tunnel_complete = 0;
