From nobody Mon Sep 28 05:48:49 2026 Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.173]) (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 5CABF2DECD3 for ; Wed, 26 Aug 2026 02:40:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712043; cv=none; b=HzCYzP8fmNYn7XYgc6PHlM56KWi13csdt5PL4NaxuFzVeZvtW+hzTqKmuikOX7NKuxNnK+bEo0h7NIObnFHDHQ//Gzt6/oWdT4sVMEQDLjCfTeO/ZqeeyTTJFnPFi9SaIjjgRSOWMrkrCwwQKW/YKA+tl3ZlVMLRMTnr2XF9Ah0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712043; c=relaxed/simple; bh=bWDpjVeQL4ZPcqxBnAYAbjPHfWZWc/lgdxSnGkqNQ2M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nQHuxktJW0g/2Q8JMgfOMLGknyTRcTlgV12WAsyKCmALKOwmBSKHJD72LdPRFRh8BDn+deYB2dpOV8qjw7nvenl4tBfKl4Z7T7XSmstq+rSjynGJm0Z6Wo6iM9/3bREkqOvqvBQeAsRXpUNt0UY5v7iWBbV3ho/non7YsuE/C6A= 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=HpveYs8r; arc=none smtp.client-ip=209.85.128.173 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="HpveYs8r" Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-81ee6b2da98so5759847b3.3 for ; Tue, 25 Aug 2026 19:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787712040; x=1788316840; 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=37syxcZjr+SQHdWr5tam1HRyww9ToksagoIyI3QIPxo=; b=HpveYs8rS2cPJLNM/j/fa1FJgcae6LaCz4286iKr9Mmd6NNSIrEipdfaYteNw+92Bt fdcets6mPdYKB6cB8T6hRti/99qex4QrmK/LqcUwu5V6nBSqdTfc4ww6dZmIivxE+GfC FGS1cNq39mugZY14NPpiEerw5tHS+h1DWTJ2iEpvb3NpF0CBtIgB0HCFgSIKuZl0bynq zf3ZiTAgrC143MjOPdJuCpuWAtSoZbme0H37jl/Xp5GL+iZdZvCEN2vmzDilzeffWA5v 5NEScOSpl8pfM+wJCiZnGHgx8PAHb1bx8Vpl2OzMAYZMcf5KkkXjdecnDGb8pO3+QwcL V9Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787712040; x=1788316840; 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=37syxcZjr+SQHdWr5tam1HRyww9ToksagoIyI3QIPxo=; b=RBEkjDYT9kSCawhY3/XmFenHw9xJdtCeUZ+Kfn+FCB27gHhaDA4sIJMQWpl8KMhsZe nff9m2EkV9OND6X6kiE8pnNii+ebrPbxrcwcgBKhCFLEZhF1uri3sGY70Hz915P2ptpy Pjp9oSH2TQkgB/6PSDw2nNPDzxxxGQl0jd2hEgsW7wX+K3g8hqyRTyIfOAB0+wRl+GjR 8C1Nq9s/MaeKgaslL51fUAuV4P4IoTITyeBqcKdqLia7zAXlvAGHNZsqD4PP+sID/Hyz hCB+nyJd0jU5SHmQ4VPgblkOAwHNeoYcBIg/HpKrxzGUvBqvlP6Kivqxp+1RpIwgz3KL MyEw== X-Forwarded-Encrypted: i=1; AHgh+RoiqvhueY4hiHDkHDVRcXbvK2CgiSoYQlLkoacxl5T/VuyuUj6LZoDaDeH0pI9ZTRX+DT9Kmqd+wvz46nI=@vger.kernel.org X-Gm-Message-State: AFuF++mMm0BDL1d2ZptA98v9VFjZjQs4ARMhz0IVjPnx2oI0+cShOAwx xU5dlsddmyO+YU4O9KnX52VaEKefImKdoRC6enLcvSsBcu8BqGMrkDRw X-Gm-Gg: AR+sD12J1u5hd1F2wvKXLhzQT0h1TdLcU1P5ZxHuvnDEq6NYaqL4p5DkS2FHcnqJoHl Avb5hrlTKBYmXZyrS+UNsMGyhqDJD/wUS8DlmEeCbs8/9BEDFV0eV+qyQZJaOBFdAzpqfb6IdN6 lDCBVakiFN4HjehR5YJ4XMbMtk5r2Ge/CxO0akRvMAHSsE62JXfMAQ6N3SK1gVra9PE3firjsia rEeg8ZxPqAShVnt4rk1uHVqR+f/P+ZTj4gsAZJNvDcrvzKnQPfpK00d3eP1kfgqlsjTXH4wpSlX 7HKbWWyGfiYLHFN07/ySkBEAfxdQ9bcpll8M+rjRQxqAAXkuvhIdBr8yngIPcnUz9bGOaLOlBAf Bkntid+NZy1FU6QWJkl5NrUBwzpCjbTcaBZRxzeKhlhpfzWJV6Or471lM1RKWdhUJH/uIcGQqxV rgM16vcPt0nrkw+3jBgpp06pINqbZnp6Ju/9pJXgnRuF4Wllef3gwD+9uilidUCw== X-Received: by 2002:a05:690c:c6c9:b0:824:a7ec:e33b with SMTP id 00721157ae682-8574172d157mr12603437b3.34.1787712040275; Tue, 25 Aug 2026 19:40:40 -0700 (PDT) Received: from [172.17.0.2] ([138.28.231.64]) by smtp.gmail.com with ESMTPSA id 00721157ae682-857053839fdsm9976087b3.10.2026.08.25.19.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2026 19:40:39 -0700 (PDT) From: Yuanshen Cao Date: Wed, 26 Aug 2026 02:40:27 +0000 Subject: [PATCH v5 1/5] dmaengine: sun6i-dma: Refactor to support A733 interrupt and register handling 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: quoted-printable Message-Id: <20260826-sun60i-a733-dma-v5-1-abc5229b441e@gmail.com> References: <20260826-sun60i-a733-dma-v5-0-abc5229b441e@gmail.com> In-Reply-To: <20260826-sun60i-a733-dma-v5-0-abc5229b441e@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.16.0 The `sun6i-dma` driver currently uses hardcoded logic for interrupt handling (reading/writing interrupt enable and status registers) and register dumping. To support the Allwinner A733, which has a different register layout and interrupt handling logic, add `irq_stride`, `irq_en_offset`, and `irq_stat_offset` to `struct sun6i_dma_config`. Implement generic `sun6i_read/write_irq_*` functions using these new configuration fields to accommodate different hardware revisions. Signed-off-by: Yuanshen Cao Reviewed-by: Frank Li --- drivers/dma/sun6i-dma.c | 87 +++++++++++++++++++++++++++++++++++++--------= ---- 1 file changed, 67 insertions(+), 20 deletions(-) diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index f47a326dd7ff..f305fbfb3545 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -27,7 +27,6 @@ /* * Common registers */ -#define DMA_IRQ_EN(x) ((x) * 0x04) #define DMA_IRQ_HALF BIT(0) #define DMA_IRQ_PKG BIT(1) #define DMA_IRQ_QUEUE BIT(2) @@ -36,8 +35,6 @@ #define DMA_IRQ_CHAN_WIDTH 4 =20 =20 -#define DMA_IRQ_STAT(x) ((x) * 0x04 + 0x10) - #define DMA_STAT 0x30 =20 /* Offset between DMA_IRQ_EN and DMA_IRQ_STAT limits number of channels */ @@ -52,6 +49,14 @@ #define SUNXI_H3_SECURE_REG 0x20 #define SUNXI_H3_DMA_GATE 0x28 #define SUNXI_H3_DMA_GATE_ENABLE 0x4 + +/* + * Interrupts specific registers + */ +#define DMA_IRQ_STRIDE_A31 0x04 +#define DMA_IRQ_EN_OFFSET_A31 0x00 +#define DMA_IRQ_STAT_OFFSET_A31 0x10 + /* * Channels specific registers */ @@ -144,6 +149,9 @@ struct sun6i_dma_config { u32 dst_addr_widths; bool has_high_addr; bool has_mbus_clk; + u32 irq_stride; + u32 irq_en_offset; + u32 irq_stat_offset; }; =20 /* @@ -234,19 +242,43 @@ to_sun6i_desc(struct dma_async_tx_descriptor *tx) return container_of(tx, struct sun6i_desc, vd.tx); } =20 +static u32 sun6i_read_irq_en(struct sun6i_dma_dev *sdev, u32 irq_reg) +{ + return readl(sdev->base + irq_reg * sdev->cfg->irq_stride + sdev->cfg->ir= q_en_offset); +} + +static void sun6i_write_irq_en(struct sun6i_dma_dev *sdev, u32 irq_reg, u3= 2 irq_val) +{ + writel(irq_val, sdev->base + irq_reg * sdev->cfg->irq_stride + sdev->cfg-= >irq_en_offset); +} + +static u32 sun6i_read_irq_stat(struct sun6i_dma_dev *sdev, u32 irq_reg) +{ + return readl(sdev->base + irq_reg * sdev->cfg->irq_stride + sdev->cfg->ir= q_stat_offset); +} + +static void sun6i_write_irq_stat(struct sun6i_dma_dev *sdev, u32 irq_reg, = u32 status) +{ + writel(status, sdev->base + irq_reg * sdev->cfg->irq_stride + sdev->cfg->= irq_stat_offset); +} + static inline void sun6i_dma_dump_com_regs(struct sun6i_dma_dev *sdev) { - dev_dbg(sdev->slave.dev, "Common register:\n" - "\tmask0(%04x): 0x%08x\n" - "\tmask1(%04x): 0x%08x\n" - "\tpend0(%04x): 0x%08x\n" - "\tpend1(%04x): 0x%08x\n" - "\tstats(%04x): 0x%08x\n", - DMA_IRQ_EN(0), readl(sdev->base + DMA_IRQ_EN(0)), - DMA_IRQ_EN(1), readl(sdev->base + DMA_IRQ_EN(1)), - DMA_IRQ_STAT(0), readl(sdev->base + DMA_IRQ_STAT(0)), - DMA_IRQ_STAT(1), readl(sdev->base + DMA_IRQ_STAT(1)), - DMA_STAT, readl(sdev->base + DMA_STAT)); + int i; + + for (i =3D 0; i < 2; i++) { + dev_dbg(sdev->slave.dev, "Common register:\n" + "chan num %d\n" + "\tmask(%04x): 0x%08x\n" + "\tpend(%04x): 0x%08x\n" + "\tstats(%04x): 0x%08x\n", + i, + i * sdev->cfg->irq_stride + sdev->cfg->irq_en_offset, + sun6i_read_irq_en(sdev, i), + i * sdev->cfg->irq_stride + sdev->cfg->irq_stat_offset, + sun6i_read_irq_stat(sdev, i), + DMA_STAT, readl(sdev->base + DMA_STAT)); + } } =20 static inline void sun6i_dma_dump_chan_regs(struct sun6i_dma_dev *sdev, @@ -460,11 +492,11 @@ static int sun6i_dma_start_desc(struct sun6i_vchan *v= chan) =20 vchan->irq_type =3D vchan->cyclic ? DMA_IRQ_PKG : DMA_IRQ_QUEUE; =20 - irq_val =3D readl(sdev->base + DMA_IRQ_EN(irq_reg)); + irq_val =3D sun6i_read_irq_en(sdev, irq_reg); irq_val &=3D ~((DMA_IRQ_HALF | DMA_IRQ_PKG | DMA_IRQ_QUEUE) << (irq_offset * DMA_IRQ_CHAN_WIDTH)); irq_val |=3D vchan->irq_type << (irq_offset * DMA_IRQ_CHAN_WIDTH); - writel(irq_val, sdev->base + DMA_IRQ_EN(irq_reg)); + sun6i_write_irq_en(sdev, irq_reg, irq_val); =20 writel(pchan->desc->p_lli, pchan->base + DMA_CHAN_LLI_ADDR); writel(DMA_CHAN_ENABLE_START, pchan->base + DMA_CHAN_ENABLE); @@ -549,14 +581,14 @@ static irqreturn_t sun6i_dma_interrupt(int irq, void = *dev_id) u32 status; =20 for (i =3D 0; i < sdev->num_pchans / DMA_IRQ_CHAN_NR; i++) { - status =3D readl(sdev->base + DMA_IRQ_STAT(i)); + status =3D sun6i_read_irq_stat(sdev, i); if (!status) continue; =20 dev_dbg(sdev->slave.dev, "DMA irq status %s: 0x%x\n", str_high_low(i), status); =20 - writel(status, sdev->base + DMA_IRQ_STAT(i)); + sun6i_write_irq_stat(sdev, i, status); =20 for (j =3D 0; (j < DMA_IRQ_CHAN_NR) && status; j++) { pchan =3D sdev->pchans + j; @@ -1072,9 +1104,11 @@ static struct dma_chan *sun6i_dma_of_xlate(struct of= _phandle_args *dma_spec, =20 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 =3D 0; i < 2; i++) + sun6i_write_irq_en(sdev, i, 0); =20 /* Prevent spurious interrupts from scheduling the tasklet */ atomic_inc(&sdev->tasklet_shutdown); @@ -1098,6 +1132,11 @@ static inline void sun6i_dma_free(struct sun6i_dma_d= ev *sdev) } } =20 +#define SUN6I_DMA_IRQ_A31_COMMON_CFG \ + .irq_stride =3D DMA_IRQ_STRIDE_A31, \ + .irq_en_offset =3D DMA_IRQ_EN_OFFSET_A31, \ + .irq_stat_offset =3D DMA_IRQ_STAT_OFFSET_A31, + /* * For A31: * @@ -1129,6 +1168,7 @@ static struct sun6i_dma_config sun6i_a31_dma_cfg =3D { .dst_addr_widths =3D BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES), + SUN6I_DMA_IRQ_A31_COMMON_CFG }; =20 /* @@ -1152,6 +1192,7 @@ static struct sun6i_dma_config sun8i_a23_dma_cfg =3D { .dst_addr_widths =3D BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES), + SUN6I_DMA_IRQ_A31_COMMON_CFG }; =20 static struct sun6i_dma_config sun8i_a83t_dma_cfg =3D { @@ -1170,6 +1211,7 @@ static struct sun6i_dma_config sun8i_a83t_dma_cfg =3D= { .dst_addr_widths =3D BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES), + SUN6I_DMA_IRQ_A31_COMMON_CFG }; =20 /* @@ -1197,6 +1239,7 @@ static struct sun6i_dma_config sun8i_h3_dma_cfg =3D { BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_8_BYTES), + SUN6I_DMA_IRQ_A31_COMMON_CFG }; =20 /* @@ -1218,6 +1261,7 @@ static struct sun6i_dma_config sun50i_a64_dma_cfg =3D= { BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_8_BYTES), + SUN6I_DMA_IRQ_A31_COMMON_CFG }; =20 /* @@ -1241,6 +1285,7 @@ static struct sun6i_dma_config sun50i_a100_dma_cfg = =3D { BIT(DMA_SLAVE_BUSWIDTH_8_BYTES), .has_high_addr =3D true, .has_mbus_clk =3D true, + SUN6I_DMA_IRQ_A31_COMMON_CFG }; =20 /* @@ -1263,6 +1308,7 @@ static struct sun6i_dma_config sun50i_h6_dma_cfg =3D { BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_8_BYTES), .has_mbus_clk =3D true, + SUN6I_DMA_IRQ_A31_COMMON_CFG }; =20 /* @@ -1286,6 +1332,7 @@ static struct sun6i_dma_config sun8i_v3s_dma_cfg =3D { .dst_addr_widths =3D BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES), + SUN6I_DMA_IRQ_A31_COMMON_CFG }; =20 static const struct of_device_id sun6i_dma_match[] =3D { --=20 2.55.0 From nobody Mon Sep 28 05:48:49 2026 Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) (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 F0D832E8DEF for ; Wed, 26 Aug 2026 02:40:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712045; cv=none; b=Q3XJ++HbEZawX3smJKEFAMUEPMJZD2zDB7Dxwxrhvrz4EJ8x+WXYrf6GkfX8NCQBirGUA6dWGChDji89tR6DIrIv1gHO+Wq2Hu/n0BQbScnPXUrjkkPTmAJAcKMmczi57FKcPma9Q3PQlu6bd8VvNV+eiswJmLMGfZqsaLGdyTY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712045; c=relaxed/simple; bh=dJeEv/rGh9nisWtmFwa508ECRE6nVq1Qn2/7Sn6Pn9o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lfsaXfuWjyHqJVan5NoCmXJJ69jOm2UPPjC7mFhIeysx+Tt2tP10K6hf0ZJj0t9tqH/f5FIGdwNE3S2bpYGjoyzVUVkOO6gWyNKDj8eqOqzXvsuBaML46j+9RKimLr2X52c+Y+dXcSZsmuiwi8O6F2+JIb5l1asbfqjyujJaQO8= 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=TZk86m4h; arc=none smtp.client-ip=209.85.128.181 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="TZk86m4h" Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-8111c0c7561so5577347b3.3 for ; Tue, 25 Aug 2026 19:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787712042; x=1788316842; 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=w469z7Q5/aaHi8aSt2+jyQ5LFi1CuQ46eioWVHjW3cs=; b=TZk86m4hkmHwVS39nDrdJZ9g5vTEyUBkTBVvRkD56eVSZXq0uld/2wjHl/RrpfV/VO DNeP9gYJJYJGnAdf1yraAEx/byepVGEUMwJRHInxl/06pOpeJU/snw8qVbsiOuuYK9W9 9S8yeqCM6j63Atyd29aOSdd7z2BAYBHxoHOKyTzl7LZ9raMB2Mq0erVPOsPlEQ8UpHzE VeV8ozrjc+dTvqHDjQY12CnRKSe+XtLe3TcJBajRDSB8umJLPzMdokRGYEklh5dTjCal CGZPZM5BTKFN6IfiRQa3AEVYmGbftBiJ3VJq47cvtMi68C6gSRisCLIDCsDhx59VEU8d I/ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787712042; x=1788316842; 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=w469z7Q5/aaHi8aSt2+jyQ5LFi1CuQ46eioWVHjW3cs=; b=W84UvYgXQ53JPC8U97cgjCtLH/j4xPSc8Ng3T+nzldYQzYGvk0NIJIBXRQtLhqDP6i kN6zu0kum6XYgeUjYmg93c8Xgt3K8c3xP5Vq7Jq199f+5qSetk74qom2mvw2HSiy1JMP gHhi+ccDdsmjNvUWOq9rBar24VxiaLKAyQM9edGq2is/QOKB09I+0KlxBF4bBwd6gBUa UI/XZ7TsL+u9xlMeSUq9ZO9jyjCC2pawSmaxFfIkB9YIZJgwyN4I7UVo1W3mWhEXBfrg CrmEeYWCfo49nmw0LYFEnC8pXB8Mk5p2bnyo+NLcjAT2hNVdmAjVix7xyn27djRMqXlZ 3gCg== X-Forwarded-Encrypted: i=1; AHgh+RoUetcQFMEtjxcR0m5dV80kXy9TjzVN+F1nA2Oj0u3neoLXF5s2vOVI0VSRokKBHvJTI4RP8YiI70kMm0Y=@vger.kernel.org X-Gm-Message-State: AFuF++lE5kw1VIBmijJL+p91tIvSwO3yNzgwd74bEmBOEGXAOTnvZBXI AsrRXHFTQHb9hpiiHKP+ceR9TnVZhTbsoQfFyJtarJb8HIFCaSJP1Son X-Gm-Gg: AR+sD102Z0KT6P04FJ1Sd0FPZKpk3gqOhNxwTGkzUNelzpw74SpTqcTlcz7HhO0FgzU VG+zbiaMhaBxUk0dkJRt8tnO+23mX0EdjaeodO/vCeanLlTPPtm7GrZ/Qbl0UfpsSEoR6xsGU+P sXyhYZQRnX7a3ybHUATNvNBOlWd2Gw1KhKHx7Sla1x1CqjB2JXZ+X86oOTr4/0TZSxbpgzLJOV+ q/FUKpg0k2/bn7ykkslC/kOqmIPuRND+X+CuKzIo5cVsNWIjcogJ4ch6T2lr4nUH5cLDD9bx21l Ab2sOvywHWGbJW6Mt6wbxlrQOxcKRAjal6KA0drCjqIy+sTLaNv07QNcCr4XAZfbUdS6Mm6Iecb BDmbk6rHvZKuIBx/egLdy2DNjOoqsfRuUVup8apsbVEsrDR+qfSQPZdn9x3UCdAoincHhRbKs2h CUfFLXcYWLrFlY3g5QNDlNAA8bshrDo/7KnrPHu+h5R44S2yPuufTSoWfXX+a8Ag== X-Received: by 2002:a05:690c:4004:b0:81e:eb11:6e5f with SMTP id 00721157ae682-8574172735emr13449597b3.34.1787712041685; Tue, 25 Aug 2026 19:40:41 -0700 (PDT) Received: from [172.17.0.2] ([138.28.231.64]) by smtp.gmail.com with ESMTPSA id 00721157ae682-857053839fdsm9976087b3.10.2026.08.25.19.40.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2026 19:40:41 -0700 (PDT) From: Yuanshen Cao Date: Wed, 26 Aug 2026 02:40:28 +0000 Subject: [PATCH v5 2/5] dmaengine: sun6i-dma: Support variable address widths using masks 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: quoted-printable Message-Id: <20260826-sun60i-a733-dma-v5-2-abc5229b441e@gmail.com> References: <20260826-sun60i-a733-dma-v5-0-abc5229b441e@gmail.com> In-Reply-To: <20260826-sun60i-a733-dma-v5-0-abc5229b441e@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.16.0 The Allwinner A733 DMA controller supports higher addresses (up to 32G) compared to previous generations. The existing `sun6i_dma_set_addr` function uses hardcoded logic for setting the high-address bits in the LLI parameters. Add `src_high_addr_mask` and `dst_high_addr_mask` to `struct sun6i_dma_config` to handle different high-address bitfield mappings. Update `sun6i_dma_set_addr` to use these masks via `field_prep()`, allowing the driver to support variable address widths. Signed-off-by: Yuanshen Cao Reviewed-by: Frank Li --- drivers/dma/sun6i-dma.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index f305fbfb3545..1ffd870d9594 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -7,6 +7,7 @@ * Maxime Ripard */ =20 +#include #include #include #include @@ -103,8 +104,8 @@ * The LLI link physical address is also mangled, but we avoid dealing * with that by allocating LLIs from the DMA32 zone. */ -#define SRC_HIGH_ADDR(x) (((x) & 0x3U) << 16) -#define DST_HIGH_ADDR(x) (((x) & 0x3U) << 18) +#define SRC_HIGH_ADDR_MASK GENMASK(17, 16) +#define DST_HIGH_ADDR_MASK GENMASK(19, 18) =20 /* * Various hardware related defines @@ -147,7 +148,8 @@ struct sun6i_dma_config { u32 dst_burst_lengths; u32 src_addr_widths; u32 dst_addr_widths; - bool has_high_addr; + u32 src_high_addr_mask; + u32 dst_high_addr_mask; bool has_mbus_clk; u32 irq_stride; u32 irq_en_offset; @@ -687,9 +689,10 @@ static inline void sun6i_dma_set_addr(struct sun6i_dma= _dev *sdev, v_lli->src =3D lower_32_bits(src); v_lli->dst =3D lower_32_bits(dst); =20 - if (sdev->cfg->has_high_addr) - v_lli->para |=3D SRC_HIGH_ADDR(upper_32_bits(src)) | - DST_HIGH_ADDR(upper_32_bits(dst)); + if (sdev->cfg->src_high_addr_mask) + v_lli->para |=3D + field_prep(sdev->cfg->src_high_addr_mask, upper_32_bits(src)) | + field_prep(sdev->cfg->dst_high_addr_mask, upper_32_bits(dst)); } =20 static struct dma_async_tx_descriptor *sun6i_dma_prep_dma_memcpy( @@ -1283,7 +1286,8 @@ static struct sun6i_dma_config sun50i_a100_dma_cfg = =3D { BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_8_BYTES), - .has_high_addr =3D true, + .src_high_addr_mask =3D SRC_HIGH_ADDR_MASK, + .dst_high_addr_mask =3D DST_HIGH_ADDR_MASK, .has_mbus_clk =3D true, SUN6I_DMA_IRQ_A31_COMMON_CFG }; --=20 2.55.0 From nobody Mon Sep 28 05:48:49 2026 Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) (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 5670A2EA75E for ; Wed, 26 Aug 2026 02:40:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712046; cv=none; b=CPgxg/lTrK04J/Dp1CUsnOz+u0+a1h31AChrPZWhr8vH+7vZmOhVZM5JwySX7zwYqWyV/2oD538GKgtnjj48cV/w4nB1zHgnJ9FWh60/ejLShzY0KhvEWPB+IBTx+g+MvjMP9cPHVXunViuciO1bQUjp/EMP6tl2SfrRdZfw0Ik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712046; c=relaxed/simple; bh=6+ewAXqjW78W01kuIRgLZxa+1D1OKS1tJVFYiHwc4QM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qtMWtNgsmr74C5HL6MkYkYPyCKuUSyjh7LvzjklntHyWyNpbQbdxThI9/FK8GzHOFyv2WA7D9+XvtLySqBSY19ogABdgYCPMbZYM6WqzBweHYfUkQ6jm7rCyKNiuLj3E5Oq+hsG6X4sG/Eu/cTqVbvVNd6XXVnqd549u+dHPnVU= 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=RibYHCHG; arc=none smtp.client-ip=209.85.128.175 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="RibYHCHG" Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-836c91bd782so7690967b3.0 for ; Tue, 25 Aug 2026 19:40:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787712043; x=1788316843; 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=5RAoTdggxobD2oaFa5ZIipVOPvbxRenYgCW3U/I11VY=; b=RibYHCHGMwXEKQYg4Rj9frgxe7M+cfl7LngbAYvEqGsIhF2fcCK5fkiK/4Ze3jxcFx 65VvjLKpoU5US61+hRGybuzELpmzvrjxfZCQ52svZvY8/3HI6JAriMqIoHOVZWOaZkjj J6c19PsGgBGCNkHH/t3jg5FISDpDSf5FaknApgBLvr7dKZO4+wqBM8PulcvGPN+z9Yky dma87QNY3dJ4aC3RNlUFCBFVlLih8ESOAEPh6iojJFkC3Ls9jDVVHHbps7nmRfqfH7TU NbTftsaGiMn5eE6jIJYX2dGl0HNujP+VqSIUbTgcHbh7PG84gS/QKm1EYq5TrogSsplZ 7kpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787712043; x=1788316843; 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=5RAoTdggxobD2oaFa5ZIipVOPvbxRenYgCW3U/I11VY=; b=qPEgw2tgzBwNr/Q0geYh2gedw64wdYGPyCKFR39++1MXxytlah6U7jBoUbIzXx3MxY aDxnnlsdLWu7+XYzqmL82uVrybDDAB4P+4K4nal+1x1asWXIuErYvVSpvSfE40kjQpwm cynPdYHhSNzgMAGUHV1ILPZv1CtHgVWLcR0IAdnHcCx9fv/aKc5fMFA3Czz0DNXTFXoK totr7/YxgEQogdTnQqr8VJkpuJ1fYhZj+Oy/bE1964JZ1XPdalRYTurxxUNQGJf+xWQv yjSd3DoVzyshiIyF734bL6qo0/aJJOCr885myaI9r6m4TMCTsfewT8y94VpRi1rz1def IKVg== X-Forwarded-Encrypted: i=1; AHgh+RqrlxTKlW4pz+MrUKBuZhuGand4byUQvfk6dbGzmFkiQq3jhYI4WdNNbKrWmBaZAPZ+7+1oukuJGOufVsg=@vger.kernel.org X-Gm-Message-State: AFuF++mmjJRHyKKVBf0HegvZI6iI6OBq9m/2igyKodXCl7iVmU2888QS K0YunCaNMpXyhSsPveMMguvE6GMhqFpZOTi7W5OxFqRsW0JCVY6VP79e X-Gm-Gg: AR+sD13CZE3s7RNx8oWedTuLq+z/AugeXi+XlALHOa3ISvJ0rpdyWya5nXp2CsIPTEQ +qP+9gRgPsXgT0PrQF+zob1TFVhmx25bBWAjCT8EXyXZ8e28b/+yp5XGyKgJPl4WJbrCpIlVVCa Y1Y8cVl1KTR8MyiOxRJSoGaV/hJMfETLyrqQ7v3SJ9rOdJJjMSNBP0or4OveiX1rB+rL5AdHaJ4 A+eIyV6M3jRTnDMctpSUn01XLKi/inzAdYpOg2kNB36MhloKxwE/PaSAq5DGmwdx53iBFZ/vVEJ CfE9wo6z1dSAzvnIoaZdhae4jX83MoFNY4t8KgB0sZrqzrYXaHt5QByibN528wySd7QTQ34UoIP 9Shmv5fMsp3FOOjid1etytg50GXAfjWlyVrg1l9sFywIPKpnPuygZxH6nMoA9E6llwzDdZJfwIq gKAKvUVigCBV1beFznqwdQU5TR87IpTamxXOsrABusq/XvXq9oS5uAUYjnxWHNIw== X-Received: by 2002:a05:690c:6311:b0:816:b469:cd12 with SMTP id 00721157ae682-8573cad05f0mr16824987b3.8.1787712043065; Tue, 25 Aug 2026 19:40:43 -0700 (PDT) Received: from [172.17.0.2] ([138.28.231.64]) by smtp.gmail.com with ESMTPSA id 00721157ae682-857053839fdsm9976087b3.10.2026.08.25.19.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2026 19:40:42 -0700 (PDT) From: Yuanshen Cao Date: Wed, 26 Aug 2026 02:40:29 +0000 Subject: [PATCH v5 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: quoted-printable Message-Id: <20260826-sun60i-a733-dma-v5-3-abc5229b441e@gmail.com> References: <20260826-sun60i-a733-dma-v5-0-abc5229b441e@gmail.com> In-Reply-To: <20260826-sun60i-a733-dma-v5-0-abc5229b441e@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.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 Reviewed-by: Frank Li --- 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 1ffd870d9594..ffb63212bea7 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -32,14 +32,13 @@ #define DMA_IRQ_PKG BIT(1) #define DMA_IRQ_QUEUE BIT(2) =20 -#define DMA_IRQ_CHAN_NR 8 #define DMA_IRQ_CHAN_WIDTH 4 =20 =20 #define DMA_STAT 0x30 =20 /* 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 =20 /* * sun8i specific registers @@ -58,6 +57,8 @@ #define DMA_IRQ_EN_OFFSET_A31 0x00 #define DMA_IRQ_STAT_OFFSET_A31 0x10 =20 +#define DMA_IRQ_CHAN_NR_A31 8 + /* * Channels specific registers */ @@ -154,6 +155,7 @@ struct sun6i_dma_config { u32 irq_stride; u32 irq_en_offset; u32 irq_stat_offset; + u32 num_channels_per_reg; }; =20 /* @@ -268,7 +270,7 @@ static inline void sun6i_dma_dump_com_regs(struct sun6i= _dma_dev *sdev) { int i; =20 - for (i =3D 0; i < 2; i++) { + for (i =3D 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" @@ -489,8 +491,8 @@ static int sun6i_dma_start_desc(struct sun6i_vchan *vch= an) =20 sun6i_dma_dump_lli(vchan, pchan->desc->v_lli, pchan->desc->p_lli); =20 - irq_reg =3D pchan->idx / DMA_IRQ_CHAN_NR; - irq_offset =3D pchan->idx % DMA_IRQ_CHAN_NR; + irq_reg =3D pchan->idx / sdev->cfg->num_channels_per_reg; + irq_offset =3D pchan->idx % sdev->cfg->num_channels_per_reg; =20 vchan->irq_type =3D vchan->cyclic ? DMA_IRQ_PKG : DMA_IRQ_QUEUE; =20 @@ -582,7 +584,7 @@ static irqreturn_t sun6i_dma_interrupt(int irq, void *d= ev_id) int i, j, ret =3D IRQ_NONE; u32 status; =20 - for (i =3D 0; i < sdev->num_pchans / DMA_IRQ_CHAN_NR; i++) { + for (i =3D 0; i < sdev->num_pchans / sdev->cfg->num_channels_per_reg; i++= ) { status =3D sun6i_read_irq_stat(sdev, i); if (!status) continue; @@ -592,7 +594,7 @@ static irqreturn_t sun6i_dma_interrupt(int irq, void *d= ev_id) =20 sun6i_write_irq_stat(sdev, i, status); =20 - for (j =3D 0; (j < DMA_IRQ_CHAN_NR) && status; j++) { + for (j =3D 0; (j < sdev->cfg->num_channels_per_reg) && status; j++) { pchan =3D sdev->pchans + j; vchan =3D pchan->vchan; if (vchan && (status & vchan->irq_type)) { @@ -1110,7 +1112,7 @@ static inline void sun6i_kill_tasklet(struct sun6i_dm= a_dev *sdev) int i; =20 /* Disable all interrupts from DMA */ - for (i =3D 0; i < 2; i++) + for (i =3D 0; i < DMA_MAX_CHANNELS / sdev->cfg->num_channels_per_reg; i++) sun6i_write_irq_en(sdev, i, 0); =20 /* Prevent spurious interrupts from scheduling the tasklet */ @@ -1138,7 +1140,8 @@ static inline void sun6i_dma_free(struct sun6i_dma_de= v *sdev) #define SUN6I_DMA_IRQ_A31_COMMON_CFG \ .irq_stride =3D DMA_IRQ_STRIDE_A31, \ .irq_en_offset =3D DMA_IRQ_EN_OFFSET_A31, \ - .irq_stat_offset =3D DMA_IRQ_STAT_OFFSET_A31, + .irq_stat_offset =3D DMA_IRQ_STAT_OFFSET_A31, \ + .num_channels_per_reg =3D DMA_IRQ_CHAN_NR_A31, =20 /* * For A31: --=20 2.55.0 From nobody Mon Sep 28 05:48:49 2026 Received: from mail-yw1-f182.google.com (mail-yw1-f182.google.com [209.85.128.182]) (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 23AC52EACF9 for ; Wed, 26 Aug 2026 02:40:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712048; cv=none; b=WtDMCRFkOoDUuWYW/nIrHXAqwLLzDfEY1VGZzSDUtiC/vm2g6g8MGik3QQLgq2T4AVmvlCY8gY+Ztqz5gMul40ID6IZOJ5pTSezG45MoWHMxavCuC9B7pWjljEjBPQYzeVRQZv0vXhZBR1JyMgOrEsA4tglhabIxxHl/eea5kuk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712048; c=relaxed/simple; bh=xXHRUhCMZY1UP0UimNCUgmYKZUE5pAtrJ+aeGai+WZg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=c0x0lyX/aVmb7HBneXes5ppfbkgP9ZUHiao8bLtMTeaxClKauGQizugXqXMAGr9tCC1Tc1Fnxr1zMOngSyxvuMz8bYa8a9FIUEO7yHAuw/mhJQHugac+zNU/9p7BHC7te0TDQUpNRorVU/IW1M63Y3vCAKn5Wu8/ZV2twn1BSb4= 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=Pk9XpRg2; arc=none smtp.client-ip=209.85.128.182 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="Pk9XpRg2" Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-836c8bde2dcso5654567b3.0 for ; Tue, 25 Aug 2026 19:40:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787712044; x=1788316844; 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=xBvIvGQQ8iDlLx9swcmCcNkQZffmEu12jGQ+ci/lSXc=; b=Pk9XpRg25dB0z18cv7mPpbZ6XEafWo4Hs5YbkvJDFxXDKzgKoBr14/soR4jtCsws/O tzSkXAi5bxUIXHozvDwQ0ryjFsBeqtQwGsfOClh+P/TerXJ6fJp9W56RYd2WT2qWqRZa AgBZwc26a8UeEa43h8olZIr+Fj4BdeofhtgbVawGeyWy4DA0n3Bi5VujFFwZde8y8ZEJ EeFkk3zW44wrjxUIoKcNKtBmQDBQouUaU8KP6ufX94uRmk4uRBe5wCh7RQEHeLqZlztQ XSV6HrJCnWZt35gqAqje837caXHC+ON10OYPNxfxBbVA5HyXNVDp57OSpMrluVX3ssEs etxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787712044; x=1788316844; 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=xBvIvGQQ8iDlLx9swcmCcNkQZffmEu12jGQ+ci/lSXc=; b=jKHYQO4zeDZ0dnKTsDmeO1ThYrbTsvC0f8xRR9gVER+aogzyaTHnK2e3TWk80ywSdE OPYr0dEUvmfBKJaBPVqF1lS0btll8dUafCknz0D8fZNZp18s42G3fF6MQr7WZSWLe5Oz ItZhcDxdUAq6sERF8U2aZPjW/ZONAsIZV/L5Ip0k8tYA63MMlHP5cBngpMPQVmLnwfhM yiUhHwcm30WVFHE548RBvxKV4CiZw3/hGiGxqjCbxvjHnaqxX0g0Px3kNs5xnBrkPRuF CS6KESShdoJwW2FhP4CTEOpKX2YwOyKfV/gtbf8Rg+hRfGCk3SSWL/e1Gt4IZqo+n3Vl tayg== X-Forwarded-Encrypted: i=1; AHgh+RqZO2tisFINZHzU5nZ0wT1Ce6zqy5g1KqihUW6XRbrmtQ+C6VwerouRVlxcfKZOy7VARi4X6/7EvBUhEYI=@vger.kernel.org X-Gm-Message-State: AFuF++kuaboyFtSh80jiN6t918jOIyZGLlL0LPAHDO7V2KjrMyoeyTKW xq506EvI1IzCWz3MzWFEAD0BbqFobAeHs+wDpwlo5RcAlu3CeitVGVvb X-Gm-Gg: AR+sD11zE56bjddCH3pVckmtYAMmiY7PoXnDINaA4sXILUuCYyluvpbV7D8Vov5ctey D4FX+Cy8mWT+5xzPWOg7BK2YMK8651MFX6XSE4OOReq0D/bt/yq+eKZ0o92X5jXzC82PRtIVEIZ 5uFvjHRuoggehEdW9AYNJDOnJgPFbDVFur1pd2Ddl3aNqJdot7O2FfbeLXoVbRbBiRvq5igQllz CoPbY5q5kIKrXtWlYW6G0fOvudfWBOtjioEfo4DPAC/wla7LM4W8WjypC0jDPgYkdNTQzaMPsOk wvq75Q7A8Er9FraFznivJi/vi5Y3iG26j6MBfiH1K9ApaSOq/XUFdRrh9hGpZJNRTxodZe8QUsB omogMt5HvCZqPa2llt6TkVN5aJgXxjpVjpvmnAG6s4ihSsKHGKoMnzC3tWO16BZ7UeDP6tk9qaq arG9V8vjXBJ4zQLQhNZqv2OpC61J6byKZEw1VQdwbF/F1QjUZsQOcWqK1D4ZfEhg== X-Received: by 2002:a05:690c:c3ce:b0:845:ddf4:a39e with SMTP id 00721157ae682-85740497985mr13245667b3.30.1787712044566; Tue, 25 Aug 2026 19:40:44 -0700 (PDT) Received: from [172.17.0.2] ([138.28.231.64]) by smtp.gmail.com with ESMTPSA id 00721157ae682-857053839fdsm9976087b3.10.2026.08.25.19.40.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2026 19:40:44 -0700 (PDT) From: Yuanshen Cao Date: Wed, 26 Aug 2026 02:40:30 +0000 Subject: [PATCH v5 4/5] dt-bindings: dmaengine: sun50i-a64-dma: Add allwinner,sun60i-a733-dma compatible string 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: quoted-printable Message-Id: <20260826-sun60i-a733-dma-v5-4-abc5229b441e@gmail.com> References: <20260826-sun60i-a733-dma-v5-0-abc5229b441e@gmail.com> In-Reply-To: <20260826-sun60i-a733-dma-v5-0-abc5229b441e@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 , Frank Li , Krzysztof Kozlowski X-Mailer: b4 0.16.0 Add `allwinner,sun60i-a733-dma` to the list of compatible strings for the `sun50i-a64-dma` dtbinding documentation. While the A733 DMA controller shares many similarities with the sun50i-a64 DMA controller, it requires a specific configuration due to differences in: - Interrupt register layout and mapping. - Number of channels per interrupt register. - Support for higher (32G) address widths in LLI parameters. Reviewed-by: Frank Li Reviewed-by: Krzysztof Kozlowski Signed-off-by: Yuanshen Cao --- Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma= .yaml b/Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml index c3e14eb6cfff..1cc3304b7414 100644 --- a/Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml +++ b/Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml @@ -25,6 +25,7 @@ properties: - allwinner,sun50i-a64-dma - allwinner,sun50i-a100-dma - allwinner,sun50i-h6-dma + - allwinner,sun60i-a733-dma - items: - const: allwinner,sun8i-r40-dma - const: allwinner,sun50i-a64-dma @@ -70,6 +71,7 @@ if: - allwinner,sun20i-d1-dma - allwinner,sun50i-a100-dma - allwinner,sun50i-h6-dma + - allwinner,sun60i-a733-dma =20 then: properties: --=20 2.55.0 From nobody Mon Sep 28 05:48:49 2026 Received: from mail-yw1-f180.google.com (mail-yw1-f180.google.com [209.85.128.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 E83252DC783 for ; Wed, 26 Aug 2026 02:40:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712050; cv=none; b=ZnZvOfVbl4MPTthHp94zOl42BkKItAd5KoXjah78uYRYycOhM3fA8hOYV/QQlsWDnDpnC0b+gfZxkDcTdmFl5wjK0WkTLhKgr5vAICBl/xTSeyWgDQqagx71tJP0sgsBC2ROhwDKd5vt9TLD4gt18RSjPy55/kVKE7V9dwPi0FM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712050; c=relaxed/simple; bh=Q/ba6rrz9Iw7+Y9A/qw1n7IqOmUJJcPITi7eRXxJZSc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=T5QF3L4aJ6bnEvz8qlGQsxB8Oc5x6/lKIUwb8vIk5jV2sJ94BDfM6/MyRh5PrrifrB4hxAA7rFUIjMkOHSujVSThxMFsjD8V31YqeLgefZnO9K2oya14dYkEd+/Amp9uEvVBqHgfdDq9UN+3MsQJl23R5rYx0MGdONfEj9GtrGw= 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=gosEKn4A; arc=none smtp.client-ip=209.85.128.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="gosEKn4A" Received: by mail-yw1-f180.google.com with SMTP id 00721157ae682-85845398586so715777b3.3 for ; Tue, 25 Aug 2026 19:40:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787712046; x=1788316846; 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=sFcQNAEgapc01hiKVhmrcgq3W/QfrjksyHpLfTytFFk=; b=gosEKn4Ae2thekxEljK1f1QiyPyJSYQz0SxdQTk7qaqUzTKHyXuwmx06CZ5WQnIe8U b4RpAxVIGv8+9WvPUUSmwgAGQrdNkwC78LmfJV4HEfHBiHz9QH80ZeDwJV80GoM7VRFP wFcDdrW6n2OmIaj6GKjGFaTcEeqfHK2vHYYE4f95XzZyMlob3ymhShWDpVBe4tHRPQni qIjZxJS0MQIQZQLU0Laz8fQOWI3r6JaLBIaino5Sm9f5cbtz+dn8kpxV+3FnZLBTQ3P3 y69Mr+KRP4MgL66QeEP5r+mIqPFFNwlhVvblsergCNOpUKI6oE5LgZQVFE2iarxjjzlJ XC8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787712046; x=1788316846; 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=sFcQNAEgapc01hiKVhmrcgq3W/QfrjksyHpLfTytFFk=; b=KytT4PxFWwriO5lLTuG5BhERb59GTda7Ik8GKnsbmcxc8ZhqqT95Y+HgNTZ5wpforw USsKKiMtzjN5Xqb2TX4tgxYup2iuC91/T+4XPC9Cq+qXT3CbQocc7FiYLOYfJtr+P6sT ZqPRevo/gnJlASXniHvIvoYWfy0A6pMELTgJV7QB+coUWaYNHYaNGszEF4qva6Ngv3eH x2PX+t95gMaMgaZWVZUDUwmJ2BSdg3XnOvktgCCdy288moU3xVjQPb07pTb0ek5PMHG7 A8xOL1qm52vH1IPReMRpSHPh0CQ2aRiU6OlE0tbT7d+LcSZE65xFy+VdV/l+8R+QH4Kj Q1gw== X-Forwarded-Encrypted: i=1; AHgh+RpjK9wvKrkeIiuvM2i7DSJPtMS+VMHameIS5UTvdV7QzBBi21NEhR5hpZMHthV6LM4oX879+/+U64UYTYU=@vger.kernel.org X-Gm-Message-State: AFuF++k4agRsnZCVAfeQuZsHpesbAlD2p8xRgiSykecy0ASR3spWJCl+ 0q0OraAe2AXOCn+lh4OqtL7V3A3RqW4L/fiE1NnVYE6h35cLjElLVJJO X-Gm-Gg: AR+sD13DDA9AZ2HE1JZExAJA9oNvFDVTRPA8VItSeaBRDoj6t/nMBdu2nnwveBsqZvS xfld7DZQdI7/qmzp5byOCERqzGT2PT8/fCn0dsx1XBEcTn1t7lduI+8HahzZsbjXxmHtbN+Yr3Y uz/ZhFa0sir0PF5WZRJqbmykQd1igWwPOZauePR9rz+xZZRv6/pn9PpPUIXBcbQhyPUY79m32Qs lqpO3Ecr21RYMDpJoUaUkQ9DFiE5bkkNl9DGAXlyfn9ZbG5ihVT6ztk2GXnS6sVEBN24XXSdOm5 va1sjRjNbOPmDehsTlcNTU4oq5aRXELlfKPqELASxSRRMyr82e6jkcXX7/1nkT6m5LwR1Icscq7 zRy0CJekzMMguADJSS5BFoJlW/HCdjOCkPa7WDKkAMUM13qF6gZZBJuqwgcAWP6RDOxuI7bLQaT OFaIqPYuZgrvE+X/tYyUba20qBJGCJafOdI5t7lD6B9ys/G/YkqC/UNMUrJwtzYg== X-Received: by 2002:a05:690c:a583:b0:845:23cf:7c01 with SMTP id 00721157ae682-8573c7dfc2dmr13611677b3.10.1787712045994; Tue, 25 Aug 2026 19:40:45 -0700 (PDT) Received: from [172.17.0.2] ([138.28.231.64]) by smtp.gmail.com with ESMTPSA id 00721157ae682-857053839fdsm9976087b3.10.2026.08.25.19.40.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2026 19:40:45 -0700 (PDT) From: Yuanshen Cao Date: Wed, 26 Aug 2026 02:40:31 +0000 Subject: [PATCH v5 5/5] dmaengine: sun6i-dma: Implement support for Allwinner A733 DMA controller 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: quoted-printable Message-Id: <20260826-sun60i-a733-dma-v5-5-abc5229b441e@gmail.com> References: <20260826-sun60i-a733-dma-v5-0-abc5229b441e@gmail.com> In-Reply-To: <20260826-sun60i-a733-dma-v5-0-abc5229b441e@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.16.0 Implement support for the Allwinner A733 DMA controller by defining A733-specific register offsets, bitfield masks, and the `sun60i_a733_dma_cfg` configuration structure. This includes the IRQ stride, offsets, and channel counts specific to the A733, as well as the 32G mask for high-address fields in the LLI. Add `sun60i_a733_dma_cfg`, which ties all the refactored functionality together for A733. Signed-off-by: Yuanshen Cao Reviewed-by: Frank Li --- drivers/dma/sun6i-dma.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index ffb63212bea7..66281e01972d 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -54,10 +54,14 @@ * Interrupts specific registers */ #define DMA_IRQ_STRIDE_A31 0x04 +#define DMA_IRQ_STRIDE_A733 0x40 #define DMA_IRQ_EN_OFFSET_A31 0x00 +#define DMA_IRQ_EN_OFFSET_A733 0x134 #define DMA_IRQ_STAT_OFFSET_A31 0x10 +#define DMA_IRQ_STAT_OFFSET_A733 0x138 =20 #define DMA_IRQ_CHAN_NR_A31 8 +#define DMA_IRQ_CHAN_NR_A733 1 =20 /* * Channels specific registers @@ -107,6 +111,8 @@ */ #define SRC_HIGH_ADDR_MASK GENMASK(17, 16) #define DST_HIGH_ADDR_MASK GENMASK(19, 18) +#define SRC_HIGH_ADDR_32G_MASK GENMASK(13, 11) +#define DST_HIGH_ADDR_32G_MASK GENMASK(17, 15) =20 /* * Various hardware related defines @@ -1318,6 +1324,32 @@ static struct sun6i_dma_config sun50i_h6_dma_cfg =3D= { SUN6I_DMA_IRQ_A31_COMMON_CFG }; =20 +/* + * The A733 binding uses the number of dma channels from the + * device tree node. + */ +static struct sun6i_dma_config sun60i_a733_dma_cfg =3D { + .clock_autogate_enable =3D sun6i_enable_clock_autogate_h3, + .set_burst_length =3D sun6i_set_burst_length_h3, + .set_drq =3D sun6i_set_drq_h6, + .set_mode =3D sun6i_set_mode_h6, + .src_burst_lengths =3D BIT(1) | BIT(4) | BIT(8) | BIT(16), + .dst_burst_lengths =3D BIT(1) | BIT(4) | BIT(8) | BIT(16), + .src_addr_widths =3D BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | + BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | + BIT(DMA_SLAVE_BUSWIDTH_4_BYTES), + .dst_addr_widths =3D BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | + BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | + BIT(DMA_SLAVE_BUSWIDTH_4_BYTES), + .src_high_addr_mask =3D SRC_HIGH_ADDR_32G_MASK, + .dst_high_addr_mask =3D DST_HIGH_ADDR_32G_MASK, + .has_mbus_clk =3D true, + .irq_stride =3D DMA_IRQ_STRIDE_A733, + .irq_en_offset =3D DMA_IRQ_EN_OFFSET_A733, + .irq_stat_offset =3D DMA_IRQ_STAT_OFFSET_A733, + .num_channels_per_reg =3D DMA_IRQ_CHAN_NR_A733, +}; + /* * The V3s have only 8 physical channels, a maximum DRQ port id of 23, * and a total of 24 usable source and destination endpoints. @@ -1352,6 +1384,7 @@ static const struct of_device_id sun6i_dma_match[] = =3D { { .compatible =3D "allwinner,sun50i-a64-dma", .data =3D &sun50i_a64_dma_c= fg }, { .compatible =3D "allwinner,sun50i-a100-dma", .data =3D &sun50i_a100_dma= _cfg }, { .compatible =3D "allwinner,sun50i-h6-dma", .data =3D &sun50i_h6_dma_cfg= }, + { .compatible =3D "allwinner,sun60i-a733-dma", .data =3D &sun60i_a733_dma= _cfg }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, sun6i_dma_match); --=20 2.55.0