diff options
| author | Keith Short <keithshort@chromium.org> | 2020-10-02 09:27:18 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-10-03 01:14:38 +0000 |
| commit | f232f68a057815fae13c55c86e46d252e820f8d8 (patch) | |
| tree | 58be361fcf151ba9eb00c800b7ffc1ef0f4ed306 | |
| parent | 54a10bd3295c065c146931a51284252da606f945 (diff) | |
| download | chrome-ec-f232f68a057815fae13c55c86e46d252e820f8d8.tar.gz | |
Revert "TCPMv2: Correct setting mux state on updating partner's USB comm"
This reverts commit c370d201003e44f1a4a6a483903bbbe065664ee1.
Reason for revert: The original change causes bugs b:169346513 and
b:169935734
Original change's description:
> TCPMv2: Correct setting mux state on updating partner's USB comm
>
> When the USB communication capabilities are enabled and if the port
> receives partner's USB communication capability again after entering
> an alternate mode, mux doesn't need to be updated. Hence, only the
> mux with port partner's USB communication capability if it is in
> disconnect state
>
> BUG=b:168453520
> BRANCH=None
> TEST=Able to retain mux's state after entering a mode.
>
> Signed-off-by: Ayushee <ayushee.shah@intel.com>
> Change-Id: I26af254b341c9f0c1cdc4369a50e16f9da329faf
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2407014
> Reviewed-by: Keith Short <keithshort@chromium.org>
BUG=b:169346513, b:169935734
BRANCH=none
TEST=connect servoV4 to Volteer, confirm USB devices shown in kernel
TEST=connect PD charger to port C1, verify charging starts
Change-Id: I11f0d5d2f944047d810a445a1dbcfd2cbe88e223
Signed-off-by: Keith Short <keithshort@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2445452
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
| -rw-r--r-- | common/usbc/usb_tc_drp_acc_trysrc_sm.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c index 45d28687a0..01264bd71f 100644 --- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c +++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c @@ -772,13 +772,10 @@ void tc_partner_usb_comm(int port, int en) TC_CLR_FLAG(port, TC_FLAGS_PARTNER_USB_COMM); /* - * If PE disables the USB communication capability, update the mux - * accordingly while, if the PE enables the USB communication - * capability, update the mux only if it is in disconnect state + * Update the mux setting according to the port partner's + * USB communication capability. */ - if (!en || (IS_ENABLED(CONFIG_USBC_SS_MUX) && - usb_mux_get(port) == USB_PD_MUX_NONE)) - set_usb_mux_with_current_data_role(port); + set_usb_mux_with_current_data_role(port); } void tc_partner_dr_data(int port, int en) |