* [PATCH 1/3] dmaengine: intel_mid_dma: locking and freeing fixes
2011-12-16 9:01 [PATCH 0/3] dmaengine: intel_mid_dma: fixes Adrian Hunter
@ 2011-12-16 9:01 ` Adrian Hunter
2011-12-16 9:01 ` [PATCH 2/3] dmaengine: intel_mid_dma: error path fix Adrian Hunter
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Adrian Hunter @ 2011-12-16 9:01 UTC (permalink / raw)
To: Vinod Koul; +Cc: Dan Williams, LKML, Adrian Hunter
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.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/dma/intel_mid_dma.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
index 01929ed..d4b9616 100644
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
@@ -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);
}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/3] dmaengine: intel_mid_dma: error path fix
2011-12-16 9:01 [PATCH 0/3] dmaengine: intel_mid_dma: fixes Adrian Hunter
2011-12-16 9:01 ` [PATCH 1/3] dmaengine: intel_mid_dma: locking and freeing fixes Adrian Hunter
@ 2011-12-16 9:01 ` Adrian Hunter
2011-12-16 9:01 ` [PATCH 3/3] dmaengine: intel_mid_dma: remove legacy pm interface Adrian Hunter
2011-12-23 16:34 ` [PATCH 0/3] dmaengine: intel_mid_dma: fixes Vinod Koul
3 siblings, 0 replies; 8+ messages in thread
From: Adrian Hunter @ 2011-12-16 9:01 UTC (permalink / raw)
To: Vinod Koul; +Cc: Dan Williams, LKML, Adrian Hunter
Add missing iounmap in error path.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/dma/intel_mid_dma.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
index d4b9616..bbcd470 100644
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
@@ -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);
--
1.7.6.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/3] dmaengine: intel_mid_dma: remove legacy pm interface
2011-12-16 9:01 [PATCH 0/3] dmaengine: intel_mid_dma: fixes Adrian Hunter
2011-12-16 9:01 ` [PATCH 1/3] dmaengine: intel_mid_dma: locking and freeing fixes Adrian Hunter
2011-12-16 9:01 ` [PATCH 2/3] dmaengine: intel_mid_dma: error path fix Adrian Hunter
@ 2011-12-16 9:01 ` Adrian Hunter
2011-12-20 9:13 ` Vinod Koul
2011-12-23 16:34 ` [PATCH 0/3] dmaengine: intel_mid_dma: fixes Vinod Koul
3 siblings, 1 reply; 8+ messages in thread
From: Adrian Hunter @ 2011-12-16 9:01 UTC (permalink / raw)
To: Vinod Koul; +Cc: Dan Williams, LKML, Kristen Carlson Accardi
From: Kristen Carlson Accardi <kristen@linux.intel.com>
Drivers should not support both legacy pm and new framework.
Signed-off-by: Kristen Carlson Accardi <kristen@linux.intel.com>
---
drivers/dma/intel_mid_dma.c | 12 +++++++-----
drivers/dma/intel_mid_dma_regs.h | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
index bbcd470..74f70aa 100644
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
@@ -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,
},
diff --git a/drivers/dma/intel_mid_dma_regs.h b/drivers/dma/intel_mid_dma_regs.h
index c6de919..c83d35b 100644
--- a/drivers/dma/intel_mid_dma_regs.h
+++ b/drivers/dma/intel_mid_dma_regs.h
@@ -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__*/
--
1.7.6.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] dmaengine: intel_mid_dma: remove legacy pm interface
2011-12-16 9:01 ` [PATCH 3/3] dmaengine: intel_mid_dma: remove legacy pm interface Adrian Hunter
@ 2011-12-20 9:13 ` Vinod Koul
2011-12-20 9:29 ` Adrian Hunter
2011-12-20 10:56 ` Alan Cox
0 siblings, 2 replies; 8+ messages in thread
From: Vinod Koul @ 2011-12-20 9:13 UTC (permalink / raw)
To: Adrian Hunter, Alan Cox
Cc: vinod.koul, Dan Williams, LKML, Kristen Carlson Accardi
On Fri, 2011-12-16 at 11:01 +0200, Adrian Hunter wrote:
> From: Kristen Carlson Accardi <kristen@linux.intel.com>
>
> Drivers should not support both legacy pm and new framework.
>
> Signed-off-by: Kristen Carlson Accardi <kristen@linux.intel.com>
There seems to be a similar patch from Kristen sent by Alan??
> ---
> drivers/dma/intel_mid_dma.c | 12 +++++++-----
> drivers/dma/intel_mid_dma_regs.h | 2 +-
> 2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
> index bbcd470..74f70aa 100644
> --- a/drivers/dma/intel_mid_dma.c
> +++ b/drivers/dma/intel_mid_dma.c
> @@ -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,
> },
> diff --git a/drivers/dma/intel_mid_dma_regs.h b/drivers/dma/intel_mid_dma_regs.h
> index c6de919..c83d35b 100644
> --- a/drivers/dma/intel_mid_dma_regs.h
> +++ b/drivers/dma/intel_mid_dma_regs.h
> @@ -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__*/
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] dmaengine: intel_mid_dma: remove legacy pm interface
2011-12-20 9:13 ` Vinod Koul
@ 2011-12-20 9:29 ` Adrian Hunter
2011-12-20 10:56 ` Alan Cox
1 sibling, 0 replies; 8+ messages in thread
From: Adrian Hunter @ 2011-12-20 9:29 UTC (permalink / raw)
To: Vinod Koul
Cc: Alan Cox, vinod.koul, Dan Williams, LKML, Kristen Carlson Accardi
On 20/12/11 11:13, Vinod Koul wrote:
> On Fri, 2011-12-16 at 11:01 +0200, Adrian Hunter wrote:
>> From: Kristen Carlson Accardi <kristen@linux.intel.com>
>>
>> Drivers should not support both legacy pm and new framework.
>>
>> Signed-off-by: Kristen Carlson Accardi <kristen@linux.intel.com>
> 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.
>
>> ---
>> drivers/dma/intel_mid_dma.c | 12 +++++++-----
>> drivers/dma/intel_mid_dma_regs.h | 2 +-
>> 2 files changed, 8 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
>> index bbcd470..74f70aa 100644
>> --- a/drivers/dma/intel_mid_dma.c
>> +++ b/drivers/dma/intel_mid_dma.c
>> @@ -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,
>> },
>> diff --git a/drivers/dma/intel_mid_dma_regs.h b/drivers/dma/intel_mid_dma_regs.h
>> index c6de919..c83d35b 100644
>> --- a/drivers/dma/intel_mid_dma_regs.h
>> +++ b/drivers/dma/intel_mid_dma_regs.h
>> @@ -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__*/
>
>
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] dmaengine: intel_mid_dma: remove legacy pm interface
2011-12-20 9:13 ` Vinod Koul
2011-12-20 9:29 ` Adrian Hunter
@ 2011-12-20 10:56 ` Alan Cox
1 sibling, 0 replies; 8+ messages in thread
From: Alan Cox @ 2011-12-20 10:56 UTC (permalink / raw)
To: Vinod Koul
Cc: Adrian Hunter, vinod.koul, Dan Williams, LKML,
Kristen Carlson Accardi
On Tue, 20 Dec 2011 14:43:16 +0530
Vinod Koul <vkoul@infradead.org> wrote:
> On Fri, 2011-12-16 at 11:01 +0200, Adrian Hunter wrote:
> > From: Kristen Carlson Accardi <kristen@linux.intel.com>
> >
> > Drivers should not support both legacy pm and new framework.
> >
> > Signed-off-by: Kristen Carlson Accardi <kristen@linux.intel.com>
> There seems to be a similar patch from Kristen sent by Alan??
Same patch via two paths.
Alan
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] dmaengine: intel_mid_dma: fixes
2011-12-16 9:01 [PATCH 0/3] dmaengine: intel_mid_dma: fixes Adrian Hunter
` (2 preceding siblings ...)
2011-12-16 9:01 ` [PATCH 3/3] dmaengine: intel_mid_dma: remove legacy pm interface Adrian Hunter
@ 2011-12-23 16:34 ` Vinod Koul
3 siblings, 0 replies; 8+ messages in thread
From: Vinod Koul @ 2011-12-23 16:34 UTC (permalink / raw)
To: Adrian Hunter; +Cc: Dan Williams, LKML, Alan Cox, Kristen Carlson Accardi
On Fri, 2011-12-16 at 11:01 +0200, Adrian Hunter wrote:
> 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(-)
>
Applied, 1 and 2.
3 we need some more discussion.
--
~Vinod
^ permalink raw reply [flat|nested] 8+ messages in thread