dmaengine: tegra-apb: Error out if DMA_PREP_INTERRUPT flag is unset
Subsystems (3)
PATCH 1/1 dmaengine: tegra-apb: Error out if DMA_PREP_INTERRUPT flag is unset
Apparently driver was never tested with DMA_PREP_INTERRUPT flag being unset since it completely disables interrupt handling instead of skipping the callbacks invocations, hence putting channel into unusable state.
The flag is always set by all of kernel drivers that use APB DMA, so let's error out in otherwise case for consistency. It won't be difficult to support that case properly if ever will be needed.
--- drivers/dma/tegra20-apb-dma.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/dma/tegra20-apb-dma.c +10 -2
@@ -988,8 +988,12 @@ static struct dma_async_tx_descriptor *tegra_dma_prep_slave_sg( csr |= tdc->slave_id <<TEGRA_APBDMA_CSR_REQ_SEL_SHIFT ; } -if (flags &DMA_PREP_INTERRUPT ) +if (flags &DMA_PREP_INTERRUPT ) { csr |=TEGRA_APBDMA_CSR_IE_EOC ; + }else { +WARN_ON_ONCE (1 ); +return NULL ; + } apb_seq |=TEGRA_APBDMA_APBSEQ_WRAP_WORD_1 ;
@@ -1131,8 +1135,12 @@ static struct dma_async_tx_descriptor *tegra_dma_prep_dma_cyclic( csr |= tdc->slave_id <<TEGRA_APBDMA_CSR_REQ_SEL_SHIFT ; } -if (flags &DMA_PREP_INTERRUPT ) +if (flags &DMA_PREP_INTERRUPT ) { csr |=TEGRA_APBDMA_CSR_IE_EOC ; + }else { +WARN_ON_ONCE (1 ); +return NULL ; + } apb_seq |=TEGRA_APBDMA_APBSEQ_WRAP_WORD_1 ;
Signature · 1 line
2.21.0
Quoted 34 lines · Dmitry Osipenko
Apparently driver was never tested with
DMA_PREP_INTERRUPTflag being unset since it completely disables interrupt handling instead of skipping the callbacks invocations, hence putting channel into unusable state.The flag is always set by all of kernel drivers that use APB DMA, so let's error out in otherwise case for consistency. It won't be difficult to support that case properly if ever will be needed.
Signed-off-by Dmitry Osipenko <[email protected]>--- drivers/dma/tegra20-apb-dma.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)drivers/dma/tegra20-apb-dma.c +5
-1@@ -988,8 +988,12 @@ static struct dma_async_tx_descriptor *tegra_dma_prep_slave_sg( csr |= tdc->slave_id <<TEGRA_APBDMA_CSR_REQ_SEL_SHIFT ; } -if (flags &DMA_PREP_INTERRUPT ) +if (flags &DMA_PREP_INTERRUPT ) { csr |=TEGRA_APBDMA_CSR_IE_EOC ; + }else { +WARN_ON_ONCE (1 ); +return NULL ; + } apb_seq |=TEGRA_APBDMA_APBSEQ_WRAP_WORD_1 ;@@ -1131,8 +1135,12 @@ static struct dma_async_tx_descriptor *tegra_dma_prep_dma_cyclic( csr |= tdc->slave_id <<TEGRA_APBDMA_CSR_REQ_SEL_SHIFT ; }
drivers/dma/tegra20-apb-dma.c static struct dma_async_tx_descriptor *tegra_dma_prep_dma_cyclic( · line 1145
Quoted 10 lines
drivers/dma/tegra20-apb-dma.c +5
-1-if (flags &DMA_PREP_INTERRUPT ) +if (flags &DMA_PREP_INTERRUPT ) { csr |=TEGRA_APBDMA_CSR_IE_EOC ; + }else { +WARN_ON_ONCE (1 ); +return NULL ; + } apb_seq |=TEGRA_APBDMA_APBSEQ_WRAP_WORD_1 ;
Looks good to me.
Cheers
Jon
Signature · 1 line
nvpublic
30.05.2019 15:01, Jon Hunter пишет:
Quoted 45 lines · Dmitry Osipenko
Quoted 43 lines
Apparently driver was never tested with
DMA_PREP_INTERRUPTflag being unset since it completely disables interrupt handling instead of skipping the callbacks invocations, hence putting channel into unusable state.The flag is always set by all of kernel drivers that use APB DMA, so let's error out in otherwise case for consistency. It won't be difficult to support that case properly if ever will be needed.
Signed-off-by Dmitry Osipenko <[email protected]>--- drivers/dma/tegra20-apb-dma.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)drivers/dma/tegra20-apb-dma.c +10
-2@@ -988,8 +988,12 @@ static struct dma_async_tx_descriptor *tegra_dma_prep_slave_sg( csr |= tdc->slave_id <<TEGRA_APBDMA_CSR_REQ_SEL_SHIFT ; } -if (flags &DMA_PREP_INTERRUPT ) +if (flags &DMA_PREP_INTERRUPT ) { csr |=TEGRA_APBDMA_CSR_IE_EOC ; + }else { +WARN_ON_ONCE (1 ); +return NULL ; + } apb_seq |=TEGRA_APBDMA_APBSEQ_WRAP_WORD_1 ;@@ -1131,8 +1135,12 @@ static struct dma_async_tx_descriptor *tegra_dma_prep_dma_cyclic( csr |= tdc->slave_id <<TEGRA_APBDMA_CSR_REQ_SEL_SHIFT ; } -if (flags &DMA_PREP_INTERRUPT ) +if (flags &DMA_PREP_INTERRUPT ) { csr |=TEGRA_APBDMA_CSR_IE_EOC ; + }else { +WARN_ON_ONCE (1 ); +return NULL ; + }
Quoted 9 lines
drivers/dma/tegra20-apb-dma.c static struct dma_async_tx_descriptor *tegra_dma_prep_dma_cyclic( · line 1145
Quoted 1 line
drivers/dma/tegra20-apb-dma.c +0
-0apb_seq |=TEGRA_APBDMA_APBSEQ_WRAP_WORD_1 ;Looks good to me.
Acked-by Jon Hunter <[email protected]>Cheers
Jon
Thanks
Quoted 7 lines · Dmitry Osipenko
Apparently driver was never tested with
DMA_PREP_INTERRUPTflag being unset since it completely disables interrupt handling instead of skipping the callbacks invocations, hence putting channel into unusable state.The flag is always set by all of kernel drivers that use APB DMA, so let's error out in otherwise case for consistency. It won't be difficult to support that case properly if ever will be needed.
Applied, thanks
Signature · 1 line
~Vinod