Add some debug output around change control mode changes.

Disable CHARGE_CONTROL_DISCHARGE so that we do not discharge if the battery soc > upper.

Signed-off-by: James Courtier-Dutton <james@superbug.co.uk>

Author: James Courtier-Dutton

common/charge_state.c

@@ -231,12 +231,15 @@ int battery_sustainer_set(int8_t lower, int8_t upper)
 	return EC_ERROR_INVAL;
 }
 
+#if 0   // Not used any more
 static void battery_sustainer_disable(void)
 {
 	battery_sustainer_set(-1, -1);
 }
+#endif
 
-test_export_static bool battery_sustainer_enabled(void)
+//test_export_static bool battery_sustainer_enabled(void)
+bool battery_sustainer_enabled(void)
 {
 	return sustain_soc.lower != -1 && sustain_soc.upper != -1;
 }
@@ -594,6 +597,9 @@ int set_chg_ctrl_mode(enum ec_charge_control_mode mode)
 	int current, voltage;
 	int rv;
 
+	CPRINTS("%s: Trying to switch control mode from %s to %s", __func__,
+		mode_text[local_state.chg_ctl_mode],
+		mode_text[mode]);
 	current = local_state.manual_current;
 	voltage = local_state.manual_voltage;
 
@@ -620,8 +626,10 @@ int set_chg_ctrl_mode(enum ec_charge_control_mode mode)
 
 	if (IS_ENABLED(CONFIG_CHARGER_DISCHARGE_ON_AC)) {
 		rv = charger_discharge_on_ac(discharge_on_ac);
-		if (rv != EC_SUCCESS)
+		if (rv != EC_SUCCESS) {
+			CPRINTS("%s: Returning due to failure of charger_discharge_on_ac() rv=%d", __func__, rv);
 			return rv;
+		}
 	}
 
 	/* Commit all atomically */
@@ -946,15 +954,16 @@ sustain_switch_mode(enum ec_charge_control_mode mode)
 			 * We come here only if the soc is already above the
 			 * upper limit at the time the sustainer started.
 			 */
-			new_mode = CHARGE_CONTROL_DISCHARGE;
+			//new_mode = CHARGE_CONTROL_DISCHARGE;
+			new_mode = CHARGE_CONTROL_IDLE;
 		} else if (sustain_soc.upper == soc) {
 			/*
 			 * We've been charging and finally reached the upper.
 			 * Let's switch to IDLE to stay.
 			 */
-			if (sustain_soc.flags & EC_CHARGE_CONTROL_FLAG_NO_IDLE)
-				new_mode = CHARGE_CONTROL_DISCHARGE;
-			else
+			//if (sustain_soc.flags & EC_CHARGE_CONTROL_FLAG_NO_IDLE)
+			//	new_mode = CHARGE_CONTROL_DISCHARGE;
+			//else
 				new_mode = CHARGE_CONTROL_IDLE;
 		}
 		break;
@@ -972,7 +981,8 @@ sustain_switch_mode(enum ec_charge_control_mode mode)
 			 * This can happen only if sustainer is restarted with
 			 * decreased upper limit. Let's discharge to the upper.
 			 */
-			new_mode = CHARGE_CONTROL_DISCHARGE;
+			//new_mode = CHARGE_CONTROL_DISCHARGE;
+			new_mode = CHARGE_CONTROL_IDLE;
 		break;
 	case CHARGE_CONTROL_DISCHARGE:
 		/* Discharging actively. */
@@ -1015,9 +1025,10 @@ static void sustain_battery_soc(void)
 		return;
 
 	rv = set_chg_ctrl_mode(new_mode);
-	CPRINTS("%s: %s control mode to %s", __func__,
+	CPRINTS("%s: %s control mode to %s, rv=%d", __func__,
 		rv == EC_SUCCESS ? "Switched" : "Failed to switch",
-		mode_text[new_mode]);
+		mode_text[new_mode],
+		rv);
 }
 
 static void current_limit_battery_soc(void)
@@ -1045,7 +1056,7 @@ void charger_init(void)
 	 */
 	battery_get_params(&curr.batt);
 
-	battery_sustainer_disable();
+	//battery_sustainer_disable();
 }
 DECLARE_HOOK(HOOK_INIT, charger_init, HOOK_PRIO_DEFAULT);
 
