2021-08-03 09:15:30

by Kyle Tso

Subject: [PATCH] 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: 8dc4bd073663 ("usb: typec: tcpm: Add support for Sink Fast Role SWAP(FRS)")
Cc: Badhri Jagan Sridharan <[email protected]>
Signed-off-by: Kyle Tso <[email protected]>
---
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);
}
--
2.32.0.554.ge1b32706d8-goog

2021-08-03 13:53:12

by Guenter Roeck

Subject: Re: [PATCH] usb: typec: tcpm: Keep other events when receiving FRS and Sourcing_vbus events

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 <[email protected]>
> Signed-off-by: Kyle Tso <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> 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);
> }
>

2021-08-03 19:27:26

by Badhri Jagan Sridharan

Subject: Re: [PATCH] usb: typec: tcpm: Keep other events when receiving FRS and Sourcing_vbus events

On Tue, Aug 3, 2021 at 6:48 AM Guenter Roeck <[email protected]> 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 <[email protected]>
> > Signed-off-by: Kyle Tso <[email protected]>
>
> Reviewed-by: Guenter Roeck <[email protected]>
Reviewed-by: Badhri Jagan Sridharan <[email protected]>
>
> > ---
> > 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);
> > }
> >
>