dma: dw: Add suspend and resume handling for PCI mode DW_DMAC.
Subsystems (2)
PATCH v2 1/1 dma: dw: Add suspend and resume handling for PCI mode DW_DMAC.
From: Chew, Chiau Ee <[email protected]>
This is to disable/enable DW_DMAC hw during late suspend/early resume. Since DMA is providing service to other clients (eg: SPI, HSUART), we need to ensure DMA suspends after the clients and resume before the clients are active.
---
v2 changelog:
* Change suspend_noirq and resume_noirq callback to suspend_late and resume_early.
drivers/dma/dw/pci.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-)
drivers/dma/dw/pci.c +33 -0
@@ -75,6 +75,36 @@ static void dw_pci_remove(struct pci_dev *pdev)dev_warn (&pdev->dev,"can't remove device properly: %d\n" , ret); } +#ifdef CONFIG_PM_SLEEP + +static int dw_pci_suspend_late (struct device *dev) +{ +struct pci_dev *pci =to_pci_dev (dev); +struct dw_dma_chip *chip =pci_get_drvdata (pci); + +return dw_dma_suspend (chip); +}; + +static int dw_pci_resume_early (struct device *dev) +{ +struct pci_dev *pci =to_pci_dev (dev); +struct dw_dma_chip *chip =pci_get_drvdata (pci); + +return dw_dma_resume (chip); +}; + +#else /* !CONFIG_PM_SLEEP */ + +#define dw_pci_suspend_late NULL +#define dw_pci_resume_early NULL + +#endif /* !CONFIG_PM_SLEEP */ + +static const struct dev_pm_ops dw_pci_dev_pm_ops = { + .suspend_late = dw_pci_suspend_late, + .resume_early = dw_pci_resume_early, +}; +static DEFINE_PCI_DEVICE_TABLE (dw_pci_id_table) = {/* Medfield */ {PCI_VDEVICE (INTEL ,0x0827 ), (kernel_ulong_t)&dw_pci_pdata },
@@ -95,6 +125,9 @@ static struct pci_driver dw_pci_driver = { .id_table = dw_pci_id_table, .probe = dw_pci_probe, .remove = dw_pci_remove, + .driver = { + .pm = &dw_pci_dev_pm_ops, + }, };module_pci_driver (dw_pci_driver);
Signature · 1 line
1.7.4.4
Quoted 6 lines · Chew Chiau Ee
From: Chew, Chiau Ee <[email protected]>
This is to disable/enable
DW_DMAChw during late suspend/early resume. Since DMA is providing service to other clients (eg: SPI, HSUART), we need to ensure DMA suspends after the clients and resume before the clients are active.
Thanks for an update!
P.S. It seems a material is for v3.16?
Quoted 61 lines
Signed-off-by Chew, Chiau Ee <[email protected]>---
v2 changelog:
* Changesuspend_noirqandresume_noirqcallback tosuspend_lateandresume_early.drivers/dma/dw/pci.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-)drivers/dma/dw/pci.c +33
-0@@ -75,6 +75,36 @@ static void dw_pci_remove(struct pci_dev *pdev)dev_warn (&pdev->dev,"can't remove device properly: %d\n" , ret); } +#ifdef CONFIG_PM_SLEEP + +static int dw_pci_suspend_late (struct device *dev) +{ +struct pci_dev *pci =to_pci_dev (dev); +struct dw_dma_chip *chip =pci_get_drvdata (pci); + +return dw_dma_suspend (chip); +}; + +static int dw_pci_resume_early (struct device *dev) +{ +struct pci_dev *pci =to_pci_dev (dev); +struct dw_dma_chip *chip =pci_get_drvdata (pci); + +return dw_dma_resume (chip); +}; + +#else /* !CONFIG_PM_SLEEP */ + +#define dw_pci_suspend_late NULL +#define dw_pci_resume_early NULL + +#endif /* !CONFIG_PM_SLEEP */ + +static const struct dev_pm_ops dw_pci_dev_pm_ops = { + .suspend_late = dw_pci_suspend_late, + .resume_early = dw_pci_resume_early, +}; +static DEFINE_PCI_DEVICE_TABLE (dw_pci_id_table) = {/* Medfield */ {PCI_VDEVICE (INTEL ,0x0827 ), (kernel_ulong_t)&dw_pci_pdata },@@ -95,6 +125,9 @@ static struct pci_driver dw_pci_driver = { .id_table = dw_pci_id_table, .probe = dw_pci_probe, .remove = dw_pci_remove, + .driver = { + .pm = &dw_pci_dev_pm_ops, + }, };module_pci_driver (dw_pci_driver);
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
Viresh Kumar
Acked-byQuoted 11 lines · Andy Shevchenko
Quoted 6 lines · Chew Chiau Ee
From: Chew, Chiau Ee <[email protected]>
This is to disable/enable
DW_DMAChw during late suspend/early resume. Since DMA is providing service to other clients (eg: SPI, HSUART), we need to ensure DMA suspends after the clients and resume before the clients are active.Thanks for an update!
Acked-by Andy Shevchenko <[email protected]>
Quoted 1 line
P.S. It seems a material is for v3.16?
I think it can go in 3.15 as well.. we aren't that late yet.
Quoted 8 lines · Chew Chiau Ee
From: Chew, Chiau Ee <[email protected]>
This is to disable/enable
DW_DMAChw during late suspend/early resume. Since DMA is providing service to other clients (eg: SPI, HSUART), we need to ensure DMA suspends after the clients and resume before the clients are active.Signed-off-by Chew, Chiau Ee <[email protected]>
Rather than bunch of ifdef, would make sense to provde a mcros in dmaengine core to do so as we expect all dmaengine drivers to be late probe
Applied thanks
Signature · 1 line
~Vinod