tree 120cc506f01eeeff4b77ade79c4e8b9c8e7d9580
parent e56b09065080a7742da7203d0667c935e13bffe5
author Nicholas Bishop <nicholasbishop@google.com> 1641494857 -0500
committer Commit Bot <commit-bot@chromium.org> 1642113565 +0000

power: fix USB power supply type on newer kernels

When initializing a PowerStatus::Port from sysfs, use both the type and
usb_type files to determine the power supply type.

Some drivers in newer kernels (4.19+) report a static type of USB, and
separately report all supported connection types in usb_type, with the
active value in brackets.

Powerd was already partially updated to handle this new file in
crrev.com/c/1684359, but only for dual-role ports. Rework this fix so
that port.type takes both the type and usb_type files into account. To
maintain compatibility across kernel versions, "USB_" is prefixed to the
usb_type when appropriate.

Added a new unit test for usb_type that partially borrows from the
DualRolePowerSources test. Removed one of the values from
kInvalidUsbTypeValues that isn't actually invalid.

BUG=b:204295196
TEST=cros_workon_make --test --install power_manager
TEST=Deploy to a Lenovo X1 Gen8 (reven board) and connect a high-power USB-C adapter.
TEST=In the settings, check that the power source shows as an AC adapter.

Change-Id: I1d507de6aa3cc8c1f9ab62e5373d30a02311faa9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/3370303
Tested-by: Nicholas Bishop <nicholasbishop@google.com>
Reviewed-by: Prashant Malani <pmalani@chromium.org>
Reviewed-by: Mengqi Guo <mqg@chromium.org>
Reviewed-by: Benson Leung <bleung@google.com>
Commit-Queue: Nicholas Bishop <nicholasbishop@google.com>