diff options
| author | Abe Levkoy <alevkoy@chromium.org> | 2021-05-21 12:24:41 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-10 19:10:42 +0000 |
| commit | 761451afd00f4936c46ed7c917194d5183be46d2 (patch) | |
| tree | b4fa5377d9787040b24cdf4e6b5e4e496f303054 /common/usbc | |
| parent | d398a53a858d6f946e6a35cd06736033bce19094 (diff) | |
| download | chrome-ec-761451afd00f4936c46ed7c917194d5183be46d2.tar.gz | |
TCPMv2: Separate discovery and mode init
Don't clear discovery data when resetting active modes during mode exit.
BUG=b:141363146
TEST=make buildall
BRANCH=firmware-volteer-13672.B-main
Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Change-Id: I8052641bb850ce8486eb9c82641b41880cb97d65
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3123837
Reviewed-by: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'common/usbc')
| -rw-r--r-- | common/usbc/usb_pe_drp_sm.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/common/usbc/usb_pe_drp_sm.c b/common/usbc/usb_pe_drp_sm.c index bf134c5449..59d45b0e28 100644 --- a/common/usbc/usb_pe_drp_sm.c +++ b/common/usbc/usb_pe_drp_sm.c @@ -1479,8 +1479,7 @@ static bool common_src_snk_dpm_requests(int port) /* Currently only support sending soft reset to SOP */ pe_send_soft_reset(port, TCPCI_MSG_SOP); return true; - } else if (PE_CHK_DPM_REQUEST(port, - DPM_REQUEST_PORT_DISCOVERY)) { + } else if (PE_CHK_DPM_REQUEST(port, DPM_REQUEST_PORT_DISCOVERY)) { pe_set_dpm_curr_request(port, DPM_REQUEST_PORT_DISCOVERY); if (!PE_CHK_FLAG(port, PE_FLAGS_MODAL_OPERATION)) { /* @@ -1489,6 +1488,11 @@ static bool common_src_snk_dpm_requests(int port) * requests. */ pd_dfp_discovery_init(port); + /* + * TODO(b/189353401): Do not reinitialize modes when no + * longer required. + */ + pd_dfp_mode_init(port); pe[port].dr_swap_attempt_counter = 0; pe[port].discover_identity_counter = 0; pd_timer_enable(port, PE_TIMER_DISCOVER_IDENTITY, @@ -2157,8 +2161,9 @@ static void pe_src_startup_entry(int port) */ pd_timer_enable(port, PE_TIMER_DISCOVER_IDENTITY, 0); - /* Clear port discovery flags */ + /* Clear port discovery/mode flags */ pd_dfp_discovery_init(port); + pd_dfp_mode_init(port); pe[port].ama_vdo = PD_VDO_INVALID; pe[port].vpd_vdo = PD_VDO_INVALID; pe[port].discover_identity_counter = 0; @@ -3010,8 +3015,9 @@ static void pe_snk_startup_entry(int port) */ pd_timer_enable(port, PE_TIMER_DISCOVER_IDENTITY, 0); - /* Clear port discovery flags */ + /* Clear port discovery/mode flags */ pd_dfp_discovery_init(port); + pd_dfp_mode_init(port); pe[port].discover_identity_counter = 0; /* Reset dr swap attempt counter */ @@ -6993,6 +6999,16 @@ uint32_t task_access[CONFIG_USB_PD_PORT_MAX_COUNT][DISCOVERY_TYPE_COUNT]; void pd_dfp_discovery_init(int port) { + atomic_or(&task_access[port][TCPCI_MSG_SOP], BIT(task_get_current())); + atomic_or(&task_access[port][TCPCI_MSG_SOP_PRIME], + BIT(task_get_current())); + + memset(pe[port].discovery, 0, sizeof(pe[port].discovery)); + +} + +void pd_dfp_mode_init(int port) +{ /* * Clear the VDM Setup Done and Modal Operation flags so we will * have a fresh discovery @@ -7000,11 +7016,6 @@ void pd_dfp_discovery_init(int port) PE_CLR_FLAG(port, PE_FLAGS_VDM_SETUP_DONE | PE_FLAGS_MODAL_OPERATION); - atomic_or(&task_access[port][TCPCI_MSG_SOP], BIT(task_get_current())); - atomic_or(&task_access[port][TCPCI_MSG_SOP_PRIME], - BIT(task_get_current())); - - memset(pe[port].discovery, 0, sizeof(pe[port].discovery)); memset(pe[port].partner_amodes, 0, sizeof(pe[port].partner_amodes)); /* Reset the DPM and DP modules to enable alternate mode entry. */ |