diff mbox series

usb: musb: mediatek: add reset FADDR to zero in reset interrupt handle

Message ID 1589428872-29282-1-git-send-email-macpaul.lin@mediatek.com (mailing list archive)
State Mainlined
Commit 402bcac4b25b520c89ba60db85eb6316f36e797f
Headers show
Series usb: musb: mediatek: add reset FADDR to zero in reset interrupt handle | expand

Commit Message

Macpaul Lin May 14, 2020, 4:01 a.m. UTC
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 <macpaul.lin@mediatek.com>
---
 drivers/usb/musb/mediatek.c |    6 ++++++
 1 file changed, 6 insertions(+)

Comments

Min Guo May 14, 2020, 7:33 a.m. UTC | #1
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 <macpaul.lin@mediatek.com>
> ---
>  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 <min.guo@mediatek.com>
Bin Liu May 20, 2020, 2:44 a.m. UTC | #2
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 <macpaul.lin@mediatek.com>
> > ---
> >  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 <min.guo@mediatek.com>
> 

Queued for v5.8. Thanks.

-Bin.
diff mbox series

Patch

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