From patchwork Wed Aug 26 02:40:27 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanshen Cao X-Patchwork-Id: 3059 Return-Path: X-Original-To: noreply@patchwork.local Delivered-To: noreply@patchwork.local Received: from sea.lore.kernel.org (sea.lore.kernel.org [172.234.253.10]) by mxe881.netcup.net (Postfix) with ESMTPS id 646751C0563 for ; Wed, 26 Aug 2026 04:41:00 +0200 (CEST) Authentication-Results: mxe881; dkim=pass header.d=gmail.com; spf=pass (sender IP is 172.234.253.10) smtp.mailfrom=linux-sunxi+bounces-25360-noreply=patchwork.local@lists.linux.dev smtp.helo=sea.lore.kernel.org Received-SPF: pass (mxe881: domain of lists.linux.dev designates 172.234.253.10 as permitted sender) client-ip=172.234.253.10; envelope-from=linux-sunxi+bounces-25360-noreply=patchwork.local@lists.linux.dev; helo=sea.lore.kernel.org; Received: from smtp.subspace.kernel.org (conduit.subspace.kernel.org [100.90.174.1]) by sea.lore.kernel.org (Postfix) with ESMTP id 19D7E30D932F for ; Wed, 26 Aug 2026 02:40:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E5E192DF142; Wed, 26 Aug 2026 02:40:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Zj0MC8gI" X-Original-To: linux-sunxi@lists.linux.dev Received: from mail-yw1-f177.google.com (mail-yw1-f177.google.com [209.85.128.177]) (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 59AFA2DECBF for ; Wed, 26 Aug 2026 02:40:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712043; cv=none; b=EWglbe3bOaNfypYSsIdyVW1sZnwfJNzhW9j976/zYdRJ8J6gGnG2/GKb6Z0YbHOC6YCYXOdPzP9G6O5tiMGo1rYYNFRTKxHZwQgT8ewxOTlMaSLM2ulkVJiQaHHACC6NvLp/6VpWLLbCYhXbQIykWw5NNTKQgIIFYS4X7EcruBY= 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=Zj0MC8gI; arc=none smtp.client-ip=209.85.128.177 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 Received: by mail-yw1-f177.google.com with SMTP id 00721157ae682-81f3b227a4aso7207887b3.1 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=lists.linux.dev; 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=Zj0MC8gIVmh7DRpTu/KaR+tCdkWEpanUeuxbdQelZQWH1Qlf/81iH2D97JdseQ+FZs Yyu3S4C2M+KcMypIwsRxfldcDg3rZmjUo4WWaWyPNy010UNlXbzSO/RM3c9c/6QCPvNI GSYZ/0HchDpEp01J3O+I+Z8ZZumw1z0y6pcNb4r9HgKYJX178PkL62+2P9gMOasCthbw 9st4CGFUmn0TOdLIQixxOETfqld8TI9kGvd5/vwdmt6gIp/i7gaF9Ktt+xDLI1Se2/8p peqcF3aPCZlFNvfftaXPlSWvW5VVEzB0nIW1QPAFVPS0trOxEj15juynDrW6fTo4r4+s DyPQ== 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=RqRkGM4YKVP33k7zSmzGjOgRqA7LuUUZ5EENiNgX8T8evjvKLs6RIZ4FVRgcXheqoQ AMxh4VFd7KJAf0KjdEgxtke2Nyi4shmEUyknFokouoFq5C0kM4+drzvLpgqGXGDSJuRu uF/VixRT+d8q2/KFKCsa97zDn0STH5JgKVWs8ddc5vMVdjcfIGEAtBpBxRk+YPLXfQEs 9C4zfeF41jDeJXV4SxDdzsjuWlZSITiqETj5o6l6BozPAQm5102cNQCEpOm8IGiZj8xV x8UxjdCil6ehd3jiNZAA0gLGiq4Mo8M1Vg5vDkY6xICKNcZ/vZlBLS8V30/6aaXQMSTi ++Cw== X-Forwarded-Encrypted: i=1; AHgh+Rq1s4NtfwXVUnpCXauhIO/uEoUqqahPtAToUVVFz/6dHjZP2eYIF63sm+OQ0tjRdo0j5rsKVaS7JkHo6g==@lists.linux.dev X-Gm-Message-State: AFuF++kAwwicclOovEFg+t0Nifw9JtDZRQ2IpdValup13SfYdmfEcx2r Ls9AFXFPzlExORGqfd9/bUKvgx+k4sybrNGCp9luRITZDUVBKz0O4aPB X-Gm-Gg: AR+sD13HSVvJbqnwDGWdnx7OaUYwLXlakc+cJvIpYzwXlDD7OH5XJJQSeSh4lpoAMsC Vq4R5QkUhJn2kQywUgqkNC2nrsHI8VlQhI8EwiLe2D/MmMAkOOkiUCBArkZkBPtfVv/3CET4ebL Js/Fkg/HTfDywOccBFgtJ3WU9bGce+GNVDzt0U+Mj45GEt7yvgHQFAnDaNnLkBJKtV0TA7uA0ai E1iaCQGhnZKw9yk4u/cbFgWVrhN196LHQgnlGsjT4yCl059xcvxWiFH9Tdx25JFDCySbQLFrawR 7LuNhU2CedPuJ+I5OEu7ftdxR0JivjD74grG+//ZSmqwdNzzDKGvJWxonGkkjVqcUqIGAtbnDLt Fst//g2mv9a+M1DIZervRV0pHJ4kGqLL9Hk6iLaoTYry3vrTweDmRaWlkcWGPmV+JDHEfYRrakm wyMcgm0N0ulWPDJt6jmaavTdGwTTMfEoc9nccgFeSUnoNYZmjsXZY7L53etHaBeg== 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-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 X-Rspamd-Server: rspamd-worker-8404 X-Spamd-Result: default: False [-1.16 / 15.00]; BAYES_HAM(-5.50)[100.00%]; RBL_SENDERSCORE(2.00)[172.234.253.10:from]; SUSPICIOUS_RECIPS(1.50)[]; DMARC_POLICY_SOFTFAIL(1.00)[gmail.com : SPF not aligned (relaxed), No valid DKIM,none]; MAILLIST(-0.15)[generic]; BAD_REP_POLICIES(0.10)[]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; RCVD_COUNT_FIVE(0.00)[6]; FROM_HAS_DN(0.00)[]; FORGED_SENDER_MAILLIST(0.00)[]; RCPT_COUNT_TWELVE(0.00)[15]; PRECEDENCE_BULK(0.00)[]; FREEMAIL_CC(0.00)[vger.kernel.org,lists.infradead.org,lists.linux.dev,gmail.com]; TAGGED_RCPT(0.00)[dt]; DBL_BLOCKED_OPENRESOLVER(0.00)[sea.lore.kernel.org:rdns,sea.lore.kernel.org:helo]; FROM_NEQ_ENVFROM(0.00)[alexcaoys@gmail.com,linux-sunxi@lists.linux.dev]; TAGGED_FROM(0.00)[bounces-25360-noreply=patchwork.local]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(0.00)[+ip4:172.234.253.10]; TO_DN_SOME(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[172.234.253.10:from]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[100.90.174.1:received,209.85.128.177:received]; ASN(0.00)[asn:63949, ipnet:172.234.224.0/19, country:SG]; FREEMAIL_TO(0.00)[kernel.org,gmail.com,sholland.org]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; ARC_ALLOW(0.00)[subspace.kernel.org:s=arc-20240116:i=1]; RCVD_TLS_LAST(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 646751C0563 X-MORS-Enabled: yes X-MORS-DOMAIN: patchwork.local X-MORS-HOSTING: hosting172546 X-MORS-USER: hosting172546 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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 --- 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 -#define DMA_IRQ_STAT(x) ((x) * 0x04 + 0x10) - #define DMA_STAT 0x30 /* 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; }; /* @@ -234,19 +242,43 @@ to_sun6i_desc(struct dma_async_tx_descriptor *tx) return container_of(tx, struct sun6i_desc, vd.tx); } +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->irq_en_offset); +} + +static void sun6i_write_irq_en(struct sun6i_dma_dev *sdev, u32 irq_reg, u32 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->irq_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 = 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)); + } } 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 *vchan) vchan->irq_type = vchan->cyclic ? DMA_IRQ_PKG : DMA_IRQ_QUEUE; - irq_val = readl(sdev->base + DMA_IRQ_EN(irq_reg)); + irq_val = sun6i_read_irq_en(sdev, irq_reg); irq_val &= ~((DMA_IRQ_HALF | DMA_IRQ_PKG | DMA_IRQ_QUEUE) << (irq_offset * DMA_IRQ_CHAN_WIDTH)); irq_val |= 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); 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; for (i = 0; i < sdev->num_pchans / DMA_IRQ_CHAN_NR; i++) { - status = readl(sdev->base + DMA_IRQ_STAT(i)); + status = sun6i_read_irq_stat(sdev, i); if (!status) continue; dev_dbg(sdev->slave.dev, "DMA irq status %s: 0x%x\n", str_high_low(i), status); - writel(status, sdev->base + DMA_IRQ_STAT(i)); + sun6i_write_irq_stat(sdev, i, status); for (j = 0; (j < DMA_IRQ_CHAN_NR) && status; j++) { pchan = sdev->pchans + j; @@ -1072,9 +1104,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 < 2; i++) + sun6i_write_irq_en(sdev, i, 0); /* 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_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, + /* * For A31: * @@ -1129,6 +1168,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), + SUN6I_DMA_IRQ_A31_COMMON_CFG }; /* @@ -1152,6 +1192,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), + SUN6I_DMA_IRQ_A31_COMMON_CFG }; static struct sun6i_dma_config sun8i_a83t_dma_cfg = { @@ -1170,6 +1211,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), + SUN6I_DMA_IRQ_A31_COMMON_CFG }; /* @@ -1197,6 +1239,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), + SUN6I_DMA_IRQ_A31_COMMON_CFG }; /* @@ -1218,6 +1261,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), + SUN6I_DMA_IRQ_A31_COMMON_CFG }; /* @@ -1241,6 +1285,7 @@ static struct sun6i_dma_config sun50i_a100_dma_cfg = { BIT(DMA_SLAVE_BUSWIDTH_8_BYTES), .has_high_addr = true, .has_mbus_clk = true, + SUN6I_DMA_IRQ_A31_COMMON_CFG }; /* @@ -1263,6 +1308,7 @@ static struct sun6i_dma_config sun50i_h6_dma_cfg = { BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_8_BYTES), .has_mbus_clk = true, + SUN6I_DMA_IRQ_A31_COMMON_CFG }; /* @@ -1286,6 +1332,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), + SUN6I_DMA_IRQ_A31_COMMON_CFG }; static const struct of_device_id sun6i_dma_match[] = { From patchwork Wed Aug 26 02:40:28 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanshen Cao X-Patchwork-Id: 3058 Return-Path: X-Original-To: noreply@patchwork.local Delivered-To: noreply@patchwork.local Received: from tor.lore.kernel.org (tor.lore.kernel.org [172.105.105.114]) by mxe881.netcup.net (Postfix) with ESMTPS id 72ABD1C0563 for ; Wed, 26 Aug 2026 04:40:57 +0200 (CEST) Authentication-Results: mxe881; dkim=pass header.d=gmail.com; spf=pass (sender IP is 172.105.105.114) smtp.mailfrom=linux-sunxi+bounces-25361-noreply=patchwork.local@lists.linux.dev smtp.helo=tor.lore.kernel.org Received-SPF: pass (mxe881: domain of lists.linux.dev designates 172.105.105.114 as permitted sender) client-ip=172.105.105.114; envelope-from=linux-sunxi+bounces-25361-noreply=patchwork.local@lists.linux.dev; helo=tor.lore.kernel.org; Received: from smtp.subspace.kernel.org (conduit.subspace.kernel.org [100.90.174.1]) by tor.lore.kernel.org (Postfix) with ESMTP id 8A08D30082B3 for ; Wed, 26 Aug 2026 02:40:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A24692E764D; Wed, 26 Aug 2026 02:40:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AwiuONib" X-Original-To: linux-sunxi@lists.linux.dev Received: from mail-yw1-f169.google.com (mail-yw1-f169.google.com [209.85.128.169]) (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 160F32DCC13 for ; Wed, 26 Aug 2026 02:40:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712045; cv=none; b=uaqin4znf7FocVC9MAshjZ+yGxYxF/2lmFfZkdUgaXyCzq79wiWZOQ4w9/GSpRsZpJHKHZ2Ghq3Cv/t7+jGqUTdLqUnUmb8bS0rM4HW7GXT9xCEDPFEwhHWUpQ2Rq2RCgydFIGg4uqKH7KDVi+tmtLXwocS1qtFttRN7lYnNCgg= 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=AwiuONib; arc=none smtp.client-ip=209.85.128.169 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 Received: by mail-yw1-f169.google.com with SMTP id 00721157ae682-8111c0c7561so5577367b3.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=lists.linux.dev; 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=AwiuONibktpcSvcwnnlvCib1OkHTT3jCUJouswO5TgEYRitU0TONzBmGHfMfxOJQhS 3mN0bFJkjQ3Jk6o6kgH3Eq+wN/zhBXJW/kl8azvGMWWdd4wmuVb1obHaCNw9xoobcnHU TSCdayouq/qEysi+wRsPqrZuAOzWjKshDOa1lfnppkEWe/hjpTgwRYvkFlzNUcl/22mT 3K+22V9f87/QNHR+fzMDQaEIYJc3ygtvp+Ya78TPG+klv7x8rMMFTnY8KFZGmnpdCyz6 Fff3gAObSYiYgMiQRicqOzw4j1sujk4pPG9w7BCh9r4+E1cbR5vgJ0XZ5yO9tj349IMC uhtw== 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=V7h5wcnbGhf9+dl04EwBouyW6A44IXDwilf+vVjdvbhD2so7gPt6q/UxtI2n+cgoei ot01Nw7q+5Imcky7fmoK5vEWMk58j1UO36CDdxQ4wvxpY8fYur5vVP3SiCafOC8vmRvz lJheD0ZwUMl7nMTgsSR2cKDXDb8ygXZ68W6pl7LaXKH2b+rD1EKpeze54NyhUaJJexw0 +U24pDFQJSpdYvaWy9KAx2dIYqDLL7wwGY7NNlRfsS9HeyO3UMi3sNUYCwxnKln2gEc8 IiKxQpPKny9mozmOjcuMkLwCyiZDyP9GwkGvCuCFo5VLq3G3xfS6XQXru/bYcIzzqBPz tV/Q== X-Forwarded-Encrypted: i=1; AHgh+RpXYUjAOkorCcoC62ePy35KtiGQikh2q4bksQyrZmTKQ8BrKGjxUgnuYqv0AfqGN1QFLNRLFVGYvaBoXQ==@lists.linux.dev X-Gm-Message-State: AFuF++ktUrEf7rvvq0qH2p/vALS178Mn7f9XeBEzUrWRkF/8zFkatze2 3SPRk/dkp20QeBI4bEbn2McebTmHgV+g1hyJLoLUbpIsBnngjXWaGWaJ X-Gm-Gg: AR+sD135BjmhHlfLdUZAHRkt9P3glFi3Eu5cvY7hRWzr09Y8zimdfDutc6AvZ6Doxa1 qo+Uq6MpfGOS/VW8/26UNVHpbSrf4IVNHtLVRjdwDnhQXUzWWqRgb6axV8uKs8/V5rh/0HEA3RK KIO76uM/30U11bPG4F9DTxfV6D59EcEfN8C0AENibS5Sp1ZjFtqQ8Kk+aNSy++Vy8xUTGdPtws7 fXlYm5M1hJiiyLqKu7FdQiG9I2LjxhW4+djdyrjQmEnRzWmB1hQwcXrwruIEDYU6i4F9DC450Ox CdaEohdbgdddsw2QTHxNzhd5eJh/dEneaiHdCM6YJMjazuJVYP5sO1NTg42qLPIdqlim1ZctMxt jWmaCw6agnY0CPDNlDvfj0w6rWiR0r1USeSBTEz1dr5g6yenimRlCFwlWVAfrtTfds1nR9wgAHW 4LA1X/qWxneoP4MpOuJWaOFe6YAXpAOuuxWvl6qb+1YrXeG1cr5oDyDouI0CX8Eg== 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-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 X-MORS-Enabled: yes X-MORS-DOMAIN: patchwork.local X-MORS-HOSTING: hosting172546 X-MORS-USER: hosting172546 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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 --- 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 */ +#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) /* * 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 = lower_32_bits(src); v_lli->dst = lower_32_bits(dst); - if (sdev->cfg->has_high_addr) - v_lli->para |= SRC_HIGH_ADDR(upper_32_bits(src)) | - DST_HIGH_ADDR(upper_32_bits(dst)); + if (sdev->cfg->src_high_addr_mask) + v_lli->para |= + field_prep(sdev->cfg->src_high_addr_mask, upper_32_bits(src)) | + field_prep(sdev->cfg->dst_high_addr_mask, upper_32_bits(dst)); } static struct dma_async_tx_descriptor *sun6i_dma_prep_dma_memcpy( @@ -1283,7 +1286,8 @@ 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), - .has_high_addr = true, + .src_high_addr_mask = SRC_HIGH_ADDR_MASK, + .dst_high_addr_mask = DST_HIGH_ADDR_MASK, .has_mbus_clk = true, SUN6I_DMA_IRQ_A31_COMMON_CFG }; From patchwork Wed Aug 26 02:40:29 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanshen Cao X-Patchwork-Id: 3060 Return-Path: X-Original-To: noreply@patchwork.local Delivered-To: noreply@patchwork.local Received: from sea.lore.kernel.org (sea.lore.kernel.org [172.234.253.10]) by mxe881.netcup.net (Postfix) with ESMTPS id 256711C0563 for ; Wed, 26 Aug 2026 04:41:55 +0200 (CEST) Authentication-Results: mxe881; dkim=pass header.d=gmail.com; spf=pass (sender IP is 172.234.253.10) smtp.mailfrom=linux-sunxi+bounces-25362-noreply=patchwork.local@lists.linux.dev smtp.helo=sea.lore.kernel.org Received-SPF: pass (mxe881: domain of lists.linux.dev designates 172.234.253.10 as permitted sender) client-ip=172.234.253.10; envelope-from=linux-sunxi+bounces-25362-noreply=patchwork.local@lists.linux.dev; helo=sea.lore.kernel.org; Received: from smtp.subspace.kernel.org (conduit.subspace.kernel.org [100.90.174.1]) by sea.lore.kernel.org (Postfix) with ESMTP id AA4AD312AC87 for ; Wed, 26 Aug 2026 02:40:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0F8562F7AD2; Wed, 26 Aug 2026 02:40:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cpTBy7f/" X-Original-To: linux-sunxi@lists.linux.dev 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 4E1502E7394 for ; Wed, 26 Aug 2026 02:40:44 +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=1787712047; cv=none; b=XaCSgUgYiOlmTT1dCtMqkWBWt+t0ydy5dEIjiREnm9BFaTQOnJ7aRY/37nDt4QsHG45Kv4NWsW9XFYoEgQaI0M3stuT8t5RwifRYuxSWK4ZqAyH4zvqdulUkGoG9y9KxbfqS4Esf9x9gwEPwh+G6Xyl/D4F4tO1ooGpowIS1AOU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712047; c=relaxed/simple; bh=6+ewAXqjW78W01kuIRgLZxa+1D1OKS1tJVFYiHwc4QM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=g1ONkc+428NBhd+KnHKfvHirX/bikreCgfUVLt7CB3Ja007SEw49maK+UBfJn7AMwvBw+efy2xU9WKThzcxE0tI3u8GgoG063+aBNksig6zk9g8qhZ2C2ZX77H5HlEy1W+2p1Mi0LF8xcR5RFZyp6PYtQ27bNlgwNHrA93aO8dY= 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=cpTBy7f/; 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 Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-836d2861a39so7342517b3.2 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=lists.linux.dev; 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=cpTBy7f/vSJ2w5nDSZ+Z1ZVljEXI4LmFn8LHeQLIAXq9Yt79LfYHclKv915q/13E6g Z9ZXGMGVq7snghnC97XWYFioPeGYKr4dUDMes0vCG4YCKW6wUMcyS2THsT7+nrsVs8Kp OxbfWmiQRzp2aqOMLTqzMTkkaZECNw8xj8Ha7I9TT5wiPfs8Fi0p6UH9jMksgy2p4YzC RWhNVh8IEiApjVqzkQONESyflab21I38r2hWnkZ4wRivUQ6lGJDGfC/m3xbh2BUBl4d/ CP+KTHnTZKQAWYkOVvejTc7jFLIqUtP/KiKMJBJ3aUeQ2YhxXCGMaYStaRRHTgi2oe4c F5Fg== 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=T/ygOX+8UN6BKlZdP5dNqySowYfWH2/QRHhNZ7BipB0w6XdAlDtLHsDWC16DhjybZ7 uCrj4cxwmG7yYmGr9AUiWHeHLyoYJJM/7gFIR6OiObxy+apSKqkcgYgsLANkxla3QvDp ZgQaSsYB1SnY0nRAtaTQSvwF5rAoqoWjkP2TR70zz0DBwtVfyIJJtDEXIresEC0KEuGF 3dS7ZY0QGWdizKKUOY1Wx4b3bhZQdhHV6NjrAOUtpydhHi07Z3421Xqh0nlAeeROPPXS XFQiMUS3/ODYlq6AEIxAhfYcLunuouR5KdBiX3O7QB2CIil1y9TWXST1q1lZ+ktN9ovU EeqQ== X-Forwarded-Encrypted: i=1; AHgh+RojeUEFH4hUGPUQE4vNzQA8nHYWLYUqYF61J2h5nHlix8/Si2+ECbFIyQQqM0JvfKhqdlY92el5RoaMow==@lists.linux.dev X-Gm-Message-State: AFuF++nZC7882kXvtv1VMH27iL2eAftSHuT/YZ+O0cFiLZnEuV9YquPK iiZKpcc6rVdZFNAlgFDSRwk01Ia8/biodpwHXAZnuZmRCzbOMsNSbU6y X-Gm-Gg: AR+sD111tD0yLsWZSY8IqPtfH9ltR6q6f+PY4ua/naV9w/eb30uhMQmXmmfxbBNSuAD MtgorN+HAPVEpGd/0Q5wHmMC3+14A72BnqirsRkWMGXp7YuTHpprWGWtnypWg4HbrlOwPSihhfp pkBTx+BE4gm99oSAwDmcy6kNC7QwKQoLWLNi/utjLS3rpjXZCugUugFD/+WYFgiLb6o4hnlg4vA GflNTvcZK6EagKK72mT33LdDWAiD/2lWhIiX67kOXdeS4uYtaR99Zb2k5snVKseOpP8F1PbrP55 pj0hwrI4/wpOCQ7iZFosygJcDc6NTJO0E2OLG2SqaiBzLP5uaDHEty7Z396L+OGjBjphwuoKJyl m8B2+e6AcF1MzT6M1kY8JJPtHYfcmnnQTQOJwdU0k1euKXiw6G9DFmtTdXW9lqiIsY8pfMEgXQF jzhdaXXhaCd4wD5FV1d2IzRlCh/xx3l7jrhYSkzh8ONgqDm3YEhM3n9MsitGvSVA== 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-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 X-MORS-Enabled: yes X-MORS-DOMAIN: patchwork.local X-MORS-HOSTING: hosting172546 X-MORS-USER: hosting172546 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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 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) -#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 @@ -58,6 +57,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 */ @@ -154,6 +155,7 @@ struct sun6i_dma_config { u32 irq_stride; u32 irq_en_offset; u32 irq_stat_offset; + u32 num_channels_per_reg; }; /* @@ -268,7 +270,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" @@ -489,8 +491,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; @@ -582,7 +584,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; @@ -592,7 +594,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)) { @@ -1110,7 +1112,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 */ @@ -1138,7 +1140,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: From patchwork Wed Aug 26 02:40:30 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanshen Cao X-Patchwork-Id: 3061 Return-Path: X-Original-To: noreply@patchwork.local Delivered-To: noreply@patchwork.local Received: from sea.lore.kernel.org (sea.lore.kernel.org [172.234.253.10]) by mxe881.netcup.net (Postfix) with ESMTPS id 2380B1C0563 for ; Wed, 26 Aug 2026 04:41:59 +0200 (CEST) Authentication-Results: mxe881; dkim=pass header.d=gmail.com; spf=pass (sender IP is 172.234.253.10) smtp.mailfrom=linux-sunxi+bounces-25363-noreply=patchwork.local@lists.linux.dev smtp.helo=sea.lore.kernel.org Received-SPF: pass (mxe881: domain of lists.linux.dev designates 172.234.253.10 as permitted sender) client-ip=172.234.253.10; envelope-from=linux-sunxi+bounces-25363-noreply=patchwork.local@lists.linux.dev; helo=sea.lore.kernel.org; Received: from smtp.subspace.kernel.org (conduit.subspace.kernel.org [100.90.174.1]) by sea.lore.kernel.org (Postfix) with ESMTP id EC4CE312EB77 for ; Wed, 26 Aug 2026 02:40:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 594922F7F01; Wed, 26 Aug 2026 02:40:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qbNXufER" X-Original-To: linux-sunxi@lists.linux.dev Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) (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 0DD602EEE7C for ; Wed, 26 Aug 2026 02:40:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712048; cv=none; b=PHZtEWZDfFFpR12kMU/ZmRjmY9keGXJhoKMArveISWoe1j13jjmHKcLiFQBNVOWB02FGOZRuSlDxZrE2ZweztQ7qyGjgEwZIgs5Dtd9OsnTBiGBUsg9DisuOjvlsnGj1LIDrHrkSZJ+VgmKqWpqsnHY51wbEXuuvOr4zgBzh+1s= 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=qbNXufER; arc=none smtp.client-ip=209.85.128.170 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 Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-81f36179d72so6288647b3.2 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=lists.linux.dev; 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=qbNXufERLaH6xupQ5TrMN/CO4hPhLPIiD4DpRbKcfJvOTrGgrySJNaPBi2oD/Va/fR YtrsL12NAtKJmmdJmz+Y20l3F60lfl21W+Y/krQnzHQIls1qvsY2/fkYqL4qvUulDbQp rEM4g+x5VfsK7QTC8nC6svyC6o6BUW44qVKiY7sheFAXpZ2N5umwAOltgMfdUhgD+ZU0 /3w48BPKieAKl7lTs0qkNJofTy6TAhCw+IiZ3m5/qYVWgu2lidCYgk2BZOB7MK11zSso CTn/bk0mR/Bq0K3Tlc6DjgK1CKXpewrvqR5D6ZV+NYrycbH02Dk+5/hKO6hEm/M3TSJh SkDQ== 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=X/9v7HhDr/o3ez5jJNSpipvSdOeu/yCZ0P2WzmqvKEFovkFGU6rv78kPYCKKAIp3bC XWqfFO1nFjrW0R548upjHfD5Wonx8VAkDCohfrkK3/k45yhMmuL7JICNzTXLd6FnGBCO R51K019F8eShvZxWXZAM5o6DHMmn4xNtZR0heH1Pv/zOPtqk6/dfL1p/sNIW0RJGIjaz pJ+ow2zoAr8LA7d2tCpWc/UabrXE6H2j9ZcVz6opfgGnFVuopFxWl1OChAJTPyK8U0Iq UifnXJCyS8O0IuqzGIaYShCpx12r/LgpIkKNgcAtFa+f2af5xD3RDEvPLGKksO9q18Kq EmpA== X-Forwarded-Encrypted: i=1; AHgh+Rqvxnb0RHQi9VloYGZTVBlHkD5mHRNVmlLpSREdS8uYIg2WGLp0cDrtND3pQCpr73ZqoAf/EmrQ7D35xQ==@lists.linux.dev X-Gm-Message-State: AFuF++kiKs2ytAcduKTZ7LXoOtD/hPV/N6BV+MYtbrjvs0tK10g8ioYT ULXGRaVZ/8efubVZzLvQt94Upi7ZQtfQAjQCRBDBESdO+UBk8pT5Cvut4dOjpT7f X-Gm-Gg: AR+sD10UIwUuX+CFgs0cX7IsSQXuxszXZSTMoxgxSO2yiGWWO2EMfKohM7bGv/pje90 aaqAaW8G3usq+gjX57Me+ipPBSx9RASZL8TQMM7LCvcnUOH5sM3RjT9FAJI9xVywwVmfBJ5HWyo WuwndfiyuNaVymF48YcIprFqqdgMdev6ZkcbLYdaPtOYBZy9edVcQZoYdB/FKoOxJTuMD3S6Rwn U9aSX8g0VQTWKe8mKT+7QB7bwybOKZO2cnxf34eOgz1s/Iy7EMpp0l14PRLflZBQLGqC4WYDBhj gj0L4fCOISuim74QIDsj6vDhpvEBOptDcK1Yims/twsCXIZDiTKoWbCeNglBgPe2pYZM2pib/OX j89V91HCXtY3+TbvMW31O72vowf/PV65eEMzV0SF6r4vlSMd6PbFfOHziSuFxH49wTqKXcwQKLo JFRpTKu5REGo++vs2wOxW956OGIM4yIWT/Zv7ZO2JVwpfZsOac6SHRSXcLFdih9g== 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-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 X-Rspamd-Server: rspamd-worker-8404 X-Spamd-Result: default: False [-1.16 / 15.00]; BAYES_HAM(-5.50)[99.99%]; RBL_SENDERSCORE(2.00)[172.234.253.10:from]; SUSPICIOUS_RECIPS(1.50)[]; DMARC_POLICY_SOFTFAIL(1.00)[gmail.com : SPF not aligned (relaxed), No valid DKIM,none]; MAILLIST(-0.15)[generic]; BAD_REP_POLICIES(0.10)[]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; RCVD_COUNT_FIVE(0.00)[6]; FROM_HAS_DN(0.00)[]; FORGED_SENDER_MAILLIST(0.00)[]; RCPT_COUNT_TWELVE(0.00)[17]; PRECEDENCE_BULK(0.00)[]; FREEMAIL_CC(0.00)[vger.kernel.org,lists.infradead.org,lists.linux.dev,gmail.com,nxp.com,oss.qualcomm.com]; TAGGED_RCPT(0.00)[dt]; DBL_BLOCKED_OPENRESOLVER(0.00)[sea.lore.kernel.org:rdns,sea.lore.kernel.org:helo,nxp.com:email,qualcomm.com:email]; FROM_NEQ_ENVFROM(0.00)[alexcaoys@gmail.com,linux-sunxi@lists.linux.dev]; TAGGED_FROM(0.00)[bounces-25363-noreply=patchwork.local]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(0.00)[+ip4:172.234.253.10]; TO_DN_SOME(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[172.234.253.10:from]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[100.90.174.1:received,138.28.231.64:received]; ASN(0.00)[asn:63949, ipnet:172.234.224.0/19, country:SG]; FREEMAIL_TO(0.00)[kernel.org,gmail.com,sholland.org]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; ARC_ALLOW(0.00)[subspace.kernel.org:s=arc-20240116:i=1]; RCVD_TLS_LAST(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 2380B1C0563 X-MORS-Enabled: yes X-MORS-DOMAIN: patchwork.local X-MORS-HOSTING: hosting172546 X-MORS-USER: hosting172546 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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 then: properties: From patchwork Wed Aug 26 02:40:31 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanshen Cao X-Patchwork-Id: 3062 Return-Path: X-Original-To: noreply@patchwork.local Delivered-To: noreply@patchwork.local Received: from sea.lore.kernel.org (sea.lore.kernel.org [172.234.253.10]) by mxe881.netcup.net (Postfix) with ESMTPS id 6A1CF1C0563 for ; Wed, 26 Aug 2026 04:42:38 +0200 (CEST) Authentication-Results: mxe881; dkim=pass header.d=gmail.com; spf=pass (sender IP is 172.234.253.10) smtp.mailfrom=linux-sunxi+bounces-25364-noreply=patchwork.local@lists.linux.dev smtp.helo=sea.lore.kernel.org Received-SPF: pass (mxe881: domain of lists.linux.dev designates 172.234.253.10 as permitted sender) client-ip=172.234.253.10; envelope-from=linux-sunxi+bounces-25364-noreply=patchwork.local@lists.linux.dev; helo=sea.lore.kernel.org; Received: from smtp.subspace.kernel.org (conduit.subspace.kernel.org [100.90.174.1]) by sea.lore.kernel.org (Postfix) with ESMTP id F05133156694 for ; Wed, 26 Aug 2026 02:40:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 03B192FBE1F; Wed, 26 Aug 2026 02:40:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dR0RKs88" X-Original-To: linux-sunxi@lists.linux.dev 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 7A3782E62B3 for ; Wed, 26 Aug 2026 02:40:47 +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=1787712049; cv=none; b=Xu4e0GAELEk8vSOtLU6LOb08sBtStWCXFZk15XAvyICTNQAUIPOZNSMpt2WFkbXWE+W8pXc76wqiWbcI5Z0FqZriDlwVSAKmeqbems/CcJQkuYkODr83kKjWS4Hmu/JmGQhasuu+REal+mfN2d6NWDKqFQIW6PIh+EAA77nRqGw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787712049; 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=gph+JMqvStjy0lEoarQ3L4tbQOBwfn9mE7SAWrRt9NlrejmhJp0PfKXnKXyXESlWRfmC0UzcEimg6dUS0HBVyxTyjSf4mUSgJeNDsaaBckLWkIlGi1AmderQ8mQJY7BXIekqM76jkmXm7h3k2Nj3sg146Fbx52DORw8xvwRa+JU= 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=dR0RKs88; 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 Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-85845398586so715797b3.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=lists.linux.dev; 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=dR0RKs88huIRB+vD4BCB3/HUxsO/HOOJ8m7ZOLRFNkDvrZmmXmXro50IbkMrbu3S8W 3ZTHDFj8FrSA4sVKLpu4MbMZnAyw7yYrjkK9g3wAxQN+n9DExSU1BKJDUr8HLzwiH0pk O/cZA2KUzMaB5hWRFMrBpEeWbkDe6jjukIjubbJuWqhTQ9w4SdJkzzsOdlStdeCYkrS4 q3uUcpXJrXVm9jSaoUWpYkaiS4PCEffStz2TQRjTjhxamaYBER7Ut3PUz8Nazypf8WmB uY2IUQrEkavuEN2NeCVEjqxElRw4uIKDMoQIGSx0oPdqFv67N+Pjb6oYf2eOE1yBEdp2 Uh9w== 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=a4EPIbReVs+pVdjLGFVNiUyovr4k/YsxMBfm/gwwzouMyhdcLD38gMIBoDPo+kpav1 qnfyM3fIO/5B2tjmewyCybRE6tLZEa1m38r0aQ/Z3HS+DCKZLSvjkYXBf++jJJv7xGz1 oB/IQOuGH/VIdJdUWs8EVxBpVj2Fq32wov57SCAyGCnVx8LHM8E2iRE4pE4T34l+qgF4 Ypb9v/ufmogLdWO1GSK+jrs9hPxeEUO+OeFSbZPLpQF4rHbTKIQUjdQM/HIbOLTip1K0 NrHF0reH3Rni9uXz19X1hSNxTxPDjTrhWMvBd/C3B+3jihse4vImLKFYEgDbPwoQpiBi vVFw== X-Forwarded-Encrypted: i=1; AHgh+RqIavXqvx8ZKn521cePc5felclEYkraG6Z/q9oK2JO5BgFKjdU9hjK52MA6R7MmRPq1rlNSu3DOCXOvHQ==@lists.linux.dev X-Gm-Message-State: AFuF++lz35izXCDP9Q0pFQsHsXraWBpdPkwmH6OURCE9m0XM5i+2AQiV aqcC4SmzNLmc1S0894DJuB5HeY8TCTWtJRXl7yfLKlrgJdsJ19yhbrK+ X-Gm-Gg: AR+sD13RkbRg/vutQClbrk5wlybFe6ofDUAM91rxYVEareu4qlr111P335px5Ng4UVc Ws4aptSFDI4l822vQJXMA+LXB0fh8DS3R4rXHgcdI68Bijmdx5HmTToG/L5W48EgMLqkUp7BdwD fnIsHHSeXc4hHLoLvOd6Dh4LQK+7JsCRWVocXoYujFb32NqQgYf9Ms6xjlEmmrhBQfgyiDzzdHU QHislkBRyMaAjsayBJQMC5xE/uZm73NdaX0sIR0oiHSirLnryoMn7x8LC1VwHUGzqTXXFQUs2NF OJ2HgZUNNllvEspzR78bF4CoPOS1rABt6g5gdA6GPqCVl52KXaY37r5pnNznSVcjm61RaJmsVaf YwNgWvYnRYxds8gCW2o3LYcm91a4Q2HxTPVJaE8sfQktI9jVGTH+RxQRdiFE7cPU6l6ai8bgLqB F78upG3oa3ktdD0Z8d+LspRNhQKOAHcY6COShvWZtQM3RXyE0a0xUKcGs3RSnb/w== 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-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 X-MORS-Enabled: yes X-MORS-DOMAIN: patchwork.local X-MORS-HOSTING: hosting172546 X-MORS-USER: hosting172546 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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 --- 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 #define DMA_IRQ_CHAN_NR_A31 8 +#define DMA_IRQ_CHAN_NR_A733 1 /* * 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) /* * Various hardware related defines @@ -1318,6 +1324,32 @@ static struct sun6i_dma_config sun50i_h6_dma_cfg = { SUN6I_DMA_IRQ_A31_COMMON_CFG }; +/* + * The A733 binding uses the number of dma channels from the + * device tree node. + */ +static struct sun6i_dma_config sun60i_a733_dma_cfg = { + .clock_autogate_enable = sun6i_enable_clock_autogate_h3, + .set_burst_length = sun6i_set_burst_length_h3, + .set_drq = sun6i_set_drq_h6, + .set_mode = sun6i_set_mode_h6, + .src_burst_lengths = BIT(1) | BIT(4) | BIT(8) | BIT(16), + .dst_burst_lengths = BIT(1) | BIT(4) | BIT(8) | BIT(16), + .src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | + BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | + BIT(DMA_SLAVE_BUSWIDTH_4_BYTES), + .dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | + BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | + BIT(DMA_SLAVE_BUSWIDTH_4_BYTES), + .src_high_addr_mask = SRC_HIGH_ADDR_32G_MASK, + .dst_high_addr_mask = DST_HIGH_ADDR_32G_MASK, + .has_mbus_clk = true, + .irq_stride = DMA_IRQ_STRIDE_A733, + .irq_en_offset = DMA_IRQ_EN_OFFSET_A733, + .irq_stat_offset = DMA_IRQ_STAT_OFFSET_A733, + .num_channels_per_reg = 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[] = { { .compatible = "allwinner,sun50i-a64-dma", .data = &sun50i_a64_dma_cfg }, { .compatible = "allwinner,sun50i-a100-dma", .data = &sun50i_a100_dma_cfg }, { .compatible = "allwinner,sun50i-h6-dma", .data = &sun50i_h6_dma_cfg }, + { .compatible = "allwinner,sun60i-a733-dma", .data = &sun60i_a733_dma_cfg }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, sun6i_dma_match);