coreboot-mirror
/
chrome-ec
mirror of https://review.coreboot.org/chrome-ec.git
1
0
Fork 0
Code Issues Releases Wiki Activity

battery: Remove redundant lfcc variable when calculate compensation 

The value of lfcc variable, which is copied from
host_get_memmap(EC_MEMMAP_BATT_LFCC), is actually the compensated full
capacity. Use the value of *full directly.

BRANCH=None
BUG=b:162604872
TEST=Checked the battery console command result.

Change-Id: Iae103dd325679333c524698ce7a86cdc96a3587e
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2335885
Reviewed-by: Jett Rink <jettrink@chromium.org>
This commit is contained in:
Wai-Hong Tam 2020-08-03 16:12:09 -07:00 committed by Commit Bot
parent b9da49edc4
commit c87d8834ce
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/battery.c
View File

@ -581,7 +581,6 @@ void battery_compensate_params(struct batt_params *batt)
int numer, denom;
int *remain = &(batt->remaining_capacity);
int *full = &(batt->full_capacity);
int lfcc = *(int *)host_get_memmap(EC_MEMMAP_BATT_LFCC);
if ((batt->flags & BATT_FLAG_BAD_FULL_CAPACITY) ||
(batt->flags & BATT_FLAG_BAD_REMAINING_CAPACITY))
@ -597,19 +596,16 @@ void battery_compensate_params(struct batt_params *batt)
/* full_factor is effectively disabled in powerd. */
*full = *full * batt_full_factor / 100;
if (lfcc == 0)
/* EC just reset. Assume host full is equal. */
lfcc = *full;
if (*remain > lfcc)
*remain = lfcc;
if (*remain > *full)
*remain = *full;
/*
* Powerd uses the following equation to calculate display percentage:
* charge = 100 * remain/full;
* 100 * (charge - shutdown_pct) / (full_factor - shutdown_pct);
*/
numer = (100 * *remain - lfcc * batt_host_shutdown_pct) * 1000;
denom = lfcc * (100 - batt_host_shutdown_pct);
numer = (100 * *remain - *full * batt_host_shutdown_pct) * 1000;
denom = *full * (100 - batt_host_shutdown_pct);
/* Rounding (instead of truncating) */
batt->display_charge = (numer + denom / 2) / denom;
if (batt->display_charge < 0)