diff options
author | Aseda Aboagye <aaboagye@google.com> | 2017-08-10 13:12:30 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2017-08-11 20:10:20 -0700 |
commit | 79ae73477c1d6a84ce9c64eb82a183a163aa3646 (patch) | |
tree | 6afeec8aa404c0750d079a326712fc3ab39fd4aa /common/usb_pd_policy.c | |
parent | 97fe22e8d559449cbd9df5cc2065f5ab5941830e (diff) | |
download | chrome-ec-79ae73477c1d6a84ce9c64eb82a183a163aa3646.tar.gz |
charge_manager: Consider port in source PDO.
When CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT is defined for a board, as
its name implies, the board can source a higher current if there is
only one port acting as a source.
This commit fixes an issue with selecting the right source capability
message to advertise. charge_manager_get_source_pdo() was simply
checking if there was more than one sink connected, instead of checking
if there were any *other* sinks connected. In the event that a sink
was connected to a different port, we would advertise the max source
PDO.
BUG=b:64037926, b:35577509
BRANCH=gru,eve,reef
TEST=Connect sink to port 1. Connect a AMA to port 0 that claims that
VBUS isn't necessary. Start sending source caps, verify that the max
PDO is not being advertised in the source caps.
Change-Id: Ie4145ecaf98d5b9070ad3e8b139e5653685fa801
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/610479
Commit-Ready: Aseda Aboagye <aaboagye@chromium.org>
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'common/usb_pd_policy.c')
-rw-r--r-- | common/usb_pd_policy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c index 62f9ecbfa5..cf58e7ff07 100644 --- a/common/usb_pd_policy.c +++ b/common/usb_pd_policy.c @@ -33,7 +33,7 @@ static int rw_flash_changed = 1; -int pd_check_requested_voltage(uint32_t rdo) +int pd_check_requested_voltage(uint32_t rdo, const int port) { int max_ma = rdo & 0x3FF; int op_ma = (rdo >> 10) & 0x3FF; @@ -43,7 +43,7 @@ int pd_check_requested_voltage(uint32_t rdo) #if defined(CONFIG_USB_PD_DYNAMIC_SRC_CAP) || \ defined(CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT) const uint32_t *src_pdo; - const int pdo_cnt = charge_manager_get_source_pdo(&src_pdo); + const int pdo_cnt = charge_manager_get_source_pdo(&src_pdo, port); #else const uint32_t *src_pdo = pd_src_pdo; const int pdo_cnt = pd_src_pdo_cnt; |