lotus: modified EPR flow and PMF updated flow (#862)

* lotus: modified EPR flow and PMF updated flow

Signed-off-by: Josh-Tsai <[email protected]>

* lotus: set the poweroff_dp_deferred from 5s to 30s

Signed-off-by: Josh-Tsai <[email protected]>

* lotus: converstion the current after epr progress

Signed-off-by: Josh-Tsai <[email protected]>

* lotus: add the retry ERP when the PD chip does not response EPR event

Signed-off-by: Josh-Tsai <[email protected]>

* louts: clear port status when PD sent hard reset for customized extpower

Signed-off-by: Josh-Tsai <[email protected]>

* lotus: only process enter epr mode when the source is support

Signed-off-by: Josh-Tsai <[email protected]>

---------

Signed-off-by: Josh-Tsai <[email protected]>

Author: Josh-Tsai

zephyr/program/lotus/include/common_cpu_power.h

@@ -72,6 +72,7 @@ int set_pl_limits(uint32_t spl, uint32_t fppt, uint32_t sppt, uint32_t p3t);
 
 #ifdef CONFIG_BOARD_LOTUS
 int update_apu_only_sppt_limit(uint32_t mwatt);
+void update_pmf_events(uint8_t pd_event, int enable);
 #endif
 
 extern bool thermal_warn_trigger(void);

zephyr/program/lotus/include/cypress_pd_common.h

@@ -272,6 +272,7 @@ enum ccg_pd_command {
 	CCG_PD_CMD_EC_INIT_COMPLETE = 0x10,
 	CCG_PD_CMD_PORT_DISABLE = 0x11,
 	CCG_PD_CMD_CHANGE_PD_PORT_PARAMS = 0x14,
+	CCG_PD_CMD_READ_SRC_PDO = 0x20,
 	CCG_PD_CMD_INITIATE_EPR_ENTRY = 0x47,
 	CCG_PD_CMD_INITIATE_EPR_EXIT = 0x48,
 };
@@ -444,6 +445,7 @@ enum pd_port {
 enum pd_progress {
 	PD_PROGRESS_IDLE = 0,
 	PD_PROGRESS_DISCONNECTED,
+	PD_PROGRESS_EPR_MODE,
 };
 
 struct pd_chip_config_t {
@@ -462,6 +464,7 @@ struct pd_port_current_state_t {
 	uint8_t pd_state;
 	uint8_t cc;
 	uint8_t epr_active;
+	uint8_t epr_support;
 
 	enum pd_power_role power_role;
 	enum pd_data_role data_role;
@@ -557,22 +560,14 @@ int cypd_vbus_state_check(void);
  */
 int cypd_get_ac_power(void);
 
-/**
- * Set disable_epr_mode flag to true
- *
- */
-void force_disable_epr_mode(void);
+void exit_epr_mode(void);
 
-void release_disable_epr_mode(void);
+void enter_epr_mode(void);
 
 int cypd_modify_safety_power(int controller, int port, int profile);
 
 int cypd_port_3a_status(int controller, int port);
 
 uint8_t cypd_get_cfet_status(void);
 
-uint8_t get_pd_progress_flags(void);
-
-void update_pd_progress_flags(int bit, int clear);
-
 #endif /* __CROS_EC_CYPRESS_PD_COMMON_H */

zephyr/program/lotus/lotus/src/battery.c

@@ -16,6 +16,7 @@
 #include "charge_state.h"
 #include "charge_manager.h"
 #include "cypress_pd_common.h"
+#include "common_cpu_power.h"
 #include "console.h"
 #include "customized_shared_memory.h"
 #include "hooks.h"
@@ -379,7 +380,7 @@ __override int board_cut_off_battery(void)
 	if (power_uw <= 100000000) {
 		hook_call_deferred(&board_cut_off_data, 0);
 	} else {
-		force_disable_epr_mode();
+		exit_epr_mode();
 		hook_call_deferred(&board_cut_off_data, 700*MSEC);
 	}
 

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

@@ -26,6 +26,13 @@ static int battery_current_limit_mA;
 static int slider_stt_table;
 static int thermal_stt_table;
 static int safety_stt;
+static uint8_t events;
+
+enum clear_reasons {
+	PROCHOT_CLEAR_REASON_SUCCESS,
+	PROCHOT_CLEAR_REASON_NOT_POWER,
+	PROCHOT_CLEAR_REASON_FORCE,
+};
 
 /* Update PL for thermal table pmf sheet : slider default */
 static void update_os_power_slider(int mode, bool with_dc, int active_mpower)
@@ -889,13 +896,34 @@ static void update_safety_power_limit(int active_mpower)
 	}
 }
 
-void clear_prochot(void)
+void update_pmf_events(uint8_t pd_event, int enable)
 {
-	bool wait_pmf_update = !!(get_pd_progress_flags() & BIT(PD_PROGRESS_DISCONNECTED));
+	static uint8_t pre_events;
+
+	/* We should not need to assert the prochot before apu ready to update pmf */
+	if (!get_apu_ready())
+		return;
+
+	if (enable)
+		events |= pd_event;
+	else
+		events &= ~pd_event;
+
+	if (pre_events != events) {
+		if (events)
+			throttle_ap(THROTTLE_ON, THROTTLE_HARD, THROTTLE_SRC_UPDATE_PMF);
+		else
+			throttle_ap(THROTTLE_OFF, THROTTLE_HARD, THROTTLE_SRC_UPDATE_PMF);
+
+		pre_events = events;
+	}
+}
 
-	if (wait_pmf_update) {
-		throttle_ap(THROTTLE_OFF, THROTTLE_HARD, THROTTLE_SRC_UPDATE_PMF);
-		update_pd_progress_flags(PD_PROGRESS_DISCONNECTED, 1);
+void clear_prochot(enum clear_reasons reason)
+{
+	if (events) {
+		CPRINTS("release pmf prochot reason:%d", reason);
+		update_pmf_events(events, 0);
 	}
 }
 
@@ -911,14 +939,15 @@ void update_soc_power_limit(bool force_update, bool force_no_adapter)
 	static int old_stt_table;
 	int mode = *host_get_memmap(EC_MEMMAP_POWER_SLIDE);
 	int active_mpower = cypd_get_ac_power();
-	bool with_dc = ((battery_is_present() == BP_YES) ? true : false);
+	bool with_dc = (((battery_is_present() == BP_YES) &&
+			!battery_cutoff_in_progress() && !battery_is_cut_off()) ? true : false);
 	int battery_percent = get_system_percentage() / 10;
 
 	if ((*host_get_memmap(EC_MEMMAP_STT_TABLE_NUMBER)) == 0)
 		old_stt_table = 0;
 
 	if (!chipset_in_state(CHIPSET_STATE_ON) || !get_apu_ready()) {
-		clear_prochot();
+		clear_prochot(PROCHOT_CLEAR_REASON_NOT_POWER);
 		return;
 	}
 
@@ -978,26 +1007,31 @@ void update_soc_power_limit(bool force_update, bool force_no_adapter)
 		|| power_limit[target_func[TYPE_P3T]].mwatt[TYPE_P3T] != old_p3t_limit
 		|| (power_limit[target_func[TYPE_APU_ONLY_SPPT]].mwatt[TYPE_APU_ONLY_SPPT]
 			!= old_ao_sppt)
-		|| set_pl_limit || force_update) {
+		|| set_pl_limit || force_update || events) {
 		/* only set PL when it is changed */
 		old_sustain_power_limit = power_limit[target_func[TYPE_SPL]].mwatt[TYPE_SPL];
 		old_slow_ppt_limit = power_limit[target_func[TYPE_SPPT]].mwatt[TYPE_SPPT];
 		old_fast_ppt_limit = power_limit[target_func[TYPE_FPPT]].mwatt[TYPE_FPPT];
 		old_p3t_limit = power_limit[target_func[TYPE_P3T]].mwatt[TYPE_P3T];
 
-		CPRINTF("Change SOC Power Limit: SPL %dmW, sPPT %dmW, fPPT %dmW, p3T %dmW, ",
-			old_sustain_power_limit, old_slow_ppt_limit,
-			old_fast_ppt_limit, old_p3t_limit);
 		set_pl_limit = set_pl_limits(old_sustain_power_limit, old_fast_ppt_limit,
 			old_slow_ppt_limit, old_p3t_limit);
-		old_ao_sppt =
+
+		if (!set_pl_limit) {
+			old_ao_sppt =
 			power_limit[target_func[TYPE_APU_ONLY_SPPT]].mwatt[TYPE_APU_ONLY_SPPT];
-		CPRINTF("ao_sppt %dmW\n", old_ao_sppt);
-		if (!set_pl_limit)
 			set_pl_limit = update_apu_only_sppt_limit(old_ao_sppt);
-	}
+		}
 
-	clear_prochot();
+		if (!set_pl_limit) {
+			/* Update PMF success, print the setting and de-asssert the prochot */
+			CPRINTS("PMF: SPL %dmW, sPPT %dmW, fPPT %dmW, p3T %dmW, ao_sppt %dmW",
+			old_sustain_power_limit, old_slow_ppt_limit,
+			old_fast_ppt_limit, old_p3t_limit, old_ao_sppt);
+
+			clear_prochot(PROCHOT_CLEAR_REASON_SUCCESS);
+		}
+	}
 }
 
 static void initial_soc_power_limit(void)

zephyr/program/lotus/lotus/src/power_sequence.c

@@ -347,9 +347,8 @@ static int chipset_prepare_S3(uint8_t enable)
 		peripheral_power_suspend();
 		/* only exit epr when battery connect */
 		if (battery_get_disconnect_state() == BATTERY_NOT_DISCONNECTED)
-			force_disable_epr_mode();
+			exit_epr_mode();
 	} else {
-		release_disable_epr_mode();
 		k_msleep(10);
 		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_susp_l), 1);
 		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_0p75vs_pwr_en), 1);
@@ -577,8 +576,11 @@ enum power_state power_handle_state(enum power_state state)
 			return POWER_S0ixS3;
 		}
 
-		if (check_s0ix_statsus() == CS_EXIT_S0ix)
+		if (check_s0ix_statsus() == CS_EXIT_S0ix) {
+			/* We should enter EPR mode when the system actually resume to S0 state */
+			enter_epr_mode();
 			return POWER_S0ixS0;
+		}
 
 		break;