diff options
| author | Edward Hill <ecgh@chromium.org> | 2018-06-04 11:11:47 -0600 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-09-20 23:08:36 +0000 |
| commit | b0023bd4386a0c0a81792421df2ebe2848911560 (patch) | |
| tree | 141ec9873156a8f532ee7e3fa7fe84eb2627c533 | |
| parent | d8de510aa7bdfb7c43621c7d48b7ca3ab372e3c7 (diff) | |
| download | chrome-ec-b0023bd4386a0c0a81792421df2ebe2848911560.tar.gz | |
usb_charger: Always update VBUS charge supplier
usb_charger_init() did not call charge_manager_update_charge() if we are
sourcing VBUS. This means we can get stuck with charge_manager_is_seeded()
never returning true, and so charging never starts, and power-on is
prevented.
Change update_vbus_supplier() so it always calls
charge_manager_update_charge(), but with current = 0 when we are sourcing
VBUS.
BUG=b:80203727
BRANCH=none
TEST=Reboot Grunt EC while one USB-C port is VBUS source.
Change-Id: I24c29dc6b9ad9c50254181614a6440d2d055cd5a
Signed-off-by: Edward Hill <ecgh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1086113
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1236846
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | common/usb_charger.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/common/usb_charger.c b/common/usb_charger.c index 3e7d52f646..d9d4e50fe7 100644 --- a/common/usb_charger.c +++ b/common/usb_charger.c @@ -26,17 +26,14 @@ static void update_vbus_supplier(int port, int vbus_level) { struct charge_port_info charge; - /* - * If VBUS is low, or VBUS is high and we are not outputting VBUS - * ourselves, then update the VBUS supplier. - */ - if (!vbus_level || !usb_charger_port_is_sourcing_vbus(port)) { - charge.voltage = USB_CHARGER_VOLTAGE_MV; - charge.current = vbus_level ? USB_CHARGER_MIN_CURR_MA : 0; - charge_manager_update_charge(CHARGE_SUPPLIER_VBUS, - port, - &charge); - } + charge.voltage = USB_CHARGER_VOLTAGE_MV; + + if (vbus_level && !usb_charger_port_is_sourcing_vbus(port)) + charge.current = USB_CHARGER_MIN_CURR_MA; + else + charge.current = 0; + + charge_manager_update_charge(CHARGE_SUPPLIER_VBUS, port, &charge); } #ifndef CONFIG_USBC_PPC |