diff mbox series

[2/2] usb: musb: dsps: Fix vbus vs tps65217-charger irq conflict

Message ID 20230822132202.19659-1-nemith592@gmail.com
State Superseded
Headers show
Series [1/2] power: supply: Fix tps65217-charger vs vbus irq conflict | expand

Commit Message

Grant B Adams Aug. 22, 2023, 1:22 p.m. UTC
Enabling the tps65217-charger driver/module causes an interrupt conflict
with the vbus driver resulting in a probe failure.
The conflict is resolved by changing both driver's threaded interrupt
request function from IRQF_ONESHOT to IRQF_SHARED.

Signed-off-by: Grant B Adams <nemith592@gmail.com>
---
 drivers/usb/musb/musb_dsps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Greg Kroah-Hartman Aug. 22, 2023, 2:42 p.m. UTC | #1
On Tue, Aug 22, 2023 at 03:22:02PM +0200, Grant B Adams wrote:
> Enabling the tps65217-charger driver/module causes an interrupt conflict
> with the vbus driver resulting in a probe failure.
> The conflict is resolved by changing both driver's threaded interrupt
> request function from IRQF_ONESHOT to IRQF_SHARED.
> 
> Signed-off-by: Grant B Adams <nemith592@gmail.com>
> ---
>  drivers/usb/musb/musb_dsps.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
> index 9119b1d51370..cbb45de5a76f 100644
> --- a/drivers/usb/musb/musb_dsps.c
> +++ b/drivers/usb/musb/musb_dsps.c
> @@ -851,7 +851,7 @@ static int dsps_setup_optional_vbus_irq(struct platform_device *pdev,
>  
>  	error = devm_request_threaded_irq(glue->dev, glue->vbus_irq,
>  					  NULL, dsps_vbus_threaded_irq,
> -					  IRQF_ONESHOT,
> +					  IRQF_SHARED,
>  					  "vbus", glue);
>  	if (error) {
>  		glue->vbus_irq = 0;
> -- 
> 2.34.1
> 

Why is the patch here talking about the tps65217-charger driver?  That's
totally independent.

Also, your patches are not threaded, how did you send them?  Are they
related in some way or not?

thanks,

greg k-h
Greg Kroah-Hartman Aug. 22, 2023, 6:46 p.m. UTC | #2
On Tue, Aug 22, 2023 at 08:20:56PM +0200, Grant Adams wrote:
> On Tue, Aug 22, 2023 at 4:42 PM Greg Kroah-Hartman <
> gregkh@linuxfoundation.org> wrote:
> 
> > On Tue, Aug 22, 2023 at 03:22:02PM +0200, Grant B Adams wrote:
> > > Enabling the tps65217-charger driver/module causes an interrupt conflict
> > > with the vbus driver resulting in a probe failure.
> > > The conflict is resolved by changing both driver's threaded interrupt
> > > request function from IRQF_ONESHOT to IRQF_SHARED.
> > >
> > > Signed-off-by: Grant B Adams <nemith592@gmail.com>
> > > ---
> > >  drivers/usb/musb/musb_dsps.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
> > > index 9119b1d51370..cbb45de5a76f 100644
> > > --- a/drivers/usb/musb/musb_dsps.c
> > > +++ b/drivers/usb/musb/musb_dsps.c
> > > @@ -851,7 +851,7 @@ static int dsps_setup_optional_vbus_irq(struct
> > platform_device *pdev,
> > >
> > >       error = devm_request_threaded_irq(glue->dev, glue->vbus_irq,
> > >                                         NULL, dsps_vbus_threaded_irq,
> > > -                                       IRQF_ONESHOT,
> > > +                                       IRQF_SHARED,
> > >                                         "vbus", glue);
> > >       if (error) {
> > >               glue->vbus_irq = 0;
> > > --
> > > 2.34.1
> > >
> >
> > Why is the patch here talking about the tps65217-charger driver?  That's
> > totally independent.
> >
> > Also, your patches are not threaded, how did you send them?  Are they
> > related in some way or not?
> >
> > thanks,
> >
> > greg k-h
> >
> 
> Apologies Greg,
> 
> This is my first patch and did not know about creating email threads for
> multiple patches. I'll create an email thread for the patches and will
> provide
> an overview and better context in [PATCH 0/2].

That would be great, be sure to number this a v2 patch series as the
documentation asks for as well :)

good luck!

greg k-h
diff mbox series

Patch

diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 9119b1d51370..cbb45de5a76f 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -851,7 +851,7 @@  static int dsps_setup_optional_vbus_irq(struct platform_device *pdev,
 
 	error = devm_request_threaded_irq(glue->dev, glue->vbus_irq,
 					  NULL, dsps_vbus_threaded_irq,
-					  IRQF_ONESHOT,
+					  IRQF_SHARED,
 					  "vbus", glue);
 	if (error) {
 		glue->vbus_irq = 0;