| Message ID | 20230703131944.353224-1-biju.das.jz@bp.renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Pavel Machek |
| Headers | show |
| Series | [6.1.y-cip] usb: gadget: udc: renesas_usb3: Fix RZ/V2M {modprobe,bind} error | expand |
Hi Biju, > -----Original Message----- > From: Biju Das <biju.das.jz@bp.renesas.com> > Sent: Monday, July 3, 2023 10:20 PM > To: cip-dev@lists.cip-project.org; iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□ > ＤＩＴ○ＯＳＴ) <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek > <pavel@denx.de> > Cc: Biju Das <biju.das.jz@bp.renesas.com>; Fabrizio Castro > <fabrizio.castro.jz@renesas.com> > Subject: [PATCH 6.1.y-cip] usb: gadget: udc: renesas_usb3: Fix RZ/V2M > {modprobe,bind} error > > commit 3e6ac852fbc71a234de24b5455086f6b98d3d958 upstream. > > Currently {modprobe, bind} after {rmmod, unbind} results in probe failure. > > genirq: Flags mismatch irq 22. 00000004 (85070400.usb3drd) vs. 00000004 > (85070400.usb3drd) > renesas_usb3: probe of 85070000.usb3peri failed with error -16 > > The reason is, it is trying to register an interrupt handler for the same IRQ twice. > The devm_request_irq() was called with the parent device. > So the interrupt handler won't be unregistered when the usb3-peri device is > unbound. > > Fix this issue by replacing "parent dev"->"dev" as the irq resource is managed > by this driver. > > Fixes: 9cad72dfc556 ("usb: gadget: Add support for RZ/V2M USB3DRD driver") > Cc: stable <stable@kernel.org> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > Message-ID: <20230530161720.179927-1-biju.das.jz@bp.renesas.com> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > --- > drivers/usb/gadget/udc/renesas_usb3.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/gadget/udc/renesas_usb3.c > b/drivers/usb/gadget/udc/renesas_usb3.c > index a301af66bd91..50d3d4c55fac 100644 > --- a/drivers/usb/gadget/udc/renesas_usb3.c > +++ b/drivers/usb/gadget/udc/renesas_usb3.c > @@ -2898,9 +2898,9 @@ static int renesas_usb3_probe(struct > platform_device *pdev) > struct rzv2m_usb3drd *ddata = > dev_get_drvdata(pdev->dev.parent); > > usb3->drd_reg = ddata->reg; > - ret = devm_request_irq(ddata->dev, ddata->drd_irq, > + ret = devm_request_irq(&pdev->dev, ddata->drd_irq, > renesas_usb3_otg_irq, 0, > - dev_name(ddata->dev), usb3); > + dev_name(&pdev->dev), usb3); > if (ret < 0) > return ret; > } > -- > 2.25.1 Looks good to me. I can apply, if there are no comments. Reviewed-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> Best regards, Nobuhiro
Hi! > > commit 3e6ac852fbc71a234de24b5455086f6b98d3d958 upstream. > > > > Currently {modprobe, bind} after {rmmod, unbind} results in probe failure. > > > > genirq: Flags mismatch irq 22. 00000004 (85070400.usb3drd) vs. 00000004 > > (85070400.usb3drd) > > renesas_usb3: probe of 85070000.usb3peri failed with error -16 > > > > The reason is, it is trying to register an interrupt handler for the same IRQ twice. > > The devm_request_irq() was called with the parent device. > > So the interrupt handler won't be unregistered when the usb3-peri device is > > unbound. > > > > Fix this issue by replacing "parent dev"->"dev" as the irq resource is managed > > by this driver. > > > > Fixes: 9cad72dfc556 ("usb: gadget: Add support for RZ/V2M USB3DRD driver") > > Cc: stable <stable@kernel.org> > Looks good to me. I can apply, if there are no comments. > Reviewed-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> Patch looks good to me, too. Commit being fixed is not in 6.1, so Greg should not be picking this to stable-6.1 and we should not have rejects. Good. Reviewed-by: Pavel Machek <pavel@denx.de> Best regards, Pavel
Hi! > commit 3e6ac852fbc71a234de24b5455086f6b98d3d958 upstream. > > Currently {modprobe, bind} after {rmmod, unbind} results in probe failure. > > genirq: Flags mismatch irq 22. 00000004 (85070400.usb3drd) vs. 00000004 (85070400.usb3drd) > renesas_usb3: probe of 85070000.usb3peri failed with error -16 > > The reason is, it is trying to register an interrupt handler for the same > IRQ twice. The devm_request_irq() was called with the parent device. > So the interrupt handler won't be unregistered when the usb3-peri device > is unbound. > > Fix this issue by replacing "parent dev"->"dev" as the irq resource > is managed by this driver. Thank you, applied. Best regards, Pavel
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c index a301af66bd91..50d3d4c55fac 100644 --- a/drivers/usb/gadget/udc/renesas_usb3.c +++ b/drivers/usb/gadget/udc/renesas_usb3.c @@ -2898,9 +2898,9 @@ static int renesas_usb3_probe(struct platform_device *pdev) struct rzv2m_usb3drd *ddata = dev_get_drvdata(pdev->dev.parent); usb3->drd_reg = ddata->reg; - ret = devm_request_irq(ddata->dev, ddata->drd_irq, + ret = devm_request_irq(&pdev->dev, ddata->drd_irq, renesas_usb3_otg_irq, 0, - dev_name(ddata->dev), usb3); + dev_name(&pdev->dev), usb3); if (ret < 0) return ret; }
commit 3e6ac852fbc71a234de24b5455086f6b98d3d958 upstream. Currently {modprobe, bind} after {rmmod, unbind} results in probe failure. genirq: Flags mismatch irq 22. 00000004 (85070400.usb3drd) vs. 00000004 (85070400.usb3drd) renesas_usb3: probe of 85070000.usb3peri failed with error -16 The reason is, it is trying to register an interrupt handler for the same IRQ twice. The devm_request_irq() was called with the parent device. So the interrupt handler won't be unregistered when the usb3-peri device is unbound. Fix this issue by replacing "parent dev"->"dev" as the irq resource is managed by this driver. Fixes: 9cad72dfc556 ("usb: gadget: Add support for RZ/V2M USB3DRD driver") Cc: stable <stable@kernel.org> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Message-ID: <20230530161720.179927-1-biju.das.jz@bp.renesas.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> --- drivers/usb/gadget/udc/renesas_usb3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)