Skip to content

Commit 36f7847

Browse files
ChiYuan Huanggregkh
authored andcommitted
usb: typec: tcpm: Fix altmode re-registration causes sysfs create fail
There's the altmode re-registeration issue after data role swap (DR_SWAP). Comparing to USBPD 2.0, in USBPD 3.0, it loose the limit that only DFP can initiate the VDM command to get partner identity information. For a USBPD 3.0 UFP device, it may already get the identity information from its port partner before DR_SWAP. If DR_SWAP send or receive at the mean time, 'send_discover' flag will be raised again. It causes discover identify action restart while entering ready state. And after all discover actions are done, the 'tcpm_register_altmodes' will be called. If old altmode is not unregistered, this sysfs create fail can be found. In 'DR_SWAP_CHANGE_DR' state case, only DFP will unregister altmodes. For UFP, the original altmodes keep registered. This patch fix the logic that after DR_SWAP, 'tcpm_unregister_altmodes' must be called whatever the current data role is. Reviewed-by: Macpaul Lin <macpaul.lin@mediatek.com> Fixes: ae8a2ca ("usb: typec: Group all TCPCI/TCPM code together") Reported-by: TommyYl Chen <tommyyl.chen@mediatek.com> Cc: stable@vger.kernel.org Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/1673248790-15794-1-git-send-email-cy_huang@richtek.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e95765e commit 36f7847

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

drivers/usb/typec/tcpm/tcpm.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4594,14 +4594,13 @@ static void run_state_machine(struct tcpm_port *port)
45944594
tcpm_set_state(port, ready_state(port), 0);
45954595
break;
45964596
case DR_SWAP_CHANGE_DR:
4597-
if (port->data_role == TYPEC_HOST) {
4598-
tcpm_unregister_altmodes(port);
4597+
tcpm_unregister_altmodes(port);
4598+
if (port->data_role == TYPEC_HOST)
45994599
tcpm_set_roles(port, true, port->pwr_role,
46004600
TYPEC_DEVICE);
4601-
} else {
4601+
else
46024602
tcpm_set_roles(port, true, port->pwr_role,
46034603
TYPEC_HOST);
4604-
}
46054604
tcpm_ams_finish(port);
46064605
tcpm_set_state(port, ready_state(port), 0);
46074606
break;

0 commit comments

Comments
 (0)