@@ -1279,7 +1290,11 @@ static void process_ac_change(const int chgnum)
 			prev_ac = curr.ac;
 	} else {
 		/* Some things are only meaningful on AC */
-		set_chg_ctrl_mode(CHARGE_CONTROL_NORMAL);
+		int rv = set_chg_ctrl_mode(CHARGE_CONTROL_NORMAL);
+		CPRINTS("%s: %s control mode to %s, rv=%d", __func__,
+			rv == EC_SUCCESS ? "Switched" : "Failed to switch",
+			mode_text[CHARGE_CONTROL_NORMAL],
+			rv);
 		battery_seems_dead = 0;
 		prev_ac = curr.ac;
 
@@ -2143,12 +2158,14 @@ charge_command_charge_control(struct host_cmd_handler_args *args)
 
 	if (p->cmd == EC_CHARGE_CONTROL_CMD_SET) {
 		if (p->mode == CHARGE_CONTROL_NORMAL) {
-			rv = battery_sustainer_set(p->sustain_soc.lower,
+			if ((p->sustain_soc.lower != -1) && (p->sustain_soc.upper != -1)) {
+				rv = battery_sustainer_set(p->sustain_soc.lower,
 						   p->sustain_soc.upper);
-			if (rv == EC_RES_UNAVAILABLE)
-				return EC_RES_UNAVAILABLE;
-			if (rv)
-				return EC_RES_INVALID_PARAM;
+				if (rv == EC_RES_UNAVAILABLE)
+					return EC_RES_UNAVAILABLE;
+				if (rv)
+					return EC_RES_INVALID_PARAM;
+			}
 			if (args->version == 2) {
 				/*
 				 * V2 uses lower == upper to indicate NO_IDLE.
@@ -2162,7 +2179,7 @@ charge_command_charge_control(struct host_cmd_handler_args *args)
 				sustain_soc.flags = p->flags;
 			}
 		} else {
-			battery_sustainer_disable();
+			//battery_sustainer_disable();
 		}
 	} else if (p->cmd == EC_CHARGE_CONTROL_CMD_GET) {
 		r->mode = get_chg_ctrl_mode();
@@ -2177,6 +2194,10 @@ charge_command_charge_control(struct host_cmd_handler_args *args)
 	}
 
 	rv = set_chg_ctrl_mode(p->mode);
+	CPRINTS("%s: %s control mode to %s, rv=%d", __func__,
+		rv == EC_SUCCESS ? "Switched" : "Failed to switch",
+		mode_text[p->mode],
+		rv);
 	if (rv != EC_SUCCESS)
 		return EC_RES_ERROR;
 
@@ -2425,6 +2446,10 @@ static int command_chgstate(int argc, const char **argv)
 				return EC_ERROR_PARAM2;
 			rv = set_chg_ctrl_mode(val ? CHARGE_CONTROL_IDLE :
 						     CHARGE_CONTROL_NORMAL);
+			CPRINTS("%s: %s control mode to %s, rv=%d", __func__,
+				rv == EC_SUCCESS ? "Switched" : "Failed to switch",
+				mode_text[val ? CHARGE_CONTROL_IDLE : CHARGE_CONTROL_NORMAL],
+				rv);
 			if (rv)
 				return rv;
 		} else if (!strcasecmp(argv[1], "discharge")) {
@@ -2434,6 +2459,10 @@ static int command_chgstate(int argc, const char **argv)
 				return EC_ERROR_PARAM2;
 			rv = set_chg_ctrl_mode(val ? CHARGE_CONTROL_DISCHARGE :
 						     CHARGE_CONTROL_NORMAL);
+			CPRINTS("%s: %s control mode to %s, rv=%d", __func__,
+				rv == EC_SUCCESS ? "Switched" : "Failed to switch",
+				mode_text[val ? CHARGE_CONTROL_DISCHARGE : CHARGE_CONTROL_NORMAL],
+				rv);
 			if (rv)
 				return rv;
 		} else if (IS_ENABLED(CONFIG_CHARGE_DEBUG) &&

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

@@ -40,6 +40,8 @@ enum clear_reasons {
 	PROCHOT_CLEAR_REASON_FORCE,
 };
 
+extern const char *mode_text[];
+
 /* Update PL for thermal table pmf sheet : slider default */
 static void update_os_power_slider(int mode, bool with_dc, int active_mpower)
 {
@@ -830,10 +832,18 @@ static void update_safety_power_limit(int active_mpower)
 	case LEVEL_STOP_CHARGE:
 		/* stop charging */
 		if (level_increase) {
-			set_chg_ctrl_mode(CHARGE_CONTROL_IDLE);
+			int rv = set_chg_ctrl_mode(CHARGE_CONTROL_IDLE);
+			CPRINTS("%s: %s control mode to %s, rv=%d", __func__,
+				rv == EC_SUCCESS ? "Switched" : "Failed to switch",
+				mode_text[CHARGE_CONTROL_IDLE],
+				rv);
 			safety_level++;
 		} else {
-			set_chg_ctrl_mode(CHARGE_CONTROL_NORMAL);
+			int rv = set_chg_ctrl_mode(CHARGE_CONTROL_NORMAL);
+			CPRINTS("%s: %s control mode to %s, rv=%d", __func__,
+				rv == EC_SUCCESS ? "Switched" : "Failed to switch",
+				mode_text[CHARGE_CONTROL_NORMAL],
+				rv);
 			if (safety_level > 0)
 				safety_level--;
 		}

zephyr/program/framework/src/battery_extender.c

@@ -41,6 +41,8 @@ enum battery_extender_stage_t {
 	BATT_EXTENDER_STAGE_2,
 };
 
+extern const char *mode_text[];
+
 static bool batt_extender_disable;
 static uint64_t battery_extender_trigger = 5*DAY;
 static uint64_t battery_extender_reset = 30*MINUTE;
@@ -77,8 +79,12 @@ int charger_sustainer_percentage(void)
 void charger_sustainer_reset(void)
 {
 	old_charger_limit = 0;
-	battery_sustainer_set(-1, -1);
-	set_chg_ctrl_mode(CHARGE_CONTROL_NORMAL);
+	//battery_sustainer_set(-1, -1);
+	int rv = set_chg_ctrl_mode(CHARGE_CONTROL_NORMAL);
+	CPRINTS("%s: %s control mode to %s, rv=%d", __func__,
+		rv == EC_SUCCESS ? "Switched" : "Failed to switch",
+		mode_text[CHARGE_CONTROL_NORMAL],
+		rv);
 }
 
 static void battery_percentage_control(void)
@@ -99,7 +105,7 @@ static void battery_percentage_control(void)
 	if (old_charger_limit != charging_maximum_level) {
 		old_charger_limit = charging_maximum_level;
 		battery_sustainer_set(MAX(20, (charging_maximum_level - 5)),
-			MAX(20, charging_maximum_level));
+			MAX(25, charging_maximum_level));
 	}
 }