Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1404736 > unrolled thread
| Started by | Andy Gross <andy.gross@linaro.org> |
|---|---|
| First post | 2016-05-20 23:40 +0200 |
| Last post | 2016-05-26 09:00 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] usb: host: ehci-msm: Conditionally call ehci suspend/resume Andy Gross <andy.gross@linaro.org> - 2016-05-20 23:40 +0200
Re: [PATCH] usb: host: ehci-msm: Conditionally call ehci suspend/resume Alan Stern <stern@rowland.harvard.edu> - 2016-05-21 16:40 +0200
Re: [PATCH] usb: host: ehci-msm: Conditionally call ehci suspend/resume Pramod Gurav <pramod.gurav@linaro.org> - 2016-05-26 09:00 +0200
| From | Andy Gross <andy.gross@linaro.org> |
|---|---|
| Date | 2016-05-20 23:40 +0200 |
| Subject | [PATCH] usb: host: ehci-msm: Conditionally call ehci suspend/resume |
| Message-ID | <rB0jg-2Q7-5@gated-at.bofh.it> |
This patch fixes a suspend/resume issue where the driver is blindly
calling ehci_suspend/resume functions when the ehci hasn't been setup.
This results in a crash during suspend/resume operations.
Signed-off-by: Andy Gross <andy.gross@linaro.org>
---
drivers/usb/host/ehci-msm.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 3e226ef..9996a60 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -179,22 +179,32 @@ static int ehci_msm_remove(struct platform_device *pdev)
static int ehci_msm_pm_suspend(struct device *dev)
{
struct usb_hcd *hcd = dev_get_drvdata(dev);
+ struct ehci_hcd *ehci = hcd_to_ehci(hcd);
bool do_wakeup = device_may_wakeup(dev);
dev_dbg(dev, "ehci-msm PM suspend\n");
- return ehci_suspend(hcd, do_wakeup);
+ /* Only call ehci_suspend if ehci_setup has been done */
+ if (ehci->sbrn)
+ return ehci_suspend(hcd, do_wakeup);
+
+ return 0;
}
static int ehci_msm_pm_resume(struct device *dev)
{
struct usb_hcd *hcd = dev_get_drvdata(dev);
+ struct ehci_hcd *ehci = hcd_to_ehci(hcd);
dev_dbg(dev, "ehci-msm PM resume\n");
- ehci_resume(hcd, false);
+
+ /* Only call ehci_resume if ehci_setup has been done */
+ if (ehci->sbrn)
+ ehci_resume(hcd, false);
return 0;
}
+
#else
#define ehci_msm_pm_suspend NULL
#define ehci_msm_pm_resume NULL
--
1.9.1
[toc] | [next] | [standalone]
| From | Alan Stern <stern@rowland.harvard.edu> |
|---|---|
| Date | 2016-05-21 16:40 +0200 |
| Message-ID | <rBgem-4Gi-15@gated-at.bofh.it> |
| In reply to | #1404736 |
On Fri, 20 May 2016, Andy Gross wrote:
> This patch fixes a suspend/resume issue where the driver is blindly
> calling ehci_suspend/resume functions when the ehci hasn't been setup.
> This results in a crash during suspend/resume operations.
>
> Signed-off-by: Andy Gross <andy.gross@linaro.org>
> ---
> drivers/usb/host/ehci-msm.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
> index 3e226ef..9996a60 100644
> --- a/drivers/usb/host/ehci-msm.c
> +++ b/drivers/usb/host/ehci-msm.c
> @@ -179,22 +179,32 @@ static int ehci_msm_remove(struct platform_device *pdev)
> static int ehci_msm_pm_suspend(struct device *dev)
> {
> struct usb_hcd *hcd = dev_get_drvdata(dev);
> + struct ehci_hcd *ehci = hcd_to_ehci(hcd);
> bool do_wakeup = device_may_wakeup(dev);
>
> dev_dbg(dev, "ehci-msm PM suspend\n");
>
> - return ehci_suspend(hcd, do_wakeup);
> + /* Only call ehci_suspend if ehci_setup has been done */
> + if (ehci->sbrn)
> + return ehci_suspend(hcd, do_wakeup);
> +
> + return 0;
> }
>
> static int ehci_msm_pm_resume(struct device *dev)
> {
> struct usb_hcd *hcd = dev_get_drvdata(dev);
> + struct ehci_hcd *ehci = hcd_to_ehci(hcd);
>
> dev_dbg(dev, "ehci-msm PM resume\n");
> - ehci_resume(hcd, false);
> +
> + /* Only call ehci_resume if ehci_setup has been done */
> + if (ehci->sbrn)
> + ehci_resume(hcd, false);
>
> return 0;
> }
> +
> #else
> #define ehci_msm_pm_suspend NULL
> #define ehci_msm_pm_resume NULL
Acked-by: Alan Stern <stern@rowland.harvard.edu>
[toc] | [prev] | [next] | [standalone]
| From | Pramod Gurav <pramod.gurav@linaro.org> |
|---|---|
| Date | 2016-05-26 09:00 +0200 |
| Message-ID | <rCXqW-32a-5@gated-at.bofh.it> |
| In reply to | #1404736 |
On 21 May 2016 at 03:05, Andy Gross <andy.gross@linaro.org> wrote: > This patch fixes a suspend/resume issue where the driver is blindly > calling ehci_suspend/resume functions when the ehci hasn't been setup. > This results in a crash during suspend/resume operations. > > Signed-off-by: Andy Gross <andy.gross@linaro.org> Fixes below crash while doing a system suspend: root@linaro-alip:~# echo freeze > /sys/power/state [ 22.348960] PM: Syncing filesystems ... done. [ 22.387778] Freezing user space processes ... (elapsed 0.001 seconds) done. [ 22.393614] Freezing remaining freezable tasks ... (elapsed 0.001 seconds) done. [ 22.512736] mmc0: Reset 0x1 never completed. [ 22.514296] Unable to handle kernel NULL pointer dereference at virtual address 000004e8 [ 22.516068] pgd = ffff80003817d000 [ 22.524161] [000004e8] *pgd=00000000b817e003, *pud=00000000b817f003, *pmd=0000000000000000 [ 22.535414] Internal error: Oops: 96000006 [#1] PREEMPT SMP [ 22.535680] Modules linked in: [ 22.544183] CPU: 3 PID: 1499 Comm: bash Not tainted 4.6.0+ #65 [ 22.544275] Hardware name: Qualcomm Technologies, Inc. APQ 8016 SBC (DT) [ 22.550006] task: ffff800039abd780 ti: ffff80003928c000 task.ti: ffff80003928c000 [ 22.556870] PC is at ehci_suspend+0x34/0xe4 [ 22.564240] LR is at ehci_msm_pm_suspend+0x2c/0x34 [ 22.568232] pc : [<ffff0000085ad2b4>] lr : [<ffff0000085b4970>] pstate: a0000145 Tested-by: Pramod Gurav <pramod.gurav@linaro.org> > --- > drivers/usb/host/ehci-msm.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > Regards, Pramod
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web