shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

FROMGIT: usb: typec: tcpm: Fix misuses of AMS invocation

Browse Source 
tcpm_ams_start is used to initiate an AMS as well as checking Collision
Avoidance conditions but not for flagging passive AMS (initiated by the
port partner). Fix the misuses of tcpm_ams_start in tcpm_pd_svdm.

ATTENTION doesn't need responses so the AMS flag is not needed here.

Fixes: 0bc3ee9288 ("usb: typec: tcpm: Properly interrupt VDM AMS")
Signed-off-by: Kyle Tso <kyletso@google.com>
Link: https://lore.kernel.org/r/20210601123151.3441914-5-kyletso@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 80137c1873
 https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-linus)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I238554b1af5c77bf245f867fcd1fdfdb12825abf
This commit is contained in:
Kyle Tso
2021-06-01 20:31:51 +08:00
committed by Greg Kroah-Hartman
parent 1139005f05
commit bb6f011afc
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/usb/typec/tcpm/tcpm.c
View File

@@ -1603,7 +1603,7 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev,
svdm_version = PD_VDO_SVDM_VER(p[0]); svdm_version = PD_VDO_SVDM_VER(p[0]);
} }
tcpm_ams_start(port, DISCOVER_IDENTITY); port->ams = DISCOVER_IDENTITY;
/* /*
* PD2.0 Spec 6.10.3: respond with NAK as DFP (data host) * PD2.0 Spec 6.10.3: respond with NAK as DFP (data host)
* PD3.1 Spec 6.4.4.2.5.1: respond with NAK if "invalid field" or * PD3.1 Spec 6.4.4.2.5.1: respond with NAK if "invalid field" or
@@ -1626,19 +1626,18 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev,
} }
break; break;
case CMD_DISCOVER_SVID: case CMD_DISCOVER_SVID:
tcpm_ams_start(port, DISCOVER_SVIDS); port->ams = DISCOVER_SVIDS;
break; break;
case CMD_DISCOVER_MODES: case CMD_DISCOVER_MODES:
tcpm_ams_start(port, DISCOVER_MODES); port->ams = DISCOVER_MODES;
break; break;
case CMD_ENTER_MODE: case CMD_ENTER_MODE:
tcpm_ams_start(port, DFP_TO_UFP_ENTER_MODE); port->ams = DFP_TO_UFP_ENTER_MODE;
break; break;
case CMD_EXIT_MODE: case CMD_EXIT_MODE:
tcpm_ams_start(port, DFP_TO_UFP_EXIT_MODE); port->ams = DFP_TO_UFP_EXIT_MODE;
break; break;
case CMD_ATTENTION: case CMD_ATTENTION:
tcpm_ams_start(port, ATTENTION);
/* Attention command does not have response */ /* Attention command does not have response */
*adev_action = ADEV_ATTENTION; *adev_action = ADEV_ATTENTION;
return 0; return 0;