Hi,
Gregory Herrero <gregory.herrero@xxxxxxxxx> writes:
> When receiving GINTSTS_GINNAKEFF or GINTSTS_GOUTNAKEFF interrupt,
> DCTL will be overwritten with DCTL_CGOUTNAK or DCTL_CGNPINNAK values.
> Instead of overwriting it, write only needed bits.
>
> It could cause an issue if GINTSTS_GINNAKEFF or GINTSTS_GOUTNAKEFF
> interrupt is received after dwc2 disabled pullup by writing
> DCTL_SFTDISCON bit.
> Pullup will then be re-enabled whereas it should not.
>
> Signed-off-by: Gregory Herrero <gregory.herrero@xxxxxxxxx>
John, are you okay with this patch ?
> ---
> drivers/usb/dwc2/gadget.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
> index 0abf73c..311ce49 100644
> --- a/drivers/usb/dwc2/gadget.c
> +++ b/drivers/usb/dwc2/gadget.c
> @@ -2585,7 +2585,7 @@ irq_retry:
> if (gintsts & GINTSTS_GOUTNAKEFF) {
> dev_info(hsotg->dev, "GOUTNakEff triggered\n");
>
> - dwc2_writel(DCTL_CGOUTNAK, hsotg->regs + DCTL);
> + __orr32(hsotg->regs + DCTL, DCTL_CGOUTNAK);
>
> dwc2_hsotg_dump(hsotg);
> }
> @@ -2593,7 +2593,7 @@ irq_retry:
> if (gintsts & GINTSTS_GINNAKEFF) {
> dev_info(hsotg->dev, "GINNakEff triggered\n");
>
> - dwc2_writel(DCTL_CGNPINNAK, hsotg->regs + DCTL);
> + __orr32(hsotg->regs + DCTL, DCTL_CGNPINNAK);
>
> dwc2_hsotg_dump(hsotg);
> }
> --
> 2.6.2
>
--
balbi
Attachment:
signature.asc
Description: PGP signature
