dmaengine: intel_mid_dma: fixes
cover dmaengine: intel_mid_dma: fixes
Hi
Here are some minor fixes:
Adrian Hunter (2):
dmaengine: intel_mid_dma: locking and freeing fixes
dmaengine: intel_mid_dma: error path fix
Kristen Carlson Accardi (1):
dmaengine: intel_mid_dma: remove legacy pm interface
drivers/dma/intel_mid_dma.c | 25 ++++++++++++++++++------- drivers/dma/intel_mid_dma_regs.h | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-)
Regards
Adrian
PATCH 1/3 dmaengine: intel_mid_dma: locking and freeing fixes
Two issues are fixed:
1. DMA descriptors are reused so when freeing lli structures that are linked to them, the pointer must be nulled.
2. midc_scan_descriptors() must be called with the channel lock held.
--- drivers/dma/intel_mid_dma.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
drivers/dma/intel_mid_dma.c +6 -1
@@ -280,7 +280,8 @@ static void midc_dostart(struct intel_mid_dma_chan *midc,* callbacks but must be called with the lock held. */ static void midc_descriptor_complete (struct intel_mid_dma_chan *midc, -struct intel_mid_dma_desc *desc) +struct intel_mid_dma_desc *desc) + __releases(&midc->lock) __acquires(&midc->lock) {struct dma_async_tx_descriptor *txd = &desc->txd;dma_async_tx_callback callback_txd =NULL ;
@@ -311,6 +312,7 @@ static void midc_descriptor_complete(struct intel_mid_dma_chan *midc,pci_pool_free (desc->lli_pool, desc->lli, desc->lli_phys);pci_pool_destroy (desc->lli_pool); + desc->lli =NULL ; }list_move (&desc->desc_node, &midc->free_list); midc->busy = false;
@@ -490,7 +492,9 @@ static enum dma_status intel_mid_dma_tx_status(struct dma_chan *chan, ret =dma_async_is_complete (cookie, last_complete, last_used);if (ret !=DMA_SUCCESS ) { +spin_lock_bh (&midc->lock);midc_scan_descriptors (to_middma_device (chan->device), midc); +spin_unlock_bh (&midc->lock); last_complete = midc->completed; last_used = chan->cookie;
@@ -566,6 +570,7 @@ static int intel_mid_dma_device_control(struct dma_chan *chan,pci_pool_free (desc->lli_pool, desc->lli, desc->lli_phys);pci_pool_destroy (desc->lli_pool); + desc->lli =NULL ; }list_move (&desc->desc_node, &midc->free_list); }
Signature · 1 line
1.7.6.4
PATCH 2/3 dmaengine: intel_mid_dma: error path fix
In reply to Adrian HunterAdd missing iounmap in error path.
--- drivers/dma/intel_mid_dma.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/dma/intel_mid_dma.c +5 -1
@@ -1104,7 +1104,8 @@ static int mid_setup_dma(struct pci_dev *pdev) LNW_PERIPHRAL_MASK_SIZE);if (dma->mask_reg ==NULL ) {pr_err ("ERR_MDMA:Can't map periphral intr space !!\n" ); -return -ENOMEM ; + err = -ENOMEM ; + goto err_ioremap; } }else dma->mask_reg =NULL ;
@@ -1201,6 +1202,9 @@ static int mid_setup_dma(struct pci_dev *pdev) err_engine:free_irq (pdev->irq, dma); err_irq: +if (dma->mask_reg) +iounmap (dma->mask_reg); +err_ioremap:pci_pool_destroy (dma->dma_pool); err_dma_pool:pr_err ("ERR_MDMA:setup_dma failed: %d\n" , err);
Signature · 1 line
1.7.6.4
PATCH 3/3 dmaengine: intel_mid_dma: remove legacy pm interface
In reply to Adrian HunterFrom: Kristen Carlson Accardi <[email protected]>
Drivers should not support both legacy pm and new framework.
--- drivers/dma/intel_mid_dma.c | 12 +++++++----- drivers/dma/intel_mid_dma_regs.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-)
drivers/dma/intel_mid_dma.c +7 -5
@@ -873,7 +873,7 @@ static int intel_mid_dma_alloc_chan_resources(struct dma_chan *chan)pm_runtime_get_sync (&mid->pdev->dev);if (mid->state ==SUSPENDED ) { -if (dma_resume (mid->pdev)) { +if (dma_resume (&mid->pdev->dev)) {pr_err ("ERR_MDMA: resume failed" );return -EFAULT ; }
@@ -1346,8 +1346,9 @@ static void __devexit intel_mid_dma_remove(struct pci_dev *pdev)* * This function is called by OS when a power event occurs */ -int dma_suspend (struct pci_dev *pci,pm_message_t state) +static int dma_suspend (struct device *dev) { +struct pci_dev *pci =to_pci_dev (dev);int i;struct middma_device *device =pci_get_drvdata (pci);pr_debug ("MDMA: dma_suspend called\n" );
@@ -1371,8 +1372,9 @@ int dma_suspend(struct pci_dev *pci, pm_message_t state)* * This function is called by OS when a power event occurs */ -int dma_resume (struct pci_dev *pci) +int dma_resume (struct device *dev) { +struct pci_dev *pci =to_pci_dev (dev);int ret;struct middma_device *device =pci_get_drvdata (pci);
@@ -1438,6 +1440,8 @@ static const struct dev_pm_ops intel_mid_dma_pm = { .runtime_suspend = dma_runtime_suspend, .runtime_resume = dma_runtime_resume, .runtime_idle = dma_runtime_idle, + .suspend = dma_suspend, + .resume = dma_resume, };static struct pci_driver intel_mid_dma_pci_driver = {
@@ -1446,8 +1450,6 @@ static struct pci_driver intel_mid_dma_pci_driver = { .probe = intel_mid_dma_probe, .remove =__devexit_p (intel_mid_dma_remove), #ifdef CONFIG_PM - .suspend = dma_suspend, - .resume = dma_resume, .driver = { .pm = &intel_mid_dma_pm, },
drivers/dma/intel_mid_dma_regs.h +1 -1
@@ -296,6 +296,6 @@ static inline struct intel_mid_dma_slave *to_intel_mid_dma_slave } -int dma_resume (struct pci_dev *pci); +int dma_resume (struct device *dev);#endif /*__INTEL_MID_DMAC_REGS_H__*/
Signature · 1 line
1.7.6.4
Re: [PATCH 3/3] dmaengine: intel_mid_dma: remove legacy pm interface
Quoted 5 lines · Adrian Hunter
From: Kristen Carlson Accardi <[email protected]>
Drivers should not support both legacy pm and new framework.
Signed-off-by Kristen Carlson Accardi <[email protected]>
There seems to be a similar patch from Kristen sent by Alan??
Quoted 70 lines
--- drivers/dma/intel_mid_dma.c | 12 +++++++----- drivers/dma/intel_mid_dma_regs.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-)drivers/dma/intel_mid_dma.c +7
-5@@ -873,7 +873,7 @@ static int intel_mid_dma_alloc_chan_resources(struct dma_chan *chan)pm_runtime_get_sync (&mid->pdev->dev);if (mid->state ==SUSPENDED ) { -if (dma_resume (mid->pdev)) { +if (dma_resume (&mid->pdev->dev)) {pr_err ("ERR_MDMA: resume failed" );return -EFAULT ; }@@ -1346,8 +1346,9 @@ static void __devexit intel_mid_dma_remove(struct pci_dev *pdev)* * This function is called by OS when a power event occurs */ -int dma_suspend (struct pci_dev *pci,pm_message_t state) +static int dma_suspend (struct device *dev) { +struct pci_dev *pci =to_pci_dev (dev);int i;struct middma_device *device =pci_get_drvdata (pci);pr_debug ("MDMA: dma_suspend called\n" );@@ -1371,8 +1372,9 @@ int dma_suspend(struct pci_dev *pci, pm_message_t state)* * This function is called by OS when a power event occurs */ -int dma_resume (struct pci_dev *pci) +int dma_resume (struct device *dev) { +struct pci_dev *pci =to_pci_dev (dev);int ret;struct middma_device *device =pci_get_drvdata (pci);@@ -1438,6 +1440,8 @@ static const struct dev_pm_ops intel_mid_dma_pm = { .runtime_suspend = dma_runtime_suspend, .runtime_resume = dma_runtime_resume, .runtime_idle = dma_runtime_idle, + .suspend = dma_suspend, + .resume = dma_resume, };static struct pci_driver intel_mid_dma_pci_driver = {@@ -1446,8 +1450,6 @@ static struct pci_driver intel_mid_dma_pci_driver = { .probe = intel_mid_dma_probe, .remove =__devexit_p (intel_mid_dma_remove), #ifdef CONFIG_PM - .suspend = dma_suspend, - .resume = dma_resume, .driver = { .pm = &intel_mid_dma_pm, },drivers/dma/intel_mid_dma_regs.h +1
-1@@ -296,6 +296,6 @@ static inline struct intel_mid_dma_slave *to_intel_mid_dma_slave } -int dma_resume (struct pci_dev *pci); +int dma_resume (struct device *dev);#endif /*__INTEL_MID_DMAC_REGS_H__*/
Re: [PATCH 3/3] dmaengine: intel_mid_dma: remove legacy pm interface
Quoted 7 lines · Vinod Koul
Quoted 5 lines · Adrian Hunter
From: Kristen Carlson Accardi <[email protected]>
Drivers should not support both legacy pm and new framework.
Signed-off-by Kristen Carlson Accardi <[email protected]>There seems to be a similar patch from Kristen sent by Alan??
Apologies to all.
The patches are identical except for subject and signed-off.
Please take Alan's.
Quoted 75 lines
Quoted 71 lines
--- drivers/dma/intel_mid_dma.c | 12 +++++++----- drivers/dma/intel_mid_dma_regs.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-)drivers/dma/intel_mid_dma.c +7
-5@@ -873,7 +873,7 @@ static int intel_mid_dma_alloc_chan_resources(struct dma_chan *chan)pm_runtime_get_sync (&mid->pdev->dev);if (mid->state ==SUSPENDED ) { -if (dma_resume (mid->pdev)) { +if (dma_resume (&mid->pdev->dev)) {pr_err ("ERR_MDMA: resume failed" );return -EFAULT ; }@@ -1346,8 +1346,9 @@ static void __devexit intel_mid_dma_remove(struct pci_dev *pdev)* * This function is called by OS when a power event occurs */ -int dma_suspend (struct pci_dev *pci,pm_message_t state) +static int dma_suspend (struct device *dev) { +struct pci_dev *pci =to_pci_dev (dev);int i;struct middma_device *device =pci_get_drvdata (pci);pr_debug ("MDMA: dma_suspend called\n" );@@ -1371,8 +1372,9 @@ int dma_suspend(struct pci_dev *pci, pm_message_t state)* * This function is called by OS when a power event occurs */ -int dma_resume (struct pci_dev *pci) +int dma_resume (struct device *dev) { +struct pci_dev *pci =to_pci_dev (dev);int ret;struct middma_device *device =pci_get_drvdata (pci);@@ -1438,6 +1440,8 @@ static const struct dev_pm_ops intel_mid_dma_pm = { .runtime_suspend = dma_runtime_suspend, .runtime_resume = dma_runtime_resume, .runtime_idle = dma_runtime_idle, + .suspend = dma_suspend, + .resume = dma_resume, };static struct pci_driver intel_mid_dma_pci_driver = {@@ -1446,8 +1450,6 @@ static struct pci_driver intel_mid_dma_pci_driver = { .probe = intel_mid_dma_probe, .remove =__devexit_p (intel_mid_dma_remove), #ifdef CONFIG_PM - .suspend = dma_suspend, - .resume = dma_resume, .driver = { .pm = &intel_mid_dma_pm, },drivers/dma/intel_mid_dma_regs.h +1
-1@@ -296,6 +296,6 @@ static inline struct intel_mid_dma_slave *to_intel_mid_dma_slave } -int dma_resume (struct pci_dev *pci); +int dma_resume (struct device *dev);#endif /*__INTEL_MID_DMAC_REGS_H__*/
Re: [PATCH 3/3] dmaengine: intel_mid_dma: remove legacy pm interface
In reply to Vinod KoulQuoted 7 lines · On Tue, 20 Dec 2011 14:43:16 +0530 Vinod Koul <[email protected]> wrote:
Quoted 5 lines · Adrian Hunter
From: Kristen Carlson Accardi <[email protected]>
Drivers should not support both legacy pm and new framework.
Signed-off-by Kristen Carlson Accardi <[email protected]>There seems to be a similar patch from Kristen sent by Alan??
Same patch via two paths.
Alan
Vinod Koul
AppliedQuoted 8 lines · Adrian Hunter
Hi
Here are some minor fixes:
Adrian Hunter (2):
dmaengine:intel_mid_dma: locking and freeing fixes
dmaengine:intel_mid_dma: error path fix
Quoted 7 lines
Kristen Carlson Accardi (1):
dmaengine:intel_mid_dma: remove legacy pm interfacedrivers/dma/intel_mid_dma.c | 25 ++++++++++++++++++------- drivers/dma/intel_mid_dma_regs.h | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-)
Applied, 1 and 2.
3 we need some more discussion.
Signature · 1 line
~Vinod