From: Jean-Michel Hautbois via B4 Relay <devnull+jeanmichel.hautbois.yoseli.org@kernel.org>
To: Frank Li <Frank.Li@nxp.com>, Vinod Koul <vkoul@kernel.org>,
Angelo Dureghello <angelo@sysam.it>
Cc: Greg Ungerer <gerg@linux-m68k.org>,
imx@lists.linux.dev, dmaengine@vger.kernel.org,
linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org,
Jean-Michel Hautbois <jeanmichel.hautbois@yoseli.org>
Subject: [PATCH v2 5/5] dma: mcf-edma: Fix error handler for all 64 DMA channels
Date: Wed, 26 Nov 2025 09:36:06 +0100 [thread overview]
Message-ID: <20251126-dma-coldfire-v2-5-5b1e4544d609@yoseli.org> (raw)
In-Reply-To: <20251126-dma-coldfire-v2-0-5b1e4544d609@yoseli.org>
From: Jean-Michel Hautbois <jeanmichel.hautbois@yoseli.org>
Fix the DMA error interrupt handler to properly handle errors on all
64 channels. The previous implementation had several issues:
1. Returned IRQ_NONE if low channels had no errors, even if high
channels did
2. Used direct status assignment instead of fsl_edma_err_chan_handler()
for high channels
Split the error handling into two separate loops for the low (0-31)
and high (32-63) channel groups, using for_each_set_bit() for cleaner
iteration. Both groups now consistently use fsl_edma_err_chan_handler()
for proper error status reporting.
Fixes: e7a3ff92eaf1 ("dmaengine: fsl-edma: add ColdFire mcf5441x edma support")
Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@yoseli.org>
---
drivers/dma/mcf-edma-main.c | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/drivers/dma/mcf-edma-main.c b/drivers/dma/mcf-edma-main.c
index 6353303df957..5bd04faa639c 100644
--- a/drivers/dma/mcf-edma-main.c
+++ b/drivers/dma/mcf-edma-main.c
@@ -12,6 +12,7 @@
#include "fsl-edma-common.h"
#define EDMA_CHANNELS 64
+#define EDMA_CHANS_PER_REG (EDMA_CHANNELS / 2)
#define EDMA_MASK_CH(x) ((x) & GENMASK(5, 0))
static irqreturn_t mcf_edma_tx_handler(int irq, void *dev_id)
@@ -42,33 +43,33 @@ static irqreturn_t mcf_edma_err_handler(int irq, void *dev_id)
{
struct fsl_edma_engine *mcf_edma = dev_id;
struct edma_regs *regs = &mcf_edma->regs;
- unsigned int err, ch;
+ unsigned int ch;
+ unsigned long err;
+ bool handled = false;
+ /* Check low 32 channels (0-31) */
err = ioread32(regs->errl);
- if (!err)
- return IRQ_NONE;
-
- for (ch = 0; ch < (EDMA_CHANNELS / 2); ch++) {
- if (err & BIT(ch)) {
+ if (err) {
+ handled = true;
+ for_each_set_bit(ch, &err, EDMA_CHANS_PER_REG) {
fsl_edma_disable_request(&mcf_edma->chans[ch]);
iowrite8(EDMA_CERR_CERR(ch), regs->cerr);
fsl_edma_err_chan_handler(&mcf_edma->chans[ch]);
}
}
+ /* Check high 32 channels (32-63) */
err = ioread32(regs->errh);
- if (!err)
- return IRQ_NONE;
-
- for (ch = (EDMA_CHANNELS / 2); ch < EDMA_CHANNELS; ch++) {
- if (err & (BIT(ch - (EDMA_CHANNELS / 2)))) {
- fsl_edma_disable_request(&mcf_edma->chans[ch]);
- iowrite8(EDMA_CERR_CERR(ch), regs->cerr);
- mcf_edma->chans[ch].status = DMA_ERROR;
+ if (err) {
+ handled = true;
+ for_each_set_bit(ch, &err, EDMA_CHANS_PER_REG) {
+ fsl_edma_disable_request(&mcf_edma->chans[ch + EDMA_CHANS_PER_REG]);
+ iowrite8(EDMA_CERR_CERR(ch + EDMA_CHANS_PER_REG), regs->cerr);
+ fsl_edma_err_chan_handler(&mcf_edma->chans[ch + EDMA_CHANS_PER_REG]);
}
}
- return IRQ_HANDLED;
+ return handled ? IRQ_HANDLED : IRQ_NONE;
}
static int mcf_edma_irq_init(struct platform_device *pdev,
--
2.39.5
next prev parent reply other threads:[~2025-11-26 8:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-26 8:36 [PATCH v2 0/5] dma: fsl/mcf-edma: Bug fixes and enhancements for ColdFire support Jean-Michel Hautbois via B4 Relay
2025-11-26 8:36 ` [PATCH v2 1/5] dma: fsl-edma: Add FSL_EDMA_DRV_MCF flag for ColdFire eDMA Jean-Michel Hautbois via B4 Relay
2025-11-26 8:36 ` [PATCH v2 2/5] dma: mcf-edma: Add per-channel IRQ naming for debugging Jean-Michel Hautbois via B4 Relay
2025-11-26 16:12 ` Frank Li
2025-12-16 15:26 ` Vinod Koul
2025-12-16 15:38 ` Frank Li
2025-12-17 6:34 ` Jean-Michel Hautbois
2025-12-17 16:21 ` Frank Li
2025-11-26 8:36 ` [PATCH v2 3/5] dma: mcf-edma: Fix interrupt handler for 64 DMA channels Jean-Michel Hautbois via B4 Relay
2025-11-26 8:36 ` [PATCH v2 4/5] dma: fsl-edma: Move error handler out of header file Jean-Michel Hautbois via B4 Relay
2025-11-26 8:36 ` Jean-Michel Hautbois via B4 Relay [this message]
2025-11-26 16:14 ` [PATCH v2 5/5] dma: mcf-edma: Fix error handler for all 64 DMA channels Frank Li
2025-12-16 15:27 ` [PATCH v2 0/5] dma: fsl/mcf-edma: Bug fixes and enhancements for ColdFire support Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251126-dma-coldfire-v2-5-5b1e4544d609@yoseli.org \
--to=devnull+jeanmichel.hautbois.yoseli.org@kernel.org \
--cc=Frank.Li@nxp.com \
--cc=angelo@sysam.it \
--cc=dmaengine@vger.kernel.org \
--cc=gerg@linux-m68k.org \
--cc=imx@lists.linux.dev \
--cc=jeanmichel.hautbois@yoseli.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®