From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (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 4849533291F for ; Fri, 19 Jun 2026 04:54:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781844874; cv=none; b=FrZmLTaJpLabDBwlzWVO/+F0uzzHfIVy8EkaAV+ZmH07OTEB6pW2qRst9V+/Sauhx0rcKuR9nzDlgVZIEHN4fkP2M/3R6x6XjPsi5a54sBvZPAJOVhNSqvTI03wp2KHPdFVDsPr8ku+pVbz9iIGr5BhNiIXt1cAIUZgCoFOiLgY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781844874; c=relaxed/simple; bh=aSajCbsbFZZ1xQwTPnErZJbWQK1/5h9xY/tXmk98wvc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CY5iQ9fYojVYNXtG0EvIEHHgLKiS7uPGMIQ6sdx1YuJyNuRpkSsCqW8t1r6p6gP7C/rI8cN0vfnJwAGFUchNZ/jZYi9nipxew7iJ3R6kdUEt/NI94Y2z2c5Y2wo/heZtc1YQ5luHWtw5IK6G8U28Eubs/2KpBZrOug5WRl7DAy0= 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=KLEBQden; arc=none smtp.client-ip=209.85.222.180 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="KLEBQden" Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-91574384cc2so204791285a.2 for ; Thu, 18 Jun 2026 21:54:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781844872; x=1782449672; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Q55XUG3Ko0ecxcUOCYiIDN/X4N3ed40r7B6RThXSSPU=; b=KLEBQdenisj1rQxuI0fF3pAI3RILZFDReVM1Iyt8I82dsdEWVbZrCzVzPtFGHALI2Y Pi/GGXnA89V09d17MZmxl9l6WUQFtDPsaA0t50LL37V3wA/ClyImVX1dw4T6weV0B7gK R+PUxi4tzKkuA6ZZBEqMViTwLbf5K9g2nkfmzqztJzIl4Bb3ZRMZxMFiLZWq5YHY1wi6 T5rhqDd6YZFvBvbKbXysqbsOyf1ktA1ekoIjkwqdqO7PcgqGq0q8iJBXu78EHS6ucljb KncCoP7yzX+kTGxHcbWmgkVq0GmcJXFfGWm92Z/c5HP+OF2Dl2RyKRhw1DSWEHe3nsfu CMgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781844872; x=1782449672; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Q55XUG3Ko0ecxcUOCYiIDN/X4N3ed40r7B6RThXSSPU=; b=q9TGom6JU2gm87nULWJ33osDyZs79uCfyV6hSWuHVSQf3/ZLLQJ+h0V7+L1W1stQqz EjQ/TxYaWIiIlatx0EgDwgTag9MPVbfIroqA1Y0mwMUW0kQCnZPMrUfE791kJpExUD/Z pGK0VeeXEsuZ1nYr8zHV1hL2HorR7JIb9vZje+YTnK0Fk8UsYOB8imu5ujHT5DzlTZW7 tBj4tFb+7j8DUaxpkTB6hACEOHfTxH4140Vc9+Tc0wDJT8JS/wL9HDqroUZwhs8mE7xe cFTmVTZPEQ53UP5HfH49jvkRA8XtkwngmClcd85LKHVeM/XvVh/KkUsdjstCYar3X2d5 H1ZQ== X-Forwarded-Encrypted: i=1; AFNElJ+Uvsxbl5C9HC3M4f1BOkguO+SUvrCY5GuMV/ty8ylD4aPuML+F4dvYwCmVzSNAqTN0qVnmaeZJeMY/Ksk=@vger.kernel.org X-Gm-Message-State: AOJu0YxsDkCr3oJom3b/pObESAQizH/DHG9l7F+2gR3pi8rwEeYq6iZF kB923S3o9nl+RjKpEhxhrxAy6LwEUWk1Sr+O0hYC58+h7zH43p1/bRPJ X-Gm-Gg: AfdE7ck7F89IRyJPyVeNoocC3g9OQdjkoskZDOwhyaHoFYafVnGPoey+AWDXRI3AJdR 6rt/GsBUWsdpph3tZx/t31k+Fxve/Lc7nRRxwosxd+X8GEjvy8mdk0nOhohaAt7qPFV7Bc/+U0X sNPw+ni/Zpx58Qmfct1g3DO6LsLk7+r6SZlvgJsppVtwp7O775cUgW5usZQxU/EQt6xtFsAr7kg BIWEKKoTfSry+mxPRxS+wDBg5UwoQ3Uo0sc5dTxgDk2NYY0Dm3KJiuECOKagHfutnKinAV2bFfd rULp04YrM6m60ukV212t+RAb9GrXTuqnysatziiTxitamQh9sAtIi1Pl3EDjSE804EGtWxdxl6K IE1KyTyC2EvOkBwa26nPhFnZujUDqxEr0F3Re07nTHQxSrn40Bbis8Elad6S+zF+eKwhKu8IBRV m7XUqn3hUYoM2Jmw== X-Received: by 2002:a05:620a:298c:b0:915:afa5:754 with SMTP id af79cd13be357-9208e982356mr322872985a.2.1781844872251; Thu, 18 Jun 2026 21:54:32 -0700 (PDT) Received: from [172.17.0.2] ([138.28.231.64]) by smtp.gmail.com with ESMTPSA id af79cd13be357-920a425448asm134464485a.23.2026.06.18.21.54.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2026 21:54:31 -0700 (PDT) From: Yuanshen Cao Date: Fri, 19 Jun 2026 04:53:32 +0000 Subject: [PATCH 3/5] dmaengine: sun6i-dma: Add num_channels_per_reg for flexible interrupt mapping Precedence: bulk X-Mailing-List: linux-kernel@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: <20260619-sun60i-a733-dma-v1-3-da4b649fc72a@gmail.com> References: <20260619-sun60i-a733-dma-v1-0-da4b649fc72a@gmail.com> In-Reply-To: <20260619-sun60i-a733-dma-v1-0-da4b649fc72a@gmail.com> To: Vinod Koul , Frank Li , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maxime Ripard Cc: dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Yuanshen Cao X-Mailer: b4 0.15.2 The previous implementation of `sun6i-dma` had some implicit assumptions about the number of channels per interrupt register. Specifically, functions like `sun6i_kill_tasklet` were hardcoded to only disable interrupts for IRQ 0 and 1. `DMA_MAX_CHANNELS` is also not in used in the past, 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. This patch introduces `num_channels_per_reg` to the `sun6i_dma_config`, similar to BSP, to make the interrupt handling logic hardware-agnostic. It also sets `DMA_MAX_CHANNELS` to 16 to align with the new BSP code and ensure loops over interrupts are correctly bounded. Changes: - Change `DMA_MAX_CHANNELS` definition to 16. - Added `num_channels_per_reg` to `struct sun6i_dma_config`. - Replaced hardcoded IRQ register calculations with values from `sdev->cfg->num_channels_per_reg`. - Updated `sun6i_kill_tasklet` to loop through all possible interrupt registers based on `DMA_MAX_CHANNELS` and the configuration. Signed-off-by: Yuanshen Cao --- drivers/dma/sun6i-dma.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index 059455425e19..fb1c1a28744b 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -41,7 +41,7 @@ #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 @@ -151,6 +151,7 @@ struct sun6i_dma_config { u32 src_addr_widths; u32 dst_addr_widths; bool has_mbus_clk; + u32 num_channels_per_reg; }; /* @@ -481,8 +482,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; @@ -574,7 +575,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 = sdev->cfg->read_irq_stat(sdev, i); if (!status) continue; @@ -584,7 +585,7 @@ static irqreturn_t sun6i_dma_interrupt(int irq, void *dev_id) sdev->cfg->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)) { @@ -1108,9 +1109,11 @@ static struct dma_chan *sun6i_dma_of_xlate(struct of_phandle_args *dma_spec, static inline void sun6i_kill_tasklet(struct sun6i_dma_dev *sdev) { + int i; + /* Disable all interrupts from DMA */ - writel(0, sdev->base + DMA_IRQ_EN(0)); - writel(0, sdev->base + DMA_IRQ_EN(1)); + for (i = 0; i < DMA_MAX_CHANNELS / sdev->cfg->num_channels_per_reg; i++) + sdev->cfg->write_irq_en(sdev, i, 0); /* Prevent spurious interrupts from scheduling the tasklet */ atomic_inc(&sdev->tasklet_shutdown); @@ -1171,6 +1174,7 @@ static struct sun6i_dma_config sun6i_a31_dma_cfg = { .dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES), + .num_channels_per_reg = DMA_IRQ_CHAN_NR, }; /* @@ -1200,6 +1204,7 @@ static struct sun6i_dma_config sun8i_a23_dma_cfg = { .dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES), + .num_channels_per_reg = DMA_IRQ_CHAN_NR, }; static struct sun6i_dma_config sun8i_a83t_dma_cfg = { @@ -1224,6 +1229,7 @@ static struct sun6i_dma_config sun8i_a83t_dma_cfg = { .dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES), + .num_channels_per_reg = DMA_IRQ_CHAN_NR, }; /* @@ -1257,6 +1263,7 @@ static struct sun6i_dma_config sun8i_h3_dma_cfg = { BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_8_BYTES), + .num_channels_per_reg = DMA_IRQ_CHAN_NR, }; /* @@ -1284,6 +1291,7 @@ static struct sun6i_dma_config sun50i_a64_dma_cfg = { BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_8_BYTES), + .num_channels_per_reg = DMA_IRQ_CHAN_NR, }; /* @@ -1311,6 +1319,7 @@ static struct sun6i_dma_config sun50i_a100_dma_cfg = { BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_8_BYTES), + .num_channels_per_reg = DMA_IRQ_CHAN_NR, .has_mbus_clk = true, }; @@ -1339,6 +1348,7 @@ static struct sun6i_dma_config sun50i_h6_dma_cfg = { BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_8_BYTES), + .num_channels_per_reg = DMA_IRQ_CHAN_NR, .has_mbus_clk = true, }; @@ -1369,6 +1379,7 @@ static struct sun6i_dma_config sun8i_v3s_dma_cfg = { .dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES), + .num_channels_per_reg = DMA_IRQ_CHAN_NR, }; static const struct of_device_id sun6i_dma_match[] = { -- 2.54.0