]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
dmaengine: dw-edma: Fix unmasking STOP and ABORT interrupts for HDMA
authorMrinmay Sarkar <quic_msarkar@quicinc.com>
Mon, 26 Aug 2024 12:11:00 +0000 (17:41 +0530)
committerVinod Koul <vkoul@kernel.org>
Wed, 28 Aug 2024 13:10:17 +0000 (18:40 +0530)
The current logic is enabling both STOP_INT_MASK and ABORT_INT_MASK
bit. This is apparently masking those particular interrupts rather than
unmasking the same. If the interrupts are masked, they would never get
triggered.

So fix the issue by unmasking the STOP and ABORT interrupts properly.

Fixes: e74c39573d35 ("dmaengine: dw-edma: Add support for native HDMA")
cc: stable@vger.kernel.org
Signed-off-by: Mrinmay Sarkar <quic_msarkar@quicinc.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/1724674261-3144-2-git-send-email-quic_msarkar@quicinc.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/dw-edma/dw-hdma-v0-core.c

index 10e8f0715114fb5f08f135b4f2d592ce6c53f10c..2addaca3b694f1b12dd89e257321059f6244c2de 100644 (file)
@@ -247,10 +247,11 @@ static void dw_hdma_v0_core_start(struct dw_edma_chunk *chunk, bool first)
        if (first) {
                /* Enable engine */
                SET_CH_32(dw, chan->dir, chan->id, ch_en, BIT(0));
-               /* Interrupt enable&unmask - done, abort */
-               tmp = GET_CH_32(dw, chan->dir, chan->id, int_setup) |
-                     HDMA_V0_STOP_INT_MASK | HDMA_V0_ABORT_INT_MASK |
-                     HDMA_V0_LOCAL_STOP_INT_EN | HDMA_V0_LOCAL_ABORT_INT_EN;
+               /* Interrupt unmask - stop, abort */
+               tmp = GET_CH_32(dw, chan->dir, chan->id, int_setup);
+               tmp &= ~(HDMA_V0_STOP_INT_MASK | HDMA_V0_ABORT_INT_MASK);
+               /* Interrupt enable - stop, abort */
+               tmp |= HDMA_V0_LOCAL_STOP_INT_EN | HDMA_V0_LOCAL_ABORT_INT_EN;
                if (!(dw->chip->flags & DW_EDMA_CHIP_LOCAL))
                        tmp |= HDMA_V0_REMOTE_STOP_INT_EN | HDMA_V0_REMOTE_ABORT_INT_EN;
                SET_CH_32(dw, chan->dir, chan->id, int_setup, tmp);