diff options
| author | Scott Chao <scott_chao@wistron.corp-partner.google.com> | 2022-09-21 13:26:20 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-10-07 16:46:25 +0000 |
| commit | c6b3af73ed1ef97d51c2bb2645b4615d663993b5 (patch) | |
| tree | 765fc4a55cddb0187ed1fdb750743238479548fa | |
| parent | 964f3715bd4bf3a3437151beeb376f529ead8dea (diff) | |
| download | chrome-ec-c6b3af73ed1ef97d51c2bb2645b4615d663993b5.tar.gz | |
TCPMv2: modify default rp value when bist share mode
Modify default rp value when bist share mode in order to pass the
TDA.2.3.1.1.
BUG=b:242957100
BRANCH=none
TEST=Pass TDA.2.3.1.1
TEST=make host-coverage-usb_typec_drp_acc_trysrc
TEST=make test-coverage
Change-Id: I873c9a2bb135e69c24df7891215c84c0603e6d73
Signed-off-by: Scott Chao <scott_chao@wistron.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3906517
Reviewed-by: Diana Z <dzigterman@chromium.org>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
| -rw-r--r-- | common/usbc/usb_tc_drp_acc_trysrc_sm.c | 7 | ||||
| -rw-r--r-- | test/usb_typec_drp_acc_trysrc.c | 5 | ||||
| -rw-r--r-- | zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c index e68b0139db..ae84574b40 100644 --- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c +++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c @@ -1284,7 +1284,12 @@ void typec_select_src_current_limit_rp(int port, enum tcpc_rp_value rp) } __overridable int typec_get_default_current_limit_rp(int port) { - return CONFIG_USB_PD_PULLUP; + int rp = CONFIG_USB_PD_PULLUP; + + if (pd_get_bist_share_mode()) + rp = TYPEC_RP_3A0; + + return rp; } void typec_select_src_collision_rp(int port, enum tcpc_rp_value rp) { diff --git a/test/usb_typec_drp_acc_trysrc.c b/test/usb_typec_drp_acc_trysrc.c index 28da84e228..637db36d80 100644 --- a/test/usb_typec_drp_acc_trysrc.c +++ b/test/usb_typec_drp_acc_trysrc.c @@ -41,6 +41,11 @@ const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { }, } }; +uint8_t pd_get_bist_share_mode(void) +{ + return 0; +} + void charge_manager_set_ceil(int port, enum ceil_requestor requestor, int ceil) { /* Do Nothing, but needed for linking */ diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c index bf51c9814d..47e26f97d6 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c @@ -214,6 +214,8 @@ ZTEST_F(usb_pd_bist_shared, verify_control_bist_shared_mode) zassert_equal(PDO_FIXED_VOLTAGE(f5v_cap), 5000, "PDO voltage wrong"); zassert_equal(PDO_FIXED_CURRENT(f5v_cap), 3000, "PDO initial current wrong"); + zassert_equal(typec_get_default_current_limit_rp(USBC_PORT_C0), + TYPEC_RP_3A0, "Default rp not 3A"); host_cmd_typec_control_bist_share_mode(USBC_PORT_C0, 0); } |