2023-06-26 16:08:19

by Guiting Shen

Subject: [PATCH v3] usb: ohci-at91: Fix the unhandle interrupt when resume

The ohci_hcd_at91_drv_suspend() sets ohci->rh_state to OHCI_RH_HALTED when
suspend which will let the ohci_irq() skip the interrupt after resume. And
nobody to handle this interrupt.

According to the comment in ohci_hcd_at91_drv_suspend(), it need to reset
when resume from suspend(MEM) to fix by setting "hibernated" argument of
ohci_resume().

Signed-off-by: Guiting Shen <[email protected]>
---
drivers/usb/host/ohci-at91.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 533537ef3c21..360680769494 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -673,7 +673,13 @@ ohci_hcd_at91_drv_resume(struct device *dev)
else
at91_start_clock(ohci_at91);

- ohci_resume(hcd, false);
+ /*
+ * According to the comment in ohci_hcd_at91_drv_suspend()
+ * we need to do a reset if the 48Mhz clock was stopped,
+ * that is, if ohci_at91->wakeup is clear. Tell ohci_resume()
+ * to reset in this case by setting its "hibernated" flag.
+ */
+ ohci_resume(hcd, !ohci_at91->wakeup);

return 0;
}
--
2.25.1

2023-06-26 16:16:45

by Alan Stern

Subject: Re: [PATCH v3] usb: ohci-at91: Fix the unhandle interrupt when resume

On Mon, Jun 26, 2023 at 11:27:13PM +0800, Guiting Shen wrote:
> The ohci_hcd_at91_drv_suspend() sets ohci->rh_state to OHCI_RH_HALTED when
> suspend which will let the ohci_irq() skip the interrupt after resume. And
> nobody to handle this interrupt.
>
> According to the comment in ohci_hcd_at91_drv_suspend(), it need to reset
> when resume from suspend(MEM) to fix by setting "hibernated" argument of
> ohci_resume().
>
> Signed-off-by: Guiting Shen <[email protected]>
> ---

Reviewed-by: Alan Stern <[email protected]>

> drivers/usb/host/ohci-at91.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
> index 533537ef3c21..360680769494 100644
> --- a/drivers/usb/host/ohci-at91.c
> +++ b/drivers/usb/host/ohci-at91.c
> @@ -673,7 +673,13 @@ ohci_hcd_at91_drv_resume(struct device *dev)
> else
> at91_start_clock(ohci_at91);
>
> - ohci_resume(hcd, false);
> + /*
> + * According to the comment in ohci_hcd_at91_drv_suspend()
> + * we need to do a reset if the 48Mhz clock was stopped,
> + * that is, if ohci_at91->wakeup is clear. Tell ohci_resume()
> + * to reset in this case by setting its "hibernated" flag.
> + */
> + ohci_resume(hcd, !ohci_at91->wakeup);
>
> return 0;
> }
> --
> 2.25.1
>