2020-05-14 04:03:36

by Macpaul Lin

Subject: [PATCH] usb: musb: mediatek: add reset FADDR to zero in reset interrupt handle

When receiving reset interrupt, FADDR need to be reset to zero in
periphearl mode. Otherwise ep0 cannot do enumeration when re-pluging USB
cable.

Signed-off-by: Macpaul Lin <[email protected]>
---
drivers/usb/musb/mediatek.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/drivers/usb/musb/mediatek.c b/drivers/usb/musb/mediatek.c
index 6196b0e..eebeadd 100644
--- a/drivers/usb/musb/mediatek.c
+++ b/drivers/usb/musb/mediatek.c
@@ -208,6 +208,12 @@ static irqreturn_t generic_interrupt(int irq, void *__hci)
musb->int_rx = musb_clearw(musb->mregs, MUSB_INTRRX);
musb->int_tx = musb_clearw(musb->mregs, MUSB_INTRTX);

+ if ((musb->int_usb & MUSB_INTR_RESET) && !is_host_active(musb)) {
+ /* ep0 FADDR must be 0 when (re)entering peripheral mode */
+ musb_ep_select(musb->mregs, 0);
+ musb_writeb(musb->mregs, MUSB_FADDR, 0);
+ }
+
if (musb->int_usb || musb->int_tx || musb->int_rx)
retval = musb_interrupt(musb);

--
1.7.9.5

2020-05-14 07:38:51

by Min Guo

Subject: Re: [PATCH] usb: musb: mediatek: add reset FADDR to zero in reset interrupt handle

On Thu, 2020-05-14 at 12:01 +0800, Macpaul Lin wrote:
> When receiving reset interrupt, FADDR need to be reset to zero in
> periphearl mode. Otherwise ep0 cannot do enumeration when re-pluging USB
> cable.
>
> Signed-off-by: Macpaul Lin <[email protected]>
> ---
> drivers/usb/musb/mediatek.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/usb/musb/mediatek.c b/drivers/usb/musb/mediatek.c
> index 6196b0e..eebeadd 100644
> --- a/drivers/usb/musb/mediatek.c
> +++ b/drivers/usb/musb/mediatek.c
> @@ -208,6 +208,12 @@ static irqreturn_t generic_interrupt(int irq, void *__hci)
> musb->int_rx = musb_clearw(musb->mregs, MUSB_INTRRX);
> musb->int_tx = musb_clearw(musb->mregs, MUSB_INTRTX);
>
> + if ((musb->int_usb & MUSB_INTR_RESET) && !is_host_active(musb)) {
> + /* ep0 FADDR must be 0 when (re)entering peripheral mode */
> + musb_ep_select(musb->mregs, 0);
> + musb_writeb(musb->mregs, MUSB_FADDR, 0);
> + }
> +
> if (musb->int_usb || musb->int_tx || musb->int_rx)
> retval = musb_interrupt(musb);
>

Acked-by:Min Guo <[email protected]>

2020-05-20 02:46:51

by Bin Liu

Subject: Re: [PATCH] usb: musb: mediatek: add reset FADDR to zero in reset interrupt handle

On Thu, May 14, 2020 at 03:33:25PM +0800, Min Guo wrote:
> On Thu, 2020-05-14 at 12:01 +0800, Macpaul Lin wrote:
> > When receiving reset interrupt, FADDR need to be reset to zero in
> > periphearl mode. Otherwise ep0 cannot do enumeration when re-pluging USB
> > cable.
> >
> > Signed-off-by: Macpaul Lin <[email protected]>
> > ---
> > drivers/usb/musb/mediatek.c | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/drivers/usb/musb/mediatek.c b/drivers/usb/musb/mediatek.c
> > index 6196b0e..eebeadd 100644
> > --- a/drivers/usb/musb/mediatek.c
> > +++ b/drivers/usb/musb/mediatek.c
> > @@ -208,6 +208,12 @@ static irqreturn_t generic_interrupt(int irq, void *__hci)
> > musb->int_rx = musb_clearw(musb->mregs, MUSB_INTRRX);
> > musb->int_tx = musb_clearw(musb->mregs, MUSB_INTRTX);
> >
> > + if ((musb->int_usb & MUSB_INTR_RESET) && !is_host_active(musb)) {
> > + /* ep0 FADDR must be 0 when (re)entering peripheral mode */
> > + musb_ep_select(musb->mregs, 0);
> > + musb_writeb(musb->mregs, MUSB_FADDR, 0);
> > + }
> > +
> > if (musb->int_usb || musb->int_tx || musb->int_rx)
> > retval = musb_interrupt(musb);
> >
>
> Acked-by:Min Guo <[email protected]>
>

Queued for v5.8. Thanks.

-Bin.