diff options
| author | Andrew McRae <amcrae@google.com> | 2020-06-16 09:00:16 +1000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-16 02:39:31 +0000 |
| commit | 08a39ff9dbb8a1e6417ed3b55eb35cc9850d5057 (patch) | |
| tree | 1c43a3a3938b02924ff2dae7dccf635b338818c0 | |
| parent | 6af17f0cd227d96c9d74af87724d80b76995c35c (diff) | |
| download | chrome-ec-08a39ff9dbb8a1e6417ed3b55eb35cc9850d5057.tar.gz | |
TCPMv2: Fix the sending of CMD_EXIT_MODE
Fix the request to send CMD_EXIT_MODE, which needs to
set the right state in order for the message to be sent.
Also handle the receipt of an ACK for CMD_EXIT_MODE.
BUG=b:158813138
TEST=Confirm that DP mode is exited.
BRANCH=none
Signed-off-by: Andrew McRae <amcrae@google.com>
Change-Id: Id9b58616771e729d8ae6543f973669be7649dc45
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2245584
Reviewed-by: Andrew McRae <amcrae@chromium.org>
Tested-by: Andrew McRae <amcrae@chromium.org>
Commit-Queue: Andrew McRae <amcrae@chromium.org>
| -rw-r--r-- | common/usbc/dp_alt_mode.c | 8 | ||||
| -rw-r--r-- | common/usbc/usb_pe_drp_sm.c | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/common/usbc/dp_alt_mode.c b/common/usbc/dp_alt_mode.c index ff8909bbd6..f8ccc5f3c8 100644 --- a/common/usbc/dp_alt_mode.c +++ b/common/usbc/dp_alt_mode.c @@ -61,6 +61,14 @@ void dp_vdm_acked(int port, enum tcpm_transmit_type type, int vdo_count, pd_get_amode_data(port, type, USB_SID_DISPLAYPORT); const uint8_t vdm_cmd = PD_VDO_CMD(vdm[0]); + /* + * Handle the ACK of a request to exit alt mode. + */ + if (type == TCPC_TX_SOP && vdm_cmd == CMD_EXIT_MODE) { + dpm_init(port); + return; + } + if (type != TCPC_TX_SOP || next_vdm_cmd[port] != vdm_cmd) { print_unexpected_response(port, type, CMDT_RSP_ACK, vdm_cmd); dpm_set_mode_entry_done(port); diff --git a/common/usbc/usb_pe_drp_sm.c b/common/usbc/usb_pe_drp_sm.c index dadcfe02af..45e2ed4206 100644 --- a/common/usbc/usb_pe_drp_sm.c +++ b/common/usbc/usb_pe_drp_sm.c @@ -1152,7 +1152,9 @@ static bool common_src_snk_dpm_requests(int port) /* * Init VDM CMD_EXIT_MODE message. * alt_opos must be set with the opos to be sent. + * TODO: Convert this to use DPM_REQUEST_VDM. */ + pe[port].tx_type = TCPC_TX_SOP; pe[port].vdm_data[0] = VDO( USB_SID_DISPLAYPORT, 1, /* structured */ @@ -1162,6 +1164,8 @@ static bool common_src_snk_dpm_requests(int port) VDO_CMDT(CMDT_INIT) | CMD_EXIT_MODE); pe[port].vdm_cnt = 1; + set_state_pe(port, PE_VDM_REQUEST); + return true; } else if (PE_CHK_DPM_REQUEST(port, DPM_REQUEST_VDM)) { PE_CLR_DPM_REQUEST(port, DPM_REQUEST_VDM); @@ -4911,7 +4915,7 @@ static void pe_vdm_response_entry(int port) rx_payload[0] &= ~VDO_CMDT_MASK; if (cmd_type != CMDT_INIT) { - CPRINTF("ERR:CMDT:%d\n", vdo_cmd); + CPRINTF("ERR:CMDT:%d:%d\n", cmd_type, vdo_cmd); if (pe[port].power_role == PD_ROLE_SOURCE) set_state_pe(port, PE_SRC_READY); |