diff options
| author | Aseda Aboagye <aaboagye@google.com> | 2018-03-22 20:07:39 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-04-10 19:13:32 -0700 |
| commit | 46ca9738f23d91148519fdaf31e8791be49855e3 (patch) | |
| tree | 44c57af9f4710e84ef6735888386b4582cf2719f /common/system.c | |
| parent | dccaf9d9fce04a1e2fd1eb51fb85627ef2976146 (diff) | |
| download | chrome-ec-46ca9738f23d91148519fdaf31e8791be49855e3.tar.gz | |
chgstv2: Check charger power in prevent_power_on.
charge_prevent_power_on() had sections which were gated on the following
CONFIG_* option:
CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT
However, the block of code that this gated didn't even take the battery
percentage into account and made it very confusing as to why.
This commit simply changes the CONFIG_* option used to gate to be the
following:
CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON
This better reflects the checks that were actually being made.
Additionally, this CONFIG_* option is defined by default for boards that
have a chipset task and is initialized to 15W, which is the power that
indicates that the charger is likely to speak USB PD.
BUG=b:76174140
BRANCH=None
TEST=make -j buildall
Change-Id: Ic9158dd7109ce6082c6d00157ff266842363b295
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/977431
Commit-Ready: Aseda Aboagye <aaboagye@chromium.org>
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Edward Hill <ecgh@chromium.org>
Diffstat (limited to 'common/system.c')
| -rw-r--r-- | common/system.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/common/system.c b/common/system.c index 48c26776b9..1699b5b3fa 100644 --- a/common/system.c +++ b/common/system.c @@ -1491,13 +1491,16 @@ int system_can_boot_ap(void) power_good = 1; #endif -#ifdef CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW +#ifdef CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON +#ifdef CONFIG_CHARGE_MANAGER if (!power_good) { pow = charge_manager_get_power_limit_uw() / 1000; - if (pow >= CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW) + if (pow >= CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON) power_good = 1; } -#endif +#endif /* CONFIG_CHARGE_MANAGER */ +#endif /* CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON */ + if (!power_good) CPRINTS("Not enough power to boot: chg=%d pwr=%d", soc, pow); |