2014-04-10 10:28:15

by Vivek Gautam

Subject: [PATCH v2 1/2] usb: ehci-exynos: Return immediately from suspend if ehci_suspend fails

Patch 'b8efdaf USB: EHCI: add check for wakeup/suspend race'
adds a check for possible race between suspend and wakeup interrupt,
and thereby it returns -EBUSY as error code if there's a wakeup
interrupt.
So the platform host controller should not proceed further with
its suspend callback, rather should return immediately to avoid
powering down the essential things, like phy.

Signed-off-by: Vivek Gautam <[email protected]>
Acked-by: Jingoo Han <[email protected]>
Cc: Alan Stern <[email protected]>
---

Changes from v1:
-- Removed unnecessary change 'return 0'

drivers/usb/host/ehci-exynos.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
index d1d8c47..7f425ac 100644
--- a/drivers/usb/host/ehci-exynos.c
+++ b/drivers/usb/host/ehci-exynos.c
@@ -212,6 +212,8 @@ static int exynos_ehci_suspend(struct device *dev)
int rc;

rc = ehci_suspend(hcd, do_wakeup);
+ if (rc)
+ return rc;

if (exynos_ehci->otg)
exynos_ehci->otg->set_host(exynos_ehci->otg, &hcd->self);
--
1.7.10.4

2014-04-10 10:28:23

by Vivek Gautam

Subject: [PATCH v2 2/2] usb: ehci-platform: Return immediately from suspend if ehci_suspend fails

Patch 'b8efdaf USB: EHCI: add check for wakeup/suspend race'
adds a check for possible race between suspend and wakeup interrupt,
and thereby it returns -EBUSY as error code if there's a wakeup
interrupt.
So the platform host controller should not proceed further with
its suspend callback, rather should return immediately to avoid
powering down the essential things, like phy.

Signed-off-by: Vivek Gautam <[email protected]>
Cc: Alan Stern <[email protected]>
Cc: Hauke Mehrtens <[email protected]>
Cc: Hans de Goede <[email protected]>
---

Changes from v1:
-- Removed unnecessary change 'return 0'

drivers/usb/host/ehci-platform.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index b3a0e11..c7dd93a 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -303,6 +303,8 @@ static int ehci_platform_suspend(struct device *dev)
int ret;

ret = ehci_suspend(hcd, do_wakeup);
+ if (ret)
+ return ret;

if (pdata->power_suspend)
pdata->power_suspend(pdev);
--
1.7.10.4

2014-04-10 15:27:46

by Alan Stern

Subject: Re: [PATCH v2 1/2] usb: ehci-exynos: Return immediately from suspend if ehci_suspend fails

On Thu, 10 Apr 2014, Vivek Gautam wrote:

> Patch 'b8efdaf USB: EHCI: add check for wakeup/suspend race'
> adds a check for possible race between suspend and wakeup interrupt,
> and thereby it returns -EBUSY as error code if there's a wakeup
> interrupt.
> So the platform host controller should not proceed further with
> its suspend callback, rather should return immediately to avoid
> powering down the essential things, like phy.
>
> Signed-off-by: Vivek Gautam <[email protected]>
> Acked-by: Jingoo Han <[email protected]>
> Cc: Alan Stern <[email protected]>
> ---
>
> Changes from v1:
> -- Removed unnecessary change 'return 0'
>
> drivers/usb/host/ehci-exynos.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
> index d1d8c47..7f425ac 100644
> --- a/drivers/usb/host/ehci-exynos.c
> +++ b/drivers/usb/host/ehci-exynos.c
> @@ -212,6 +212,8 @@ static int exynos_ehci_suspend(struct device *dev)
> int rc;
>
> rc = ehci_suspend(hcd, do_wakeup);
> + if (rc)
> + return rc;
>
> if (exynos_ehci->otg)
> exynos_ehci->otg->set_host(exynos_ehci->otg, &hcd->self);

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

2014-04-10 15:27:57

by Alan Stern

Subject: Re: [PATCH v2 2/2] usb: ehci-platform: Return immediately from suspend if ehci_suspend fails

On Thu, 10 Apr 2014, Vivek Gautam wrote:

> Patch 'b8efdaf USB: EHCI: add check for wakeup/suspend race'
> adds a check for possible race between suspend and wakeup interrupt,
> and thereby it returns -EBUSY as error code if there's a wakeup
> interrupt.
> So the platform host controller should not proceed further with
> its suspend callback, rather should return immediately to avoid
> powering down the essential things, like phy.
>
> Signed-off-by: Vivek Gautam <[email protected]>
> Cc: Alan Stern <[email protected]>
> Cc: Hauke Mehrtens <[email protected]>
> Cc: Hans de Goede <[email protected]>
> ---
>
> Changes from v1:
> -- Removed unnecessary change 'return 0'
>
> drivers/usb/host/ehci-platform.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
> index b3a0e11..c7dd93a 100644
> --- a/drivers/usb/host/ehci-platform.c
> +++ b/drivers/usb/host/ehci-platform.c
> @@ -303,6 +303,8 @@ static int ehci_platform_suspend(struct device *dev)
> int ret;
>
> ret = ehci_suspend(hcd, do_wakeup);
> + if (ret)
> + return ret;
>
> if (pdata->power_suspend)
> pdata->power_suspend(pdev);

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