From nobody Thu Feb 12 04:51:36 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 AFDFDC77B7C for ; Thu, 27 Apr 2023 12:10:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243783AbjD0MKJ (ORCPT ); Thu, 27 Apr 2023 08:10:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243401AbjD0MKD (ORCPT ); Thu, 27 Apr 2023 08:10:03 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BE5349D8 for ; Thu, 27 Apr 2023 05:10:01 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-4ec9c7c6986so8910563e87.0 for ; Thu, 27 Apr 2023 05:10:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682597400; x=1685189400; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=nBQqau5zd2jC+LHz8Ur60RWpH4I9DwzbI/d1n0X/hZQ=; b=Zd61UDivIru9nOswRX6lsNoYqxwEl+I+DUHIDb8GWzVmNWoEUI2Ct2DrHWg9DgZafp Lw7RrqH9wN+oMynZKtNQNGOlU/bMLOOmcjnVHXgr73KRBeWWYVIf1IIDmUcKPg8TNE7n 3w2vfTJcH+0DToR2mAPz7h3aZDnYawiOH/IcVo8trEHOOCz9/Tj9I3Do5o1m3RAWNoIG vcdCTK71+1piDsR+35+mcyY5o25eSBvXqq4bOabRYHGLY+WEQmgyx930xXnVHJmwRR/V du5vY0AMFm1fZdIudbqXPhJiSWLipjYKuS4EM/NEyNGFVyMFXGhY8BoOJKs4L5ywp/05 Z/OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682597400; x=1685189400; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nBQqau5zd2jC+LHz8Ur60RWpH4I9DwzbI/d1n0X/hZQ=; b=MU7V6AZ9x57iXzKvs8qL5gGMiGhuzTLNQ2xeG1fG4lY2vr87SuMMuqU1hFUUWNd+n/ bvKlmzs/pbSXoF+GBeUea/WwQkd1EVHDaWm3GHp60kCW274lJmjMdl7pU3lR9OyMhP10 5sgtDeyCZxl0NR8Hx4TLzl2A1ny7//xnWUvgCO9xM79eOYifb4pn8+8lA56F0eH362WM sAIfs6bNY2+lzHTJ+cxd2HGhi/Q20yqOfJlgmILk74cmX0vpH9gN59PJp66LaJizfwCg TlqV8jTPM52bG0c9LJ/roKB+T6ec6BjmNe0JbLquXuE1euznmDLyiRWc0BfIFCDNzrrl XmoQ== X-Gm-Message-State: AC+VfDwBZfhCKuxJUE7WylR5gyeBFN2DajUp4S54HJe6RGS4SthNlgfL 8Dr9dRSaBm2LrxV93wDgCsd+nQ== X-Google-Smtp-Source: ACHHUZ51RnqVnzXZaFmG/P4pMw3HLHFfsYhhRc1Ti4h0XtxeUBVoIzsQyB7wcEKR8Oii4Y5j4rxviA== X-Received: by 2002:ac2:5691:0:b0:4e8:46a1:21a9 with SMTP id 17-20020ac25691000000b004e846a121a9mr553592lfr.49.1682597399823; Thu, 27 Apr 2023 05:09:59 -0700 (PDT) Received: from [192.168.1.2] (c-05d8225c.014-348-6c756e10.bbcust.telenor.se. [92.34.216.5]) by smtp.gmail.com with ESMTPSA id e7-20020ac25467000000b004d4d7fb0e07sm2892044lfn.216.2023.04.27.05.09.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 05:09:59 -0700 (PDT) From: Linus Walleij Date: Thu, 27 Apr 2023 14:09:56 +0200 Subject: [PATCH v2 1/8] dt-bindings: dma: dma40: Prefer to pass sram through phandle MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230417-ux500-dma40-cleanup-v2-1-cdaa68a4b863@linaro.org> References: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> In-Reply-To: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski Cc: dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linus Walleij X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Extend the DMA40 bindings so that we can pass two SRAM segments as phandles instead of directly referring to the memory address in the second reg cell. This enables more granular control over the SRAM, and adds the optiona LCLA SRAM segment as well. Deprecate the old way of passing LCPA as a second reg cell, make sram compulsory. Signed-off-by: Linus Walleij Reviewed-by: Rob Herring --- ChangeLog v1->v2: - Enumerate phandles using inner and outer maxItems as specified by Rob. - Drop quotes around reference. --- .../devicetree/bindings/dma/stericsson,dma40.yaml | 36 +++++++++++++++++-= ---- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/stericsson,dma40.yaml b/= Documentation/devicetree/bindings/dma/stericsson,dma40.yaml index 64845347f44d..1e5752b19a49 100644 --- a/Documentation/devicetree/bindings/dma/stericsson,dma40.yaml +++ b/Documentation/devicetree/bindings/dma/stericsson,dma40.yaml @@ -112,14 +112,23 @@ properties: - const: stericsson,dma40 =20 reg: - items: - - description: DMA40 memory base - - description: LCPA memory base + oneOf: + - items: + - description: DMA40 memory base + - items: + - description: DMA40 memory base + - description: LCPA memory base, deprecated, use eSRAM pool inst= ead + deprecated: true + =20 reg-names: - items: - - const: base - - const: lcpa + oneOf: + - items: + - const: base + - items: + - const: base + - const: lcpa + deprecated: true =20 interrupts: maxItems: 1 @@ -127,6 +136,15 @@ properties: clocks: maxItems: 1 =20 + sram: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: A phandle array with inner size 1 (no arg cells). + First phandle is the LCPA (Logical Channel Parameter Address) memory. + Second phandle is the LCLA (Logical Channel Link base Address) memo= ry. + maxItems: 2 + items: + maxItems: 1 + memcpy-channels: $ref: /schemas/types.yaml#/definitions/uint32-array description: Array of u32 elements indicating which channels on the DMA @@ -138,6 +156,7 @@ required: - reg - interrupts - clocks + - sram - memcpy-channels =20 additionalProperties: false @@ -149,8 +168,9 @@ examples: #include dma-controller@801c0000 { compatible =3D "stericsson,db8500-dma40", "stericsson,dma40"; - reg =3D <0x801c0000 0x1000>, <0x40010000 0x800>; - reg-names =3D "base", "lcpa"; + reg =3D <0x801c0000 0x1000>; + reg-names =3D "base"; + sram =3D <&lcpa>, <&lcla>; interrupts =3D ; #dma-cells =3D <3>; memcpy-channels =3D <56 57 58 59 60>; --=20 2.40.0 From nobody Thu Feb 12 04:51:36 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 14E34C77B73 for ; Thu, 27 Apr 2023 12:10:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243769AbjD0MKN (ORCPT ); Thu, 27 Apr 2023 08:10:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243638AbjD0MKE (ORCPT ); Thu, 27 Apr 2023 08:10:04 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A66F49DC for ; Thu, 27 Apr 2023 05:10:02 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-4ec816c9d03so9317432e87.2 for ; Thu, 27 Apr 2023 05:10:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682597401; x=1685189401; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=aWTuvneH8OCx2P81Wc3vASVRb7SduL7aaPSfgRD/SAs=; b=om4ZJrubqvm9fw2ZalUk1RT0azz39OuLOId41AYD0LfTb5dlZ9LX3jCwDrBZKOO++e uA1mRFlnjWE2DTzo+ZEKqXtcuZhYON83NYKG5peLU1pizGZ1Gwa7SJipGmrVJEUf4upi yp9LH5iTxIqy8l15MjffFKXm4jfGcp+XPj97cRTp1hrQUnEb4HAFaYn+P1uhVDxlxWo/ WD1ZR1HVW5/REtdxhNkQnjbS02c9El/JOTgMDHdVZpQ+wH3rYf50S403y6n1slz289eO mNT+SaaGh+DDOzJ0okF99kSR/kGGc5YehVHI8N8wPHUz6/1ivOHPM+jRdU4uS+zRsBOq AvmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682597401; x=1685189401; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aWTuvneH8OCx2P81Wc3vASVRb7SduL7aaPSfgRD/SAs=; b=itVlUeI6EA9Q8h2MakiHOyEm+E6tK5MS/Mq/9jV9lSbQgECqOubX6YbYnTEZZCZMX9 8EgvAZkaqA7+7YROIYFA0YN8EreoUG3iar+1zLDeq14fud2ezoBYiVVMgm7vFgug5iZY OCv4iAagQjT9SMZodeGNsR/ljIDxAvCAxieiOU/DRGXihR+0XA1DsILhGM173/9qdmeY kk7r2WmtNNVjVKEL3HhHkx8sgLVu9Q7hWTG+osBpjCglwkd6u8DmqEf7UutH0YS5cZI2 guCY33BoW1lMiD1i/72Ftdf96jau/InjAS5MdVXjqwiEYGnf7E+/FvPWu56EzGV5HTAN Lpxg== X-Gm-Message-State: AC+VfDzq+7S/lo6eSyhLD97KeLpfcyWGaqO10Z2ovHfjB6vrl+5Z/Q9e gUgJLgnrLSHXuCslEX2mIgQBXw== X-Google-Smtp-Source: ACHHUZ43cX0+V8tD1PWXB6ZPABwRslcXJOEw7f4/EvLJ4ocyNR1FMVgddher638aNSpzw269uNIK2A== X-Received: by 2002:a05:6512:3cc:b0:4ed:cc6d:1da1 with SMTP id w12-20020a05651203cc00b004edcc6d1da1mr433433lfp.36.1682597400855; Thu, 27 Apr 2023 05:10:00 -0700 (PDT) Received: from [192.168.1.2] (c-05d8225c.014-348-6c756e10.bbcust.telenor.se. [92.34.216.5]) by smtp.gmail.com with ESMTPSA id e7-20020ac25467000000b004d4d7fb0e07sm2892044lfn.216.2023.04.27.05.09.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 05:10:00 -0700 (PDT) From: Linus Walleij Date: Thu, 27 Apr 2023 14:09:57 +0200 Subject: [PATCH v2 2/8] dmaengine: ste_dma40: Get LCPA SRAM from SRAM node MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230417-ux500-dma40-cleanup-v2-2-cdaa68a4b863@linaro.org> References: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> In-Reply-To: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski Cc: dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linus Walleij X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of passing the reserved SRAM as a "reg" field look for a phandle to the LCPA SRAM memory so we can use the proper SRAM device tree bindings for the SRAM. Signed-off-by: Linus Walleij --- drivers/dma/Kconfig | 1 + drivers/dma/ste_dma40.c | 47 ++++++++++++++++++++++++---------------------= -- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index fb7073fc034f..37db3dc9a92a 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -553,6 +553,7 @@ config STE_DMA40 bool "ST-Ericsson DMA40 support" depends on ARCH_U8500 select DMA_ENGINE + select SRAM help Support for ST-Ericsson DMA40 controller =20 diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index f093e08c23b1..236269d35a53 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -3506,9 +3507,11 @@ static int __init d40_probe(struct platform_device *= pdev) { struct stedma40_platform_data *plat_data =3D dev_get_platdata(&pdev->dev); struct device_node *np =3D pdev->dev.of_node; + struct device_node *np_lcpa; int ret =3D -ENOENT; struct d40_base *base; struct resource *res; + struct resource res_lcpa; int num_reserved_chans; u32 val; =20 @@ -3535,37 +3538,37 @@ static int __init d40_probe(struct platform_device = *pdev) spin_lock_init(&base->interrupt_lock); spin_lock_init(&base->execmd_lock); =20 - /* Get IO for logical channel parameter address */ - res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "lcpa"); - if (!res) { - ret =3D -ENOENT; - d40_err(&pdev->dev, "No \"lcpa\" memory resource\n"); - goto destroy_cache; + /* Get IO for logical channel parameter address (LCPA) */ + np_lcpa =3D of_parse_phandle(np, "sram", 0); + if (!np_lcpa) { + dev_err(&pdev->dev, "no LCPA SRAM node\n"); + goto report_failure; } - base->lcpa_size =3D resource_size(res); - base->phy_lcpa =3D res->start; - - if (request_mem_region(res->start, resource_size(res), - D40_NAME " I/O lcpa") =3D=3D NULL) { - ret =3D -EBUSY; - d40_err(&pdev->dev, "Failed to request LCPA region %pR\n", res); - goto destroy_cache; + /* This is no device so read the address directly from the node */ + ret =3D of_address_to_resource(np_lcpa, 0, &res_lcpa); + if (ret) { + dev_err(&pdev->dev, "no LCPA SRAM resource\n"); + goto report_failure; } + base->lcpa_size =3D resource_size(&res_lcpa); + base->phy_lcpa =3D res_lcpa.start; + dev_info(&pdev->dev, "found LCPA SRAM at 0x%08x, size 0x%08x\n", + base->phy_lcpa, base->lcpa_size); =20 /* We make use of ESRAM memory for this. */ val =3D readl(base->virtbase + D40_DREG_LCPA); - if (res->start !=3D val && val !=3D 0) { + if (base->phy_lcpa !=3D val && val !=3D 0) { dev_warn(&pdev->dev, - "[%s] Mismatch LCPA dma 0x%x, def %pa\n", - __func__, val, &res->start); + "[%s] Mismatch LCPA dma 0x%x, def %08x\n", + __func__, val, base->phy_lcpa); } else - writel(res->start, base->virtbase + D40_DREG_LCPA); + writel(base->phy_lcpa, base->virtbase + D40_DREG_LCPA); =20 - base->lcpa_base =3D ioremap(res->start, resource_size(res)); + base->lcpa_base =3D ioremap(base->phy_lcpa, base->lcpa_size); if (!base->lcpa_base) { ret =3D -ENOMEM; d40_err(&pdev->dev, "Failed to ioremap LCPA region\n"); - goto destroy_cache; + goto release_base; } /* If lcla has to be located in ESRAM we don't need to allocate */ if (base->plat_data->use_esram_lcla) { @@ -3678,9 +3681,7 @@ static int __init d40_probe(struct platform_device *p= dev) if (base->lcpa_base) iounmap(base->lcpa_base); =20 - if (base->phy_lcpa) - release_mem_region(base->phy_lcpa, - base->lcpa_size); +release_base: if (base->phy_start) release_mem_region(base->phy_start, base->phy_size); --=20 2.40.0 From nobody Thu Feb 12 04:51:36 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 3BE3AC7EE24 for ; Thu, 27 Apr 2023 12:10:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243805AbjD0MKP (ORCPT ); Thu, 27 Apr 2023 08:10:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243710AbjD0MKE (ORCPT ); Thu, 27 Apr 2023 08:10:04 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C80E4692 for ; Thu, 27 Apr 2023 05:10:02 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-4f004cc54f4so2418621e87.3 for ; Thu, 27 Apr 2023 05:10:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682597402; x=1685189402; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=6dzjqDUqhlpwIVqCpt+cUtHh+EAeuNijiG89uyJMVyE=; b=GE0B2hlfsZ7HsdMx37vjGXXwJpLwp2GmtgxQ5XGC/Yt42Zf7fMYnoGrpZjrQ816WGx uS2GsUFIQ7JfTyPqqtUtIJsbwf+Zpnv6h6T/mrldPoS8Bs3eqXhNqPAl9rUpw5vaW7Uh ac7e7w3is/Hs3OpG+qgCF6njW2jqWCXVIoYFQKZj1hihJn6pajlGktWxvh0XmFZg0HYI B6SdtgNUysjD007W03YANvqTvbis+Vu0HZuVFhJ78TEmfJwB7IDByYpeqNhHUi96UgFe PygZqGV+cX15zJ4CPc7dcibKAxZBEbQlxYg8elm4f4rHq96LU1DaEYLhTC45Ra64yGFq SY8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682597402; x=1685189402; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6dzjqDUqhlpwIVqCpt+cUtHh+EAeuNijiG89uyJMVyE=; b=e7Ae+wPwpExuA+vs3qr5vaLbv7kQnBZR0H1wKbCchMFjU8KCe29o9FNxI5tbsFRwyc kOKvLUk27kkPYGwP+SxFktLYpuBfVbRzX9oo8XztDhWTpToB2wDkFw9CG3ZAKPj044lz egZe70njsIOj6zukMQ4MHZpPpCl0F5Szm2T+KJ8M2NXZ6NWih/SMTfofhOzsEb3V/7Ic Stfl/UwbTXq8/QsXK9a+ryEpoZlFoLnX+Nqf7UENnckFnIZ194Jg0bbkZueozkOk61S/ UwKdDvRguXV/r69Xl5+VDpNuNcNiJOVdFI/iqUAqSipRXtGlmQEETiX15wzwUVPoa7LR oQdA== X-Gm-Message-State: AC+VfDzeC+3/pC9fCNZn7Iwnwg2bBtp+DJgqvWeW5p08/0KdFw6DHM/C t8dtiNxPUKGyC5pmMkPQrnjlkw== X-Google-Smtp-Source: ACHHUZ7tTRg6JjrQn0fN0wMHNQEUZxZc+8nVJItV2YPemA+2Nsy91sZM02NQMcgDGGIBwHzi+eaRLQ== X-Received: by 2002:ac2:5616:0:b0:4ee:d8f3:1398 with SMTP id v22-20020ac25616000000b004eed8f31398mr465560lfd.68.1682597401956; Thu, 27 Apr 2023 05:10:01 -0700 (PDT) Received: from [192.168.1.2] (c-05d8225c.014-348-6c756e10.bbcust.telenor.se. [92.34.216.5]) by smtp.gmail.com with ESMTPSA id e7-20020ac25467000000b004d4d7fb0e07sm2892044lfn.216.2023.04.27.05.10.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 05:10:01 -0700 (PDT) From: Linus Walleij Date: Thu, 27 Apr 2023 14:09:58 +0200 Subject: [PATCH v2 3/8] dmaengine: ste_dma40: Add dev helper variable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230417-ux500-dma40-cleanup-v2-3-cdaa68a4b863@linaro.org> References: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> In-Reply-To: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski Cc: dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linus Walleij X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The &pdev->dev device pointer is used so many times in the probe() and d40_hw_detect_init() functions that a local *dev variable makes the code way easier to read. Signed-off-by: Linus Walleij --- drivers/dma/ste_dma40.c | 50 +++++++++++++++++++++++++--------------------= ---- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 236269d35a53..ef2a2fdaa82e 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -3104,6 +3104,7 @@ static int __init d40_phy_res_init(struct d40_base *b= ase) static struct d40_base * __init d40_hw_detect_init(struct platform_device = *pdev) { struct stedma40_platform_data *plat_data =3D dev_get_platdata(&pdev->dev); + struct device *dev =3D &pdev->dev; struct clk *clk; void __iomem *virtbase; struct resource *res; @@ -3117,15 +3118,15 @@ static struct d40_base * __init d40_hw_detect_init(= struct platform_device *pdev) u32 cid; u8 rev; =20 - clk =3D clk_get(&pdev->dev, NULL); + clk =3D clk_get(dev, NULL); if (IS_ERR(clk)) { - d40_err(&pdev->dev, "No matching clock found\n"); + d40_err(dev, "No matching clock found\n"); goto check_prepare_enabled; } =20 clk_ret =3D clk_prepare_enable(clk); if (clk_ret) { - d40_err(&pdev->dev, "Failed to prepare/enable clock\n"); + d40_err(dev, "Failed to prepare/enable clock\n"); goto disable_unprepare; } =20 @@ -3151,11 +3152,11 @@ static struct d40_base * __init d40_hw_detect_init(= struct platform_device *pdev) & 255) << (i * 8); =20 if (cid !=3D AMBA_CID) { - d40_err(&pdev->dev, "Unknown hardware! No PrimeCell ID\n"); + d40_err(dev, "Unknown hardware! No PrimeCell ID\n"); goto unmap_io; } if (AMBA_MANF_BITS(pid) !=3D AMBA_VENDOR_ST) { - d40_err(&pdev->dev, "Unknown designer! Got %x wanted %x\n", + d40_err(dev, "Unknown designer! Got %x wanted %x\n", AMBA_MANF_BITS(pid), AMBA_VENDOR_ST); goto unmap_io; @@ -3171,7 +3172,7 @@ static struct d40_base * __init d40_hw_detect_init(st= ruct platform_device *pdev) */ rev =3D AMBA_REV_BITS(pid); if (rev < 2) { - d40_err(&pdev->dev, "hardware revision: %d is not supported", rev); + d40_err(dev, "hardware revision: %d is not supported", rev); goto unmap_io; } =20 @@ -3189,7 +3190,7 @@ static struct d40_base * __init d40_hw_detect_init(st= ruct platform_device *pdev) =20 num_log_chans =3D num_phy_chans * D40_MAX_LOG_CHAN_PER_PHY; =20 - dev_info(&pdev->dev, + dev_info(dev, "hardware rev: %d @ %pa with %d physical and %d logical channels\n", rev, &res->start, num_phy_chans, num_log_chans); =20 @@ -3209,7 +3210,7 @@ static struct d40_base * __init d40_hw_detect_init(st= ruct platform_device *pdev) base->phy_size =3D resource_size(res); base->virtbase =3D virtbase; base->plat_data =3D plat_data; - base->dev =3D &pdev->dev; + base->dev =3D dev; base->phy_chans =3D ((void *)base) + ALIGN(sizeof(struct d40_base), 4); base->log_chans =3D &base->phy_chans[num_phy_chans]; =20 @@ -3505,7 +3506,8 @@ static int __init d40_of_probe(struct platform_device= *pdev, =20 static int __init d40_probe(struct platform_device *pdev) { - struct stedma40_platform_data *plat_data =3D dev_get_platdata(&pdev->dev); + struct device *dev =3D &pdev->dev; + struct stedma40_platform_data *plat_data =3D dev_get_platdata(dev); struct device_node *np =3D pdev->dev.of_node; struct device_node *np_lcpa; int ret =3D -ENOENT; @@ -3522,7 +3524,7 @@ static int __init d40_probe(struct platform_device *p= dev) goto report_failure; } } else { - d40_err(&pdev->dev, "No pdata or Device Tree provided\n"); + d40_err(dev, "No pdata or Device Tree provided\n"); goto report_failure; } } @@ -3541,24 +3543,24 @@ static int __init d40_probe(struct platform_device = *pdev) /* Get IO for logical channel parameter address (LCPA) */ np_lcpa =3D of_parse_phandle(np, "sram", 0); if (!np_lcpa) { - dev_err(&pdev->dev, "no LCPA SRAM node\n"); + dev_err(dev, "no LCPA SRAM node\n"); goto report_failure; } /* This is no device so read the address directly from the node */ ret =3D of_address_to_resource(np_lcpa, 0, &res_lcpa); if (ret) { - dev_err(&pdev->dev, "no LCPA SRAM resource\n"); + dev_err(dev, "no LCPA SRAM resource\n"); goto report_failure; } base->lcpa_size =3D resource_size(&res_lcpa); base->phy_lcpa =3D res_lcpa.start; - dev_info(&pdev->dev, "found LCPA SRAM at 0x%08x, size 0x%08x\n", + dev_info(dev, "found LCPA SRAM at 0x%08x, size 0x%08x\n", base->phy_lcpa, base->lcpa_size); =20 /* We make use of ESRAM memory for this. */ val =3D readl(base->virtbase + D40_DREG_LCPA); if (base->phy_lcpa !=3D val && val !=3D 0) { - dev_warn(&pdev->dev, + dev_warn(dev, "[%s] Mismatch LCPA dma 0x%x, def %08x\n", __func__, val, base->phy_lcpa); } else @@ -3567,7 +3569,7 @@ static int __init d40_probe(struct platform_device *p= dev) base->lcpa_base =3D ioremap(base->phy_lcpa, base->lcpa_size); if (!base->lcpa_base) { ret =3D -ENOMEM; - d40_err(&pdev->dev, "Failed to ioremap LCPA region\n"); + d40_err(dev, "Failed to ioremap LCPA region\n"); goto release_base; } /* If lcla has to be located in ESRAM we don't need to allocate */ @@ -3576,7 +3578,7 @@ static int __init d40_probe(struct platform_device *p= dev) "lcla_esram"); if (!res) { ret =3D -ENOENT; - d40_err(&pdev->dev, + d40_err(dev, "No \"lcla_esram\" memory resource\n"); goto destroy_cache; } @@ -3584,7 +3586,7 @@ static int __init d40_probe(struct platform_device *p= dev) resource_size(res)); if (!base->lcla_pool.base) { ret =3D -ENOMEM; - d40_err(&pdev->dev, "Failed to ioremap LCLA region\n"); + d40_err(dev, "Failed to ioremap LCLA region\n"); goto destroy_cache; } writel(res->start, base->virtbase + D40_DREG_LCLA); @@ -3592,7 +3594,7 @@ static int __init d40_probe(struct platform_device *p= dev) } else { ret =3D d40_lcla_allocate(base); if (ret) { - d40_err(&pdev->dev, "Failed to allocate LCLA area\n"); + d40_err(dev, "Failed to allocate LCLA area\n"); goto destroy_cache; } } @@ -3603,7 +3605,7 @@ static int __init d40_probe(struct platform_device *p= dev) =20 ret =3D request_irq(base->irq, d40_handle_interrupt, 0, D40_NAME, base); if (ret) { - d40_err(&pdev->dev, "No IRQ defined\n"); + d40_err(dev, "No IRQ defined\n"); goto destroy_cache; } =20 @@ -3611,7 +3613,7 @@ static int __init d40_probe(struct platform_device *p= dev) =20 base->lcpa_regulator =3D regulator_get(base->dev, "lcla_esram"); if (IS_ERR(base->lcpa_regulator)) { - d40_err(&pdev->dev, "Failed to get lcpa_regulator\n"); + d40_err(dev, "Failed to get lcpa_regulator\n"); ret =3D PTR_ERR(base->lcpa_regulator); base->lcpa_regulator =3D NULL; goto destroy_cache; @@ -3619,7 +3621,7 @@ static int __init d40_probe(struct platform_device *p= dev) =20 ret =3D regulator_enable(base->lcpa_regulator); if (ret) { - d40_err(&pdev->dev, + d40_err(dev, "Failed to enable lcpa_regulator\n"); regulator_put(base->lcpa_regulator); base->lcpa_regulator =3D NULL; @@ -3642,7 +3644,7 @@ static int __init d40_probe(struct platform_device *p= dev) =20 ret =3D dma_set_max_seg_size(base->dev, STEDMA40_MAX_SEG_SIZE); if (ret) { - d40_err(&pdev->dev, "Failed to set dma max seg size\n"); + d40_err(dev, "Failed to set dma max seg size\n"); goto destroy_cache; } =20 @@ -3651,7 +3653,7 @@ static int __init d40_probe(struct platform_device *p= dev) if (np) { ret =3D of_dma_controller_register(np, d40_xlate, NULL); if (ret) - dev_err(&pdev->dev, + dev_err(dev, "could not register of_dma_controller\n"); } =20 @@ -3701,7 +3703,7 @@ static int __init d40_probe(struct platform_device *p= dev) kfree(base->phy_res); kfree(base); report_failure: - d40_err(&pdev->dev, "probe failed\n"); + d40_err(dev, "probe failed\n"); return ret; } =20 --=20 2.40.0 From nobody Thu Feb 12 04:51:36 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 DB692C77B7C for ; Thu, 27 Apr 2023 12:10:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243813AbjD0MKR (ORCPT ); Thu, 27 Apr 2023 08:10:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243768AbjD0MKH (ORCPT ); Thu, 27 Apr 2023 08:10:07 -0400 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E17594C24 for ; Thu, 27 Apr 2023 05:10:04 -0700 (PDT) Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2a8b3ecf59fso84226151fa.0 for ; Thu, 27 Apr 2023 05:10:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682597403; x=1685189403; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=16sZ2YhEqcAT3vEUuYnQSOpaLyx08pK+uCVG1ZL4MiQ=; b=vz4AHlEp+QE62eG7yxVJKxoQ73/JvVqDz/IXtIbajgj8wiHd72Tr2WBKK5AptGPVqm FSVSijVwvZnrIFX3HS+d4MRjqpKaQF6oo1ubnD2G+5rqUZS7gEi/9swWCJo2pUf7dW1v NWiHG9/k0visOcEE0ZUaHmEmL1c6+y1zorWWCpJpJGotzEh7xnbM0RatFoFQkDZOu8m1 0pHP5dxP8BHN3anOheXz8bWrdGMMOFMd1Z/MMFK1ESWG8OQDu459YRFYL1LBI3dcMzWq nB7TJNBxzBIGlS/e7obrPDYqJcYpPhNq7vcH6Rcc9b7PZ7lySXs/CLCdk084XV93KDhl KVlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682597403; x=1685189403; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=16sZ2YhEqcAT3vEUuYnQSOpaLyx08pK+uCVG1ZL4MiQ=; b=PXODMYjcOdGcKxvCtaeBGfJMQbCimdput9Ie4IDiNWJlgPBdqVz5CN5OUO0sF4jPbe rqznOPDzXnOIoUUadFx8ISMjDhdAgsfr+s2YbXaeKVKKAGckuFNbMb4d/6y2zCPwoPU2 cfbJGtOLNlAr9SzQcCEfKGBPxA6VRuI1pqWhKIe+LIdZdh9F+ZupG0ZIZBjwGAOFhF1X pgnGHS03jk4Pk35B/BZAXweufJsER6Bp7SPQ7bW4DHPTnZke93RCjVk5d648H6wLMijp urwPpjfoY2AjEBIh+n+yHlPo2SGeab2h609GUKBa0hHazXgfGkiRzP7ccFV+e6eHp3NL qpTg== X-Gm-Message-State: AC+VfDwmKPep982pSe2jwwkamuxjn5jfMl5j5VewDCmL7vyjmhpIdVRI TyjcUaeIioLHbMo3NRerXk0JNQ== X-Google-Smtp-Source: ACHHUZ7haRd+5tKmAvQr9FlOMZt0hQmCEOhj/i//PJimOl3t5g1UGh4y8BC0PnVV6C9e2NAUlxpQJw== X-Received: by 2002:a05:6512:3743:b0:4eb:341c:ecc5 with SMTP id a3-20020a056512374300b004eb341cecc5mr557696lfs.12.1682597403118; Thu, 27 Apr 2023 05:10:03 -0700 (PDT) Received: from [192.168.1.2] (c-05d8225c.014-348-6c756e10.bbcust.telenor.se. [92.34.216.5]) by smtp.gmail.com with ESMTPSA id e7-20020ac25467000000b004d4d7fb0e07sm2892044lfn.216.2023.04.27.05.10.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 05:10:02 -0700 (PDT) From: Linus Walleij Date: Thu, 27 Apr 2023 14:09:59 +0200 Subject: [PATCH v2 4/8] dmaengine: ste_dma40: Remove platform data MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230417-ux500-dma40-cleanup-v2-4-cdaa68a4b863@linaro.org> References: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> In-Reply-To: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski Cc: dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linus Walleij X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Ux500 is device tree-only since ages. Delete the platform data header and push it into or next to the driver instead. Drop the non-DT probe path since this will not happen. Signed-off-by: Linus Walleij --- drivers/dma/ste_dma40.c | 56 ++++++++---- .../dma-ste-dma40.h =3D> drivers/dma/ste_dma40.h | 101 +--------------= ------ drivers/dma/ste_dma40_ll.c | 3 +- 3 files changed, 41 insertions(+), 119 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index ef2a2fdaa82e..e5df28cdc4c8 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -23,11 +23,39 @@ #include #include #include -#include =20 #include "dmaengine.h" +#include "ste_dma40.h" #include "ste_dma40_ll.h" =20 +/** + * struct stedma40_platform_data - Configuration struct for the dma device. + * + * @dev_tx: mapping between destination event line and io address + * @dev_rx: mapping between source event line and io address + * @disabled_channels: A vector, ending with -1, that marks physical chann= els + * that are for different reasons not available for the driver. + * @soft_lli_chans: A vector, that marks physical channels will use LLI by= SW + * which avoids HW bug that exists in some versions of the controller. + * SoftLLI introduces relink overhead that could impact performace for + * certain use cases. + * @num_of_soft_lli_chans: The number of channels that needs to be configu= red + * to use SoftLLI. + * @use_esram_lcla: flag for mapping the lcla into esram region + * @num_of_memcpy_chans: The number of channels reserved for memcpy. + * @num_of_phy_chans: The number of physical channels implemented in HW. + * 0 means reading the number of channels from DMA HW but this is only val= id + * for 'multiple of 4' channels, like 8. + */ +struct stedma40_platform_data { + int disabled_channels[STEDMA40_MAX_PHYS]; + int *soft_lli_chans; + int num_of_soft_lli_chans; + bool use_esram_lcla; + int num_of_memcpy_chans; + int num_of_phy_chans; +}; + #define D40_NAME "dma40" =20 #define D40_PHY_CHAN -1 @@ -2269,7 +2297,7 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlis= t *sg_src, return NULL; } =20 -bool stedma40_filter(struct dma_chan *chan, void *data) +static bool stedma40_filter(struct dma_chan *chan, void *data) { struct stedma40_chan_cfg *info =3D data; struct d40_chan *d40c =3D @@ -2288,7 +2316,6 @@ bool stedma40_filter(struct dma_chan *chan, void *dat= a) =20 return err =3D=3D 0; } -EXPORT_SYMBOL(stedma40_filter); =20 static void __d40_set_prio_rt(struct d40_chan *d40c, int dev_type, bool sr= c) { @@ -3517,16 +3544,9 @@ static int __init d40_probe(struct platform_device *= pdev) int num_reserved_chans; u32 val; =20 - if (!plat_data) { - if (np) { - if (d40_of_probe(pdev, np)) { - ret =3D -ENOMEM; - goto report_failure; - } - } else { - d40_err(dev, "No pdata or Device Tree provided\n"); - goto report_failure; - } + if (d40_of_probe(pdev, np)) { + ret =3D -ENOMEM; + goto report_failure; } =20 base =3D d40_hw_detect_init(pdev); @@ -3650,11 +3670,11 @@ static int __init d40_probe(struct platform_device = *pdev) =20 d40_hw_init(base); =20 - if (np) { - ret =3D of_dma_controller_register(np, d40_xlate, NULL); - if (ret) - dev_err(dev, - "could not register of_dma_controller\n"); + ret =3D of_dma_controller_register(np, d40_xlate, NULL); + if (ret) { + dev_err(dev, + "could not register of_dma_controller\n"); + goto destroy_cache; } =20 dev_info(base->dev, "initialized\n"); diff --git a/include/linux/platform_data/dma-ste-dma40.h b/drivers/dma/ste_= dma40.h similarity index 51% rename from include/linux/platform_data/dma-ste-dma40.h rename to drivers/dma/ste_dma40.h index 10641633facc..c697bfe16a01 100644 --- a/include/linux/platform_data/dma-ste-dma40.h +++ b/drivers/dma/ste_dma40.h @@ -1,19 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) ST-Ericsson SA 2007-2010 - * Author: Per Forlin for ST-Ericsson - * Author: Jonas Aaberg for ST-Ericsson - */ - =20 #ifndef STE_DMA40_H #define STE_DMA40_H =20 -#include -#include -#include -#include - /* * Maxium size for a single dma descriptor * Size is limited to 16 bits. @@ -118,92 +107,4 @@ struct stedma40_chan_cfg { int phy_channel; }; =20 -/** - * struct stedma40_platform_data - Configuration struct for the dma device. - * - * @dev_tx: mapping between destination event line and io address - * @dev_rx: mapping between source event line and io address - * @disabled_channels: A vector, ending with -1, that marks physical chann= els - * that are for different reasons not available for the driver. - * @soft_lli_chans: A vector, that marks physical channels will use LLI by= SW - * which avoids HW bug that exists in some versions of the controller. - * SoftLLI introduces relink overhead that could impact performace for - * certain use cases. - * @num_of_soft_lli_chans: The number of channels that needs to be configu= red - * to use SoftLLI. - * @use_esram_lcla: flag for mapping the lcla into esram region - * @num_of_memcpy_chans: The number of channels reserved for memcpy. - * @num_of_phy_chans: The number of physical channels implemented in HW. - * 0 means reading the number of channels from DMA HW but this is only val= id - * for 'multiple of 4' channels, like 8. - */ -struct stedma40_platform_data { - int disabled_channels[STEDMA40_MAX_PHYS]; - int *soft_lli_chans; - int num_of_soft_lli_chans; - bool use_esram_lcla; - int num_of_memcpy_chans; - int num_of_phy_chans; -}; - -#ifdef CONFIG_STE_DMA40 - -/** - * stedma40_filter() - Provides stedma40_chan_cfg to the - * ste_dma40 dma driver via the dmaengine framework. - * does some checking of what's provided. - * - * Never directly called by client. It used by dmaengine. - * @chan: dmaengine handle. - * @data: Must be of type: struct stedma40_chan_cfg and is - * the configuration of the framework. - * - * - */ - -bool stedma40_filter(struct dma_chan *chan, void *data); - -/** - * stedma40_slave_mem() - Transfers a raw data buffer to or from a slave - * (=3Ddevice) - * - * @chan: dmaengine handle - * @addr: source or destination physicall address. - * @size: bytes to transfer - * @direction: direction of transfer - * @flags: is actually enum dma_ctrl_flags. See dmaengine.h - */ - -static inline struct -dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan, - dma_addr_t addr, - unsigned int size, - enum dma_transfer_direction direction, - unsigned long flags) -{ - struct scatterlist sg; - sg_init_table(&sg, 1); - sg.dma_address =3D addr; - sg.length =3D size; - - return dmaengine_prep_slave_sg(chan, &sg, 1, direction, flags); -} - -#else -static inline bool stedma40_filter(struct dma_chan *chan, void *data) -{ - return false; -} - -static inline struct -dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan, - dma_addr_t addr, - unsigned int size, - enum dma_transfer_direction direction, - unsigned long flags) -{ - return NULL; -} -#endif - -#endif +#endif /* STE_DMA40_H */ diff --git a/drivers/dma/ste_dma40_ll.c b/drivers/dma/ste_dma40_ll.c index b5287c661eb7..4c489b126cb2 100644 --- a/drivers/dma/ste_dma40_ll.c +++ b/drivers/dma/ste_dma40_ll.c @@ -6,8 +6,9 @@ */ =20 #include -#include +#include =20 +#include "ste_dma40.h" #include "ste_dma40_ll.h" =20 static u8 d40_width_to_bits(enum dma_slave_buswidth width) --=20 2.40.0 From nobody Thu Feb 12 04:51:36 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 0E8A9C77B61 for ; Thu, 27 Apr 2023 12:10:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243823AbjD0MKV (ORCPT ); Thu, 27 Apr 2023 08:10:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243754AbjD0MKH (ORCPT ); Thu, 27 Apr 2023 08:10:07 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEC32524F for ; Thu, 27 Apr 2023 05:10:05 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-4f004943558so2404685e87.3 for ; Thu, 27 Apr 2023 05:10:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682597404; x=1685189404; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=pNvCCMPMF278Wqr3jAy5GhuoPQm5kPBgkMVcgaYk7hs=; b=kzyVHrQBPyLbh7Z7H9tNdb7DTY2g7oozYbJpteZq3a4GM52Ed4wUr0jSg76ineFNmB 8Fd3VSBeUZoQbr4P25HBYfhnF8E24xT7KYf+OCFoXfO3hgdXAktHyrLzP290wxZLmxIL tCdiCoA5hdLspOIEMV/a9m+iKX/2Dww3tsGq7X5ZDH0PO7aql7YKmuwuBrVklRER6xO/ NjDtuX2NNZwTNy1sQ5rqxB4uaf5zoI6Z7f1PDf7R/sHfqzFy5u+Cdw3WFhEn3XiZmVCG CCJ1e1uIA3BVYj8cTRWJEmaPpTNyb9nvTM5lBG9cpQ4shI1iR9DiTSDUUDG38d/EE9Yo x2IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682597404; x=1685189404; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pNvCCMPMF278Wqr3jAy5GhuoPQm5kPBgkMVcgaYk7hs=; b=VtjOlg19s64rgtHVho4wmx+yx9shmhrWlq2nyOJY87ibGP2kQYsjoKN0tXJ+bZeQxB kKQDvjf6iKa1KQ3VLE4pVROv+kO3ngHwxcmGDDiAFF95fsZygZqp/Go+CpusGaAHORlg ikzb3RvwtCZee1pr9MhwwflEJA3hjf8QHhsEVd3brTUVrHF132uEAUjuop3FBCYaBH0O 1tLKalk9LtYTPWupchnm99ld2zQ49V7KuDCRz+PA/ktCfP4zz90zZCBu1guzqmWbDJf7 j86enqXAAog4l0CVHOiLJ9e0d9ZpYVQpUu66kNdlVUjTcyou9u2nd5C92V2g9SBLBX71 T3AA== X-Gm-Message-State: AC+VfDxG9dNc0NkIcZpCLTzhRJKfj2bxtd0QxdQw15efVquZuVV9GqiS f/r0gEmdVl8j4RjhL0NCy2nJSQ== X-Google-Smtp-Source: ACHHUZ4k5tqT/e7Tm+ZkgWv3u5PbF2kWhz24FovFMaYm4ehf6Yey1ZUqce5Rir4CZKSKaKbVL0GsNw== X-Received: by 2002:ac2:48b3:0:b0:4ef:f630:5c1e with SMTP id u19-20020ac248b3000000b004eff6305c1emr491617lfg.51.1682597404231; Thu, 27 Apr 2023 05:10:04 -0700 (PDT) Received: from [192.168.1.2] (c-05d8225c.014-348-6c756e10.bbcust.telenor.se. [92.34.216.5]) by smtp.gmail.com with ESMTPSA id e7-20020ac25467000000b004d4d7fb0e07sm2892044lfn.216.2023.04.27.05.10.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 05:10:03 -0700 (PDT) From: Linus Walleij Date: Thu, 27 Apr 2023 14:10:00 +0200 Subject: [PATCH v2 5/8] dmaengine: ste_dma40: Pass dev to OF function MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230417-ux500-dma40-cleanup-v2-5-cdaa68a4b863@linaro.org> References: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> In-Reply-To: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski Cc: dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linus Walleij X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The OF platform data population function only wants to use struct device *dev, so pass that instead. This change makes the compiler realize that the local platform data variable is unused, so drop that too. Signed-off-by: Linus Walleij --- drivers/dma/ste_dma40.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index e5df28cdc4c8..fe98f12b8130 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -3480,14 +3480,14 @@ static int __init d40_lcla_allocate(struct d40_base= *base) return ret; } =20 -static int __init d40_of_probe(struct platform_device *pdev, +static int __init d40_of_probe(struct device *dev, struct device_node *np) { struct stedma40_platform_data *pdata; int num_phy =3D 0, num_memcpy =3D 0, num_disabled =3D 0; const __be32 *list; =20 - pdata =3D devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); + pdata =3D devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) return -ENOMEM; =20 @@ -3500,7 +3500,7 @@ static int __init d40_of_probe(struct platform_device= *pdev, num_memcpy /=3D sizeof(*list); =20 if (num_memcpy > D40_MEMCPY_MAX_CHANS || num_memcpy <=3D 0) { - d40_err(&pdev->dev, + d40_err(dev, "Invalid number of memcpy channels specified (%d)\n", num_memcpy); return -EINVAL; @@ -3515,7 +3515,7 @@ static int __init d40_of_probe(struct platform_device= *pdev, num_disabled /=3D sizeof(*list); =20 if (num_disabled >=3D STEDMA40_MAX_PHYS || num_disabled < 0) { - d40_err(&pdev->dev, + d40_err(dev, "Invalid number of disabled channels specified (%d)\n", num_disabled); return -EINVAL; @@ -3526,7 +3526,7 @@ static int __init d40_of_probe(struct platform_device= *pdev, num_disabled); pdata->disabled_channels[num_disabled] =3D -1; =20 - pdev->dev.platform_data =3D pdata; + dev->platform_data =3D pdata; =20 return 0; } @@ -3534,7 +3534,6 @@ static int __init d40_of_probe(struct platform_device= *pdev, static int __init d40_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; - struct stedma40_platform_data *plat_data =3D dev_get_platdata(dev); struct device_node *np =3D pdev->dev.of_node; struct device_node *np_lcpa; int ret =3D -ENOENT; @@ -3544,7 +3543,7 @@ static int __init d40_probe(struct platform_device *p= dev) int num_reserved_chans; u32 val; =20 - if (d40_of_probe(pdev, np)) { + if (d40_of_probe(dev, np)) { ret =3D -ENOMEM; goto report_failure; } --=20 2.40.0 From nobody Thu Feb 12 04:51:36 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 8F068C77B61 for ; Thu, 27 Apr 2023 12:10:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243807AbjD0MKY (ORCPT ); Thu, 27 Apr 2023 08:10:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243790AbjD0MKL (ORCPT ); Thu, 27 Apr 2023 08:10:11 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0553F55A2 for ; Thu, 27 Apr 2023 05:10:07 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4f00d41df22so3456900e87.1 for ; Thu, 27 Apr 2023 05:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682597405; x=1685189405; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vNVAexPIh/sHv/lvxik7B3SVOHh9Va7Le+Py7GRZYJo=; b=vDE89jr5SAeieEkm2ahfOYylaMZLCmUqUPyd0upykNRsggCTr7cdb0C2JfhiuGN2cb JaefAw410v2nBgwHzZAziXKeSKZzfGjHWG7fz3pDb6c5TfwXHf/BzF0DVB/B91j61XYL sANizLZ7Pw13rM7TveROmPXpS3lrBgyxDJpKCsRmfVWXwbKaxm/K5RVSO42mIo82GAnc D8t1QCh3FQqhz4IOkAelkuAGf93BWLVw2IzItzpml4x5Kj8SYPt1I7Et1ne/rSiFvhHO Jo7x1jh+HVchIw2901ZGuOiNG4b++v1wWZJCnHUULl6cqqeE/g1fwtTRQP9LwL91zHIc tuWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682597405; x=1685189405; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vNVAexPIh/sHv/lvxik7B3SVOHh9Va7Le+Py7GRZYJo=; b=jvpyG6oL6KGDiq66tG843NcsqBbyn0COojpis5zLSc8RvsLI09fpFpJnGgROpawvra SNYB2brosZXH6cs94GreBiTWxLz4JBZQnBNVHPutOyCemHQ2KDYe1goiQRQw4xh2Ica6 7TMs3YGEXICHCPdinsi3bwrrgYYDEE3EDoTrlQNdFiYnmfms78tyUV6dGbm+QYkughke VYQP41j801Ju1zbNDbqvP7+yp7SzJAKrkkw4c0IFdvZr4ds20Lpi0sM1FxXmgP4agB7t OfSmCPiR0LU8ISVYFGAQizDsOtD3y5DA5GzLqX0Noj+ESXswmIGUrSyOZuy+iPnvY8li qG9g== X-Gm-Message-State: AC+VfDw5u97IWD0yJWBnHJ5qZv4HbIWNhzJJAGm63nY7y9PvklhebeDi LYzZlibkwLufB+4SXUEdeK6Y+A== X-Google-Smtp-Source: ACHHUZ7G9u3zNIMCnhUBViDMp45lY8nWsidJQsaPmCtpIBL1jXdfrrWoOigpU27Yv8Nd4yrc+U1o+g== X-Received: by 2002:a05:6512:230d:b0:4ef:ee59:d28d with SMTP id o13-20020a056512230d00b004efee59d28dmr1395541lfu.7.1682597405194; Thu, 27 Apr 2023 05:10:05 -0700 (PDT) Received: from [192.168.1.2] (c-05d8225c.014-348-6c756e10.bbcust.telenor.se. [92.34.216.5]) by smtp.gmail.com with ESMTPSA id e7-20020ac25467000000b004d4d7fb0e07sm2892044lfn.216.2023.04.27.05.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 05:10:04 -0700 (PDT) From: Linus Walleij Date: Thu, 27 Apr 2023 14:10:01 +0200 Subject: [PATCH v2 6/8] dmaengine: ste_dma40: Use managed resources MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230417-ux500-dma40-cleanup-v2-6-cdaa68a4b863@linaro.org> References: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> In-Reply-To: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski Cc: dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linus Walleij X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This switches the DMA40 driver to use a bunch of managed resources and strip down the errorpath. The result is pretty neat and makes the driver way more readable. Signed-off-by: Linus Walleij --- drivers/dma/ste_dma40.c | 180 ++++++++++++++++----------------------------= ---- 1 file changed, 61 insertions(+), 119 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index fe98f12b8130..c5991009d3e4 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -554,8 +554,6 @@ struct d40_gen_dmac { * @virtbase: The virtual base address of the DMA's register. * @rev: silicon revision detected. * @clk: Pointer to the DMA clock structure. - * @phy_start: Physical memory start of the DMA registers. - * @phy_size: Size of the DMA register map. * @irq: The IRQ number. * @num_memcpy_chans: The number of channels used for memcpy (mem-to-mem * transfers). @@ -599,8 +597,6 @@ struct d40_base { void __iomem *virtbase; u8 rev:4; struct clk *clk; - phys_addr_t phy_start; - resource_size_t phy_size; int irq; int num_memcpy_chans; int num_phy_chans; @@ -3128,65 +3124,58 @@ static int __init d40_phy_res_init(struct d40_base = *base) return num_phy_chans_avail; } =20 +/* Called from the registered devm action */ +static void d40_drop_kmem_cache_action(void *d) +{ + struct kmem_cache *desc_slab =3D d; + + kmem_cache_destroy(desc_slab); +} + static struct d40_base * __init d40_hw_detect_init(struct platform_device = *pdev) { struct stedma40_platform_data *plat_data =3D dev_get_platdata(&pdev->dev); struct device *dev =3D &pdev->dev; struct clk *clk; void __iomem *virtbase; - struct resource *res; struct d40_base *base; int num_log_chans; int num_phy_chans; int num_memcpy_chans; - int clk_ret =3D -EINVAL; int i; u32 pid; u32 cid; u8 rev; + int ret; =20 - clk =3D clk_get(dev, NULL); - if (IS_ERR(clk)) { - d40_err(dev, "No matching clock found\n"); - goto check_prepare_enabled; - } - - clk_ret =3D clk_prepare_enable(clk); - if (clk_ret) { - d40_err(dev, "Failed to prepare/enable clock\n"); - goto disable_unprepare; - } + clk =3D devm_clk_get_enabled(dev, NULL); + if (IS_ERR(clk)) + return NULL; =20 /* Get IO for DMAC base address */ - res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "base"); - if (!res) - goto disable_unprepare; - - if (request_mem_region(res->start, resource_size(res), - D40_NAME " I/O base") =3D=3D NULL) - goto release_region; - - virtbase =3D ioremap(res->start, resource_size(res)); - if (!virtbase) - goto release_region; + virtbase =3D devm_platform_ioremap_resource_byname(pdev, "base"); + if (IS_ERR(virtbase)) { + dev_err(dev, "No IO base defined\n"); + return NULL; + } =20 /* This is just a regular AMBA PrimeCell ID actually */ for (pid =3D 0, i =3D 0; i < 4; i++) - pid |=3D (readl(virtbase + resource_size(res) - 0x20 + 4 * i) + pid |=3D (readl(virtbase + SZ_4K - 0x20 + 4 * i) & 255) << (i * 8); for (cid =3D 0, i =3D 0; i < 4; i++) - cid |=3D (readl(virtbase + resource_size(res) - 0x10 + 4 * i) + cid |=3D (readl(virtbase + SZ_4K - 0x10 + 4 * i) & 255) << (i * 8); =20 if (cid !=3D AMBA_CID) { d40_err(dev, "Unknown hardware! No PrimeCell ID\n"); - goto unmap_io; + return NULL; } if (AMBA_MANF_BITS(pid) !=3D AMBA_VENDOR_ST) { d40_err(dev, "Unknown designer! Got %x wanted %x\n", AMBA_MANF_BITS(pid), AMBA_VENDOR_ST); - goto unmap_io; + return NULL; } /* * HW revision: @@ -3200,7 +3189,7 @@ static struct d40_base * __init d40_hw_detect_init(st= ruct platform_device *pdev) rev =3D AMBA_REV_BITS(pid); if (rev < 2) { d40_err(dev, "hardware revision: %d is not supported", rev); - goto unmap_io; + return NULL; } =20 /* The number of physical channels on this HW */ @@ -3218,23 +3207,22 @@ static struct d40_base * __init d40_hw_detect_init(= struct platform_device *pdev) num_log_chans =3D num_phy_chans * D40_MAX_LOG_CHAN_PER_PHY; =20 dev_info(dev, - "hardware rev: %d @ %pa with %d physical and %d logical channels\n", - rev, &res->start, num_phy_chans, num_log_chans); + "hardware rev: %d with %d physical and %d logical channels\n", + rev, num_phy_chans, num_log_chans); =20 - base =3D kzalloc(ALIGN(sizeof(struct d40_base), 4) + - (num_phy_chans + num_log_chans + num_memcpy_chans) * - sizeof(struct d40_chan), GFP_KERNEL); + base =3D devm_kzalloc(dev, + ALIGN(sizeof(struct d40_base), 4) + + (num_phy_chans + num_log_chans + num_memcpy_chans) * + sizeof(struct d40_chan), GFP_KERNEL); =20 - if (base =3D=3D NULL) - goto unmap_io; + if (!base) + return NULL; =20 base->rev =3D rev; base->clk =3D clk; base->num_memcpy_chans =3D num_memcpy_chans; base->num_phy_chans =3D num_phy_chans; base->num_log_chans =3D num_log_chans; - base->phy_start =3D res->start; - base->phy_size =3D resource_size(res); base->virtbase =3D virtbase; base->plat_data =3D plat_data; base->dev =3D dev; @@ -3271,76 +3259,55 @@ static struct d40_base * __init d40_hw_detect_init(= struct platform_device *pdev) base->gen_dmac.init_reg_size =3D ARRAY_SIZE(dma_init_reg_v4a); } =20 - base->phy_res =3D kcalloc(num_phy_chans, - sizeof(*base->phy_res), - GFP_KERNEL); + base->phy_res =3D devm_kcalloc(dev, num_phy_chans, + sizeof(*base->phy_res), + GFP_KERNEL); if (!base->phy_res) - goto free_base; + return NULL; =20 - base->lookup_phy_chans =3D kcalloc(num_phy_chans, - sizeof(*base->lookup_phy_chans), - GFP_KERNEL); + base->lookup_phy_chans =3D devm_kcalloc(dev, num_phy_chans, + sizeof(*base->lookup_phy_chans), + GFP_KERNEL); if (!base->lookup_phy_chans) - goto free_phy_res; + return NULL; =20 - base->lookup_log_chans =3D kcalloc(num_log_chans, - sizeof(*base->lookup_log_chans), - GFP_KERNEL); + base->lookup_log_chans =3D devm_kcalloc(dev, num_log_chans, + sizeof(*base->lookup_log_chans), + GFP_KERNEL); if (!base->lookup_log_chans) - goto free_phy_chans; + return NULL; =20 - base->reg_val_backup_chan =3D kmalloc_array(base->num_phy_chans, + base->reg_val_backup_chan =3D devm_kmalloc_array(dev, base->num_phy_chans, sizeof(d40_backup_regs_chan), GFP_KERNEL); if (!base->reg_val_backup_chan) - goto free_log_chans; + return NULL; =20 - base->lcla_pool.alloc_map =3D kcalloc(num_phy_chans + base->lcla_pool.alloc_map =3D devm_kcalloc(dev, num_phy_chans * D40_LCLA_LINK_PER_EVENT_GRP, sizeof(*base->lcla_pool.alloc_map), GFP_KERNEL); if (!base->lcla_pool.alloc_map) - goto free_backup_chan; + return NULL; =20 - base->regs_interrupt =3D kmalloc_array(base->gen_dmac.il_size, + base->regs_interrupt =3D devm_kmalloc_array(dev, base->gen_dmac.il_size, sizeof(*base->regs_interrupt), GFP_KERNEL); if (!base->regs_interrupt) - goto free_map; + return NULL; =20 base->desc_slab =3D kmem_cache_create(D40_NAME, sizeof(struct d40_desc), 0, SLAB_HWCACHE_ALIGN, NULL); - if (base->desc_slab =3D=3D NULL) - goto free_regs; + if (!base->desc_slab) + return NULL; =20 + ret =3D devm_add_action_or_reset(dev, d40_drop_kmem_cache_action, + base->desc_slab); + if (ret) + return NULL; =20 return base; - free_regs: - kfree(base->regs_interrupt); - free_map: - kfree(base->lcla_pool.alloc_map); - free_backup_chan: - kfree(base->reg_val_backup_chan); - free_log_chans: - kfree(base->lookup_log_chans); - free_phy_chans: - kfree(base->lookup_phy_chans); - free_phy_res: - kfree(base->phy_res); - free_base: - kfree(base); - unmap_io: - iounmap(virtbase); - release_region: - release_mem_region(res->start, resource_size(res)); - check_prepare_enabled: - if (!clk_ret) - disable_unprepare: - clk_disable_unprepare(clk); - if (!IS_ERR(clk)) - clk_put(clk); - return NULL; } =20 static void __init d40_hw_init(struct d40_base *base) @@ -3585,11 +3552,11 @@ static int __init d40_probe(struct platform_device = *pdev) } else writel(base->phy_lcpa, base->virtbase + D40_DREG_LCPA); =20 - base->lcpa_base =3D ioremap(base->phy_lcpa, base->lcpa_size); + base->lcpa_base =3D devm_ioremap(dev, base->phy_lcpa, base->lcpa_size); if (!base->lcpa_base) { ret =3D -ENOMEM; d40_err(dev, "Failed to ioremap LCPA region\n"); - goto release_base; + goto report_failure; } /* If lcla has to be located in ESRAM we don't need to allocate */ if (base->plat_data->use_esram_lcla) { @@ -3599,14 +3566,14 @@ static int __init d40_probe(struct platform_device = *pdev) ret =3D -ENOENT; d40_err(dev, "No \"lcla_esram\" memory resource\n"); - goto destroy_cache; + goto report_failure; } - base->lcla_pool.base =3D ioremap(res->start, - resource_size(res)); + base->lcla_pool.base =3D devm_ioremap(dev, res->start, + resource_size(res)); if (!base->lcla_pool.base) { ret =3D -ENOMEM; d40_err(dev, "Failed to ioremap LCLA region\n"); - goto destroy_cache; + goto report_failure; } writel(res->start, base->virtbase + D40_DREG_LCLA); =20 @@ -3678,16 +3645,8 @@ static int __init d40_probe(struct platform_device *= pdev) =20 dev_info(base->dev, "initialized\n"); return 0; - destroy_cache: - kmem_cache_destroy(base->desc_slab); - if (base->virtbase) - iounmap(base->virtbase); - - if (base->lcla_pool.base && base->plat_data->use_esram_lcla) { - iounmap(base->lcla_pool.base); - base->lcla_pool.base =3D NULL; - } =20 + destroy_cache: if (base->lcla_pool.dma_addr) dma_unmap_single(base->dev, base->lcla_pool.dma_addr, SZ_1K * base->num_phy_chans, @@ -3699,28 +3658,11 @@ static int __init d40_probe(struct platform_device = *pdev) =20 kfree(base->lcla_pool.base_unaligned); =20 - if (base->lcpa_base) - iounmap(base->lcpa_base); - -release_base: - if (base->phy_start) - release_mem_region(base->phy_start, - base->phy_size); - if (base->clk) { - clk_disable_unprepare(base->clk); - clk_put(base->clk); - } - if (base->lcpa_regulator) { regulator_disable(base->lcpa_regulator); regulator_put(base->lcpa_regulator); } =20 - kfree(base->lcla_pool.alloc_map); - kfree(base->lookup_log_chans); - kfree(base->lookup_phy_chans); - kfree(base->phy_res); - kfree(base); report_failure: d40_err(dev, "probe failed\n"); return ret; --=20 2.40.0 From nobody Thu Feb 12 04:51:36 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 63C9BC77B61 for ; Thu, 27 Apr 2023 12:10:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243838AbjD0MK2 (ORCPT ); Thu, 27 Apr 2023 08:10:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243791AbjD0MKL (ORCPT ); Thu, 27 Apr 2023 08:10:11 -0400 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D8E04C18 for ; Thu, 27 Apr 2023 05:10:08 -0700 (PDT) Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-4efec123b28so6464076e87.1 for ; Thu, 27 Apr 2023 05:10:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682597406; x=1685189406; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=iexne6KWiUZLuVlw3N1v+wyJfKESkTIo0maZTpTI9HE=; b=XaqgjtwdVcU9AORsU7T2pzMxrCU/fNdtM41WtrStcjjTPpM0aNsN6ppeQoIqFt+2Gw 2SK67wMAlpVUnZsUXL1dtd1AhBD8LRxoxNEO57x0yU3n2VIZJ1A+IP6kfuSNGYPQ1LJO U3WbHmJpomEX22tZDK4qNz6IGNU3FfHUaL0Br8mMPNYBkrUVZHt+08Qfb3eoAfGi9urB 0SI5cVXbSpulLmYfpXyQO3+X0pcwg9gtHtWZkuekXYSh91Kuzfgh2Hf8QKKPdMdRovwc 5cxXb+x76KIFoL80aiLc6wETFBSX7+zsH5GWUfa9WJ2CIaRMCfDlCQgOI05CnAFqsg5q p3pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682597406; x=1685189406; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iexne6KWiUZLuVlw3N1v+wyJfKESkTIo0maZTpTI9HE=; b=fcCObJiDKjiAqHKE4h+EmIESaowR7o0hbVm8a/qqr1AgNaoU3vkrTt+FjQF/hhHlC9 f5iyH8mlo0WQ4zE+PpWgGDdIVKYDj3Yae2WMq3N+54bFdmH6p27MQvEDkH+PgYjW4Vmy ujWxH+nswwvILg1C0Pim9wHIjzDYc73AN7fdEg0c8iZ5TJD00ilBDZlREf0X6vTRUDH8 qgFwbOT+A9xnE8x2rRyVV7kbFYIzMSI1d6DQnKIRMpH6xUuk2sjOkHXJAYAH/yDHxSlT zooZ09byl8F3ThFMbCQ18fC1VbD6uv0ViF+FFZK8K+Th/O09KvSpWkYTdFSc/tvU0Q60 L7Sg== X-Gm-Message-State: AC+VfDylB/wxMLVu/4V35qv5TZlng7oRQ7o43e54ZVxWgA+XhcCfaa3A 9YRGRHRF04yomCZGedG37sjIqw== X-Google-Smtp-Source: ACHHUZ64h1cMUCvx0c2PIRR6kjDHa7YGe8eE5JsKstwj1P8W2/L/14jUmmPABSGuKATY1fxz9CJ/hA== X-Received: by 2002:a19:f70c:0:b0:4ef:e7cb:b0ef with SMTP id z12-20020a19f70c000000b004efe7cbb0efmr541074lfe.31.1682597406393; Thu, 27 Apr 2023 05:10:06 -0700 (PDT) Received: from [192.168.1.2] (c-05d8225c.014-348-6c756e10.bbcust.telenor.se. [92.34.216.5]) by smtp.gmail.com with ESMTPSA id e7-20020ac25467000000b004d4d7fb0e07sm2892044lfn.216.2023.04.27.05.10.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 05:10:05 -0700 (PDT) From: Linus Walleij Date: Thu, 27 Apr 2023 14:10:02 +0200 Subject: [PATCH v2 7/8] dmaengine: ste_dma40: Return error codes properly MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230417-ux500-dma40-cleanup-v2-7-cdaa68a4b863@linaro.org> References: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> In-Reply-To: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski Cc: dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linus Walleij X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This makes the probe() and its subfunction d40_hw_detect_init() return proper error codes. One effect of this is that deferred probe, e.g from the clock, will start to work, would it happen. Also it is better design. Signed-off-by: Linus Walleij --- drivers/dma/ste_dma40.c | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index c5991009d3e4..2911017265cf 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -3132,7 +3132,8 @@ static void d40_drop_kmem_cache_action(void *d) kmem_cache_destroy(desc_slab); } =20 -static struct d40_base * __init d40_hw_detect_init(struct platform_device = *pdev) +static int __init d40_hw_detect_init(struct platform_device *pdev, + struct d40_base **retbase) { struct stedma40_platform_data *plat_data =3D dev_get_platdata(&pdev->dev); struct device *dev =3D &pdev->dev; @@ -3150,14 +3151,12 @@ static struct d40_base * __init d40_hw_detect_init(= struct platform_device *pdev) =20 clk =3D devm_clk_get_enabled(dev, NULL); if (IS_ERR(clk)) - return NULL; + return PTR_ERR(clk); =20 /* Get IO for DMAC base address */ virtbase =3D devm_platform_ioremap_resource_byname(pdev, "base"); - if (IS_ERR(virtbase)) { - dev_err(dev, "No IO base defined\n"); - return NULL; - } + if (IS_ERR(virtbase)) + return PTR_ERR(virtbase); =20 /* This is just a regular AMBA PrimeCell ID actually */ for (pid =3D 0, i =3D 0; i < 4; i++) @@ -3169,13 +3168,13 @@ static struct d40_base * __init d40_hw_detect_init(= struct platform_device *pdev) =20 if (cid !=3D AMBA_CID) { d40_err(dev, "Unknown hardware! No PrimeCell ID\n"); - return NULL; + return -EINVAL; } if (AMBA_MANF_BITS(pid) !=3D AMBA_VENDOR_ST) { d40_err(dev, "Unknown designer! Got %x wanted %x\n", AMBA_MANF_BITS(pid), AMBA_VENDOR_ST); - return NULL; + return -EINVAL; } /* * HW revision: @@ -3189,7 +3188,7 @@ static struct d40_base * __init d40_hw_detect_init(st= ruct platform_device *pdev) rev =3D AMBA_REV_BITS(pid); if (rev < 2) { d40_err(dev, "hardware revision: %d is not supported", rev); - return NULL; + return -EINVAL; } =20 /* The number of physical channels on this HW */ @@ -3216,7 +3215,7 @@ static struct d40_base * __init d40_hw_detect_init(st= ruct platform_device *pdev) sizeof(struct d40_chan), GFP_KERNEL); =20 if (!base) - return NULL; + return -ENOMEM; =20 base->rev =3D rev; base->clk =3D clk; @@ -3263,51 +3262,53 @@ static struct d40_base * __init d40_hw_detect_init(= struct platform_device *pdev) sizeof(*base->phy_res), GFP_KERNEL); if (!base->phy_res) - return NULL; + return -ENOMEM; =20 base->lookup_phy_chans =3D devm_kcalloc(dev, num_phy_chans, sizeof(*base->lookup_phy_chans), GFP_KERNEL); if (!base->lookup_phy_chans) - return NULL; + return -ENOMEM; =20 base->lookup_log_chans =3D devm_kcalloc(dev, num_log_chans, sizeof(*base->lookup_log_chans), GFP_KERNEL); if (!base->lookup_log_chans) - return NULL; + return -ENOMEM; =20 base->reg_val_backup_chan =3D devm_kmalloc_array(dev, base->num_phy_chans, sizeof(d40_backup_regs_chan), GFP_KERNEL); if (!base->reg_val_backup_chan) - return NULL; + return -ENOMEM; =20 base->lcla_pool.alloc_map =3D devm_kcalloc(dev, num_phy_chans * D40_LCLA_LINK_PER_EVENT_GRP, sizeof(*base->lcla_pool.alloc_map), GFP_KERNEL); if (!base->lcla_pool.alloc_map) - return NULL; + return -ENOMEM; =20 base->regs_interrupt =3D devm_kmalloc_array(dev, base->gen_dmac.il_size, sizeof(*base->regs_interrupt), GFP_KERNEL); if (!base->regs_interrupt) - return NULL; + return -ENOMEM; =20 base->desc_slab =3D kmem_cache_create(D40_NAME, sizeof(struct d40_desc), 0, SLAB_HWCACHE_ALIGN, NULL); if (!base->desc_slab) - return NULL; + return -ENOMEM; =20 ret =3D devm_add_action_or_reset(dev, d40_drop_kmem_cache_action, base->desc_slab); if (ret) - return NULL; + return ret; + + *retbase =3D base; =20 - return base; + return 0; } =20 static void __init d40_hw_init(struct d40_base *base) @@ -3503,20 +3504,20 @@ static int __init d40_probe(struct platform_device = *pdev) struct device *dev =3D &pdev->dev; struct device_node *np =3D pdev->dev.of_node; struct device_node *np_lcpa; - int ret =3D -ENOENT; struct d40_base *base; struct resource *res; struct resource res_lcpa; int num_reserved_chans; u32 val; + int ret; =20 if (d40_of_probe(dev, np)) { ret =3D -ENOMEM; goto report_failure; } =20 - base =3D d40_hw_detect_init(pdev); - if (!base) + ret =3D d40_hw_detect_init(pdev, &base); + if (ret) goto report_failure; =20 num_reserved_chans =3D d40_phy_res_init(base); @@ -3530,6 +3531,7 @@ static int __init d40_probe(struct platform_device *p= dev) np_lcpa =3D of_parse_phandle(np, "sram", 0); if (!np_lcpa) { dev_err(dev, "no LCPA SRAM node\n"); + ret =3D -EINVAL; goto report_failure; } /* This is no device so read the address directly from the node */ --=20 2.40.0 From nobody Thu Feb 12 04:51:36 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 B120CC77B61 for ; Thu, 27 Apr 2023 12:10:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243843AbjD0MKb (ORCPT ); Thu, 27 Apr 2023 08:10:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243797AbjD0MKN (ORCPT ); Thu, 27 Apr 2023 08:10:13 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95F2E5BAB for ; Thu, 27 Apr 2023 05:10:09 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-4effb818c37so3603674e87.3 for ; Thu, 27 Apr 2023 05:10:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682597407; x=1685189407; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=fQ8qe1BB0G+HYjEpOfPBNu0NP3ENE9SOB00+nySsnF0=; b=EFjdq6kmO3IwygYJjSnuPpG6tNJw3gUimlSwdstfajLcMooVt+zwCL1bDjZdgYGHTf Q682KOpEDxp4ye/cWuCO2P8ylg+7WdkE3xiiO7tNruzmgkdt0HUjjWa/o48ro3GLAmPh m0woCLrad3IJ5sEFZi9ZYKSr0idyDCJ20a+fXOOv4U4SWlgP063t4hd14lCHSWRuDeoh BI5ey7exdfdMtAtYeQ/NKgjmMXdQlfIDliPzF91hD9ErrkPlzfFfjYsbdIPqvc9FvV2J sPThNVpr3BtSxwpHhELKHSG0BkZSzruUtu6QearonKlGqi1mxHGEnTVSykvSAxZA0Agk Rp8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682597407; x=1685189407; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fQ8qe1BB0G+HYjEpOfPBNu0NP3ENE9SOB00+nySsnF0=; b=Uf505zL1dmRDTze8p2ODR2YKFiTXinIEaOYAlbD4phPPJGpioYdnlVow9Enqq+pEYG ogSoJU/DhhRW2darJgpqyKrVhE3KmAxQEXlghwDgpl8NFlxKpcjUhLQ4NFXbSmC60bm4 8SecDWVDDnJFSab2zLdsYxsvmQiHC3Tfs6LA2HP5WYQhiquUadsWQdB3/2jlFCxN+8PQ ZGnW+xAIgm1SfdN2kURZZpdWbBh589+3XttbMUqHpSYx2MM3NjUjJVDXRXCr7mgmMTXo 5mikct2Gg005Mp6UV9ppzowVcYrEdr709cmdhxX0rkdIYSnurWxfECwaGkcrWUUQ23oW JH7Q== X-Gm-Message-State: AC+VfDziSynn5nPRibA2RXWqTIVYqlfEpDQuXvrcLAybpPHNp2lN04LW 7IgkQF0AaEPwpG0AulDjMC4MEw== X-Google-Smtp-Source: ACHHUZ4uN2zzJ7cgkfoU0GrY/fzKjhLGeZLuKhL0GulOyKqNusZ4umA087qyuSEAS1QpgYGYIzCOsg== X-Received: by 2002:ac2:5549:0:b0:4ea:e0e7:d12d with SMTP id l9-20020ac25549000000b004eae0e7d12dmr472076lfk.1.1682597407485; Thu, 27 Apr 2023 05:10:07 -0700 (PDT) Received: from [192.168.1.2] (c-05d8225c.014-348-6c756e10.bbcust.telenor.se. [92.34.216.5]) by smtp.gmail.com with ESMTPSA id e7-20020ac25467000000b004d4d7fb0e07sm2892044lfn.216.2023.04.27.05.10.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 05:10:06 -0700 (PDT) From: Linus Walleij Date: Thu, 27 Apr 2023 14:10:03 +0200 Subject: [PATCH v2 8/8] ARM: dts: ux500: Add eSRAM nodes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230417-ux500-dma40-cleanup-v2-8-cdaa68a4b863@linaro.org> References: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> In-Reply-To: <20230417-ux500-dma40-cleanup-v2-0-cdaa68a4b863@linaro.org> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski Cc: dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linus Walleij X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The U8500 has 640 KB of eSRAM, split into 5 banks of 128 KB each. Add this to the device tree, with ESRAM 0, 1+2 and 3+4 as separate devices, since these have different power domains. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-dbx5x0.dtsi | 73 +++++++++++++++++++++++++++++++++++= ++-- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5= x0.dtsi index fead7afd5517..c34ccde04600 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -110,6 +110,74 @@ soc { interrupt-parent =3D <&intc>; ranges; =20 + /* + * 640KB ESRAM (embedded static random access memory), divided + * into 5 banks of 128 KB each. This is a fast memory usually + * used by different accelerators. We group these according to + * their power domains: ESRAM0 (always on) ESRAM 1+2 and + * ESRAM 3+4. + */ + sram@40000000 { + /* The first (always on) ESRAM 0, 128 KB */ + compatible =3D "mmio-sram"; + reg =3D <0x40000000 0x20000>; + #address-cells =3D <1>; + #size-cells =3D <1>; + ranges =3D <0 0x40000000 0x20000>; + + sram@0 { + compatible =3D "stericsson,u8500-esram"; + reg =3D <0x0 0x10000>; + pool; + }; + lcpa: sram@10000 { + /* + * This eSRAM is used by the DMA40 DMA controller + * for Logical Channel Paramers (LCP), the address + * where these parameters are stored is called "LCPA". + * This is addressed directly by the driver so no + * pool is used. + */ + compatible =3D "stericsson,u8500-esram"; + label =3D "DMA40-LCPA"; + reg =3D <0x10000 0x800>; + }; + sram@10800 { + compatible =3D "stericsson,u8500-esram"; + reg =3D <0x10800 0xf800>; + pool; + }; + }; + sram@40020000 { + /* ESRAM 1+2, 256 KB */ + compatible =3D "mmio-sram"; + reg =3D <0x40020000 0x40000>; + #address-cells =3D <1>; + #size-cells =3D <1>; + ranges =3D <0 0x40020000 0x40000>; + }; + sram@40060000 { + /* ESRAM 3+4, 256 KB */ + compatible =3D "mmio-sram"; + reg =3D <0x40060000 0x40000>; + #address-cells =3D <1>; + #size-cells =3D <1>; + ranges =3D <0 0x40060000 0x40000>; + + lcla: sram@20000 { + /* + * This eSRAM is used by the DMA40 DMA controller + * for Logical Channel Logical Addresses (LCLA), the address + * where these parameters are stored is called "LCLA". + * This is addressed directly by the driver so no + * pool is used. + */ + compatible =3D "stericsson,u8500-esram"; + label =3D "DMA40-LCLA"; + reg =3D <0x20000 0x2000>; + }; + }; + ptm@801ae000 { compatible =3D "arm,coresight-etm3x", "arm,primecell"; reg =3D <0x801ae000 0x1000>; @@ -536,9 +604,10 @@ usb_per5@a03e0000 { =20 dma: dma-controller@801C0000 { compatible =3D "stericsson,db8500-dma40", "stericsson,dma40"; - reg =3D <0x801C0000 0x1000 0x40010000 0x800>; - reg-names =3D "base", "lcpa"; + reg =3D <0x801C0000 0x1000>; + reg-names =3D "base"; interrupts =3D ; + sram =3D <&lcpa>, <&lcla>; =20 #dma-cells =3D <3>; memcpy-channels =3D <56 57 58 59 60>; --=20 2.40.0