From nobody Wed Jul 1 01:53:48 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E76BBC4332F for ; Wed, 5 Jan 2022 05:44:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237540AbiAEFoQ (ORCPT ); Wed, 5 Jan 2022 00:44:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237532AbiAEFoO (ORCPT ); Wed, 5 Jan 2022 00:44:14 -0500 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BDE8C061784 for ; Tue, 4 Jan 2022 21:44:14 -0800 (PST) Received: by mail-pg1-x536.google.com with SMTP id t32so3050595pgm.7 for ; Tue, 04 Jan 2022 21:44:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K49u+vw8xuJoyxVWZcA3NU+d4XvPmTqJkyhbFma1tEc=; b=RUGYRR1RJQKJtUsWJ5uTAOkOhkJH9bu4UoUiYQ6kKHDxBWY5hKh/TwfbqSR1UZo4QB kAJ4aNcqR9tGhqq7pddSAxim7ptsvg9Ke2hIBRaclfX/3xnOAiBJrCA+drxUunvh85hg UvAlOe/ZnNWL/ZUicwzR8o28Xd8XwIFT5GAFFEiR+Q/gzdDMq5L3xdldGWGlgOf1BTqu babo3m/6lJwNgQA/8iX+shYU7Qo6eFbnDERAIdiRc/soLziGFaTsX3aPsNWevBi/E3In o1C8duEkKoWxXHA1MNyIF2CAPgKiZ0uWNSgJCPV71zPh0qadMAayJX3/QBhP0uumB2s1 3O/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K49u+vw8xuJoyxVWZcA3NU+d4XvPmTqJkyhbFma1tEc=; b=Co0EkCQNAsxVfQLIS/9meGsDIc9c4uGhxSPV08pQDBO9bPqrsFDHO039G2KtIYlm/5 DjwvI9SNTgFkFBSvsy9GUhPfGnM385EbRXgG24oXN53EGmKFzl7dM+4ZY6Bkwiuf6FAU Gxe6kOgRH+QsBEWU/Z9R6QdG5Ftmvx9NVtxXQO7CKp1YjKlCKQATVcyi0RV97CDJsN7x hnoxXPyCsKtp5CKRfucoGDGa/z6ZJ9S086RSNIdxsECWsp6LOGs6FL2W/i6huoh7kS20 /puW+CxYFWIJwHX+lC2aTUFO8TtgFecy/qp2u8KWdQWkAmkoWHRTJPdMRyDIvcUh9GiA C0ww== X-Gm-Message-State: AOAM533CkTF8kySSq9cOk8sZYW2n2SKF0JKFPHorNoVunly6tdLSmfNM H9btcZJuNo4O61O2Ag1ZbDxUIw== X-Google-Smtp-Source: ABdhPJz1d/GHnBphP8/L6c4hZ+RtKg54y3QIKQ+HyWa3rLpUV2ja9CTDSCNACsrET9L5iBou/JXaFQ== X-Received: by 2002:a63:3c19:: with SMTP id j25mr1258601pga.476.1641361454102; Tue, 04 Jan 2022 21:44:14 -0800 (PST) Received: from hsinchu16.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id cu18sm1000574pjb.53.2022.01.04.21.44.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 21:44:13 -0800 (PST) From: Zong Li To: robh+dt@kernel.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, krzysztof.kozlowski@canonical.com, conor.dooley@microchip.com, geert@linux-m68k.org, bin.meng@windriver.com, green.wan@sifive.com, vkoul@kernel.org, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Cc: Zong Li Subject: [PATCH 1/3] riscv: dts: Add dma-channels property in dma node Date: Wed, 5 Jan 2022 13:43:58 +0800 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add dma-channels property, then we can determine how many channels there by device tree. Signed-off-by: Zong Li --- arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 1 + arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv= /boot/dts/microchip/microchip-mpfs.dtsi index c9f6d205d2ba..3c48f2d7a4a4 100644 --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi @@ -188,6 +188,7 @@ dma@3000000 { reg =3D <0x0 0x3000000 0x0 0x8000>; interrupt-parent =3D <&plic>; interrupts =3D <23 24 25 26 27 28 29 30>; + dma-channels =3D <4>; #dma-cells =3D <1>; }; =20 diff --git a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi b/arch/riscv/boot/d= ts/sifive/fu540-c000.dtsi index 0655b5c4201d..2bdfe7f06e4b 100644 --- a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi +++ b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi @@ -171,6 +171,7 @@ dma: dma@3000000 { reg =3D <0x0 0x3000000 0x0 0x8000>; interrupt-parent =3D <&plic0>; interrupts =3D <23 24 25 26 27 28 29 30>; + dma-channels =3D <4>; #dma-cells =3D <1>; }; uart1: serial@10011000 { --=20 2.31.1 From nobody Wed Jul 1 01:53:48 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56898C433F5 for ; Wed, 5 Jan 2022 05:44:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237558AbiAEFoV (ORCPT ); Wed, 5 Jan 2022 00:44:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237543AbiAEFoS (ORCPT ); Wed, 5 Jan 2022 00:44:18 -0500 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64AE8C061784 for ; Tue, 4 Jan 2022 21:44:18 -0800 (PST) Received: by mail-pg1-x534.google.com with SMTP id x194so11420863pgx.4 for ; Tue, 04 Jan 2022 21:44:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yHcajqg9Gpb6lA1mDgUhgvp80/uagYog9aG622RiQkc=; b=SXWvmyRxMnnFXzxISs/uv6T0FSxXr7ReBtqaa2rXzPMFtO8arE8D4c8WrHXjhAbg6Z v2c4RiXXuVBhRixsMwtb0oh/msiXOUOqR2xcIe05pOTPFave691aYvDAreElkAHO/qmV npekYShKlN1zlPyATGx0vCT8zizon1ZVZ/3vWVh0SyNKLGCjDW7n27KVsjHZLbE5nSJ4 hPBAWPYa631/lrk5bvqOTHRE0fb4VShSE/cC5jdYtdUowhJg1iY4jqUsPc28v1X8pJav oQyzuMHJPkdm4C/CS+Eod40alD/52qa9habh4+2v6wnK55S1BikOMhuBm0fmQ5itm6io alQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yHcajqg9Gpb6lA1mDgUhgvp80/uagYog9aG622RiQkc=; b=8HCT0TvX6W2Ka6YHtrWvtNX/pB4/+/CiUU7nAypYCF4COF7GI5oSGHAT329Z4K8h7G VgpGB6hBSJzVGjQMNcE6AiTvAfK+dj93uqbrnxoI/woFiNTMtbJrffHKxvkBmf8HGaGc KuoYRxRLNWjQGHRJtOIN5nFudqsGXTC2sWNkxlUrSDPMqrkcFD9H6CutWm5arZr4YKPl nU3bmCSBf3QC7BatvWbiqAdmFWbIhNwDDHOtziZqA5FDJvkpXANm1VgYyoQeOtKeSi9G QufU62HRvn5ohQ9mljyQp7EYxN3VzVtPy6Xg7wsh2vFUwu0MdjhM6rlCUSJrokcwIE5X mGGA== X-Gm-Message-State: AOAM533sX6XZKPO1B1gkbPO21MfKxuqe2mddjf1jD2cnCjFKmD0nxbff k3viCpxsiCH0kgcIze5DG/nS3g== X-Google-Smtp-Source: ABdhPJxb4U73W3VbaLmfSuss/ZkajAODH5FlLZNrkJE4VhGjoI6/tg9nwj4cGqHa4kBqzMHl7MUOng== X-Received: by 2002:a63:745d:: with SMTP id e29mr32203035pgn.213.1641361457962; Tue, 04 Jan 2022 21:44:17 -0800 (PST) Received: from hsinchu16.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id cu18sm1000574pjb.53.2022.01.04.21.44.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 21:44:17 -0800 (PST) From: Zong Li To: robh+dt@kernel.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, krzysztof.kozlowski@canonical.com, conor.dooley@microchip.com, geert@linux-m68k.org, bin.meng@windriver.com, green.wan@sifive.com, vkoul@kernel.org, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Cc: Zong Li Subject: [PATCH 2/3] dt-bindings: Add dma-channels for pdma device node Date: Wed, 5 Jan 2022 13:43:59 +0800 Message-Id: <0419b2865c87f72adeb4edee9113a959e468b4a5.1641289490.git.zong.li@sifive.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add dma-channels property, then we can determine how many channels there by device tree, rather than statically defines it in PDMA driver Signed-off-by: Zong Li --- .../devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.y= aml b/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml index d32a71b975fe..256bcb111d57 100644 --- a/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml +++ b/Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml @@ -34,12 +34,17 @@ properties: minItems: 1 maxItems: 8 =20 + dma-channels: + minimum: 1 + maximum: 4 + '#dma-cells': const: 1 =20 required: - compatible - reg + - dma-channels - interrupts - '#dma-cells' =20 @@ -50,6 +55,7 @@ examples: dma@3000000 { compatible =3D "sifive,fu540-c000-pdma"; reg =3D <0x3000000 0x8000>; + dma-channels =3D <4>; interrupts =3D <23 24 25 26 27 28 29 30>; #dma-cells =3D <1>; }; --=20 2.31.1 From nobody Wed Jul 1 01:53:48 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB344C433FE for ; Wed, 5 Jan 2022 05:44:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237569AbiAEFoY (ORCPT ); Wed, 5 Jan 2022 00:44:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237561AbiAEFoW (ORCPT ); Wed, 5 Jan 2022 00:44:22 -0500 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 257F5C061761 for ; Tue, 4 Jan 2022 21:44:22 -0800 (PST) Received: by mail-pf1-x42c.google.com with SMTP id u20so34225232pfi.12 for ; Tue, 04 Jan 2022 21:44:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gYCrjT384T+qCrcrLtXCLy/4eLs5COm+VZcUyniicZE=; b=JDBhwI9bbq1as4Sn5NxIQCtQ0iNed6+ByFwf7cjiwad0mZ/9TAZWPe2ZW/hhPyW464 8T8zu5JqkxOLVyjCLIJ8XCocG23s20vJU5aqlOEmdYyQTNbZ15c2hR1HuQDrSkeZBC4V qUemjLC1qYOTfMSDT5g5C07+pbrbKLXngwtKeqTwojZ8ag11mYLKtp6AirbVe6fjlXD/ vBbz0J5Iuv5eRPdciFg3hM/FnYmim3CV0tznzsYiY0i95IQqjhzSEj9FpvnnjYv3bk5E EWIWc+xFATIkNnh+qEqE6I1NswKMGmnhwM0OuxbGbbgcxs1zjdv7MiezAP9XeFHTg6xY RSDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gYCrjT384T+qCrcrLtXCLy/4eLs5COm+VZcUyniicZE=; b=iQlKYVm66YXb/tvM+6/YBGTbcM98OI3wGn/eNuy2Mz/WVjJCKzd38C/QDG1alKQhPQ ntvedbDNR0hL8qKceQJFjI5atKTYqA3cQsH8N9ynLomo3Id/0HMiGBU+MJ/gs0ex/bcK 1ZYadVEdSNjLkx1pgPanRYlBW4qCKP8MoyctO3t1hI7EQYZbznkRDGFu64IPNMfC7bqG Iw2zqJPnnAiaBqqBqMq4flZ44HmtEMfLfCWyYkeq46GMPQ9qxgbEo7/Ch8GR1GaBwSvk 6D+UzFFHHOmexaeifgDx/DBn4G1ykh7iR8iwa3JSVz3i1Bxqz8VC+Reks6jizjIyvHA1 pxCQ== X-Gm-Message-State: AOAM531+DDdsqeSotcRnt1GTYCGjwbb0ZI7fHxNCxzGsRTm/p5gkwFi/ KDXF9lsOf57uBL+89i69rVZd3A== X-Google-Smtp-Source: ABdhPJyyQ0QdcjtQaZ5nXIIXvrOrCVJIoWRS55wSz1V5EQJqDCCp2soZV7ICOR8x08ZwFRrTbCYxsQ== X-Received: by 2002:a63:b245:: with SMTP id t5mr1475467pgo.231.1641361461670; Tue, 04 Jan 2022 21:44:21 -0800 (PST) Received: from hsinchu16.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id cu18sm1000574pjb.53.2022.01.04.21.44.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 21:44:21 -0800 (PST) From: Zong Li To: robh+dt@kernel.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, krzysztof.kozlowski@canonical.com, conor.dooley@microchip.com, geert@linux-m68k.org, bin.meng@windriver.com, green.wan@sifive.com, vkoul@kernel.org, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Cc: Zong Li Subject: [PATCH 3/3] dmaengine: sf-pdma: Get number of channel by device tree Date: Wed, 5 Jan 2022 13:44:00 +0800 Message-Id: <5a7786cff08d55d0e084cd28bc2800565fa2dce7.1641289490.git.zong.li@sifive.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" It currently assumes that there are four channels by default, it might cause the error if there is actually less than four channels. Change that by getting number of channel from device tree. Signed-off-by: Zong Li --- drivers/dma/sf-pdma/sf-pdma.c | 15 +++++++++------ drivers/dma/sf-pdma/sf-pdma.h | 8 ++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/dma/sf-pdma/sf-pdma.c b/drivers/dma/sf-pdma/sf-pdma.c index f12606aeff87..c941150fc830 100644 --- a/drivers/dma/sf-pdma/sf-pdma.c +++ b/drivers/dma/sf-pdma/sf-pdma.c @@ -484,21 +484,24 @@ static int sf_pdma_probe(struct platform_device *pdev) struct sf_pdma *pdma; struct sf_pdma_chan *chan; struct resource *res; - int len, chans; - int ret; + int len, ret; const enum dma_slave_buswidth widths =3D DMA_SLAVE_BUSWIDTH_1_BYTE | DMA_SLAVE_BUSWIDTH_2_BYTES | DMA_SLAVE_BUSWIDTH_4_BYTES | DMA_SLAVE_BUSWIDTH_8_BYTES | DMA_SLAVE_BUSWIDTH_16_BYTES | DMA_SLAVE_BUSWIDTH_32_BYTES | DMA_SLAVE_BUSWIDTH_64_BYTES; =20 - chans =3D PDMA_NR_CH; - len =3D sizeof(*pdma) + sizeof(*chan) * chans; + len =3D sizeof(*pdma) + sizeof(*chan) * PDMA_MAX_NR_CH; pdma =3D devm_kzalloc(&pdev->dev, len, GFP_KERNEL); if (!pdma) return -ENOMEM; =20 - pdma->n_chans =3D chans; + ret =3D of_property_read_u32(pdev->dev.of_node, "dma-channels", + &pdma->n_chans); + if (ret) { + dev_err(&pdev->dev, "failed to read dma-channels\n"); + return ret; + } =20 res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); pdma->membase =3D devm_ioremap_resource(&pdev->dev, res); @@ -556,7 +559,7 @@ static int sf_pdma_remove(struct platform_device *pdev) struct sf_pdma_chan *ch; int i; =20 - for (i =3D 0; i < PDMA_NR_CH; i++) { + for (i =3D 0; i < pdma->n_chans; i++) { ch =3D &pdma->chans[i]; =20 devm_free_irq(&pdev->dev, ch->txirq, ch); diff --git a/drivers/dma/sf-pdma/sf-pdma.h b/drivers/dma/sf-pdma/sf-pdma.h index 0c20167b097d..8127d792f639 100644 --- a/drivers/dma/sf-pdma/sf-pdma.h +++ b/drivers/dma/sf-pdma/sf-pdma.h @@ -22,11 +22,7 @@ #include "../dmaengine.h" #include "../virt-dma.h" =20 -#define PDMA_NR_CH 4 - -#if (PDMA_NR_CH !=3D 4) -#error "Please define PDMA_NR_CH to 4" -#endif +#define PDMA_MAX_NR_CH 4 =20 #define PDMA_BASE_ADDR 0x3000000 #define PDMA_CHAN_OFFSET 0x1000 @@ -118,7 +114,7 @@ struct sf_pdma { void __iomem *membase; void __iomem *mappedbase; u32 n_chans; - struct sf_pdma_chan chans[PDMA_NR_CH]; + struct sf_pdma_chan chans[PDMA_MAX_NR_CH]; }; =20 #endif /* _SF_PDMA_H */ --=20 2.31.1