fwk: modified the UCSI code to support one PD chip

Remove the hard code and use the for-loop to check the pd read tunnel status.

BRANCH=fwk-main
BUG=None
TEST=UCSI is workable on the Marigold unit
TEST=UCSI driver does not display the yellow bang
TEST=After resuming from sleep, the pending event will be processed

Signed-off-by: Josh-Tsai <josh_tsai@compal.com>
(cherry picked from commit cb40672)

Author: Josh-Tsai

zephyr/program/framework/include/cypress_pd_common.h

@@ -632,6 +632,7 @@ struct pd_battery_status_t {
  */
 extern struct pd_chip_config_t pd_chip_config[];
 extern struct pd_port_current_state_t pd_port_states[];
+extern struct pd_chip_ucsi_info_t pd_chip_ucsi_info[];
 
 /**
  * cypress i2c write functions

zephyr/program/framework/src/ucsi.c

@@ -32,7 +32,7 @@
 #define CCI_ERROR_FLAG BIT(30)
 #define CCI_COMPLETE_FLAG BIT(31)
 
-static struct pd_chip_ucsi_info_t pd_chip_ucsi_info[] = {
+struct pd_chip_ucsi_info_t pd_chip_ucsi_info[] = {
 	[PD_CHIP_0] = {
 
 	},
@@ -109,8 +109,8 @@ int ucsi_write_tunnel(void)
 		CPRINTS("UCSI PPM_RESET");
 	}
 
-	pd_chip_ucsi_info[0].read_tunnel_complete = 0;
-	pd_chip_ucsi_info[1].read_tunnel_complete = 0;
+	for (i = 0; i < PD_CHIP_COUNT; i++)
+		pd_chip_ucsi_info[i].read_tunnel_complete = 0;
 
 	switch (*command) {
 	case UCSI_CMD_GET_CONNECTOR_STATUS:
@@ -207,6 +207,8 @@ void record_ucsi_connector_change_event(int controller, int port)
 {
 	int cci_port = (controller << 1) + port + 1;
 
+	__ASSERT(controller < PD_CHIP_COUNT, "Invalid PD chip controller id in %s.", __func__);
+
 	if (!chipset_in_state(CHIPSET_STATE_ON) && !chipset_in_state(CHIPSET_STATE_ANY_OFF))
 		s0ix_connector_change_indicator |= BIT(cci_port);
 }
@@ -271,6 +273,41 @@ static void resend_ucsi_connector_change_event(void)
 }
 DECLARE_HOOK(HOOK_CHIPSET_RESUME, resend_ucsi_connector_change_event, HOOK_PRIO_DEFAULT);
 
+#define OPERATOR_AND 1
+#define OPERATOR_OR  0
+
+static int ucsi_check_all_pd_status(int operator)
+{
+	int controller;
+
+	/* or operator = 0; and operator = 1 */
+	if (operator) {
+		for (controller = 0; controller < PD_CHIP_COUNT; controller++) {
+			/**
+			 * In the and operator condition,
+			 * if one pd chip does not complete the read tunnel, return false
+			 */
+			if (!pd_chip_ucsi_info[controller].read_tunnel_complete)
+				return false;
+		}
+
+		/* If all pd chips have completed the read tunnel, return true */
+		return true;
+	}
+
+	for (controller = 0; controller < PD_CHIP_COUNT; controller++) {
+		/**
+		 * In the or operator condition,
+		 * if one pd chip has completed the read tunnel, return true
+		 */
+		if (!pd_chip_ucsi_info[controller].read_tunnel_complete)
+			return true;
+	}
+
+	/* If all pd chips have not completed the read tunnel, return false */
+	return false;
+}
+
 int ucsi_read_tunnel(int controller)
 {
 	int rv;
@@ -350,8 +387,7 @@ int ucsi_read_tunnel(int controller)
 	case UCSI_CMD_SET_NOTIFICATION_ENABLE:
 	case UCSI_CMD_GET_CAPABILITY:
 		/* Those command need to wait two pd chip to response completed */
-		if (pd_chip_ucsi_info[0].read_tunnel_complete &&
-		    pd_chip_ucsi_info[1].read_tunnel_complete)
+		if (ucsi_check_all_pd_status(OPERATOR_AND))
 			read_complete = 1;
 		else
 			read_complete = 0;
@@ -365,8 +401,7 @@ int ucsi_read_tunnel(int controller)
 
 		break;
 	case UCSI_CMD_ACK_CC_CI:
-		if (pd_chip_ucsi_info[0].read_tunnel_complete &&
-		    pd_chip_ucsi_info[1].read_tunnel_complete) {
+		if (ucsi_check_all_pd_status(OPERATOR_AND)) {
 			read_complete = 1;
 
 			/* workaround for linux driver */
@@ -377,8 +412,7 @@ int ucsi_read_tunnel(int controller)
 			read_complete = 0;
 		break;
 	default:
-		if (pd_chip_ucsi_info[0].read_tunnel_complete ||
-		    pd_chip_ucsi_info[1].read_tunnel_complete)
+		if (ucsi_check_all_pd_status(OPERATOR_OR))
 			read_complete = 1;
 		else
 			read_complete = 0;
@@ -471,14 +505,12 @@ void check_ucsi_event_from_host(void)
 			CPRINTS("%s Complete",
 				command_names(*host_get_memmap(EC_CUSTOMIZED_MEMMAP_UCSI_COMMAND)));
 		}
-		if (pd_chip_ucsi_info[0].read_tunnel_complete) {
-			message_in = pd_chip_ucsi_info[0].message_in;
-			cci = &pd_chip_ucsi_info[0].cci;
-		}
 
-		if (pd_chip_ucsi_info[1].read_tunnel_complete) {
-			message_in = pd_chip_ucsi_info[1].message_in;
-			cci = &pd_chip_ucsi_info[1].cci;
+		for (i = 0; i < PD_CHIP_COUNT; i++) {
+			if (pd_chip_ucsi_info[i].read_tunnel_complete) {
+				message_in = pd_chip_ucsi_info[i].message_in;
+				cci = &pd_chip_ucsi_info[i].cci;
+			}
 		}
 		read_complete = false;
 
@@ -489,14 +521,13 @@ void check_ucsi_event_from_host(void)
 		 * so choose this response as a priority when we get an ack from
 		 * both controllers
 		 */
-		if (pd_chip_ucsi_info[1].read_tunnel_complete &&
-			pd_chip_ucsi_info[0].read_tunnel_complete) {
-			if (pd_chip_ucsi_info[0].cci & 0xFE) {
-				message_in = pd_chip_ucsi_info[0].message_in;
-				cci = &pd_chip_ucsi_info[0].cci;
-			} else if (pd_chip_ucsi_info[1].cci & 0xFE) {
-				message_in = pd_chip_ucsi_info[1].message_in;
-				cci = &pd_chip_ucsi_info[1].cci;
+		if (ucsi_check_all_pd_status(OPERATOR_AND)) {
+			for (i = 0; i < PD_CHIP_COUNT; i++) {
+				if (pd_chip_ucsi_info[i].cci & 0xFE) {
+					message_in = pd_chip_ucsi_info[i].message_in;
+					cci = &pd_chip_ucsi_info[i].cci;
+					break;
+				}
 			}
 		}
 
@@ -521,8 +552,8 @@ void check_ucsi_event_from_host(void)
 		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;
 
-		pd_chip_ucsi_info[0].read_tunnel_complete = 0;
-		pd_chip_ucsi_info[1].read_tunnel_complete = 0;
+		for (i = 0; i < PD_CHIP_COUNT; i++)
+			pd_chip_ucsi_info[i].read_tunnel_complete = 0;
 
 		/* clear the UCSI command if busy flag is not set */
 		if (0 == (*cci & CCI_BUSY_FLAG)) {