FROMGIT: usb: typec: tcpm: Keep other events when receiving FRS and Sourcing_vbus events
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>
(cherry picked from commit 43ad944cd73f2360ec8ff31d29ea44830b3119af
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-linus)
Bug: 194987217
Signed-off-by: Kyle Tso <kyletso@google.com>
Change-Id: Ibb4a2ccd2bbb34e53d4fbe44803aad521bb7029f
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
bed43a725d
commit
8914725a58
@@ -5489,7 +5489,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);
|
||||||
}
|
}
|
||||||
@@ -5498,7 +5498,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);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user