diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2023-01-04 12:51:08 -0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-01-10 00:09:58 +0000 |
| commit | 9e73d7d01bccf2cf87e01abb1dd1a4f216c569e4 (patch) | |
| tree | e8d129a68be032a2e2cae1888a6f5cf87d8662bc /driver | |
| parent | 4867369fd37e5c8822748876afd443c1e45935d9 (diff) | |
| download | chrome-ec-9e73d7d01bccf2cf87e01abb1dd1a4f216c569e4.tar.gz | |
SBS: Make battery_get_params clear flags selectively
Currently, battery_get_params clear all flags in batt.flags. This patch
makes the function clear only the flags which are explicitly set or
unset by battery_get_params. With this change, the charger task can add
a flag to batt.flags.
There isn't yet functionality change by this patch.
BUG=b:263921114
BRANCH=None
TEST=run-battery_get_params_smart run-sbs_charging_v2
TEST=./twister -i --toolchain host -s \
external/platform/ec/zephyr/test/drivers/drivers.default
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Change-Id: I5708ab6de81bc0a7c28961b13960fd89460b2e1c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4136966
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Bob Moragues <moragues@chromium.org>
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/battery/smart.c | 52 |
1 files changed, 31 insertions, 21 deletions
diff --git a/driver/battery/smart.c b/driver/battery/smart.c index 539580d201..aac76ace74 100644 --- a/driver/battery/smart.c +++ b/driver/battery/smart.c @@ -451,6 +451,34 @@ static void apply_fake_state_of_charge(struct batt_params *batt) batt->flags &= ~BATT_FLAG_BAD_REMAINING_CAPACITY; } +static bool battery_want_charge(struct batt_params *batt) +{ + if (batt->flags & + (BATT_FLAG_BAD_DESIRED_VOLTAGE | BATT_FLAG_BAD_DESIRED_CURRENT | + BATT_FLAG_BAD_STATE_OF_CHARGE)) + return false; + + /* + * Charging allowed if both desired voltage and current are nonzero + * and battery isn't full (and we read them all correctly). + */ + if (batt->desired_voltage && batt->desired_current && + batt->state_of_charge < BATTERY_LEVEL_FULL) + return true; + + /* + * TODO (crosbug.com/p/29467): remove this workaround for dead battery + * that requests no voltage/current + */ + if (IS_ENABLED(CONFIG_BATTERY_REQUESTS_NIL_WHEN_DEAD)) { + if (batt->desired_voltage == 0 && batt->desired_current == 0 && + batt->state_of_charge == 0) + return true; + } + + return false; +} + void battery_get_params(struct batt_params *batt) { struct batt_params batt_new; @@ -462,7 +490,7 @@ void battery_get_params(struct batt_params *batt) * will be preserved. */ memcpy(&batt_new, batt, sizeof(*batt)); - batt_new.flags = 0; + batt_new.flags &= ~BATT_FLAG_VOLATILE; if (sb_read(SB_TEMPERATURE, &batt_new.temperature) && fake_temperature < 0) @@ -487,6 +515,7 @@ void battery_get_params(struct batt_params *batt) if (sb_read(SB_AVERAGE_CURRENT, &v)) batt_new.flags |= BATT_FLAG_BAD_AVERAGE_CURRENT; + if (sb_read(SB_CHARGING_VOLTAGE, &batt_new.desired_voltage)) batt_new.flags |= BATT_FLAG_BAD_DESIRED_VOLTAGE; @@ -523,26 +552,7 @@ void battery_get_params(struct batt_params *batt) batt_new.is_present = BP_NOT_SURE; #endif - /* - * Charging allowed if both desired voltage and current are nonzero - * and battery isn't full (and we read them all correctly). - */ - if (!(batt_new.flags & - (BATT_FLAG_BAD_DESIRED_VOLTAGE | BATT_FLAG_BAD_DESIRED_CURRENT | - BATT_FLAG_BAD_STATE_OF_CHARGE)) && -#ifdef CONFIG_BATTERY_REQUESTS_NIL_WHEN_DEAD - /* - * TODO (crosbug.com/p/29467): remove this workaround - * for dead battery that requests no voltage/current - */ - ((batt_new.desired_voltage && batt_new.desired_current && - batt_new.state_of_charge < BATTERY_LEVEL_FULL) || - (batt_new.desired_voltage == 0 && batt_new.desired_current == 0 && - batt_new.state_of_charge == 0))) -#else - batt_new.desired_voltage && batt_new.desired_current && - batt_new.state_of_charge < BATTERY_LEVEL_FULL) -#endif + if (battery_want_charge(&batt_new)) batt_new.flags |= BATT_FLAG_WANT_CHARGE; else /* Force both to zero */ |