fwk: lotus: ensure charge mode change to avoid system damage

when switching EPR ports directly
always make sure the charger has exited bypass mode
to avoid transients being passed to the system

BRANCH=fwk-tulip-29169
BUG=https://app.clickup.com/t/86euznxv4
TEST=follow clickup reproduce steps, 240w adp connect to top right port,
180w adp connect to middle right port unplug 240w adp check the screen won't flash

Signed-off-by: LeoCX_Tsai <LeoCX_Tsai@compal.com>

Author: LeoCX-Tsai

zephyr/program/framework/include/board_charger.h

@@ -53,8 +53,8 @@ enum ec_prochot_status {
 int update_charger_in_cutoff_mode(void);
 
 #ifdef CONFIG_BOARD_LOTUS
-int charger_in_bypass_mode(void);
 void board_charger_lpm_control(int enable);
+void board_disable_bypass_oneshot(void);
 #endif
 
 #ifdef CONFIG_CHARGER_DYNAMIC_ACOK_REFERENCE

zephyr/program/framework/lotus/src/charger.c

@@ -344,29 +344,62 @@ DECLARE_HOOK(HOOK_BATTERY_SOC_CHANGE, charger_update, HOOK_PRIO_DEFAULT);
 
 static bool bypass_force_en;
 static bool bypass_force_disable;
+
+static int bypass_force_disable_oneshot;
+void board_disable_bypass_oneshot(void)
+{
+	bypass_force_disable_oneshot = 2;
+}
+
 __override int board_should_charger_bypass(void)
 {
 	int power_uw = charge_manager_get_power_limit_uw();
 	int voltage_mv = charge_manager_get_charger_voltage();
 	int curr_batt = battery_is_present();
+	int ret;
+	const char *reason = "";
 
-	if (bypass_force_en)
-		return true;
+	if (bypass_force_en) {
+		ret = true;
+		reason = "forcen";
+		goto board_exit;
+	}
 
-	if (bypass_force_disable)
-		return false;
+	if (bypass_force_disable) {
+		ret = false;
+		reason = "forcedis";
+		goto board_exit;
+	}
+
+	if (bypass_force_disable_oneshot) {
+		bypass_force_disable_oneshot--;
+		ret = false;
+		reason = "oneshot";
+		goto board_exit;
+	}
 
 	if (curr_batt == BP_YES) {
-		if (power_uw > 100000000)
-			return true;
-		else
-			return false;
+		if (power_uw > 100000000) {
+			ret = true;
+			reason = "power";
+			goto board_exit;
+		} else {
+			ret = false;
+			goto board_exit;
+		}
 	} else {
-		if (voltage_mv > 20000)
-			return true;
-		else
-			return false;
+		if (voltage_mv > 20000) {
+			ret = true;
+			reason = "volt";
+			goto board_exit;
+		} else {
+			ret = false;
+			goto board_exit;
+		}
 	}
+board_exit:
+
+	return ret;
 }
 
 int board_want_change_mode(void)
@@ -381,24 +414,6 @@ int board_want_change_mode(void)
 		return false;
 }
 
