Skip to content

Commit b6d1778

Browse files
geertuVinod Koul
authored and
Vinod Koul
committed
dmaengine: shdma: Move DMA stop to (runtime) suspend callbacks
During system reboot, the sh-dma-engine device may be runtime-suspended, causing a crash: Unhandled fault: imprecise external abort (0x1406) at 0x0002c02c Internal error: : 1406 [#1] SMP ARM ... PC is at sh_dmae_ctl_stop+0x28/0x64 LR is at sh_dmae_ctl_stop+0x24/0x64 If the sh-dma-engine is runtime-suspended, its module clock is turned off, and its registers cannot be accessed. To fix this, move the call to sh_dmae_ctl_stop(), which touches the DMAOR register, to the sh_dmae_suspend() and sh_dmae_runtime_suspend() callbacks. This makes PM operations more symmetric, as both sh_dmae_resume() and sh_dmae_runtime_resume() already call sh_dmae_rst() to re-initialize the DMAOR register. Remove sh_dmae_shutdown(), as it became empty. Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: Ulf Hansson <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
1 parent 3a314f1 commit b6d1778

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

drivers/dma/sh/shdmac.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -582,15 +582,12 @@ static void sh_dmae_chan_remove(struct sh_dmae_device *shdev)
582582
}
583583
}
584584

585-
static void sh_dmae_shutdown(struct platform_device *pdev)
586-
{
587-
struct sh_dmae_device *shdev = platform_get_drvdata(pdev);
588-
sh_dmae_ctl_stop(shdev);
589-
}
590-
591585
#ifdef CONFIG_PM
592586
static int sh_dmae_runtime_suspend(struct device *dev)
593587
{
588+
struct sh_dmae_device *shdev = dev_get_drvdata(dev);
589+
590+
sh_dmae_ctl_stop(shdev);
594591
return 0;
595592
}
596593

@@ -605,6 +602,9 @@ static int sh_dmae_runtime_resume(struct device *dev)
605602
#ifdef CONFIG_PM_SLEEP
606603
static int sh_dmae_suspend(struct device *dev)
607604
{
605+
struct sh_dmae_device *shdev = dev_get_drvdata(dev);
606+
607+
sh_dmae_ctl_stop(shdev);
608608
return 0;
609609
}
610610

@@ -929,13 +929,12 @@ static int sh_dmae_remove(struct platform_device *pdev)
929929
}
930930

931931
static struct platform_driver sh_dmae_driver = {
932-
.driver = {
932+
.driver = {
933933
.pm = &sh_dmae_pm,
934934
.name = SH_DMAE_DRV_NAME,
935935
.of_match_table = sh_dmae_of_match,
936936
},
937937
.remove = sh_dmae_remove,
938-
.shutdown = sh_dmae_shutdown,
939938
};
940939

941940
static int __init sh_dmae_init(void)

0 commit comments

Comments
 (0)