| Message ID | 20210803091314.3051302-1-kyletso@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 43ad944cd73f2360ec8ff31d29ea44830b3119af |
| Headers | show |
| Series | usb: typec: tcpm: Keep other events when receiving FRS and Sourcing_vbus events | expand |
On 8/3/21 2:13 AM, Kyle Tso wrote: > 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: 8dc4bd073663 ("usb: typec: tcpm: Add support for Sink Fast Role SWAP(FRS)") > Cc: Badhri Jagan Sridharan <badhri@google.com> > Signed-off-by: Kyle Tso <kyletso@google.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/usb/typec/tcpm/tcpm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index 5b22a1c931a9..b9bb63d749ec 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -5369,7 +5369,7 @@ EXPORT_SYMBOL_GPL(tcpm_pd_hard_reset); > void tcpm_sink_frs(struct tcpm_port *port) > { > spin_lock(&port->pd_event_lock); > - port->pd_events = TCPM_FRS_EVENT; > + port->pd_events |= TCPM_FRS_EVENT; > spin_unlock(&port->pd_event_lock); > kthread_queue_work(port->wq, &port->event_work); > } > @@ -5378,7 +5378,7 @@ EXPORT_SYMBOL_GPL(tcpm_sink_frs); > void tcpm_sourcing_vbus(struct tcpm_port *port) > { > spin_lock(&port->pd_event_lock); > - port->pd_events = TCPM_SOURCING_VBUS; > + port->pd_events |= TCPM_SOURCING_VBUS; > spin_unlock(&port->pd_event_lock); > kthread_queue_work(port->wq, &port->event_work); > } >
On Tue, Aug 3, 2021 at 6:48 AM Guenter Roeck <linux@roeck-us.net> wrote: > > On 8/3/21 2:13 AM, Kyle Tso wrote: > > 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: 8dc4bd073663 ("usb: typec: tcpm: Add support for Sink Fast Role SWAP(FRS)") > > Cc: Badhri Jagan Sridharan <badhri@google.com> > > Signed-off-by: Kyle Tso <kyletso@google.com> > > Reviewed-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Badhri Jagan Sridharan <badhri@google.com> > > > --- > > drivers/usb/typec/tcpm/tcpm.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > > index 5b22a1c931a9..b9bb63d749ec 100644 > > --- a/drivers/usb/typec/tcpm/tcpm.c > > +++ b/drivers/usb/typec/tcpm/tcpm.c > > @@ -5369,7 +5369,7 @@ EXPORT_SYMBOL_GPL(tcpm_pd_hard_reset); > > void tcpm_sink_frs(struct tcpm_port *port) > > { > > spin_lock(&port->pd_event_lock); > > - port->pd_events = TCPM_FRS_EVENT; > > + port->pd_events |= TCPM_FRS_EVENT; > > spin_unlock(&port->pd_event_lock); > > kthread_queue_work(port->wq, &port->event_work); > > } > > @@ -5378,7 +5378,7 @@ EXPORT_SYMBOL_GPL(tcpm_sink_frs); > > void tcpm_sourcing_vbus(struct tcpm_port *port) > > { > > spin_lock(&port->pd_event_lock); > > - port->pd_events = TCPM_SOURCING_VBUS; > > + port->pd_events |= TCPM_SOURCING_VBUS; > > spin_unlock(&port->pd_event_lock); > > kthread_queue_work(port->wq, &port->event_work); > > } > > >
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 5b22a1c931a9..b9bb63d749ec 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -5369,7 +5369,7 @@ EXPORT_SYMBOL_GPL(tcpm_pd_hard_reset); void tcpm_sink_frs(struct tcpm_port *port) { spin_lock(&port->pd_event_lock); - port->pd_events = TCPM_FRS_EVENT; + port->pd_events |= TCPM_FRS_EVENT; spin_unlock(&port->pd_event_lock); kthread_queue_work(port->wq, &port->event_work); } @@ -5378,7 +5378,7 @@ EXPORT_SYMBOL_GPL(tcpm_sink_frs); void tcpm_sourcing_vbus(struct tcpm_port *port) { spin_lock(&port->pd_event_lock); - port->pd_events = TCPM_SOURCING_VBUS; + port->pd_events |= TCPM_SOURCING_VBUS; spin_unlock(&port->pd_event_lock); kthread_queue_work(port->wq, &port->event_work); }
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: 8dc4bd073663 ("usb: typec: tcpm: Add support for Sink Fast Role SWAP(FRS)") Cc: Badhri Jagan Sridharan <badhri@google.com> Signed-off-by: Kyle Tso <kyletso@google.com> --- drivers/usb/typec/tcpm/tcpm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)