From patchwork Wed Aug 26 01:30:03 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanshen Cao X-Patchwork-Id: 3053 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 25F5C1C0565 for ; Wed, 26 Aug 2026 03:30:48 +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-25350-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-25350-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 CFD41310FFEF for ; Wed, 26 Aug 2026 01:30:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8F8AD279907; Wed, 26 Aug 2026 01:30:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LOBQIOR3" X-Original-To: linux-sunxi@lists.linux.dev Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.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 95ADD25E469 for ; Wed, 26 Aug 2026 01:30:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787707827; cv=none; b=nm6ekUuEwlSsAyHO9Fj+WWvyZvyg/ycCspgr+hLgsgTN4SsWGfFF3f8HNQJ9SIFTtFOV3GOuIYWwC1b+2pAZe+RjY5ijfcFrHvjX8gbKXj3MRstl85vkzFzQ/h1Qv1xWZxmxQ/0Lm42GwOsyfp/q9N0SbKbb4SXVc+RVUKofmfE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787707827; c=relaxed/simple; bh=bWDpjVeQL4ZPcqxBnAYAbjPHfWZWc/lgdxSnGkqNQ2M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=l0EUtP0UyqhjHy1cKE2DBR5jQYsm/+65NNzIVueQDnMsGqnAnOEpduhItWpa19U3k5iBNL4sVzXbMdxL/M3GF8jNRveZ7QVUyPPFjwpET7K2gn6uTVQmuaHScmAxfjKE8o74L8D1pFMnkbzkaBt/ZVIsPz8Ga3qPv/0juHUDAzE= 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=LOBQIOR3; arc=none smtp.client-ip=209.85.222.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 Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-936e8bd9caaso28400385a.2 for ; Tue, 25 Aug 2026 18:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787707824; x=1788312624; 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=LOBQIOR3Zyn3K3qzEh2xLHDV6eS8OgvggM+vWO7InySe02cndunxZL07WoWnl5zhWu xBmU/71yY5RAWNxqBuhVGDfJQPVdGW/F1+2Z+zlTjcRHmPktceHShqbu9PcGTuFJ77Ys XCCObfB+49+9XturerAc7PN3Tcc6N1L95pzgUtdsrx58o8iMJqZWlLs8gXTu9agZ05jQ Chvm9Tm9TwqfbIUAYCNKSIg2PAXZrLRK12mk3usCWEa9rx/hBJl1CztrpUWC4aHuvZ4T LIMUU2q4ElfJTHm+epO2JTTrnpxAcTyq7nSENRR6uIDz4rHKLYrMP2XQ8FX9xIiT9Lpa at8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787707824; x=1788312624; 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=mlpucT4UxkDnZV4O3niytir6onh1R38dIEz10Yzbvyfo+MpJz553Wfgq1lpTFSRoL5 yfQRDGv0UbYStfSMYyXwnW6PQ9s3v75uDdlpHxAUBOCoYyqOjGCq/DMM/miHpgxmLPOz oog7JcZH5Lu6REmZMUT8bRtFmDs9/ywEjMgEOspuDqqlGlS5uFiO5ETowt9UVTE94j5T iyBKTAUwfJV4DkBY+QTTm8Q/Ge8AMB/Oa9iG+lAAEXHPtNXqEa4yRkmGIq8pjNKLV1eK eG/EwWtSxPK7Yb80W0ydaEllCqAfHeXEV1awpFD+WObW8MkqUKM5XTbDN0KoqClNd/nB Jqdg== X-Forwarded-Encrypted: i=1; AHgh+RrS4feTz96OkpGWlIuaYqSONHSKj9DEJhObbDoZ7tRFH+mnlAaYDYddCjJozVOHwnV14slMYgeRU21udA==@lists.linux.dev X-Gm-Message-State: AFuF++nKwIGZkrYvX6wdDIU/CBBrGE+gI3aON52vvAB3gy/QsGNQJ+Y7 14sLjg1sR8kkUuxWce3vSaUKDLx7T+BkdlLfH3ON+wL6LxW7JyYkQ8Ft X-Gm-Gg: AR+sD10u0c+9FeEJfLurGqkjUsqAKJSOicfQlgz/h7UXPEef2jAJtdWivHF/JJw0zn/ O7pqdHG83dXqSOdBumi+XPJqrAqpvXDDtLbJbS0ySiBLsHwFprLNZ8EQuzFMJzjeFfna74MJXO5 lVDQh+LwzVY/Gxqm/QXj5Xb/yr82bqRaCpHDzzxE5MzVkhuBE5wRy8HPCjXF75k/5Taw/k0uLaH hSsgUIHyRl4KQpx9DYPFrI5SkxRxaJ595TDK+AP1VCZZqBWtOcoVQZLlTumG82dm32VhX/FB1Sl YuyXHrNj1RL6d8sh9IRG/tHl4ds2xfQ6TVazIYKLOaAyC2/VjccfZ+47rdeR4u6XNMqJ5l2mLey 6YeiKB0VfFOqOHaCjp7wUl0uTz1I8Xx58J2R2y0RZ6Og+N9hbut6gHgYzuPpRqEKnkIu98wM3E3 lwbGOEZVnyse4BW0NOlH4PboYwwlqaagqot5JODz1u8mGmMg3RwXvR9PcIiTEsyA== X-Received: by 2002:a05:620a:29cd:b0:934:b6ba:15d5 with SMTP id af79cd13be357-937805d1212mr268405485a.39.1787707824243; Tue, 25 Aug 2026 18:30:24 -0700 (PDT) Received: from [172.17.0.2] ([138.28.231.64]) by smtp.gmail.com with ESMTPSA id af79cd13be357-9377e67c52csm102398585a.38.2026.08.25.18.30.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2026 18:30:23 -0700 (PDT) From: Yuanshen Cao Date: Wed, 26 Aug 2026 01:30:03 +0000 Subject: [PATCH v4 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-v4-1-dc2f745f40dc@gmail.com> References: <20260826-sun60i-a733-dma-v4-0-dc2f745f40dc@gmail.com> In-Reply-To: <20260826-sun60i-a733-dma-v4-0-dc2f745f40dc@gmail.com> To: Vinod Koul , Frank Li , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maxime Ripard Cc: Yuanshen Cao , dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org X-Mailer: b4 0.16.0 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 01:30:04 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanshen Cao X-Patchwork-Id: 3055 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 D02491C0565 for ; Wed, 26 Aug 2026 03:30: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-25351-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-25351-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 D56D7311B1FD for ; Wed, 26 Aug 2026 01:30:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B470827A462; Wed, 26 Aug 2026 01:30:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UfssK4oI" X-Original-To: linux-sunxi@lists.linux.dev Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.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 D2B1349362C for ; Wed, 26 Aug 2026 01:30:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787707828; cv=none; b=cnctFtnw41XVEveaYhyoTXJ6feGo5h6erTp+naJ7jtW+YN3u44K5YRtfBcafFXLo14/gxM2DzlxCFA1JxldRIkQIMaCR1yaMniwdxFq6uI5Sx8KneqVthqNFq5FUlN0bxTI2Z/i48rP8bwt12fO2fqCbuAv4u5xndkLztKxZckw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787707828; c=relaxed/simple; bh=myemN6DX3lABoRKkmvbT35GB34tCZcAmQ8zO26JtQqM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Dh/CFZ2COx2seqOJ2lHVD7bjd7mk1Uy60+ZKHCyCud2Wl3T0HwXsXhO6oE+NI4q2O3lPYd42bTEvqW0YHr1YaLjXhrE9a817SWlzk3O5VKXYvTLpWwWmUZfJNhpCQzca4E6LwIyqLxnJiDmgP1Ca+hIMGsIhNFIYhMoXdjFNyAA= 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=UfssK4oI; arc=none smtp.client-ip=209.85.222.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-qk1-f169.google.com with SMTP id af79cd13be357-92e7c6ec9dbso19364785a.0 for ; Tue, 25 Aug 2026 18:30:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787707826; x=1788312626; 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=r8xxhXLXwBvZGQ89s3NtLyGdJ91KtYqy6L+FbcUge9s=; b=UfssK4oI/9Xe5Ol8SOiy8ku6o6eK4I9bs14UaHak0Nf2nC/TZ+iSFpVAdesq8qoYy1 AhQvFyHOzZ1TSfYJg/LpeJzgPAd5vtlFTERLPfZiWriXUQz0LgUzfJmtBfuCXxGCGzgv gWSGRyoj51kMoXv+/KchKc+uvreg7wZKg7Z/5FPJXRIWv5+J4GbrgkbLZHq6Lh2DeYR0 feGLOvOs+n1VxUhkLsfY6cTl67ZqC8E3aQtV6/C4NNPIj0ceEOkaHugCpW41t3nVDW+n f78nLe4sX1RJm4ZtWrrM7yhsIuVWWE5Tfnzdh24twZRKKOauQK+qYhVu2NyVi981ftVR N98g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787707826; x=1788312626; 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=r8xxhXLXwBvZGQ89s3NtLyGdJ91KtYqy6L+FbcUge9s=; b=EvZ3WyFJ5Bjasil+4zZ/tOvO0keJiu7Ct6KQBITiep0Oefupwg9L62MLoVpuGgcenx 4Ax1es86yH9tnOTVRSzttlSbxZgV6y9Kl63FVzdnSC0fS9+xjmXJh2g2IPSKqeuh9Fyi RtfcxZKmVtH4xgg70NkpEaYaEIcWWDyZpOoksyYSJwYlb1BB2MUhmuBZ6D0cpDC2RPhF Oek/iiX8iOdt6BoUKZ4y+grN5/Fs7dVRK3FlyMIMfJR8+0XKr8ZnLu9rrd1WjWCnPIfH j+Nm7OlD1pej/FYhqk7LRJBOqyBy7URwka0kThmKEU4dqdkki2ChQMRslZ8gEEceNagL 3ALw== X-Forwarded-Encrypted: i=1; AHgh+RqrZdRlf7s/CdAd6Pevq6MfLM3KZEKTlt84jBsGufx9K/oNbkpfqmP4IcEshYIGnaJd+PFMImeg9fCxGA==@lists.linux.dev X-Gm-Message-State: AFuF++nMZ+zTDWut9+IjNXFJFKoZglLBp902psVqtAEacZbgR9JbQWy1 Okq4Q8w9FxJ3A/OTdlj4Gp3u4GRRunCD+SVdwKviC/3tJJm67Q6M/XtU X-Gm-Gg: AR+sD128Li7bBSpfOVsetJgQPahIJD7nibZLOsngfL7a8D8lZEd4iwUb00ccuyLpCQa JRzz/BHnXvYabwpTOhdztf2z4i9VQEpUqD3DiejUVVpDyrx8s9+O9h5TGhCN9cvPJ8p2cI4/OK9 d6gsYxsFPLJvE72u7PtzKZ5nCzOOL3I9vVFKkUD7z8W1sKCXot0aVObHqvfZ/KOKZZZrJa/RRJ7 WHQ1WtLoo0a98cx71hO+vTiUhck62CBuOsgAfm9k0Ji6VISFmW9frtvClTJ/dFtd/5qVmLmx1g2 ksyCubJxlpoi6pWv7xZH/kcOsOoU9DsLG+scxNw6U4IUkolyMbEYFdyVlC9iXqJdo6hlef5HCPp Z3EEhJc+uICzTtMTf1wgXxQ7zqpWplB4y3K5ZzvJdemkNWGEVkQTMEieDddH1N+Ztw8Ndj41dEX XaipXVm9+9cN4r1EBL1dHlGlBYiEO9V5QnJiREZDwpUzSxWDPJ4qstpD0sXvGxuw== X-Received: by 2002:a05:620a:72c1:10b0:936:e71a:db90 with SMTP id af79cd13be357-937803e0e3dmr234920985a.29.1787707825690; Tue, 25 Aug 2026 18:30:25 -0700 (PDT) Received: from [172.17.0.2] ([138.28.231.64]) by smtp.gmail.com with ESMTPSA id af79cd13be357-9377e67c52csm102398585a.38.2026.08.25.18.30.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2026 18:30:25 -0700 (PDT) From: Yuanshen Cao Date: Wed, 26 Aug 2026 01:30:04 +0000 Subject: [PATCH v4 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-v4-2-dc2f745f40dc@gmail.com> References: <20260826-sun60i-a733-dma-v4-0-dc2f745f40dc@gmail.com> In-Reply-To: <20260826-sun60i-a733-dma-v4-0-dc2f745f40dc@gmail.com> To: Vinod Koul , Frank Li , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maxime Ripard Cc: Yuanshen Cao , dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org X-Mailer: b4 0.16.0 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 | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index f305fbfb3545..53c54161e32a 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -24,6 +24,10 @@ #include "virt-dma.h" +/* Non-constant mask variant of FIELD_GET() and FIELD_PREP() */ +#define field_get(_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1)) +#define field_prep(_mask, _val) (((_val) << (ffs(_mask) - 1)) & (_mask)) + /* * Common registers */ @@ -103,8 +107,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 +151,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 +692,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 +1289,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 01:30:05 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanshen Cao X-Patchwork-Id: 3056 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 9B3371C0565 for ; Wed, 26 Aug 2026 03:31:26 +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-25352-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-25352-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 C0B2B31356F5 for ; Wed, 26 Aug 2026 01:30:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 70C6F26F289; Wed, 26 Aug 2026 01:30:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SEgCZ0bG" X-Original-To: linux-sunxi@lists.linux.dev Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.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 6C71B274B53 for ; Wed, 26 Aug 2026 01:30:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787707830; cv=none; b=q0QRMHC9SEBmYTuIgig1Okws9EX85u7Kkm3WXL6pbM8iEQ+yL/wBzttfry3V/M0JeRVqIe0MNT1kiB5/+Q+r7E8qtHpGogiDpQ5lniY60BItssqV+HzHT2YEhTw0TE3yt5CL//SKxCCjiNtlQ1X+dt3Qd1Ank4mRE3J4Q5EEqVg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787707830; c=relaxed/simple; bh=usCw7Ym88poS56Zm5L+NHxa343GGy1zqroa3ApFu/gg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VJU3cM+FIf52t60Buh3kzudBN8N09jBUBP6PZEA+0H7/QMLxAFk6XT2liDEOs8moZW3jYzFKlz8ezjUOtTJwl3MyYueofr296io6urgiDu5ydUMMGh9WNZ0ZTb7ZKaMPX3dWJYNUZgoLqMMR924JZQtpmU0ma8xdPzxnv4zCt3w= 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=SEgCZ0bG; arc=none smtp.client-ip=209.85.222.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-qk1-f182.google.com with SMTP id af79cd13be357-9309d4ea213so29092585a.1 for ; Tue, 25 Aug 2026 18:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787707827; x=1788312627; darn=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=o5pUUJmcn3/3Y2ngemNPoG+r9QKqCH0NVXE0QE3SQQY=; b=SEgCZ0bG1Njn4cvSTaQTtQeWTmPao7SwbceNAXZgsxSeHwqWiMXKYHo5rcTnvpWPbw mJ8Shbabj6KbUYnh32o4S0zwAFvoklaTBjxY9ZcfuZgLsVg1xD9s1srbgPJ+ooCxOdHK qxzrm1dOedkBxAKgt2B54shFWEY4t+FVEUXRPpukFbOxhPlXPYAiPkdlkJ+OnTRl1bcD P0Nw0lfwD2hiigdQ236ZS05pVeh6Aw+HA+lt687qEwBMzdjPrrc8/D4x0h1hNLDlBTPe 5Z+cvZ/G9z1BLTMzkDiMS0JHKruBIXBRBruADU6zM3LAwGXrPBh1zLbVvcqFynrh6NcV 3weQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787707827; x=1788312627; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=o5pUUJmcn3/3Y2ngemNPoG+r9QKqCH0NVXE0QE3SQQY=; b=bVRjjrZARfyTT+d9NaDkW8Boj9/4aU7NQ3tAfg12wwjQovJa23UAZPtMMfUB1FS/MG 0Wc1oIO82uSCF28+q5bxC+l9aZj/e/MKX1xFxS8kieEwP79gP1Xg6znmsGrgSx0UNRkU CNi/uU8yhKh/rASu0na63vaLEdg7qNerdahuAk+Yeku8uYlqw/UYrkJT/HUCImECxsZA sY7uldK+xBVagx2ROnkxGDC7v6f2fupqUekgHJyu7DW+dsrSM2qzbusDtdbBP9D8Ow0B 28XLV+FJJXid44Op2RdjCvOkxsqNABKTbtOu+D+vJoRdt0QgeFHONHIwYPxjdT3afoCo DQwQ== X-Forwarded-Encrypted: i=1; AHgh+RoxWOEb7IE1vYvLSXOOsRloHdU6vSJ9qYsuROAXhnn66QWUiwKoDzUkVxgNDkN/Z9REfqvAStosuP1psw==@lists.linux.dev X-Gm-Message-State: AFuF++m7P6/2NQzxuHa3ycztdCLuOtxCOkK7fZxL5onvA0v/03IWF+OB /1HibsjSlnNI4dxKSIgDsdgmgTYdpewJPe/ARlSx0KN5AI+d4gL7IsWv X-Gm-Gg: AR+sD10Vy0mBZXxft5ME8acVhgoXP5i0r7VplsYYPxAe/QifvL1PpqSdLtM3aMMYGpC BNM06I9SiCCxmLj7ACcaF4IMSbMeec3RHQcrQACnmAqxRX94UvUBI1E2txprbe14ryCd08Y+Mxz XqBJXd5st2Uvv83Yx4AZ377pKaSbWSkAxHX6fFVvv3BhOv8xmOk1c6y+zuNjUWVGzckhj926zCR /IjY66K1RijwUC5HYmLS1h5YneVPYxlYKBy88cFcyu8akdPLHOzJ9t5Iv3IJZxIhnr2Rhc/q7Et FIJaxoE9xLhsIh3dq3f8L5m3iFXJ6Gc4LkAKKfxReWJ+1ix2ae0aEbBLoLgY45TcvJSqZTN1+jO n6adJ93aQIJO91IWjTA7FTOabZ+ty1KHGwhZ5oRKHxphPUzmzc8FwOUPyKEd4Orrf1/gB4iLmD2 bkasvqdHSJymXS3MElLidxdJTzCLiurnhleDMV2BqDvWgkOHCkKd1XhnTel+79og== X-Received: by 2002:a05:620a:4102:b0:92e:9d63:a6f6 with SMTP id af79cd13be357-937801702c8mr267218185a.17.1787707827056; Tue, 25 Aug 2026 18:30:27 -0700 (PDT) Received: from [172.17.0.2] ([138.28.231.64]) by smtp.gmail.com with ESMTPSA id af79cd13be357-9377e67c52csm102398585a.38.2026.08.25.18.30.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2026 18:30:26 -0700 (PDT) From: Yuanshen Cao Date: Wed, 26 Aug 2026 01:30:05 +0000 Subject: [PATCH v4 3/5] dmaengine: sun6i-dma: Add num_channels_per_reg for flexible interrupt mapping Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20260826-sun60i-a733-dma-v4-3-dc2f745f40dc@gmail.com> References: <20260826-sun60i-a733-dma-v4-0-dc2f745f40dc@gmail.com> In-Reply-To: <20260826-sun60i-a733-dma-v4-0-dc2f745f40dc@gmail.com> To: Vinod Koul , Frank Li , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maxime Ripard Cc: Yuanshen Cao , dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org X-Mailer: b4 0.16.0 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)[]; FORGED_SENDER_MAILLIST(0.00)[]; ARC_ALLOW(0.00)[subspace.kernel.org:s=arc-20240116:i=1]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_TWELVE(0.00)[15]; PRECEDENCE_BULK(0.00)[]; FREEMAIL_CC(0.00)[gmail.com,vger.kernel.org,lists.infradead.org,lists.linux.dev]; TAGGED_RCPT(0.00)[dt]; DBL_BLOCKED_OPENRESOLVER(0.00)[sea.lore.kernel.org:rdns,sea.lore.kernel.org:helo]; RCVD_COUNT_FIVE(0.00)[6]; ASN(0.00)[asn:63949, ipnet:172.234.224.0/19, country:SG]; R_SPF_ALLOW(0.00)[+ip4:172.234.253.10:c]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[172.234.253.10:from]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[138.28.231.64:received,100.90.174.1:received]; FROM_NEQ_ENVFROM(0.00)[alexcaoys@gmail.com,linux-sunxi@lists.linux.dev]; FREEMAIL_TO(0.00)[kernel.org,gmail.com,sholland.org]; MIME_TRACE(0.00)[0:+]; TAGGED_FROM(0.00)[bounces-25352-noreply=patchwork.local]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 9B3371C0565 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 53c54161e32a..b96d7d90f6b5 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -35,14 +35,13 @@ #define DMA_IRQ_PKG BIT(1) #define DMA_IRQ_QUEUE BIT(2) -#define DMA_IRQ_CHAN_NR 8 #define DMA_IRQ_CHAN_WIDTH 4 #define DMA_STAT 0x30 /* Offset between DMA_IRQ_EN and DMA_IRQ_STAT limits number of channels */ -#define DMA_MAX_CHANNELS (DMA_IRQ_CHAN_NR * 0x10 / 4) +#define DMA_MAX_CHANNELS 16 /* * sun8i specific registers @@ -61,6 +60,8 @@ #define DMA_IRQ_EN_OFFSET_A31 0x00 #define DMA_IRQ_STAT_OFFSET_A31 0x10 +#define DMA_IRQ_CHAN_NR_A31 8 + /* * Channels specific registers */ @@ -157,6 +158,7 @@ struct sun6i_dma_config { u32 irq_stride; u32 irq_en_offset; u32 irq_stat_offset; + u32 num_channels_per_reg; }; /* @@ -271,7 +273,7 @@ static inline void sun6i_dma_dump_com_regs(struct sun6i_dma_dev *sdev) { int i; - for (i = 0; i < 2; i++) { + for (i = 0; i < DIV_ROUND_UP(sdev->num_pchans, sdev->cfg->num_channels_per_reg); i++) { dev_dbg(sdev->slave.dev, "Common register:\n" "chan num %d\n" "\tmask(%04x): 0x%08x\n" @@ -492,8 +494,8 @@ static int sun6i_dma_start_desc(struct sun6i_vchan *vchan) sun6i_dma_dump_lli(vchan, pchan->desc->v_lli, pchan->desc->p_lli); - irq_reg = pchan->idx / DMA_IRQ_CHAN_NR; - irq_offset = pchan->idx % DMA_IRQ_CHAN_NR; + irq_reg = pchan->idx / sdev->cfg->num_channels_per_reg; + irq_offset = pchan->idx % sdev->cfg->num_channels_per_reg; vchan->irq_type = vchan->cyclic ? DMA_IRQ_PKG : DMA_IRQ_QUEUE; @@ -585,7 +587,7 @@ static irqreturn_t sun6i_dma_interrupt(int irq, void *dev_id) int i, j, ret = IRQ_NONE; u32 status; - for (i = 0; i < sdev->num_pchans / DMA_IRQ_CHAN_NR; i++) { + for (i = 0; i < sdev->num_pchans / sdev->cfg->num_channels_per_reg; i++) { status = sun6i_read_irq_stat(sdev, i); if (!status) continue; @@ -595,7 +597,7 @@ static irqreturn_t sun6i_dma_interrupt(int irq, void *dev_id) sun6i_write_irq_stat(sdev, i, status); - for (j = 0; (j < DMA_IRQ_CHAN_NR) && status; j++) { + for (j = 0; (j < sdev->cfg->num_channels_per_reg) && status; j++) { pchan = sdev->pchans + j; vchan = pchan->vchan; if (vchan && (status & vchan->irq_type)) { @@ -1113,7 +1115,7 @@ static inline void sun6i_kill_tasklet(struct sun6i_dma_dev *sdev) int i; /* Disable all interrupts from DMA */ - for (i = 0; i < 2; i++) + for (i = 0; i < DMA_MAX_CHANNELS / sdev->cfg->num_channels_per_reg; i++) sun6i_write_irq_en(sdev, i, 0); /* Prevent spurious interrupts from scheduling the tasklet */ @@ -1141,7 +1143,8 @@ static inline void sun6i_dma_free(struct sun6i_dma_dev *sdev) #define SUN6I_DMA_IRQ_A31_COMMON_CFG \ .irq_stride = DMA_IRQ_STRIDE_A31, \ .irq_en_offset = DMA_IRQ_EN_OFFSET_A31, \ - .irq_stat_offset = DMA_IRQ_STAT_OFFSET_A31, + .irq_stat_offset = DMA_IRQ_STAT_OFFSET_A31, \ + .num_channels_per_reg = DMA_IRQ_CHAN_NR_A31, /* * For A31: From patchwork Wed Aug 26 01:30:06 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanshen Cao X-Patchwork-Id: 3057 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 4CF511C0565 for ; Wed, 26 Aug 2026 03:32:22 +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-25353-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-25353-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 A29AE316B173 for ; Wed, 26 Aug 2026 01:30:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1F76D18BC3B; Wed, 26 Aug 2026 01:30:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="shABMNfZ" X-Original-To: linux-sunxi@lists.linux.dev Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E22AD27A916 for ; Wed, 26 Aug 2026 01:30:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787707833; cv=none; b=S5aHIC9XkGuH2EDySOpgI5Wkv09SKNoBDYWOmYgpCm5B71B7TQHSMeV/ytz5M6cblQg5E6imnrHtX15fqB33OO6OV5HLhaLWuxaB99LKBA8MdGC/MwsVKFjj8yZSGBmf/BQ6nRk95uT5LL1wWq8vEvZMmNWw7L77wCwqSY+CGjw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787707833; c=relaxed/simple; bh=xXHRUhCMZY1UP0UimNCUgmYKZUE5pAtrJ+aeGai+WZg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ar+8Ia44pBr3zx9L9VqwinJyjIpiiFmzqdUrkxChAvq79ArguoN79Gh/SlXQ/efztAV1TmAGnfQIV3+IzpLV1LRyJzl5p4WbeHKNSIqNkWOx2OWXvfPBUhJJXLUgcQqpU6/Puo07bc4SB81IzMy8pq2CUB9HWPHwZCqutnUNkwg= 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=shABMNfZ; arc=none smtp.client-ip=209.85.222.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-93703cc9e2dso19238185a.3 for ; Tue, 25 Aug 2026 18:30:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787707829; x=1788312629; 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=shABMNfZzTeFK44bJffV1+JmjQ6Ld2KpXnx9adnjFdHNEgyGg4hKaaJwZMfIcu5vkD 5TKWPvDGGgzJYCoWN3CYvyoiy3WPczAn+6apj1x3JnUCeIlrtN/Tp52ts68bJZ/5DHWf NnwsnDJCssy8+AQq3cKKo/5aoLCZIlX9iF5fsDkqQO+g+t4JGmcBZLOeCoc052+uUlum tPnWZupPXc4+RHdjVySp2WNzEFYy6r4QejDaEjFF4lz4OPiNhaBBEZQx0rP44RtpuXgw V1d8v3xWU/zlTUnLXSXsquVgxxTBGAnHflgZsBEjNoj1rKxEFB0K6x6MWCFbxuOgZXGj BqYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787707829; x=1788312629; 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=nAbdQ17ZKgtz9btOUudSq6Z4WJHg302135Luubb9SQYgd9PgUW7VPOBlcqXZWSlWz3 CmsJ3J6vR+A3sJegydABFIg6yAusN3iHOMWNSPfbhUso1VtCNVhkRFYwVVucHDCukbk7 WmoepGkfjQBzDsOXE8AZ7npBXXJcBmzQF9RAtDhSLAeNL5Dus3XslXHKd547pDDS2Hq0 3ipte1WWWVKatXbtSCSlJOmaKgNPiJ/hQmnnRzU72ylCznTNtzRnGKntaX2VpX88hJ9D zi8QmCf7V2Epm0go7TVl+bbD+63cBsXKTRmu/AFRPXWXB2z8kMehhi615jXXlWdXCK9E dZJg== X-Forwarded-Encrypted: i=1; AHgh+Rqd3SMayvJZhcTMbXjNTI995gfhJW/8yGh8Rat6d+4N6Y7AsJURfATTHNJvWoxZTP6ApcwRmYMDCe+YNw==@lists.linux.dev X-Gm-Message-State: AFuF++m5yCMLVefv5Y6nao422B55ccM9EAe7f22tRBpY+kjVGZ5h5Uxl zDXsD6fiioMAoB3y4VQeEzhLZ2CwTE4iMiTRShk/kcJKzc5hnaYKpzYn X-Gm-Gg: AR+sD13Ml/e59RP+dDMjny7tUsHNyu663rVlgjQAqMaN4wdWW2MVQrr5xkVn71uoyhR MwyDL28ruYNEyAg4pVEyVDM3wStPwu9MMjwtA0Mq9XteSm+ubC0brC2mQtvzNRNvtJPQ0DDpKmr k1vL+UCLOm8O/lDwXCTv+5dvk26m5Lt7Jbpxsx2kMeQjsudv23s9qjYA8liBtBPqSi9MxMemHKO LJTy1RdCyS8iQywM+134Ps2qa+ySWlEOcUmHSTPe/SR2Lcd408SmWbn7ao2OBcW48lHXy5pIKzN Hrp8pSsvC0h86kQ5tHG3EqINWTdQxlHcLINifQR7XbKjM2rKZjHMGJTgazoxlVZ91bwQEnF8pci mzqFtRFdyzLYQ1FDpKvww+Y4e2Mr4bcUuRXgCu6NkexC9l7m6LtOyWGAvwC411CL0Ea5vh1YAFp 0FhzNULMhY+FjamkRmoOxHOK7lQpS/HWLZCeWPrg0nxbUdNRnrKKUpCaf/D3fILg== X-Received: by 2002:a05:620a:29c2:b0:937:80ca:7c4a with SMTP id af79cd13be357-93780ca859amr248149485a.44.1787707828653; Tue, 25 Aug 2026 18:30:28 -0700 (PDT) Received: from [172.17.0.2] ([138.28.231.64]) by smtp.gmail.com with ESMTPSA id af79cd13be357-9377e67c52csm102398585a.38.2026.08.25.18.30.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2026 18:30:28 -0700 (PDT) From: Yuanshen Cao Date: Wed, 26 Aug 2026 01:30:06 +0000 Subject: [PATCH v4 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-v4-4-dc2f745f40dc@gmail.com> References: <20260826-sun60i-a733-dma-v4-0-dc2f745f40dc@gmail.com> In-Reply-To: <20260826-sun60i-a733-dma-v4-0-dc2f745f40dc@gmail.com> To: Vinod Koul , Frank Li , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maxime Ripard Cc: Yuanshen Cao , dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Frank Li , Krzysztof Kozlowski 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?= 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 01:30:07 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanshen Cao X-Patchwork-Id: 3054 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 0DA6F1C0565 for ; Wed, 26 Aug 2026 03:30:54 +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-25354-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-25354-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 72535303573B for ; Wed, 26 Aug 2026 01:30:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A4A2E22A7F6; Wed, 26 Aug 2026 01:30:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lmqb7rJd" X-Original-To: linux-sunxi@lists.linux.dev Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.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 791862620DE for ; Wed, 26 Aug 2026 01:30:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787707838; cv=none; b=ks0xgkSo5kq2mef3r0kTYWs5XQHbxDt/fL5caIQjXmFrcKAsI/h/YIo+J6iUYhC1vOw7ZZrTrGZD5Wd9ETCdpFrMV/ZqjSOpjwpgklkvhsqHtfrOo9pKuUP8tYFoKYVTF8w0oFUaXBzqVxXaag01gFXVqh85qkcIY8H69ulvk3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787707838; c=relaxed/simple; bh=iEeYpXVBs+6TjhynLsq72YEZrB4FSj6Ah2QNjNtJqLc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PRzZCydm7/CeazYUl+VsoRl8h6vMFd2Zz3NmmE4k/oug/yFESYyiTjHSWMt3gEIDe5yS7gz8GlqslAVr60jMBi9A94t6fASJXj4o3ocAJwYCFcvi27XkZlZM/cq0fZaVsMJRh7JfkDOP8H+54Hw6bOpK/hV8/3yoWGP/TGfCYWA= 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=lmqb7rJd; arc=none smtp.client-ip=209.85.222.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-qk1-f182.google.com with SMTP id af79cd13be357-92e6a434cabso18018585a.1 for ; Tue, 25 Aug 2026 18:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787707830; x=1788312630; 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=+RELVhCB2dHvNU7KH92aA8UYXxthIHKWatUemcM2Bk0=; b=lmqb7rJdNOnbH3mTrBowXSHYQwLxrZBkvvTYjTIvW6infmFN6L+xe40me333khp4XG TMyhF6Lwcat4O25rIlWfsAs96Oz89mKdzK52DYslnt1vPzHvvQ3fX5Ilsj3UdB7Db7VO eZGAgSOimm0um1iKwiLT8BvFdsy92EdwJrGl8H/5s/fWW7uzTfutoA61su8x6j9jSPIa +qAcuVFgzW12WSh6Vt2FInZAsin3ZREEs8Oo7pbGdTeD4SHNLQcfTQduc4S25XahDxxw yey61sMPrlVaU/xXpnxKWAGJqvVCm4a34WSYkQE8orrUNSB9gUSxRILq6e2kf06d6yM7 mzVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787707830; x=1788312630; 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=+RELVhCB2dHvNU7KH92aA8UYXxthIHKWatUemcM2Bk0=; b=NVsLAfbg4kPYwF5jemZRIeZ8bvRlPW19SfKlV2NQYuG3E0MOQ5anG6XrWjdoq06ipz 4JkHw7LWC8GmS1MXhNVUYj+3NlBfA7ENmBBQ+saplI3M+vPb8GtWcriiq0Uegq8e/hz4 e7qajMJrLd2bxPuArGqXP7oz43bgR8UPt8+zHPXQ5NHtUCzULs/JRcgKzNKVBujGynW0 6H6m/iqNBOcGMr6jCIr6ZHXJKdzYnyfSZso1mwGmZEJTGCIIxt4myBzZcvIwjX9yAokG CP4mzRrpKGawvIg+pPWfxBy8ryynj6g4NmDxut4TeJUEeEI2nooHBsNxIjLfx8bhdWRO Z5rQ== X-Forwarded-Encrypted: i=1; AHgh+RpEfpsNeb7/xRz+2Jj7tuwwRe2E5cQO0aGCUx8sI+/YSatPUs/vvE09Vm9tk1pQiY5gEqEcHN3h1mi5bQ==@lists.linux.dev X-Gm-Message-State: AFuF++lWGRjzf2P8k85btrx4kzcW1sS2szqGnu3nYOswwc6w/0lWHxvO 9k8/Cc5TxXozXLE2a3lyMnddQLQLy6u4iIiDwSmyRyX1FnE8i/UtdGTT X-Gm-Gg: AR+sD13hOLTmDzEvdUJvf5xO1lkB3zHkrfakaGAFAysAawKiN34OuLgAmTefCjaoOO5 9+FzMZ8XytONselZ9OXj1+4isANS9K0RU/NqjmyxDf/jVATekQpN0TBR69BlbXaDnokcpi3MvAw ISQsLYvbAoPfV81UU8EoDzgFr7UjZqwV6e6Vep3gK3886L7m/tjbn/F6AptzmJqN70MKHe1Bcw4 85y0oh0pcqnwVisoqOgGUhdsYek4umNeQpLXxIwP6fJeVPBzGR1OOQNYbIFXAptCXnD2ObYBGkd GrMg92F1vpkFcVsPMXBpj45RqRsEGqL319MLG40B5+pLcj0Trcn1D6ihHar/bjcoPZIXAjsNash 6+fHOWnW/oy4sljpuYF8DcmEVtDcE9fYGeg+v5yHX2IO2UHv1iPgOo4mYORshX/BySUHNnP6aUy R7o3hXufubhlAGSUhpOFTq9FYOsHgVBtNh29f+TnE2nBxk9Jn3AVLDDkNLOLPjBw== X-Received: by 2002:a05:620a:8306:b0:937:11c9:37f1 with SMTP id af79cd13be357-9378015274emr224520185a.16.1787707830137; Tue, 25 Aug 2026 18:30:30 -0700 (PDT) Received: from [172.17.0.2] ([138.28.231.64]) by smtp.gmail.com with ESMTPSA id af79cd13be357-9377e67c52csm102398585a.38.2026.08.25.18.30.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2026 18:30:29 -0700 (PDT) From: Yuanshen Cao Date: Wed, 26 Aug 2026 01:30:07 +0000 Subject: [PATCH v4 5/5] dmaengine: sun6i-dma: Add 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-v4-5-dc2f745f40dc@gmail.com> References: <20260826-sun60i-a733-dma-v4-0-dc2f745f40dc@gmail.com> In-Reply-To: <20260826-sun60i-a733-dma-v4-0-dc2f745f40dc@gmail.com> To: Vinod Koul , Frank Li , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maxime Ripard Cc: Yuanshen Cao , dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org X-Mailer: b4 0.16.0 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.105.105.114:from]; SUSPICIOUS_RECIPS(1.50)[]; DMARC_POLICY_SOFTFAIL(1.00)[gmail.com : SPF not aligned (relaxed), No valid DKIM,none]; MAILLIST(-0.15)[generic]; MIME_GOOD(-0.10)[text/plain]; BAD_REP_POLICIES(0.10)[]; HAS_LIST_UNSUB(-0.01)[]; PRECEDENCE_BULK(0.00)[]; FROM_HAS_DN(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[tor.lore.kernel.org:rdns,tor.lore.kernel.org:helo]; TAGGED_RCPT(0.00)[dt]; FORGED_SENDER_MAILLIST(0.00)[]; FREEMAIL_CC(0.00)[gmail.com,vger.kernel.org,lists.infradead.org,lists.linux.dev]; RCPT_COUNT_TWELVE(0.00)[15]; RCVD_COUNT_FIVE(0.00)[6]; ASN(0.00)[asn:63949, ipnet:172.105.96.0/20, country:SG]; R_SPF_ALLOW(0.00)[+ip4:172.105.105.114]; FREEMAIL_TO(0.00)[kernel.org,gmail.com,sholland.org]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[alexcaoys@gmail.com,linux-sunxi@lists.linux.dev]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; TAGGED_FROM(0.00)[bounces-25354-noreply=patchwork.local]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; ARC_ALLOW(0.00)[subspace.kernel.org:s=arc-20240116:i=1]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 0DA6F1C0565 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 | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index b96d7d90f6b5..fb371b57d792 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -57,10 +57,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 @@ -110,6 +114,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 @@ -1321,6 +1327,29 @@ 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, + .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. @@ -1355,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);