diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2014-12-23 09:45:16 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-12-24 21:06:16 +0000 |
| commit | 73bbc9eda8bbdfa190e3fdde16a852dd2755276c (patch) | |
| tree | 6d3c853f97bf40510180272bdb378bf57bf38b05 /test/charge_manager.c | |
| parent | b9b457173ea7f194c13a2d025496c3c49cf05792 (diff) | |
| download | chrome-ec-73bbc9eda8bbdfa190e3fdde16a852dd2755276c.tar.gz | |
charge_manager: Request power swap when switching from dual-role override port
Ports should have source roles by default, and should go back to being
sources once we stop charging from them.
BUG=chrome-os-partner:31195
TEST=Manual on Samus. Connect Samus to dual-role port. Set override
port, verify that Samus charges. Attach dedicated charger, verify that
the dual-role port becomes a charge source again. Also pass unit tests.
BRANCH=Samus
Change-Id: Icf153117229cbf0f71d4bdeb888f73299acd5eeb
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/237452
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Diffstat (limited to 'test/charge_manager.c')
| -rw-r--r-- | test/charge_manager.c | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/test/charge_manager.c b/test/charge_manager.c index fc184bebea..db81105ff6 100644 --- a/test/charge_manager.c +++ b/test/charge_manager.c @@ -399,15 +399,16 @@ static int test_override(void) charge.current = 200; charge_manager_update(CHARGE_SUPPLIER_TEST1, 0, &charge); wait_for_charge_manager_refresh(); - TEST_ASSERT(pd_get_role(0) == PD_ROLE_SINK); TEST_ASSERT(active_charge_port == 0); TEST_ASSERT(active_charge_limit == 200); + TEST_ASSERT(pd_get_role(0) == PD_ROLE_SINK); /* Set override to "don't charge", then verify we're not charging */ charge_manager_set_override(OVERRIDE_DONT_CHARGE); wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == CHARGE_PORT_NONE); TEST_ASSERT(active_charge_limit == 0); + TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); /* Update a charge supplier, verify that we still aren't charging */ charge.current = 200; @@ -415,12 +416,14 @@ static int test_override(void) wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == CHARGE_PORT_NONE); TEST_ASSERT(active_charge_limit == 0); + TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); /* Turn override off, verify that we go back to the correct charge */ charge_manager_set_override(OVERRIDE_OFF); wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == 1); TEST_ASSERT(active_charge_limit == 500); + TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); return EC_SUCCESS; } @@ -449,25 +452,59 @@ static int test_dual_role(void) wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == 0); TEST_ASSERT(active_charge_limit == 500); + TEST_ASSERT(pd_get_role(0) == PD_ROLE_SINK); /* Remove override and verify we go back to not charging */ charge_manager_set_override(OVERRIDE_OFF); wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == CHARGE_PORT_NONE); TEST_ASSERT(active_charge_limit == 0); + TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); /* Mark P0 as the override port, verify that we again charge. */ charge_manager_set_override(0); + charge.current = 550; + charge_manager_update(CHARGE_SUPPLIER_TEST2, 0, &charge); wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == 0); + TEST_ASSERT(active_charge_limit == 550); + TEST_ASSERT(pd_get_role(0) == PD_ROLE_SINK); + + /* + * Insert a dual-role charger into P1 and set the override. Verify + * that the override correctly changes. + */ + set_charger_role(1, DUAL_ROLE_CHARGER); + charge_manager_set_override(1); + charge.current = 500; + charge_manager_update(CHARGE_SUPPLIER_TEST6, 1, &charge); + wait_for_charge_manager_refresh(); + TEST_ASSERT(active_charge_port == 1); TEST_ASSERT(active_charge_limit == 500); + TEST_ASSERT(pd_get_role(1) == PD_ROLE_SINK); + TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); + + /* Set override back to P0 and verify switch */ + charge_manager_set_override(0); + charge.current = 600; + charge_manager_update(CHARGE_SUPPLIER_TEST2, 0, &charge); + wait_for_charge_manager_refresh(); + TEST_ASSERT(active_charge_port == 0); + TEST_ASSERT(active_charge_limit == 600); + TEST_ASSERT(pd_get_role(0) == PD_ROLE_SINK); + TEST_ASSERT(pd_get_role(1) == PD_ROLE_SOURCE); /* Insert a dedicated charger and verify override is removed */ + charge.current = 0; + charge_manager_update(CHARGE_SUPPLIER_TEST6, 1, &charge); + wait_for_charge_manager_refresh(); + set_charger_role(1, DEDICATED_CHARGER); charge.current = 400; charge_manager_update(CHARGE_SUPPLIER_TEST6, 1, &charge); wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == 1); TEST_ASSERT(active_charge_limit == 400); + TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); /* * Verify the port is handled normally if the dual-role source is @@ -496,6 +533,7 @@ static int test_dual_role(void) wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == 1); TEST_ASSERT(active_charge_limit == 200); + TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); return EC_SUCCESS; } |