fwk: move battery extender to use common

rewrite our timer based extender functionality to use common battery
extender functionality as upstream.

BRANCH=marigold
BUG=https://app.clickup.com/t/86eq06zen
TEST=When the timer expired the battery SOC will be lowered to 90-95%
for stage 1, and 85-87 for stage 2.
The battery extender will be reset after going off AC for 30 minutes.
toggling enable/disable will reactivate the timers

-get the charge state and battery extender setting
chgstate

battextender

- set the deadline timer values sometime in the future.
battextender timeext 15 s
battextender timeext2 20 s

battextender timerst 20 s

- set the reload values for trigger and reset
battextender trigger 60 s
battextender reset  30 s

battextender enable
battextender disable

Signed-off-by: Kieran Levin <[email protected]>

Author: kiram9

common/charge_state.c

@@ -207,12 +207,19 @@ void reset_prev_disp_charge(void)
 	prev_disp_charge = -1;
 }
 
-static int battery_sustainer_set(int8_t lower, int8_t upper)
+static bool battery_sustainer_enabled(void)
+{
+	return sustain_soc.lower != -1 && sustain_soc.upper != -1;
+}
+
+int battery_sustainer_set(int8_t lower, int8_t upper)
 {
 	if (lower == -1 || upper == -1) {
-		CPRINTS("Sustainer disabled");
-		sustain_soc.lower = -1;
-		sustain_soc.upper = -1;
+		if (battery_sustainer_enabled()) {
+			CPRINTS("Sustainer disabled");
+			sustain_soc.lower = -1;
+			sustain_soc.upper = -1;
+		}
 		return EC_SUCCESS;
 	}
 
@@ -235,14 +242,9 @@ static void battery_sustainer_disable(void)
 	battery_sustainer_set(-1, -1);
 }
 
-static bool battery_sustainer_enabled(void)
-{
-	return sustain_soc.lower != -1 && sustain_soc.upper != -1;
-}
-
 static const char *const state_list[] = { "idle", "discharge", "charge",
 					  "precharge" };
-BUILD_ASSERT(ARRAY_SIZE(state_list) == NUM_STATES_V2);
+BUILD_ASSERT(ARRAY_SIZE(state_list) == CHARGE_STATE_COUNT);
 static const char *const batt_pres[] = {
 	"NO",
 	"YES",
@@ -479,12 +481,6 @@ int charge_request(bool use_curr, bool is_full)
 #endif
 	}
 
-#ifdef CONFIG_CUSTOMIZED_DESIGN
-	/* Override the voltage if the battery extender is on */
-	if (battery_extender_stage_voltage(battery_get_info()->voltage_max))
-		voltage = battery_extender_stage_voltage(battery_get_info()->voltage_max);
-#endif
-
 	if (curr.ac) {
 		if (prev_volt != voltage || prev_curr != current)
 			CPRINTS("%s(%dmV, %dmA)", __func__, voltage, current);
@@ -1646,15 +1642,6 @@ void charger_task(void *u)
 
 		prev_full = is_full;
 
-#ifdef CONFIG_CUSTOMIZED_DESIGN
-		/**
-		 * Run the battery extender function to check the timer,
-		 * if the timer expired, will override the voltage in the
-		 * charge_request() function.
-		 */
-		battery_extender();
-#endif
-
 		adjust_requested_vi(info, is_full);
 
 		process_preferred_voltage();

include/charge_state.h

@@ -429,23 +429,20 @@ int board_should_charger_bypass(void);
 int board_want_charger_change_mode(void);
 #endif
 
-/* Config Charger */
-#include "charge_state.h"
-
-#ifdef CONFIG_CUSTOMIZED_DESIGN
 /**
- * Callback for boards to return voltage value.
+ * Set the battery sustainer mode.
  *
- * @param voltage	battery maximum voltage
- * @return battery extender stage voltage (stage1: 97% * voltage; stage2: 96% * voltage).
+ * @param lower: lower battery soc charge limit [1-100%] or -1 to disable
+ * @param upper: upper battery soc charge limit [1-100%] or -1 to disable
+ * 
+ * @return EC_SUCCESS or EC_ERROR_INVAL
  */
-int battery_extender_stage_voltage(uint16_t voltage);
+int battery_sustainer_set(int8_t lower, int8_t upper);
 
-/**
- * Callback for boards to count the battery extender timer.
- */
-void battery_extender(void);
+/* Config Charger */
+#include "charge_state.h"
 
+#ifdef CONFIG_CUSTOMIZED_DESIGN
 void battery_customize(struct charge_state_data *curr_batt);
 #endif
 

zephyr/program/framework/include/board_host_command.h

@@ -438,16 +438,19 @@ struct ec_response_get_cutoff_status {
 
 struct ec_params_battery_extender {
 	uint8_t disable;
-	uint8_t days;
-	uint16_t minutes;
+	uint8_t trigger_days;
+	uint16_t reset_minutes;
 	uint8_t cmd;
 	uint8_t manual;
 } __ec_align1;
 
 struct ec_response_battery_extender {
 	uint8_t current_stage;
-	uint16_t days;
-	uint16_t minutes;
+	uint16_t trigger_days;
+	uint16_t reset_minutes;
+	uint8_t disable;
+	uint64_t trigger_timedelta;
+	uint64_t reset_timedelta;
 } __ec_align1;
 
 enum battery_extender_cmd {