usb: host: xhci-mtk: avoid runtime suspend when removing hcd
Subsystems (5)
PATCH 1/1 usb: host: xhci-mtk: avoid runtime suspend when removing hcd
When runtime suspend was enabled, runtime suspend might happened when xhci is removing hcd. This might cause kernel panic when hcd has been freed but runtime pm suspend related handle need to reference it.
--- drivers/usb/host/xhci-mtk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-mtk.c +3 -2
@@ -587,6 +587,9 @@ static int xhci_mtk_remove(struct platform_device *dev)struct xhci_hcd *xhci =hcd_to_xhci (hcd);struct usb_hcd *shared_hcd = xhci->shared_hcd; +pm_runtime_put_sync (&dev->dev); +pm_runtime_disable (&dev->dev); +usb_remove_hcd (shared_hcd); xhci->shared_hcd =NULL ;device_init_wakeup (&dev->dev, false);
@@ -597,8 +600,6 @@ static int xhci_mtk_remove(struct platform_device *dev)xhci_mtk_sch_exit (mtk);xhci_mtk_clks_disable (mtk);xhci_mtk_ldos_disable (mtk); -pm_runtime_put_sync (&dev->dev); -pm_runtime_disable (&dev->dev);return 0 ; }
Signature · 1 line
1.7.9.5
PATCH v2 1/1 usb: host: xhci-mtk: avoid runtime suspend when removing hcd
When runtime suspend was enabled, runtime suspend might happened when xhci is removing hcd. This might cause kernel panic when hcd has been freed but runtime pm suspend related handle need to reference it.
--- drivers/usb/host/xhci-mtk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-mtk.c +3 -2
@@ -587,6 +587,9 @@ static int xhci_mtk_remove(struct platform_device *dev)struct xhci_hcd *xhci =hcd_to_xhci (hcd);struct usb_hcd *shared_hcd = xhci->shared_hcd; +pm_runtime_put_sync (&dev->dev); +pm_runtime_disable (&dev->dev); +usb_remove_hcd (shared_hcd); xhci->shared_hcd =NULL ;device_init_wakeup (&dev->dev, false);
@@ -597,8 +600,6 @@ static int xhci_mtk_remove(struct platform_device *dev)xhci_mtk_sch_exit (mtk);xhci_mtk_clks_disable (mtk);xhci_mtk_ldos_disable (mtk); -pm_runtime_put_sync (&dev->dev); -pm_runtime_disable (&dev->dev);return 0 ; }
Signature · 1 line
1.7.9.5
Quoted 25 lines · Macpaul Lin
When runtime suspend was enabled, runtime suspend might happened when xhci is removing hcd. This might cause kernel panic when hcd has been freed but runtime pm suspend related handle need to reference it.
Signed-off-by Macpaul Lin <[email protected]>--- drivers/usb/host/xhci-mtk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/usb/host/xhci-mtk.c +3
-0@@ -587,6 +587,9 @@ static int xhci_mtk_remove(struct platform_device *dev)struct xhci_hcd *xhci =hcd_to_xhci (hcd);struct usb_hcd *shared_hcd = xhci->shared_hcd; +pm_runtime_put_sync (&dev->dev); +pm_runtime_disable (&dev->dev); +usb_remove_hcd (shared_hcd); xhci->shared_hcd =NULL ;device_init_wakeup (&dev->dev, false);
drivers/usb/host/xhci-mtk.c static int xhci_mtk_remove(struct platform_device *dev) · line 605
Quoted 8 lines
drivers/usb/host/xhci-mtk.c +0
-2@@ -597,8 +600,6 @@ static int xhci_mtk_remove(struct platform_device *dev)xhci_mtk_sch_exit (mtk);xhci_mtk_clks_disable (mtk);xhci_mtk_ldos_disable (mtk); -pm_runtime_put_sync (&dev->dev); -pm_runtime_disable (&dev->dev);return 0 ; }
Thanks
Quoted 16 lines · Macpaul Lin
When runtime suspend was enabled, runtime suspend might happened when xhci is removing hcd. This might cause kernel panic when hcd has been freed but runtime pm suspend related handle need to reference it.
Change-Id I70a5dc8006207caeecbac6955ce8e5345dcc70e6Signed-off-by Macpaul Lin <[email protected]>--- drivers/usb/host/xhci-mtk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/usb/host/xhci-mtk.c +0
-0
drivers/usb/host/xhci-mtk.c static int xhci_mtk_remove(struct platform_device *dev) · line 590
Quoted 4 lines
drivers/usb/host/xhci-mtk.c +1
-0@@ -587,6 +587,9 @@ static int xhci_mtk_remove(struct platform_device *dev)struct xhci_hcd *xhci =hcd_to_xhci (hcd);struct usb_hcd *shared_hcd = xhci->shared_hcd; +pm_runtime_put_sync (&dev->dev);
Might runtime suspend here.
It's a lot better than before, no panic as hcd isn't released, but a bit unnecessary.
how about this sequence instead:pm_runtime_disable()pm_runtime_put_noidle()
drivers/usb/host/xhci-mtk.c static int xhci_mtk_remove(struct platform_device *dev) · line 592
Quoted 2 lines
drivers/usb/host/xhci-mtk.c +2
-0+pm_runtime_disable (&dev->dev); +
-Mathias
Quoted 25 lines · Mathias Nyman
Quoted 16 lines · Macpaul Lin
When runtime suspend was enabled, runtime suspend might happened when xhci is removing hcd. This might cause kernel panic when hcd has been freed but runtime pm suspend related handle need to reference it.
Change-Id I70a5dc8006207caeecbac6955ce8e5345dcc70e6Signed-off-by Macpaul Lin <[email protected]>--- drivers/usb/host/xhci-mtk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/usb/host/xhci-mtk.c +0
-0drivers/usb/host/xhci-mtk.c static int xhci_mtk_remove(struct platform_device *dev) · line 590
Quoted 4 lines
drivers/usb/host/xhci-mtk.c +1
-0@@ -587,6 +587,9 @@ static int xhci_mtk_remove(struct platform_device *dev)struct xhci_hcd *xhci =hcd_to_xhci (hcd);struct usb_hcd *shared_hcd = xhci->shared_hcd; +pm_runtime_put_sync (&dev->dev);Might runtime suspend here.
It's a lot better than before, no panic as hcd isn't released, but a bit unnecessary.
Quoted 8 lines
how about this sequence instead:
pm_runtime_disable()pm_runtime_put_noidle()drivers/usb/host/xhci-mtk.c static int xhci_mtk_remove(struct platform_device *dev) · line 592
Quoted 2 lines
drivers/usb/host/xhci-mtk.c +2
-0+pm_runtime_disable (&dev->dev); +-Mathias
Thanks for your suggestion!
Will it better to put no idle before disable?pm_runtime_put_noidle()pm_runtime_disable()
I've found pm_runtime_put_noidle is called in pm_runtime_disable() when there is a pending request.
I will send patch v3 as noidle() called earlier than disable(). Please help to comment it if disable() should go before.
Thanks!
Macpaul Lin
PATCH v3 1/1 usb: host: xhci-mtk: avoid runtime suspend when removing hcd
In reply to Mathias NymanWhen runtime suspend was enabled, runtime suspend might happened when xhci is removing hcd. This might cause kernel panic when hcd has been freed but runtime pm suspend related handle need to reference it.
---
Changes for v3:
- Replace better sequence for disabling the pm_runtime suspend.
drivers/usb/host/xhci-mtk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-mtk.c +3 -2
@@ -587,6 +587,9 @@ static int xhci_mtk_remove(struct platform_device *dev)struct xhci_hcd *xhci =hcd_to_xhci (hcd);struct usb_hcd *shared_hcd = xhci->shared_hcd; +pm_runtime_put_noidle (&dev->dev); +pm_runtime_disable (&dev->dev); +usb_remove_hcd (shared_hcd); xhci->shared_hcd =NULL ;device_init_wakeup (&dev->dev, false);
@@ -597,8 +600,6 @@ static int xhci_mtk_remove(struct platform_device *dev)xhci_mtk_sch_exit (mtk);xhci_mtk_clks_disable (mtk);xhci_mtk_ldos_disable (mtk); -pm_runtime_put_sync (&dev->dev); -pm_runtime_disable (&dev->dev);return 0 ; }
Signature · 1 line
1.7.9.5
Hello.
Quoted 1 line · Macpaul Lin
When runtime suspend was enabled, runtime suspend might happened
Happen.
Quoted 6 lines
when xhci is removing hcd. This might cause kernel panic when hcd has been freed but runtime pm suspend related handle need to reference it.
Signed-off-by Macpaul Lin <[email protected]>Reviewed-by Chunfeng Yun <[email protected]>
[...]
MBR, Sergei
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v4 1/1 usb: host: xhci-mtk: avoid runtime suspend when removing hcd
In reply to Macpaul LinWhen runtime suspend was enabled, runtime suspend might happen when xhci is removing hcd. This might cause kernel panic when hcd has been freed but runtime pm suspend related handle need to reference it.
---
Changes for v3:
- Replace better sequence for disabling the pm_runtime suspend.
Changes for v4:
- Thanks for Sergei's review, typo in commit description has been corrected.
drivers/usb/host/xhci-mtk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-mtk.c +3 -2
@@ -587,6 +587,9 @@ static int xhci_mtk_remove(struct platform_device *dev)struct xhci_hcd *xhci =hcd_to_xhci (hcd);struct usb_hcd *shared_hcd = xhci->shared_hcd; +pm_runtime_put_noidle (&dev->dev); +pm_runtime_disable (&dev->dev); +usb_remove_hcd (shared_hcd); xhci->shared_hcd =NULL ;device_init_wakeup (&dev->dev, false);
@@ -597,8 +600,6 @@ static int xhci_mtk_remove(struct platform_device *dev)xhci_mtk_sch_exit (mtk);xhci_mtk_clks_disable (mtk);xhci_mtk_ldos_disable (mtk); -pm_runtime_put_sync (&dev->dev); -pm_runtime_disable (&dev->dev);return 0 ; }
Signature · 1 line
1.7.9.5
Quoted 5 lines · Macpaul Lin
When runtime suspend was enabled, runtime suspend might happen when xhci is removing hcd. This might cause kernel panic when hcd has been freed but runtime pm suspend related handle need to reference it.
Quoted 9 lines
Signed-off-by Macpaul Lin <[email protected]>Reviewed-by Chunfeng Yun <[email protected]>---
Changes for v3:
- Replace better sequence for disabling thepm_runtimesuspend.
Changes for v4:
- Thanks for Sergei's review, typo in commit description has been corrected.
Thanks, added to queue
-Mathias