Skip to content

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

sw:drv: make use of callback_result to notify errors 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 0200a93c
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 3 deletions
software/kernel/spec-gn412x-dma.c
View file @ 57176098
...@@ -594,6 +594,7 @@ static int gn412x_dma_slave_config(struct dma_chan *chan, ...@@ -594,6 +594,7 @@ static int gn412x_dma_slave_config(struct dma_chan *chan,
static int gn412x_dma_terminate_all(struct dma_chan *chan) static int gn412x_dma_terminate_all(struct dma_chan *chan)
{ {
struct gn412x_dma_device *gn412x_dma; struct gn412x_dma_device *gn412x_dma;
struct gn412x_dma_tx *tx;
gn412x_dma = to_gn412x_dma_device(chan->device); gn412x_dma = to_gn412x_dma_device(chan->device);
gn412x_dma_ctrl_abort(gn412x_dma); gn412x_dma_ctrl_abort(gn412x_dma);
...@@ -604,6 +605,15 @@ static int gn412x_dma_terminate_all(struct dma_chan *chan) ...@@ -604,6 +605,15 @@ static int gn412x_dma_terminate_all(struct dma_chan *chan)
return -EINVAL; return -EINVAL;
} }
tx = to_gn412x_dma_chan(chan)->tx_curr;
if (tx->tx.callback_result) {
const struct dmaengine_result result = {
.result = DMA_TRANS_ABORTED,
.residue = 0,
};
tx->tx.callback_result(tx->tx.callback_param, &result);
}
return 0; return 0;
} }
...@@ -651,12 +661,27 @@ static irqreturn_t gn412x_dma_irq_handler(int irq, void *arg) ...@@ -651,12 +661,27 @@ static irqreturn_t gn412x_dma_irq_handler(int irq, void *arg)
switch (state) { switch (state) {
case GN412X_DMA_STAT_IDLE: case GN412X_DMA_STAT_IDLE:
dma_cookie_complete(&tx->tx); dma_cookie_complete(&tx->tx);
if (tx->tx.callback) if (tx->tx.callback_result) {
const struct dmaengine_result result = {
.result = DMA_TRANS_NOERROR,
.residue = 0,
};
tx->tx.callback_result(tx->tx.callback_param, &result);
} else if (tx->tx.callback) {
tx->tx.callback(tx->tx.callback_param); tx->tx.callback(tx->tx.callback_param);
}
break; break;
case GN412X_DMA_STAT_ERROR: case GN412X_DMA_STAT_ERROR:
dev_err(&gn412x_dma->pdev->dev, if (tx->tx.callback_result) {
"DMA transfer failed: error\n"); const struct dmaengine_result result = {
.result = DMA_TRANS_READ_FAILED,
.residue = 0,
};
tx->tx.callback_result(tx->tx.callback_param, &result);
}
dev_err(&gn412x_dma->pdev->dev, "DMA transfer failed: error\n");
break; break;
default: default:
dev_err(&gn412x_dma->pdev->dev, dev_err(&gn412x_dma->pdev->dev,
......
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