fwk: ucsi: support CCGx UCSI1.x and UCSI2.x message out offset

"CCGx UCSI v2.0 Firmware Design Document" describes the UCSI2.0 message
out offset should be 0xF110.

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 0b3138f)

Author: Josh-Tsai

zephyr/program/framework/include/cypress_pd_common.h

@@ -70,6 +70,7 @@
 #define CCG_CONTROL_REG			0xF008
 #define CCG_MESSAGE_IN_REG		0xF010
 #define CCG_MESSAGE_OUT_REG		0xF020
+#define CCG_MESSAGE_OUT_REG_V2	0xF110
 
 
 /************************************************/

zephyr/program/framework/include/ucsi.h

@@ -78,6 +78,7 @@ extern struct ucsi_to_pd_port_map ucsi_pd_port_map[];
 int ucsi_write_tunnel(void);
 int ucsi_read_tunnel(int controller);
 int ucsi_startup(int controller);
+int ucsi_message_out_offset(void);
 void ucsi_set_debug(bool enable);
 void check_ucsi_event_from_host(void);
 void record_ucsi_connector_change_event(int controller, int port);

zephyr/program/framework/src/cypress_pd_common.c

@@ -2277,14 +2277,14 @@ static int cmd_cypd_get_status(int argc, const char **argv)
 			}
 			CPRINTS("=====UCSI======");
 			cypd_read_reg16(i, CCG_VERSION_REG, &data);
-			CPRINTS(" Version: 0x%02x", data);
+			CPRINTS(" Version: 0x%04x", data);
 			cypd_read_reg_block(i, CCG_CCI_REG, data16, 4);
 			cypd_print_buff("     CCI:", data16, 4);
 			cypd_read_reg_block(i, CCG_CONTROL_REG, data16, 8);
 			cypd_print_buff(" Control:", data16, 8);
 			cypd_read_reg_block(i, CCG_MESSAGE_IN_REG, data16, 16);
 			cypd_print_buff(" Msg  In:", data16, 16);
-			cypd_read_reg_block(i, CCG_MESSAGE_OUT_REG, data16, 16);
+			cypd_read_reg_block(i, ucsi_message_out_offset(), data16, 16);
 			cypd_print_buff(" Msg Out:", data16, 16);
 		}
 

zephyr/program/framework/src/ucsi.c

@@ -81,6 +81,21 @@ const char *command_names(uint8_t command)
 	return "";
 }
 
+int ucsi_message_out_offset(void)
+{
+	uint16_t *version = (uint16_t *)host_get_memmap(EC_CUSTOMIZED_MEMMAP_UCSI_VERSION);
+
+	/*
+	 * version format JJ.M.N
+	 * e.g version 2.1.3 is respresented with value 0x0213
+	 */
+
+	if (*version < 0x0200)
+		return CCG_MESSAGE_OUT_REG;
+	else
+		return CCG_MESSAGE_OUT_REG_V2;
+}
+
 int ucsi_write_tunnel(void)
 {
 	uint8_t *message_out = host_get_memmap(EC_CUSTOMIZED_MEMMAP_UCSI_MESSAGE_OUT);
@@ -147,7 +162,7 @@ int ucsi_write_tunnel(void)
 		}
 
 		pd_chip_ucsi_info[controller].wait_ack = 1;
-		rv = cypd_write_reg_block(controller, CCG_MESSAGE_OUT_REG, message_out, 16);
+		rv = cypd_write_reg_block(controller, ucsi_message_out_offset(), message_out, 16);
 		rv = cypd_write_reg_block(controller, CCG_CONTROL_REG, command, 8);
 		break;
 	default:
@@ -164,7 +179,7 @@ int ucsi_write_tunnel(void)
 				continue;
 			}
 
-			rv = cypd_write_reg_block(i, CCG_MESSAGE_OUT_REG, message_out, 16);
+			rv = cypd_write_reg_block(i, ucsi_message_out_offset(), message_out, 16);
 			if (rv != EC_SUCCESS)
 				break;