xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: typec: tcpm: Keep other events when receiving FRS and Sourcing_vbus events

Browse Source 
commit 43ad944cd73f2360ec8ff31d29ea44830b3119af upstream.

When receiving FRS and Sourcing_Vbus events from low-level drivers, keep
other events which come a bit earlier so that they will not be ignored
in the event handler.

Fixes: 8dc4bd0736 ("usb: typec: tcpm: Add support for Sink Fast Role SWAP(FRS)")
Cc: stable <stable@vger.kernel.org>
Cc: Badhri Jagan Sridharan <badhri@google.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Badhri Jagan Sridharan <badhri@google.com>
Signed-off-by: Kyle Tso <kyletso@google.com>
Link: https://lore.kernel.org/r/20210803091314.3051302-1-kyletso@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kyle Tso
2021-08-03 17:13:14 +08:00
committed by Greg Kroah-Hartman
parent 5b4318885a
commit 8f8645de09
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4314,7 +4314,7 @@ EXPORT_SYMBOL_GPL(tcpm_pd_hard_reset);
void tcpm_sink_frs(struct tcpm_port *port) void tcpm_sink_frs(struct tcpm_port *port)
{ {
spin_lock(&port->pd_event_lock); spin_lock(&port->pd_event_lock);
port->pd_events = TCPM_FRS_EVENT; port->pd_events |= TCPM_FRS_EVENT;
spin_unlock(&port->pd_event_lock); spin_unlock(&port->pd_event_lock);
kthread_queue_work(port->wq, &port->event_work); kthread_queue_work(port->wq, &port->event_work);
} }
@@ -4323,7 +4323,7 @@ EXPORT_SYMBOL_GPL(tcpm_sink_frs);
void tcpm_sourcing_vbus(struct tcpm_port *port) void tcpm_sourcing_vbus(struct tcpm_port *port)
{ {
spin_lock(&port->pd_event_lock); spin_lock(&port->pd_event_lock);
port->pd_events = TCPM_SOURCING_VBUS; port->pd_events |= TCPM_SOURCING_VBUS;
spin_unlock(&port->pd_event_lock); spin_unlock(&port->pd_event_lock);
kthread_queue_work(port->wq, &port->event_work); kthread_queue_work(port->wq, &port->event_work);
} }