when switching EPR ports directly (#941)

* when switching EPR ports directly

always make sure the charger has exited bypass mode
to avoid transients being passed to the system

Signed-off-by: Kieran Levin <ktl@frame.work>

* handle ACOK threshold

Set ACOK threshold when transitioning to NVDC to discharge input power.
Make sure charger task is not woken from inside charge_manager task
board hook.

If this happens the state will be out of sync between charge manager
and charger.
And charger will try to update with the old values

Signed-off-by: Kieran Levin <ktl@frame.work>

* force disable the charger bypass when switching

Different parts of this run on different threads, so just force bypass
off for two runs of the charger updating.

Signed-off-by: Kieran Levin <ktl@frame.work>

* fix azalea build

limit power to 100W when charger not in bypass mode

Signed-off-by: Kieran Levin <ktl@frame.work>

---------

Signed-off-by: Kieran Levin <ktl@frame.work>

Author: kiram9

driver/charger/isl9241.c

@@ -1033,8 +1033,22 @@ static enum ec_error_list isl9241_bypass_to_nvdc(int chgnum)
 		return rv;
 
 	/* 12*: Set MaxSysVoltage to full charge. */
-	return isl9241_write(chgnum, ISL9241_REG_MAX_SYSTEM_VOLTAGE,
+	rv = isl9241_write(chgnum, ISL9241_REG_MAX_SYSTEM_VOLTAGE,
 			     bi->voltage_max);
+
+	if (rv)
+		return rv;
+
+#ifdef CONFIG_CUSTOMIZED_DESIGN
+	rv = isl9241_write(chgnum, ISL9241_REG_ACOK_REFERENCE,
+		      ISL9241_MV_TO_ACOK_REFERENCE(4000));
+#else
+	rv = isl9241_write(chgnum, ISL9241_REG_ACOK_REFERENCE,
+		      ISL9241_MV_TO_ACOK_REFERENCE(
+			      ISL9241_ACOK_REF_LOW_VOLTAGE_ADAPTER_MV));
+#endif
+
+	return rv;
 }
 
 #ifdef CONFIG_CHARGER_BYPASS_REVERSE_TURBO
@@ -1111,6 +1125,13 @@ static enum ec_error_list isl9241_rtb_chrg_to_rtb(int chgnum)
 }
 #endif
 
+static bool isl9241_in_bypass_mode;
+
+bool isl9241_is_in_bypass_mode(int chgnum)
+{
+	return isl9241_in_bypass_mode;
+}
+
 static enum ec_error_list isl9241_enable_bypass_mode(int chgnum, bool enable)
 {
 	enum ec_error_list rv = EC_ERROR_UNKNOWN;
@@ -1166,6 +1187,9 @@ static enum ec_error_list isl9241_enable_bypass_mode(int chgnum, bool enable)
 				CPRINTS("bypass -> RTB failed(%d)", rv);
 		}
 #endif
+		if (rv == EC_SUCCESS) {
+			isl9241_in_bypass_mode = true;
+		}
 		return rv;
 	}
 
@@ -1176,7 +1200,7 @@ static enum ec_error_list isl9241_enable_bypass_mode(int chgnum, bool enable)
 
 		rv = isl9241_read(chgnum, ISL9241_REG_CONTROL0, &reg);
 		if ((reg & ISL9241_CONTROL0_EN_BYPASS_GATE) != ISL9241_CONTROL0_EN_BYPASS_GATE) {
-			CPRINTS("Does not in bypass mode, ignore change");
+			CPRINTS("Not in bypass mode, ignore change");
 			return rv;
 		}
 
@@ -1198,6 +1222,10 @@ static enum ec_error_list isl9241_enable_bypass_mode(int chgnum, bool enable)
 		rv = isl9241_bypass_to_nvdc(chgnum);
 		if (rv)
 			CPRINTS("bypass -> nvdc failed(%d)", rv);
+
+		if (rv == EC_SUCCESS) {
+			isl9241_in_bypass_mode = false;
+		}
 		return rv;
 	} else {
 		/* AC removal */
@@ -1212,11 +1240,23 @@ static enum ec_error_list isl9241_enable_bypass_mode(int chgnum, bool enable)
 			if (rv)
 				CPRINTS("bypass -> bat failed(%d)", rv);
 		}
