diff options
| author | Aseda Aboagye <aaboagye@google.com> | 2021-11-18 16:17:51 -0600 |
|---|---|---|
| committer | Aseda Aboagye <aaboagye@google.com> | 2021-11-18 16:17:51 -0600 |
| commit | c5bd23a4b204565dab616f7fa4ee8a0b7b433d4c (patch) | |
| tree | e0c957fe0bc99144057c50b2bff004a1c9a1fe45 /driver/usb_mux/virtual.c | |
| parent | eff51ca60572c33a4abf9390798de8e684d1469c (diff) | |
| parent | 904255ef8d8c694fd21addc39ab3648178e5b354 (diff) | |
| download | chrome-ec-c5bd23a4b204565dab616f7fa4ee8a0b7b433d4c.tar.gz | |
Merge remote-tracking branch cros/main into firmware-keeby-14119.B-main
Relevant changes:
git log --oneline eff51ca60..904255ef8 -- baseboard/dedede board/cappy2
board/corori board/driblee board/gooey board/haboki board/lalala
board/waddledoo2 common/charge_state_v2.c common/mkbp_* common/ocpc.c
common/usbc/usb_tc_drp_acc_trysrc_sm.c common/usbc/usb_sm.c
common/usbc/*_pd_* common/usbc/dp_alt_mode.c common/usbc/usb_prl_sm.c
common/usbc/usb_pe_drp_sm.c common/usb_charger.c common/usb_common.c
common/usbc_ocp.c driver/charger/sm5803.* driver/charger/isl923x.*
driver/tcpm/raa489000.* driver/tcpm/it83* include/power/icelake.h
include/intel_x86.h power/icelake.c power/intel_x86.c util/getversion.sh
904255ef8 TCPMv2: Ensure modes are exited on hard reset
BRANCH=None
BUG=b:206745483
TEST=`make -j buildall`
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Change-Id: I70eff1ad825526634dc9fd5ed17ae4746b0d9636
Diffstat (limited to 'driver/usb_mux/virtual.c')
| -rw-r--r-- | driver/usb_mux/virtual.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/driver/usb_mux/virtual.c b/driver/usb_mux/virtual.c index dbece4faf9..4388bb485a 100644 --- a/driver/usb_mux/virtual.c +++ b/driver/usb_mux/virtual.c @@ -81,10 +81,17 @@ static int virtual_set_mux(const struct usb_mux *me, mux_state_t mux_state, bool *ack_required) { int port = me->usb_port; + mux_state_t new_mux_state; - /* Current USB & DP mux status + existing HPD related mux status */ - mux_state_t new_mux_state = (mux_state & ~USB_PD_MUX_HPD_STATE) | - (virtual_mux_state[port] & USB_PD_MUX_HPD_STATE); + /* + * Current USB & DP mux status + existing HPD related mux status if DP + * is still active. Otherwise, don't preserve HPD state. + */ + if (mux_state & USB_PD_MUX_DP_ENABLED) + new_mux_state = (mux_state & ~USB_PD_MUX_HPD_STATE) | + (virtual_mux_state[port] & USB_PD_MUX_HPD_STATE); + else + new_mux_state = mux_state; virtual_mux_update_state(port, new_mux_state, ack_required); |