From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 5E272298CD5 for ; Fri, 12 Dec 2025 02:06:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765505174; cv=none; b=k0814+Ysze5wHrOFR8kO5t0KL6WmbYwFmR+Ibou9x4QhluNsysE0FwJxD/RcAZvzaMjMO0It3D9X6hcv8yBkRAa3r9Y0hgbdQNA7mL/NViyd6SJ6R3dl4rSrEGZw2ikkhOf6q9Bi4OPo2SvuBBc8Yib7IYR9aMe/L4OJMJ/YdN4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765505174; c=relaxed/simple; bh=QFEtmeMBLNwpIlTTBASnNTvXw+NZAPd8troy031bRC8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fa/06d/gxKmfIY12hC324YrfYPY+A+C02ZsUFh18UGOJcifYHIzFDcRZtMdDt8AxD78+IuEYF3n1dRdsr0BaEspth87WEM5hfzKBn/cVh18fxcpR4sYPNG1zer0CzaODRjFkt5r8l6JfJuNe13RVZU/t8wBhSBtAa3YSbw27rtc= 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=nVl+CVqu; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nVl+CVqu" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-34374febdefso752337a91.0 for ; Thu, 11 Dec 2025 18:06:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765505171; x=1766109971; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6UW8ta2pE4L/+9Yv6ju5XY9TcpGvPkrqtEfI1VIl2bA=; b=nVl+CVquZJodZy7OVG2iVajNHoURUCN0ifpVuf7XGzQ01n8ZL7lvLRxs/ywRunSMmV hTrn+etH6yS+1JQo5oL6fqtFGqeIGfEKWovcLIpiQBhl4aMa8FbYpnmIBL6ZTqB3uYFD hl43K3w+bvJKXa8nV7v9H+ZIKgi5xJqJwOD9LnuWBKrZy+63PTAENge72fG0Q7A2p1o5 RucVAER4+VHGhgcCKXv0mq3J3LMlv5bsOvMB25gKNt0FhSMLI1KedApcmwhBf7NuA1bB dFEYZ/4WQlq4rvqxV9+ll6gmMpwQ9aXwTMi6DybKQ1S6U51ngW0/Bqf/u0lrWL3B8xsJ er3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765505171; x=1766109971; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=6UW8ta2pE4L/+9Yv6ju5XY9TcpGvPkrqtEfI1VIl2bA=; b=dwFm6LHliecmf51dj/o8aDcpDFji8j+sC9H5Yl32vcUxUaCb+qeJ/WFN8unzS7or3Z aE0liUWBPU5kQFl8/l6OBwQNwpUrJAUQ86y1VMDV2w38SLATYzDic/d9d+hG7hvwPF7c odmA8mPm7RLN4efG531H1NYWV1JBm6KmhLtR2rO3E3NWwBPTAhqYZHtH1KJnAdrHJlYr Fnydvq4dfParETYBNh5OpGYvpCSv6gwrvS3HIqJKxGmruWqLEc86+I4o2kvKNuu4UktM canDWL1AUEP22iGkqvs9wqYfHdaaez3BOBXzN7O3Rudhrh3h6BYstP9R7ZVSLidnUvhq 4j3g== X-Forwarded-Encrypted: i=1; AJvYcCW88xURZqQMeXrtQ6YhKBQBFOrmDKegGRnuMGOfsDIlevFWImfZUMeqltQB1r/k+DlMG8rqOlysk2fJ9bQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxW/aFk/Yfy97VJ+KA0wWXZQHULICiljtFbLIYOmGPpy97XMc58 RkYmBPdQ8F4X3LT3smdqEJbUS24/TnJusYEVFDvfeziaGvvcKxip/7QX X-Gm-Gg: AY/fxX53sQyPYKIGPmAxmGMcgvKZujkUXF6cnHtU0itQl1AV+5kdkUZROq8/oYA1+9e ahSvQjmi4HnA4dhYBPx9xwzxe6tSVhgaZ2Zucr//HmcfbqiUf3jXqlbYk/7c2rREpaJs6ns8BD6 hnwZ0Czk1SLeejUvvdcQXjxxksZo0/4YbK9K6W3USEVsiMeRgQJKaxGT4tXTKmJEfK1LVqiOwDC 488BFXTuVYyYGxqKzG108xPBSt6VvZ8KuJ4KQzapp15IhOuz83aNpyt1WkDDpFznqCLpyx7/wai 2NEXX4JjthEGpnvydilOxHCgL3TktCDLaJi2mJKqub+/YwodrQd3CO+oqLWxPiqHoGAhDy5mzcC qGbGkegqsnS6lIT+IWVOhKHG+R5ntYELzfS19/LZbj6fPRCtBmYNaohwmF31rSgiKA/IipkIgML wen2QLAeurO0BE9j7SfIQJ X-Google-Smtp-Source: AGHT+IGSWde9J7Z1CP0kykXZdi8BkMxbnhMLXy73Xa4qFfGp95pPa1k3E1/AVaVXLlBhIIxrLowN/A== X-Received: by 2002:a05:7022:f303:b0:119:e569:f610 with SMTP id a92af1059eb24-11f349a1991mr358648c88.9.1765505171307; Thu, 11 Dec 2025 18:06:11 -0800 (PST) Received: from localhost ([2001:19f0:ac00:4eb8:5400:5ff:fe30:7df3]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-11f2e1bb3b4sm12959928c88.4.2025.12.11.18.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Dec 2025 18:06:10 -0800 (PST) From: Inochi Amaoto To: Eugeniy Paltsev , Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Chen Wang , Inochi Amaoto , Alexander Sverdlin , Longbin Li , Yixun Lan , Ze Huang Cc: "Anton D . Stavinskii" , dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, sophgo@lists.linux.dev Subject: [PATCH 2/3] dmaengine: dw-axi-dmac: Add support for CV1800B DMA Date: Fri, 12 Dec 2025 10:05:02 +0800 Message-ID: <20251212020504.915616-3-inochiama@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251212020504.915616-1-inochiama@gmail.com> References: <20251212020504.915616-1-inochiama@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit As the DMA controller on Sophgo CV1800 series SoC only has 8 channels, the SoC provides a dma multiplexer to reuse the DMA channel. However, the dma multiplexer also controlls the DMA interrupt multiplexer, which means that the dma multiplexer needs to know the channel number. Allow the driver to use DMA phandle args as the channel number, so the DMA multiplexer can route the DMA interrupt correctly. Signed-off-by: Inochi Amaoto --- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 23 ++++++++++++++++--- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c index b23536645ff7..62bf0d0dc354 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -50,6 +50,7 @@ #define AXI_DMA_FLAG_HAS_APB_REGS BIT(0) #define AXI_DMA_FLAG_HAS_RESETS BIT(1) #define AXI_DMA_FLAG_USE_CFG2 BIT(2) +#define AXI_DMA_FLAG_HANDSHAKE_AS_CHAN BIT(3) static inline void axi_dma_iowrite32(struct axi_dma_chip *chip, u32 reg, u32 val) @@ -1361,15 +1362,26 @@ static struct dma_chan *dw_axi_dma_of_xlate(struct of_phandle_args *dma_spec, struct of_dma *ofdma) { struct dw_axi_dma *dw = ofdma->of_dma_data; + unsigned int handshake = dma_spec->args[0]; struct axi_dma_chan *chan; struct dma_chan *dchan; - dchan = dma_get_any_slave_channel(&dw->dma); + if (dw->hdata->use_handshake_as_channel_number) { + if (handshake >= dw->hdata->nr_channels) + return NULL; + + chan = &dw->chan[handshake]; + dchan = dma_get_slave_channel(&chan->vc.chan); + } else { + dchan = dma_get_any_slave_channel(&dw->dma); + } + if (!dchan) return NULL; - chan = dchan_to_axi_dma_chan(dchan); - chan->hw_handshake_num = dma_spec->args[0]; + if (!chan) + chan = dchan_to_axi_dma_chan(dchan); + chan->hw_handshake_num = handshake; return dchan; } @@ -1508,6 +1520,8 @@ static int dw_probe(struct platform_device *pdev) return ret; } + chip->dw->hdata->use_handshake_as_channel_number = !!(flags & AXI_DMA_FLAG_HANDSHAKE_AS_CHAN); + chip->dw->hdata->use_cfg2 = !!(flags & AXI_DMA_FLAG_USE_CFG2); chip->core_clk = devm_clk_get(chip->dev, "core-clk"); @@ -1663,6 +1677,9 @@ static const struct of_device_id dw_dma_of_id_table[] = { }, { .compatible = "intel,kmb-axi-dma", .data = (void *)AXI_DMA_FLAG_HAS_APB_REGS, + }, { + .compatible = "sophgo,cv1800b-axi-dma", + .data = (void *)AXI_DMA_FLAG_HANDSHAKE_AS_CHAN, }, { .compatible = "starfive,jh7110-axi-dma", .data = (void *)(AXI_DMA_FLAG_HAS_RESETS | AXI_DMA_FLAG_USE_CFG2), diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h index b842e6a8d90d..67cc199e24d1 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h @@ -34,6 +34,7 @@ struct dw_axi_dma_hcfg { bool reg_map_8_channels; bool restrict_axi_burst_len; bool use_cfg2; + bool use_handshake_as_channel_number; }; struct axi_dma_chan { -- 2.52.0