usb: dwc2: fix transfer stop programming for out endpoint
Subsystems (2)
PATCH 1/1 usb: dwc2: fix transfer stop programming for out endpoint
From: "Du, Changbin" <[email protected]>
To stop an out endpoint, software should set sets the Global OUT NAK, but not the Global Non-periodic IN NAK. This driver bug leads the out-ep failed be in disabled state with below error.
dwc2_hsotg_ep_stop_xfr: timeout DOEPCTL.EPDisable
--- drivers/usb/dwc2/gadget.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/usb/dwc2/gadget.c +5 -5
@@ -2911,15 +2911,15 @@ static void dwc2_hsotg_ep_stop_xfr(struct dwc2_hsotg *hsotg, "%s: timeout DIEPINT.NAKEFF\n", __func__); }else {/* Clear any pending nak effect interrupt */ -dwc2_writel (GINTSTS_GINNAKEFF , hsotg->regs +GINTSTS ); +dwc2_writel (GINTSTS_GOUTNAKEFF , hsotg->regs +GINTSTS ); -__orr32 (hsotg->regs +DCTL ,DCTL_SGNPINNAK ); +__orr32 (hsotg->regs +DCTL ,DCTL_SGOUTNAK );/* Wait for global nak to take effect */ if (dwc2_hsotg_wait_bit_set (hsotg,GINTSTS , -GINTSTS_GINNAKEFF ,100 )) +GINTSTS_GOUTNAKEFF ,100 ))dev_warn (hsotg->dev, -"%s: timeout GINTSTS.GINNAKEFF\n" , __func__); +"%s: timeout GINTSTS.GOUTNAKEFF\n" , __func__); }/* Disable ep */
@@ -2944,7 +2944,7 @@ static void dwc2_hsotg_ep_stop_xfr(struct dwc2_hsotg *hsotg,/* TODO: Flush shared tx fifo */ }else {/* Remove global NAKs */ -__bic32 (hsotg->regs +DCTL ,DCTL_SGNPINNAK ); +__bic32 (hsotg->regs +DCTL ,DCTL_SGOUTNAK ); } }
Signature · 1 line
2.5.0
Hi,
Quoted 9 lines · [email protected] writes:
From: "Du, Changbin" <[email protected]>
To stop an out endpoint, software should set sets the Global OUT NAK, but not the Global Non-periodic IN NAK. This driver bug leads the out-ep failed be in disabled state with below error.
dwc2_hsotg_ep_stop_xfr: timeout DOEPCTL.EPDisableSigned-off-by Du, Changbin <[email protected]>
John, is this patch okay to apply ?
Quoted 40 lines
--- drivers/usb/dwc2/gadget.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/usb/dwc2/gadget.c +5
-5@@ -2911,15 +2911,15 @@ static void dwc2_hsotg_ep_stop_xfr(struct dwc2_hsotg *hsotg, "%s: timeout DIEPINT.NAKEFF\n", __func__); }else {/* Clear any pending nak effect interrupt */ -dwc2_writel (GINTSTS_GINNAKEFF , hsotg->regs +GINTSTS ); +dwc2_writel (GINTSTS_GOUTNAKEFF , hsotg->regs +GINTSTS ); -__orr32 (hsotg->regs +DCTL ,DCTL_SGNPINNAK ); +__orr32 (hsotg->regs +DCTL ,DCTL_SGOUTNAK );/* Wait for global nak to take effect */ if (dwc2_hsotg_wait_bit_set (hsotg,GINTSTS , -GINTSTS_GINNAKEFF ,100 )) +GINTSTS_GOUTNAKEFF ,100 ))dev_warn (hsotg->dev, -"%s: timeout GINTSTS.GINNAKEFF\n" , __func__); +"%s: timeout GINTSTS.GOUTNAKEFF\n" , __func__); }/* Disable ep */ @@ -2944,7 +2944,7 @@ static void dwc2_hsotg_ep_stop_xfr(struct dwc2_hsotg *hsotg,/* TODO: Flush shared tx fifo */ }else {/* Remove global NAKs */ -__bic32 (hsotg->regs +DCTL ,DCTL_SGNPINNAK ); +__bic32 (hsotg->regs +DCTL ,DCTL_SGOUTNAK ); } }Signature · 1 line
2.5.0
Signature · 1 line
balbi
John Youn
Acked-byQuoted 10 lines · Felipe Balbi
Hi,
Quoted 6 lines · [email protected] writes:
From: "Du, Changbin" <[email protected]>
To stop an out endpoint, software should set sets the Global OUT NAK, but not the Global Non-periodic IN NAK. This driver bug leads the out-ep failed be in disabled state with below error.
Quoted 6 lines
Quoted 3 lines
dwc2_hsotg_ep_stop_xfr: timeout DOEPCTL.EPDisableSigned-off-by Du, Changbin <[email protected]>John, is this patch okay to apply ?
Yes. Looks good to me.
John