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 };