+
+		if (rv == EC_SUCCESS) {
+			isl9241_in_bypass_mode = false;
+		}
+
 		return rv;
 	}
 
 	return rv;
 }
+#else 
+
+bool isl9241_is_in_bypass_mode(int chgnum)
+{
+	return false;
+}
+
 #endif /* CONFIG_CHARGER_BYPASS_MODE */
 
 /*****************************************************************************/

include/driver/charger/isl9241_public.h

@@ -33,6 +33,13 @@ int isl9241_set_ac_prochot(int chgnum, int ma);
  */
 int isl9241_set_dc_prochot(int chgnum, int ma);
 
+/**
+ * Check if charger is currently in bypass mode
+ *
+ * @return true/false
+ */
+bool isl9241_is_in_bypass_mode(int chgnum);
+
 #ifdef CONFIG_CHARGER_RAA489110
 #define ISL9241_AC_PROCHOT_CURRENT_MIN 32 /* mA */
 #else /* CONFIG_CHARGER_ISL9241 */

zephyr/program/lotus/include/board_charger.h

@@ -35,6 +35,7 @@ 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
 
 #endif	/* __CROS_EC_BOARD_CHARGER_H */

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

@@ -344,29 +344,61 @@ 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) {
+		ret = true;
+		reason = "forcen";
+		goto board_exit;
+	}
 
-	if (bypass_force_en)
-		return true;
+	if (bypass_force_disable){
+		ret = false;
+		reason = "forcedis";
+		goto board_exit;
+	}
 
-	if (bypass_force_disable)
-		return false;
+	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:
+	/* CPRINTS("board_should_charger_bypass %s %d", reason, ret); */
+
+	return ret;
 }
 
 int board_want_change_mode(void)
@@ -381,24 +413,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/lotus/lotus/src/cpu_power.c

@@ -22,7 +22,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)
@@ -992,7 +992,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 */
-		if (charger_in_bypass_mode())
+		if (isl9241_is_in_bypass_mode(0))
 			update_pmf_events(BIT(PD_PROGRESS_ENTER_EPR_MODE), 0);
 	}
 
@@ -1030,7 +1030,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);
 
 #endif

zephyr/program/lotus/src/cypress_pd_common.c

@@ -33,6 +33,7 @@
 #ifdef CONFIG_BOARD_LOTUS
 #include "gpu.h"
 #include "cpu_power.h"
+#include "board_charger.h"
 #endif
 
 #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ##args)
@@ -467,7 +468,7 @@ void exit_epr_mode(void)
 					CCG_PD_CONTROL_REG(port_idx & 0x1),
 					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);
 		}
 	}
 }
@@ -1328,6 +1329,8 @@ static void cypd_update_port_state(int controller, int port)
 		pd_epr_in_progress &= ~EPR_PROCESS_MASK;
 	}
 #endif
+
+	charge_wakeup();
 }
 
 int cypd_set_power_state(int power_state, int controller)
@@ -1679,6 +1682,11 @@ int cypd_get_ac_power(void)
 	ac_power_mW = (pd_port_states[prev_charge_port].current
 		* pd_port_states[prev_charge_port].voltage);
 
+	if (!isl9241_is_in_bypass_mode(0)) {
+		/* limit to 100W if not in bypass mode */
+		ac_power_mW = MIN(100000000, ac_power_mW);
+	}
+
 	return (ac_power_mW / 1000);
 }
 
@@ -2173,12 +2181,16 @@ int board_set_active_charge_port(int charge_port)
 	int i;
 	CPRINTS("%s port %d, prev:%d", __func__, charge_port, prev_charge_port);
 
+
 	if (prev_charge_port == charge_port) {
 		/* in the case of hard reset, we do not turn off the old
 		 * port, but the PD will implicitly clear the 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;
 	}
 
@@ -2187,6 +2199,20 @@ 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();
+#endif
+		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
+			 */
+			usleep(8*MSEC);
+		}
+
+
 	}
 
 	for (i = 0; i < PD_PORT_COUNT; i++) {