-int charger_in_bypass_mode(void)
-{
-	int reg;
-	int rv;
-
-	rv = i2c_read16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS, ISL9241_REG_CONTROL0, &reg);
-
-	/* read register fail */
-	if (rv)
-		return 0;
-
-	/* charer not enter bypass mode */
-	if ((reg & ISL9241_CONTROL0_EN_BYPASS_GATE) != ISL9241_CONTROL0_EN_BYPASS_GATE)
-		return 0;
-
-	return 1;
-}
-
 int board_discharge_on_ac(int enable)
 {
 	int chgnum;

zephyr/program/framework/lotus/src/cpu_power.c

@@ -23,7 +23,7 @@
 #include "throttle_ap.h"
 #include "util.h"
 #include "gpu.h"
-
+#include "driver/charger/isl9241_public.h"
 
 #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
 #define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args)
@@ -347,7 +347,7 @@ void clear_prochot(enum clear_reasons reason)
 	if (events & BIT(PD_PROGRESS_ENTER_EPR_MODE) && (cypd_get_ac_power() > 100000)) {
 		/* wait charger to entry the bypass mode */
 #ifdef CONFIG_BOARD_LOTUS
-		if (charger_in_bypass_mode())
+		if (isl9241_is_in_bypass_mode(0))
 			update_pmf_events(BIT(PD_PROGRESS_ENTER_EPR_MODE), 0);
 #else
 		update_pmf_events(BIT(PD_PROGRESS_ENTER_EPR_MODE), 0);
@@ -468,7 +468,7 @@ void update_soc_power_limit(bool force_update, bool force_no_adapter)
 	}
 
 #ifdef CONFIG_BOARD_LOTUS
-	if (force_update && charger_in_bypass_mode() && !get_gpu_gpio(GPIO_FUNC_ACDC))
+	if (force_update && isl9241_is_in_bypass_mode(0) && !get_gpu_gpio(GPIO_FUNC_ACDC))
 		set_gpu_gpio(GPIO_FUNC_ACDC, 1);
 #else
 	if (force_update && !get_gpu_gpio(GPIO_FUNC_ACDC))

zephyr/program/framework/src/cypd_ccg8.c

@@ -717,7 +717,7 @@ void exit_epr_mode(void)
 					CCG_PD_CONTROL_REG(PORT_TO_CONTROLLER_PORT(port_idx)),
 					CCG_PD_CMD_INITIATE_EPR_EXIT);
 
-			hook_call_deferred(&epr_flow_pending_deferred_data, 500 * MSEC);
+			hook_call_deferred(&epr_flow_pending_deferred_data, 1000 * MSEC);
 #endif
 		}
 	}

zephyr/program/framework/src/cypress_pd_common.c

@@ -35,6 +35,7 @@
 #ifdef CONFIG_PLATFORM_EC_FRAMEWORK_LAPTOP_16
 #include "gpu.h"
 #include "cpu_power.h"
+#include "board_charger.h"
 #endif
 
 #include <zephyr/sys_clock.h>
@@ -1359,6 +1360,7 @@ void cypd_update_port_state(int controller, int port)
 	 */
 	cypd_ccd_mode_control();
 #endif
+	charge_wakeup();
 }
 
 void cypd_set_power_state(int power_state, int controller)
@@ -1618,6 +1620,9 @@ int board_set_active_charge_port(int charge_port)
 		 * so we need to turn on the vbus control again.
 		 */
 		cypd_cfet_vbus_control(charge_port, true, true);
+#ifdef CONFIG_BOARD_LOTUS
+		board_disable_bypass_oneshot();
+#endif
 		return EC_SUCCESS;
 	}
 
@@ -1626,6 +1631,19 @@ int board_set_active_charge_port(int charge_port)
 		prev_charge_port != charge_port) {
 		/* Turn off the previous charge port before turning on the next port */
 		cypd_cfet_vbus_control(prev_charge_port, false, true);
+#ifdef CONFIG_BOARD_LOTUS
+		board_disable_bypass_oneshot();
+
+		if (isl9241_is_in_bypass_mode(0)) {
+			CPRINTS("Force exit bypass mode for port switch");
+			if (chg_chips[0].drv->enable_bypass_mode)
+				chg_chips[0].drv->enable_bypass_mode(0, false);
+			/* ACOK threshold has been lowered, give the charger some time to
+			 * discharge the input caps before switching to the new port
+			 */
+			crec_usleep(8*MSEC);
+		}
+#endif
 	}
 
 	for (i = 0; i < PD_PORT_COUNT; i++) {
@@ -1669,7 +1687,12 @@ int cypd_get_ac_power(void)
 
 	ac_power_mW = (pd_port_states[prev_charge_port].current
 		* pd_port_states[prev_charge_port].voltage);
-
+#ifdef CONFIG_BOARD_LOTUS
+	if (!isl9241_is_in_bypass_mode(0)) {
+		/* limit to 100W if not in bypass mode */
+		ac_power_mW = MIN(100000000, ac_power_mW);
+	}
+#endif
 	return (ac_power_mW / 1000);
 }