From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52CE4274B4A for ; Wed, 26 Aug 2026 01:30:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787707832; cv=none; b=XRoV6SXHasaOVOWXHPBcwAkH+xIvqUkZmFtdhZiTAlKitYjHiKlFD7BgNAXD5xFLnoLBLLvzUxyLfUzZ+J6Rq/B2q0myNNyizDCNlJd+qkHDlnneMrNnP/Ci4v8vtDE9oXBQ6yDAJDR3CSX+w1DnFSlZWM1gN8PtLAYMlC5Bws4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787707832; c=relaxed/simple; bh=usCw7Ym88poS56Zm5L+NHxa343GGy1zqroa3ApFu/gg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K5k0dyZHzB/w2rSWUgb6L5Q0OaDD5SST+q7nKi+UI+7VdRnxy42bTPZb+FJqiFbEzVjGLugKMu9DYl2NoKYOM9MFMIsL1oLW6WbIrIMK1eDdEJObHq1yaQwCZSTC5esuaf4tn6vT6qMyIvNo/To4inZEdyufjFp8UwBXezWToss= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JjT+sg1v; arc=none smtp.client-ip=209.85.222.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JjT+sg1v" Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-92e57a753f9so26087085a.2 for ; Tue, 25 Aug 2026 18:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787707827; x=1788312627; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=o5pUUJmcn3/3Y2ngemNPoG+r9QKqCH0NVXE0QE3SQQY=; b=JjT+sg1vKmOzf13drXd7//G6+K/Fc94XtzHjhLa/tuevJ4kwDeFHwLC38zE1NPKBRh eA1UacRQk/G4vdTW9tsN6R0EugzoV1hOPjwh3gDmYxp5ABsHofHzsNP0WVOU7WaBTher mhzKvCXJCHFfzdajqnqdFE4LDOl2UUDPteSa5uwpfof+SSUwBF2Jjk6Rv3ws2zeYLZS1 yYftJGT7SGbUidVi43SBTHsYWex7YX+hr/Wg8P80/5DjlKvA67B6Q42I1szY1M/tIQcZ VCPk8pMmN3jRNmbUZhfA64ZUwHWt5Y8VFl4TuYhefC5f5+0tMpbjTVk1KfKgv97MNisx vyWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787707827; x=1788312627; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=o5pUUJmcn3/3Y2ngemNPoG+r9QKqCH0NVXE0QE3SQQY=; b=f1n4GP5lWOmLJFMViU0L84cNfxW1EkS6IgvhkvjXxNscKMUpZkXpJl/QjFersIz/dc naJdPxEK1UjkUzp8BqcZaOz8vnIzg6C9O07fhLwNTUtIECyj9jyBGjOsf/CEszVh1/Tb rs0S0GJGk0HeuIobmC5QoJQZvV9YzusT69YOlsAYIg+WKeC7q7ZBin8fko141dOhKHpn zAO2poDtwCtZOJppDf7poPVUohc4b7uxmmm8f1AHJfPAEvP1gFtt2/m/T9FWCoLMTeGo UBTRDMRNRkmxehOC2k49hnXRAqDz4UnjHPkxgKQbnzHRiMsbfeDEMm+3Np7LMXiNff6a 8DRg== X-Forwarded-Encrypted: i=1; AHgh+RrnA69zA6ppQfWLqiw24OrvrphoEGQFb1UQonsOcoK9H9WmCMT6eKrcUk1nwHEBrSKP8dHENja0Ix88@vger.kernel.org X-Gm-Message-State: AFuF++kHejMpRfNG/sfHVvY0g5yapkFZ1nhV7gfGLV8TH153nbDkEjbb UNtnjrUzgh0UdlgI4yN2Uc4Hq+3x6E9qOpccb2eyOTB/mnTR5vvegjRY X-Gm-Gg: AR+sD13Ja6SQtJX8BLsYpokH6+UsQhDHVNw4S4o39q0sl5MhyZAwDPmEGcZ83mTDk1c FrRLjFsYGnYyOIhNW0n0f0YPUFBL2b0F3ZpmdhBCfoGTjj9Dfi6LnjFkQNDkPy8kvjahQwLe6fb kCzfYxpYs1qGLhpERFEC5MXdntz3NK7UPsEulPIkYsTPUz+3GsyXv68jhrfrdp6f+3JkZoYr8AU 50XBmKHq6W9YvXTiBQhFB4Wck5HyJ10lOYwAB7C7Mpf3hdR4MD72E+M98HP+z7oeuJWo3rmPnub LtnKOstGZokugYPaaMdlUDb3w+MDY4bExns64XEAYTAyEp+BFPOVUXa78FeH9P6su0U/6L4+Iuq /VkHv/s4JAleeS85WOvJR+BUAxHHNOkFufIUQ1s1kOtwO/D4PdRgOwE8V5jbbMKpRsfFLwoxnSD VDHy1YJN3Z12HuYOXwjAGTMptb81+oyXwPRUwX7YDdTjR+iuNpZuMfFk7ykG/BZw== X-Received: by 2002:a05:620a:4102:b0:92e:9d63:a6f6 with SMTP id af79cd13be357-937801702c8mr267218185a.17.1787707827056; Tue, 25 Aug 2026 18:30:27 -0700 (PDT) Received: from [172.17.0.2] ([138.28.231.64]) by smtp.gmail.com with ESMTPSA id af79cd13be357-9377e67c52csm102398585a.38.2026.08.25.18.30.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2026 18:30:26 -0700 (PDT) From: Yuanshen Cao Date: Wed, 26 Aug 2026 01:30:05 +0000 Subject: [PATCH v4 3/5] dmaengine: sun6i-dma: Add num_channels_per_reg for flexible interrupt mapping Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260826-sun60i-a733-dma-v4-3-dc2f745f40dc@gmail.com> References: <20260826-sun60i-a733-dma-v4-0-dc2f745f40dc@gmail.com> In-Reply-To: <20260826-sun60i-a733-dma-v4-0-dc2f745f40dc@gmail.com> To: Vinod Koul , Frank Li , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maxime Ripard Cc: Yuanshen Cao , dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org X-Mailer: b4 0.16.0 The `sun6i-dma` driver previously assumed a fixed number of channels per interrupt register. For example, `sun6i_kill_tasklet` was hardcoded to disable interrupts only for registers 0 and 1. `DMA_MAX_CHANNELS` was also not in used previously, and the old SoCs never has more than 16 channels. The A733 has a different interrupt structure where the number of channels per register may differ. Add `num_channels_per_reg` to `struct sun6i_dma_config` to make the interrupt handling logic handware-agnostic Update `sun6i_dma_interrupt`, `sun6i_dma_start_desc`, and `sun6i_kill_tasklet` to use this value. Additionally, set `DMA_MAX_CHANNELS` to 16 to ensure loops over interrupts are correctly bounded, aligning with the hardware specifications. Signed-off-by: Yuanshen Cao --- drivers/dma/sun6i-dma.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index 53c54161e32a..b96d7d90f6b5 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -35,14 +35,13 @@ #define DMA_IRQ_PKG BIT(1) #define DMA_IRQ_QUEUE BIT(2) -#define DMA_IRQ_CHAN_NR 8 #define DMA_IRQ_CHAN_WIDTH 4 #define DMA_STAT 0x30 /* Offset between DMA_IRQ_EN and DMA_IRQ_STAT limits number of channels */ -#define DMA_MAX_CHANNELS (DMA_IRQ_CHAN_NR * 0x10 / 4) +#define DMA_MAX_CHANNELS 16 /* * sun8i specific registers @@ -61,6 +60,8 @@ #define DMA_IRQ_EN_OFFSET_A31 0x00 #define DMA_IRQ_STAT_OFFSET_A31 0x10 +#define DMA_IRQ_CHAN_NR_A31 8 + /* * Channels specific registers */ @@ -157,6 +158,7 @@ struct sun6i_dma_config { u32 irq_stride; u32 irq_en_offset; u32 irq_stat_offset; + u32 num_channels_per_reg; }; /* @@ -271,7 +273,7 @@ static inline void sun6i_dma_dump_com_regs(struct sun6i_dma_dev *sdev) { int i; - for (i = 0; i < 2; i++) { + for (i = 0; i < DIV_ROUND_UP(sdev->num_pchans, sdev->cfg->num_channels_per_reg); i++) { dev_dbg(sdev->slave.dev, "Common register:\n" "chan num %d\n" "\tmask(%04x): 0x%08x\n" @@ -492,8 +494,8 @@ static int sun6i_dma_start_desc(struct sun6i_vchan *vchan) sun6i_dma_dump_lli(vchan, pchan->desc->v_lli, pchan->desc->p_lli); - irq_reg = pchan->idx / DMA_IRQ_CHAN_NR; - irq_offset = pchan->idx % DMA_IRQ_CHAN_NR; + irq_reg = pchan->idx / sdev->cfg->num_channels_per_reg; + irq_offset = pchan->idx % sdev->cfg->num_channels_per_reg; vchan->irq_type = vchan->cyclic ? DMA_IRQ_PKG : DMA_IRQ_QUEUE; @@ -585,7 +587,7 @@ static irqreturn_t sun6i_dma_interrupt(int irq, void *dev_id) int i, j, ret = IRQ_NONE; u32 status; - for (i = 0; i < sdev->num_pchans / DMA_IRQ_CHAN_NR; i++) { + for (i = 0; i < sdev->num_pchans / sdev->cfg->num_channels_per_reg; i++) { status = sun6i_read_irq_stat(sdev, i); if (!status) continue; @@ -595,7 +597,7 @@ static irqreturn_t sun6i_dma_interrupt(int irq, void *dev_id) sun6i_write_irq_stat(sdev, i, status); - for (j = 0; (j < DMA_IRQ_CHAN_NR) && status; j++) { + for (j = 0; (j < sdev->cfg->num_channels_per_reg) && status; j++) { pchan = sdev->pchans + j; vchan = pchan->vchan; if (vchan && (status & vchan->irq_type)) { @@ -1113,7 +1115,7 @@ static inline void sun6i_kill_tasklet(struct sun6i_dma_dev *sdev) int i; /* Disable all interrupts from DMA */ - for (i = 0; i < 2; i++) + for (i = 0; i < DMA_MAX_CHANNELS / sdev->cfg->num_channels_per_reg; i++) sun6i_write_irq_en(sdev, i, 0); /* Prevent spurious interrupts from scheduling the tasklet */ @@ -1141,7 +1143,8 @@ static inline void sun6i_dma_free(struct sun6i_dma_dev *sdev) #define SUN6I_DMA_IRQ_A31_COMMON_CFG \ .irq_stride = DMA_IRQ_STRIDE_A31, \ .irq_en_offset = DMA_IRQ_EN_OFFSET_A31, \ - .irq_stat_offset = DMA_IRQ_STAT_OFFSET_A31, + .irq_stat_offset = DMA_IRQ_STAT_OFFSET_A31, \ + .num_channels_per_reg = DMA_IRQ_CHAN_NR_A31, /* * For A31: -- 2.55.0