[PATCH V4 3/6] USB: OHCI: Properly handle ohci-s3c2410 suspend
From: Majunath Goudar <hidden>
Date: 2013-10-21 14:19:33
Also in:
linux-samsung-soc, lkml
Subsystem:
arm/samsung s3c, s5p and exynos arm architectures, the rest, usb ohci driver, usb subsystem · Maintainers:
Krzysztof Kozlowski, Peter Griffin, Linus Torvalds, Alan Stern, Greg Kroah-Hartman
Suspend scenario in case of ohci-s3c2410 glue was not
properly handled as it was not suspending generic part
of ohci controller. Alan Stern suggested, properly handle
ohci-s3c2410 suspend scenario.
Calling explicitly the ohci_suspend()
routine in ohci_hcd_s3c2410_drv_suspend() will ensure
proper handling of suspend scenario.
Signed-off-by: Manjunath Goudar <redacted>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg KH <redacted>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <redacted>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-samsung-soc at vger.kernel.org
Cc: linux-kernel at vger.kernel.org
Cc: linux-usb at vger.kernel.org
---
V3->V4:
-No changes, only added Alan Acked-by.
V2->V3:
-No changes.
As a build failure on "ep93xx proper suspend patch" and Linaro
id bounced. Rewrote this patch on top of latest Greg usb-next
branch. This patch not gives any build error. Patch is required
for ohci-s3c2410 proper suspending as Alan mentioned.
Initially when I wrote this patch I was working in Linaro, now
I am not part of Linaro that is why Linaro id is bouncing. Sending
this patch from personal mail id.
V1->V2:
-No changes.
Due to the build failure on ep93xx reverted this patch.
This patch is needed as Alan Stern suggestion.
drivers/usb/host/ohci-s3c2410.c | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index be3429e..b5bf9b7 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c@@ -426,28 +426,15 @@ static int ohci_hcd_s3c2410_drv_remove(struct platform_device *pdev) static int ohci_hcd_s3c2410_drv_suspend(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); - struct ohci_hcd *ohci = hcd_to_ohci(hcd); struct platform_device *pdev = to_platform_device(dev); - unsigned long flags; + bool do_wakeup = device_may_wakeup(dev); int rc = 0; - /* - * Root hub was already suspended. Disable irq emission and - * mark HW unaccessible, bail out if RH has been resumed. Use - * the spinlock to properly synchronize with possible pending - * RH suspend or resume activity. - */ - spin_lock_irqsave(&ohci->lock, flags); - if (ohci->rh_state != OHCI_RH_SUSPENDED) { - rc = -EINVAL; - goto bail; - } - - clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); + rc = ohci_suspend(hcd, do_wakeup); + if (rc) + return rc; s3c2410_stop_hc(pdev); -bail: - spin_unlock_irqrestore(&ohci->lock, flags); return rc; }
--
1.7.9.5