iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmaengine: intel_mid_dma: locking and freeing fixes

Browse Source 
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>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
This commit is contained in:
Adrian Hunter 2011-12-16 11:01:38 +02:00 committed by Vinod Koul
parent 0ef7e206d6
commit 1fded07513
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/dma/intel_mid_dma.c
View File

@ -280,7 +280,8 @@ static void midc_dostart(struct intel_mid_dma_chan *midc,
* callbacks but must be called with the lock held. * callbacks but must be called with the lock held.
*/ */
static void midc_descriptor_complete(struct intel_mid_dma_chan *midc, 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; struct dma_async_tx_descriptor *txd = &desc->txd;
dma_async_tx_callback callback_txd = NULL; 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, pci_pool_free(desc->lli_pool, desc->lli,
desc->lli_phys); desc->lli_phys);
pci_pool_destroy(desc->lli_pool); pci_pool_destroy(desc->lli_pool);
desc->lli = NULL;
} }
list_move(&desc->desc_node, &midc->free_list); list_move(&desc->desc_node, &midc->free_list);
midc->busy = false; 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); ret = dma_async_is_complete(cookie, last_complete, last_used);
if (ret != DMA_SUCCESS) { if (ret != DMA_SUCCESS) {
spin_lock_bh(&midc->lock);
midc_scan_descriptors(to_middma_device(chan->device), midc); midc_scan_descriptors(to_middma_device(chan->device), midc);
spin_unlock_bh(&midc->lock);
last_complete = midc->completed; last_complete = midc->completed;
last_used = chan->cookie; 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, pci_pool_free(desc->lli_pool, desc->lli,
desc->lli_phys); desc->lli_phys);
pci_pool_destroy(desc->lli_pool); pci_pool_destroy(desc->lli_pool);
desc->lli = NULL;
} }
list_move(&desc->desc_node, &midc->free_list); list_move(&desc->desc_node, &midc->free_list);
} }