From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5A243C61DB9 for ; Wed, 26 Aug 2026 02:41:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=37syxcZjr+SQHdWr5tam1HRyww9ToksagoIyI3QIPxo=; b=luCP0lVAyChXiqfJJIGADNg8o4 ocg+U667B3bPEDTbATVOfa33NG6lVqZ+0jay/kR87iIXBfBocDG556EVZK6w2fGRTy+oHmEWoPTyf 8FUbeI7Ve8L+cAZN4gOkfB4OPGgnpdSFejXfEltG7Z7DPfV/0ulSsWEoDzapJCdHherE54c+256jj OLlYIBtegpRBXrE4++uSdreFwcSxvs/Sa6Q/3xzGIWcucFfnUtftUQcfU2jwy+9MWtI4zXLtQk3DH xCLMA+VwMSO5v0tVRg1t2BL0tPAykaSF7EFPn0Sz1+o2FlTgXWSpB/lUqNHTOsqOT28/2LFrkSLBK 3rHdvbgQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wz3ZQ-00000001o4v-3E58; Wed, 26 Aug 2026 02:41:00 +0000 Received: from mail-yw1-x1134.google.com ([2607:f8b0:4864:20::1134]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wz3ZB-00000001nzX-2Cl1 for linux-arm-kernel@lists.infradead.org; Wed, 26 Aug 2026 02:40:45 +0000 Received: by mail-yw1-x1134.google.com with SMTP id 00721157ae682-856114a8247so5542837b3.2 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.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=37syxcZjr+SQHdWr5tam1HRyww9ToksagoIyI3QIPxo=; b=ZxSmw6B7dhobT1E4y4/C2ieQwO2yW3AyRi88ttF0Bo2DB1GOWqnsJv7NSeAsQnnFme dD5qds4U/qhb5Vwbzxv9gUsCm5YpQSTMo9dPJNUt9U/MkXtgyMv+U0/sZAowYMr5iv7G yd4tgI63CKNOcGrz7vL7pT/m+2eRpgrXDbSvGZfeTxUkRu3iV885uFSWl80aChP2TBJz UB2nZpgdJeTz8frJTMhumwyjgGr/Vk1ok71cQ2M7MKKL14g96B2Klhqqk2Rd3L22BFff yLX+CjM9xSifOuz9iUiQQW8gvtWu9FkBX80dPaypp9A+B/MqR/wV3GiapJTfNDJ+4tba Dftg== 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=aWgc9aZzlO/WuZwsBgyg1XIpIF90PeYPY5758WyZOaWm91xj4clHuGbMyXNqNze3Fd N3yy6MXNbzDMSdHNjIaI0wsi/4GCPUXSewg3ZzIqbs7eyodz4dI6QMgkGp8oi3ZV7Iky 2qUVXFmvtiGWaqNJWhP1AVWlL6ph4meHSdsOpqEk5da9T2dpUEnojPa1HXKCetrt0w1c K3wm4M5+NU/i/vitBMFp+bVjztdBRcAjKiwM+0i1DdsWHDTcnQ8WBoGEpMapUjGoeOYM QAF1hJNFIp6R5b6gNhrsej/FpZ1xgiZ5sUnBjZp+tO0XdsNer7KVwoE/J/il/Q6Q/c0O sp+Q== X-Forwarded-Encrypted: i=1; AHgh+RrBNMZ2Rsmra79kaVfsQfpJ/nsnNmTBAH/EvWJB3hsd6WMrhvrXRzzAuZ7dxK8AnBG9bsWUYFtMxrBJplvbJJkZ@lists.infradead.org X-Gm-Message-State: AFuF++n7aBhfjLv9mo8CLikFFQA3wCDNkGxVTvGyHkQ3Nq1GIVK6BZ98 lYRKM5ZGvGdfyrXGPA06c7w77DnXny0KrF09o/BjM6J7bLBXXpOj0DxI X-Gm-Gg: AR+sD13TbfpxoDh1z+jh/qYNhKvp3pEw44vfdQopwv7F8LQrv0SpW2AphqDYVmNz//L ObVDlwrdle0xSOZj5xEwKpAOljlv4t4DPWtF/5f/bDqxgpNMvNT6ChQO0QC3oHgdKr10Jf/Qbwj e/KVk0QXC2oJlRyNBkEmNT/B20+IaQYZ71qrwGK7FTD+s0zs8HW7U0qlNkOImrmVHUATP5cMgSD yp9k0eWWB1OE1dKt9go5E8r6o1XjZJbfrFB7G0g1PEqyF+IrkwFt/6jVtm7GjjexfQbTjy31pY5 nlrK+7EW1jegA9y8fQIlC+k0wWUp4H/5J6SZG51fvKBQ0Wii985AUdZfmPnvx9iTBMcn/uwXe3j AczCv1k/F5aIWzbZJGUZrkE4nbSxTBStLr7TkG//SIw2ciyeTEqwLI0nO92xBM6TWBX3bSShCu2 yEK+m/b9ukzi8OTEjwnHeFwk1TUS/WSH/Heyi0Ds/NXVBZAzChLpIZPMTRrCNbmg== 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260825_194041_579941_9510EE2A X-CRM114-Status: GOOD ( 19.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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[] = { -- 2.55.0