Skip to content

S
Simple PCIe FMC carrier SPEC
Commit e4ab4642 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

sw:drv: bugfix in terminate_all 

the tx pointer was not pointing to the last tx_cur because the for
loop was overwriting its value.
Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 9295311d
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 13 deletions
software/kernel/spec-gn412x-dma.c
View file @ e4ab4642
...@@ -635,31 +635,25 @@ static int gn412x_dma_terminate_all(struct dma_chan *chan) ...@@ -635,31 +635,25 @@ static int gn412x_dma_terminate_all(struct dma_chan *chan)
gn412x_dma = to_gn412x_dma_device(chan->device); gn412x_dma = to_gn412x_dma_device(chan->device);
spin_lock_irqsave(&gn412x_dma_chan->lock, flags); spin_lock_irqsave(&gn412x_dma_chan->lock, flags);
tx = gn412x_dma_chan->tx_curr;
if (tx) {
gn412x_dma_ctrl_abort(gn412x_dma);
gn412x_dma_chan->tx_curr = NULL;
}
gn412x_dma_tx_free(tx);
list_for_each_entry_safe(tx, tx_tmp, list_for_each_entry_safe(tx, tx_tmp,
&gn412x_dma_chan->pending_list, list) { &gn412x_dma_chan->pending_list, list) {
list_del(&tx->list); list_del(&tx->list);
gn412x_dma_tx_free(tx); gn412x_dma_tx_free(tx);
} }
spin_unlock_irqrestore(&gn412x_dma_chan->lock, flags); tx = gn412x_dma_chan->tx_curr;
if (tx) {
if (gn412x_dma_is_abort(gn412x_dma)) { gn412x_dma_ctrl_abort(gn412x_dma);
if (tx && tx->tx.callback_result) { gn412x_dma_chan->tx_curr = NULL;
if (tx->tx.callback_result && gn412x_dma_is_abort(gn412x_dma)) {
const struct dmaengine_result result = { const struct dmaengine_result result = {
.result = DMA_TRANS_ABORTED, .result = DMA_TRANS_ABORTED,
.residue = 0, .residue = 0,
}; };
tx->tx.callback_result(tx->tx.callback_param, &result); tx->tx.callback_result(tx->tx.callback_param, &result);
} }
gn412x_dma_tx_free(tx);
} }
spin_unlock_irqrestore(&gn412x_dma_chan->lock, flags);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment