From nobody Tue Dec 16 12:21:19 2025 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 AABBCC4167B for ; Thu, 30 Nov 2023 15:20:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346208AbjK3PTy (ORCPT ); Thu, 30 Nov 2023 10:19:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346234AbjK3PTu (ORCPT ); Thu, 30 Nov 2023 10:19:50 -0500 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12CDE10F1 for ; Thu, 30 Nov 2023 07:19:56 -0800 (PST) Received: from mail-oi1-f200.google.com (mail-oi1-f200.google.com [209.85.167.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 3DC563F65A for ; Thu, 30 Nov 2023 15:19:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1701357594; bh=kJozCoiP+8SSmbIdgX+XEOLC3TmZqjTi2KwgKhtjA04=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tg2AgNrsOtlLHpxEc7uRzLLKEozhkNr+M545R6prrCUcJx8c3vpsNNeOFrZU2MM7e Em362apU0Ijd9yi8c4MAIzoI2EcmkrdXOI8xqVWzPoLAzayBS/vVYn/xfw87cC7wGi UHufiBSfp8/SsPkQD7yNR3gGkDLM4hXGqU7BBFkxiOoIWfBs0EU/N2yNzjBFD8fDWM ihZVyI6zJ3V8MTAfivnGc5Pk8aRp/zUvIDoCRyJJedyFmJuE43rdO7HFQZ15uODTQU 0vuTNuU0RH1AflB0z76e59oZKoWJSvfe1sEBWJ1Wl6o2EaBIIsRH0Md7YmOUxPGV3Q 2Ix3jSw/pLOCA== Received: by mail-oi1-f200.google.com with SMTP id 5614622812f47-3b895096897so1259452b6e.2 for ; Thu, 30 Nov 2023 07:19:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701357592; x=1701962392; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kJozCoiP+8SSmbIdgX+XEOLC3TmZqjTi2KwgKhtjA04=; b=u5YbZcWRx/2lwFoY+GOnvLfKKN02ewMYAdf3+2XH/S+nKLTAmEXVXMTswZcFC4Y+M4 i22kCv6qew/5L+kHUSLqXGEdpjUs40EOEVw8Qh1SmQYD2p9gRYa/ddpecgw2ShgK2A9u Hj9Yv5MWdrJjKuyUZAYVLWhpQEVGFoiaB/vgtSdZokbzNCJ/8Oh9ipkKTRBLyUCaTU7z FamzVRyQTrIpJAMY6tSd6qv1Vtdgzub9+xEfLuIkcAdcH2JCZmtb1PeYjw5PJkBMHoeZ T9/XbSN+A42PhurzE8JbdTeP6JNrClRoI79y9alM2PJaZJEe4y2aQtmgWpJNYD75aHL0 1Geg== X-Gm-Message-State: AOJu0YyrResGMotA/iRpvSZxvvdHOCpUXbpWzbqk26ZO8cOo5HBADSOv Rl1yfkNnb263XxNMpleoo0xqGUQDmkOIC0YGqmKZ9APLeh/BUY5ezKBLkJWS20FNxm9VOh83mFw sfMnh2Azv4gFcGwyifyoBRIfB905IFVBiHbZPxDvVlw== X-Received: by 2002:a05:6808:114c:b0:3b8:616b:24e with SMTP id u12-20020a056808114c00b003b8616b024emr22271201oiu.49.1701357592731; Thu, 30 Nov 2023 07:19:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IF/tZgpwM4g3D4RLe+xKwxGoAIWPI28s+VjwwPdoqac/L+nPUOpvs7DOtcRdrL5y9bTCAwjtg== X-Received: by 2002:a05:6808:114c:b0:3b8:616b:24e with SMTP id u12-20020a056808114c00b003b8616b024emr22271182oiu.49.1701357592537; Thu, 30 Nov 2023 07:19:52 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id y125-20020a636483000000b005bd3d6e270dsm1356002pgb.68.2023.11.30.07.19.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 07:19:52 -0800 (PST) From: Emil Renner Berthing To: linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Paul Walmsley , Palmer Dabbelt , Emil Renner Berthing , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Cristian Ciocaltea , Geert Uytterhoeven , Conor Dooley Subject: [PATCH v2 1/8] riscv: errata: Add StarFive JH7100 errata Date: Thu, 30 Nov 2023 16:19:25 +0100 Message-Id: <20231130151932.729708-2-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231130151932.729708-1-emil.renner.berthing@canonical.com> References: <20231130151932.729708-1-emil.renner.berthing@canonical.com> 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" This not really an errata, but since the JH7100 was made before the standard Zicbom extension it needs the DMA_GLOBAL_POOL and RISCV_NONSTANDARD_CACHE_OPS enabled to work correctly. Acked-by: Conor Dooley Signed-off-by: Emil Renner Berthing Acked-by: Palmer Dabbelt Reviewed-by: Palmer Dabbelt --- arch/riscv/Kconfig.errata | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/riscv/Kconfig.errata b/arch/riscv/Kconfig.errata index e2c731cfed8c..692de149141f 100644 --- a/arch/riscv/Kconfig.errata +++ b/arch/riscv/Kconfig.errata @@ -53,6 +53,23 @@ config ERRATA_SIFIVE_CIP_1200 =20 If you don't know what to do here, say "Y". =20 +config ERRATA_STARFIVE_JH7100 + bool "StarFive JH7100 support" + depends on ARCH_STARFIVE && NONPORTABLE + select DMA_GLOBAL_POOL + select RISCV_DMA_NONCOHERENT + select RISCV_NONSTANDARD_CACHE_OPS + select SIFIVE_CCACHE + default n + help + The StarFive JH7100 was a test chip for the JH7110 and has + caches that are non-coherent with respect to peripheral DMAs. + It was designed before the Zicbom extension so needs non-standard + cache operations through the SiFive cache controller. + + Say "Y" if you want to support the BeagleV Starlight and/or + StarFive VisionFive V1 boards. + config ERRATA_THEAD bool "T-HEAD errata" depends on RISCV_ALTERNATIVE --=20 2.40.1 From nobody Tue Dec 16 12:21:19 2025 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 6AE18C4167B for ; Thu, 30 Nov 2023 15:20:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346212AbjK3PUE (ORCPT ); Thu, 30 Nov 2023 10:20:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346231AbjK3PT4 (ORCPT ); Thu, 30 Nov 2023 10:19:56 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A747910F1 for ; Thu, 30 Nov 2023 07:20:02 -0800 (PST) Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 6E97440C50 for ; Thu, 30 Nov 2023 15:20:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1701357601; bh=tj9HPh6BvRLNZqMKySfyhhevyeW6ZzHpiXvh8Tdk9iY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qn0lkeldt9aAfO7a1JfrFQ6B1mo3I0Yazc3vuKglEVFfZ02Z/qWkuyS2Yly4ChaiH p53p5EXdpRkUKHteWmk3Nse9AoagTDK+4cKgnuTDdHBP8mHziMrfOdlCvhBrKim4Wa W+onP/Hs4yQpYPnFq078ZJ/odtPojCsCT36Zb97peTBynFBnSVZrHVHFjoHZmZuYYG MYMzknRSn7p6ipJPTUV0uwU26xDVCJATQRcvAp5w7GT/itup+vuyEj+s2IbHBxmZqd g0xGorB/GHjmMgFz5x5pVaIPC1/G3EihGCgt4nw9r+EYNrTXC0qbtVO4Gn91s758+h PUZIMioHUTQ+Q== Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-5c6065d5e1bso1006216a12.3 for ; Thu, 30 Nov 2023 07:20:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701357600; x=1701962400; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tj9HPh6BvRLNZqMKySfyhhevyeW6ZzHpiXvh8Tdk9iY=; b=tl0+HoEIGtTq8keJKgTLlB3k6CjkZW0SeVh4t3GR5+1yjK2VrMrxK/TZA1fVbJZ54Q OaFlg7AWg1Uqs/JOms1DTTFbHgHRvlTysSaqI7p9ctvvFgTAmKWzpFI4VuafJpbVuXly b02P+c5NMsO8eaD4IflTDCcsrmuAZbdIlEL2N/+TwQjV+AtIG/uFScYk25XxPtOiIY1M GKeY2BPV7V89pEZHP5Fne6MX6bxYxfNxXd7geFeBnvAqAd7y/aonq1LFg6NSuwnlaYwd krtmFBZrIwtptSZDayNJct5p7rtfc1kRoe2oLj2du6fI7qRqIVqx3GDCK7/ya6NPbD4G /Ewg== X-Gm-Message-State: AOJu0YwG/ycCZlgI2pKB8HSGt931kHVc8vTtSTLkbgUkIqsD/fmT4rYX TD0zshGCicctGGQslr+qL/qJ+hSb03jKpZI82kmpcnJ6xWlVOhSs/0pQpKC/DA0sBb6T3e0lScW eDUMM4oVUwMNhAOBrTouBd4CyWDJn2U9NfLJO8U/3zQ== X-Received: by 2002:a05:6a20:2445:b0:187:f7d3:fe4 with SMTP id t5-20020a056a20244500b00187f7d30fe4mr23989920pzc.11.1701357600049; Thu, 30 Nov 2023 07:20:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IH1mvOn1/uJNCv0eb4azsQCzjyj+9l3Hl/zvOgcVmnx6qLHRyWHQAlXD/AuQrB0F0f5KVnWrA== X-Received: by 2002:a05:6a20:2445:b0:187:f7d3:fe4 with SMTP id t5-20020a056a20244500b00187f7d30fe4mr23989897pzc.11.1701357599785; Thu, 30 Nov 2023 07:19:59 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id y125-20020a636483000000b005bd3d6e270dsm1356002pgb.68.2023.11.30.07.19.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 07:19:59 -0800 (PST) From: Emil Renner Berthing To: linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Geert Uytterhoeven , Paul Walmsley , Palmer Dabbelt , Emil Renner Berthing , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Cristian Ciocaltea Subject: [PATCH v2 2/8] riscv: dts: starfive: Group tuples in interrupt properties Date: Thu, 30 Nov 2023 16:19:26 +0100 Message-Id: <20231130151932.729708-3-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231130151932.729708-1-emil.renner.berthing@canonical.com> References: <20231130151932.729708-1-emil.renner.berthing@canonical.com> 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" From: Geert Uytterhoeven To improve human readability and enable automatic validation, the tuples in the various properties containing interrupt specifiers should be grouped. Fix this by grouping the tuples of "interrupts-extended" properties using angle brackets. Signed-off-by: Geert Uytterhoeven Signed-off-by: Emil Renner Berthing --- arch/riscv/boot/dts/starfive/jh7100.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/riscv/boot/dts/starfive/jh7100.dtsi b/arch/riscv/boot/dts= /starfive/jh7100.dtsi index e68cafe7545f..a40a8544b860 100644 --- a/arch/riscv/boot/dts/starfive/jh7100.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7100.dtsi @@ -149,15 +149,15 @@ soc { clint: clint@2000000 { compatible =3D "starfive,jh7100-clint", "sifive,clint0"; reg =3D <0x0 0x2000000 0x0 0x10000>; - interrupts-extended =3D <&cpu0_intc 3 &cpu0_intc 7 - &cpu1_intc 3 &cpu1_intc 7>; + interrupts-extended =3D <&cpu0_intc 3>, <&cpu0_intc 7>, + <&cpu1_intc 3>, <&cpu1_intc 7>; }; =20 plic: interrupt-controller@c000000 { compatible =3D "starfive,jh7100-plic", "sifive,plic-1.0.0"; reg =3D <0x0 0xc000000 0x0 0x4000000>; - interrupts-extended =3D <&cpu0_intc 11 &cpu0_intc 9 - &cpu1_intc 11 &cpu1_intc 9>; + interrupts-extended =3D <&cpu0_intc 11>, <&cpu0_intc 9>, + <&cpu1_intc 11>, <&cpu1_intc 9>; interrupt-controller; #address-cells =3D <0>; #interrupt-cells =3D <1>; --=20 2.40.1 From nobody Tue Dec 16 12:21:19 2025 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 80E69C4167B for ; Thu, 30 Nov 2023 15:20:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346235AbjK3PUL (ORCPT ); Thu, 30 Nov 2023 10:20:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346231AbjK3PUI (ORCPT ); Thu, 30 Nov 2023 10:20:08 -0500 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3340910E6 for ; Thu, 30 Nov 2023 07:20:15 -0800 (PST) Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 0EEBB3FA55 for ; Thu, 30 Nov 2023 15:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1701357610; bh=O3TPicaObXUf+CQ2/13bF4S5EM9ZMGJpI/eXjOZpsCQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rjPwgCGosAQVwCOmWpGHVVCvFG4aIq8Ii7KxZ8Vfkoxy1vM8gTKTxbc+QjsjCmeHj K1HZfIZjdFVdKvUfv8zesr7G3+6IgkQDnmV8dI6pHfBAUhgEX5y/L2/17jTzOAU5zS zYq7arAxqEiuyruPZ9GfuiBYadqUJ3jLxcN7sLTCNTfBzrTaLWHGKXEKkKXw3zfxaM myQUxaojkcXxPEJZ6FSlS6cJTAcBlegkT5J5KKiQqWaljLG0Wo4YCERqLxl2bJPdqE PdS25p44Og+fql3Fl9SvYVNYZrHmSNubRAeVR06BzY5ZbYvNqfEvLM6U+m7H9W8M9t tWJ4M4kbu8zAw== Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-6cba754b041so1391432b3a.3 for ; Thu, 30 Nov 2023 07:20:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701357607; x=1701962407; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O3TPicaObXUf+CQ2/13bF4S5EM9ZMGJpI/eXjOZpsCQ=; b=hJi8mZ/o9hI9TcfRZc+iJHaqduYcD9vM/reQtZQ7hXURWdemSR12v8A+B+ERKJoZoi krMQ1oAQqghxpMaxjnyUA4yZcL5A9QKD52lGPgHiMSDOhuDdZKcwoBPDzK/XNGH6fzIo FKqyoIF2SbdrYe66l4vrFEjdfifaeESXNiuvL9paykWLoZKteFy3rUzJpKKgzkExgzCa 2zmCiJMYg+5YZWFKCrWakUFY61d5L5AXWiYKj02usnsz+gzFqlVzNKOAmni5a3BgKp9N eF5Zv6CnsumZFmVF8i17Fogn2gtpyGCeK7Y6II2w1Oi3oi/YsPDvbmWxipH5NHQyK24E QQqQ== X-Gm-Message-State: AOJu0YyMkp/SSemCTCUb3gmNfwUckYGEPrVRmJhezQId9Wk/4W5NZfoR I9WKdN7BovzzKdmcitcM4jMkZqNXxDU0wiW693taD0dUu4R2MTUwYtM9wIwdT7TVWaCtg5DXZbO hIaD5qLSplBbJ2cucUqFJQwCR5cHWSpVtLQ/DgmCrBg== X-Received: by 2002:a05:6a00:1914:b0:68f:f38d:f76c with SMTP id y20-20020a056a00191400b0068ff38df76cmr24404052pfi.6.1701357607362; Thu, 30 Nov 2023 07:20:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IGO2ck+Ida+RKRFtuLd6VUs98DdkRkXb2Q1rcWsF3vYMURGwbviCaQAdpZ1mHrt9Ipgx7Ym1A== X-Received: by 2002:a05:6a00:1914:b0:68f:f38d:f76c with SMTP id y20-20020a056a00191400b0068ff38df76cmr24404026pfi.6.1701357607117; Thu, 30 Nov 2023 07:20:07 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id y125-20020a636483000000b005bd3d6e270dsm1356002pgb.68.2023.11.30.07.20.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 07:20:06 -0800 (PST) From: Emil Renner Berthing To: linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Emil Renner Berthing , Paul Walmsley , Palmer Dabbelt , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Cristian Ciocaltea , Geert Uytterhoeven Subject: [PATCH v2 3/8] riscv: dts: starfive: Mark the JH7100 as having non-coherent DMAs Date: Thu, 30 Nov 2023 16:19:27 +0100 Message-Id: <20231130151932.729708-4-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231130151932.729708-1-emil.renner.berthing@canonical.com> References: <20231130151932.729708-1-emil.renner.berthing@canonical.com> 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" From: Emil Renner Berthing The StarFive JH7100 SoC has non-coherent device DMAs, so mark the soc bus as such. Link: https://github.com/starfive-tech/JH7100_Docs/blob/main/JH7100%20Cache= %20Coherence%20V1.0.pdf Signed-off-by: Emil Renner Berthing --- arch/riscv/boot/dts/starfive/jh7100.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/riscv/boot/dts/starfive/jh7100.dtsi b/arch/riscv/boot/dts= /starfive/jh7100.dtsi index a40a8544b860..7c1009428c1f 100644 --- a/arch/riscv/boot/dts/starfive/jh7100.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7100.dtsi @@ -144,6 +144,7 @@ soc { interrupt-parent =3D <&plic>; #address-cells =3D <2>; #size-cells =3D <2>; + dma-noncoherent; ranges; =20 clint: clint@2000000 { --=20 2.40.1 From nobody Tue Dec 16 12:21:19 2025 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 C496BC4167B for ; Thu, 30 Nov 2023 15:20:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346268AbjK3PUg (ORCPT ); Thu, 30 Nov 2023 10:20:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346226AbjK3PUb (ORCPT ); Thu, 30 Nov 2023 10:20:31 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C956910E0 for ; Thu, 30 Nov 2023 07:20:37 -0800 (PST) Received: from mail-yb1-f198.google.com (mail-yb1-f198.google.com [209.85.219.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 6DB5F40C50 for ; Thu, 30 Nov 2023 15:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1701357636; bh=DJHVa7mIKQwhZz/JHltxB0iKVUnDkFEjfRvqGAQUx+4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ivXxbZO5FV5n6b+uAnkBarCyQvRxyzCXbAn6Mr3Ceq9m0ulWFM8p3z00mO1T0mZQJ tkjtnIG7XSsMTn2snD29DM+GY3vWFXXujwjUSKJKtmlmcNlmUIBS4mHWV7cgNYNu4y mfNXzU1ZWhEx3K8rMm+1NxAUWrY6wKO1raaG535W4lMHfMrW+JrhZyAGVfCZQUGQvV B603voA1+pTcMmLgPxlNykTTYs6LISidRCvlg3r346FXr7Q4HjrI8Zv1ybDcYqxVJo yImgYvdh2UFQbLx12zQ8n9ROgzoYvhy2fkk/6MaJufzJvin+tJIqDCryWCgTb2hvVl 76d88q9k+Pmvw== Received: by mail-yb1-f198.google.com with SMTP id 3f1490d57ef6-da1aa98ec19so1358708276.2 for ; Thu, 30 Nov 2023 07:20:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701357635; x=1701962435; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DJHVa7mIKQwhZz/JHltxB0iKVUnDkFEjfRvqGAQUx+4=; b=YdHQ3su5qGR6oXJAaQ8VL8pqdmoXkwr5En3NtkDpSQIzFIZ2EHjQInfv6/aE8qOaOg 975qgwUtIgeGOY7VFopwCKh2FIufg5fsdV8gpw29rI3y1mNkDRP4JPEXDwRfRNiCSJC2 ybACpnslb22IbRy/W+qhQiZLT8ZZsR30zngHeFquHJSNRP7sZMbYQPWqhgRHl9+hw3Bv sEGpqSxABEzzEr/0tHGJr4eCiYj/5QcGiPsShfXXLovhXFKc50bAzR4tFkjYzz5vb6Nl 8Ww+y9L8wW7+lkkWxaahtngcCiVlFIhmeAZC0yPRvqqP5QAPM6WQNCynBUDi8Pt5KXLW KOFQ== X-Gm-Message-State: AOJu0Yywt+SZ2LmghQNSFTxZFIGMh9ChZlrE8gKEM7xAUgn/Ea8LssS1 /6R/KbrAvNaCAypmH6SJ9B68kq3Xb0neXujaze7qmKrLi/PWjws0SyAet4dOHaFTIt5NVxOBDtY BrCjwEf+dTMk//IF/fgIkcmyDE98s+kQwro0qsGTsIA== X-Received: by 2002:a05:6a20:7f98:b0:188:290d:17dc with SMTP id d24-20020a056a207f9800b00188290d17dcmr23728144pzj.60.1701357614813; Thu, 30 Nov 2023 07:20:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IE7Mu2nDLembDBF+YwfqitZTioRcWFBD0XGtNJbp2zbw7AJm8Uh5SE/GyfEnowTrFxztj1irA== X-Received: by 2002:a05:6a20:7f98:b0:188:290d:17dc with SMTP id d24-20020a056a207f9800b00188290d17dcmr23728123pzj.60.1701357614540; Thu, 30 Nov 2023 07:20:14 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id y125-20020a636483000000b005bd3d6e270dsm1356002pgb.68.2023.11.30.07.20.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 07:20:14 -0800 (PST) From: Emil Renner Berthing To: linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Paul Walmsley , Palmer Dabbelt , Emil Renner Berthing , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Cristian Ciocaltea , Geert Uytterhoeven Subject: [PATCH v2 4/8] riscv: dts: starfive: Add JH7100 cache controller Date: Thu, 30 Nov 2023 16:19:28 +0100 Message-Id: <20231130151932.729708-5-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231130151932.729708-1-emil.renner.berthing@canonical.com> References: <20231130151932.729708-1-emil.renner.berthing@canonical.com> 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" The StarFive JH7100 SoC also features the SiFive L2 cache controller, so add the device tree nodes for it. Signed-off-by: Emil Renner Berthing --- arch/riscv/boot/dts/starfive/jh7100.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/riscv/boot/dts/starfive/jh7100.dtsi b/arch/riscv/boot/dts= /starfive/jh7100.dtsi index 7c1009428c1f..0cafac437746 100644 --- a/arch/riscv/boot/dts/starfive/jh7100.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7100.dtsi @@ -32,6 +32,7 @@ U74_0: cpu@0 { i-tlb-sets =3D <1>; i-tlb-size =3D <32>; mmu-type =3D "riscv,sv39"; + next-level-cache =3D <&ccache>; riscv,isa =3D "rv64imafdc"; riscv,isa-base =3D "rv64i"; riscv,isa-extensions =3D "i", "m", "a", "f", "d", "c", "zicntr", "zicsr= ", @@ -60,6 +61,7 @@ U74_1: cpu@1 { i-tlb-sets =3D <1>; i-tlb-size =3D <32>; mmu-type =3D "riscv,sv39"; + next-level-cache =3D <&ccache>; riscv,isa =3D "rv64imafdc"; riscv,isa-base =3D "rv64i"; riscv,isa-extensions =3D "i", "m", "a", "f", "d", "c", "zicntr", "zicsr= ", @@ -154,6 +156,17 @@ clint: clint@2000000 { <&cpu1_intc 3>, <&cpu1_intc 7>; }; =20 + ccache: cache-controller@2010000 { + compatible =3D "starfive,jh7100-ccache", "sifive,ccache0", "cache"; + reg =3D <0x0 0x2010000 0x0 0x1000>; + interrupts =3D <128>, <130>, <131>, <129>; + cache-block-size =3D <64>; + cache-level =3D <2>; + cache-sets =3D <2048>; + cache-size =3D <2097152>; + cache-unified; + }; + plic: interrupt-controller@c000000 { compatible =3D "starfive,jh7100-plic", "sifive,plic-1.0.0"; reg =3D <0x0 0xc000000 0x0 0x4000000>; --=20 2.40.1 From nobody Tue Dec 16 12:21:19 2025 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 466BAC4167B for ; Thu, 30 Nov 2023 15:20:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346190AbjK3PUW (ORCPT ); Thu, 30 Nov 2023 10:20:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346261AbjK3PUT (ORCPT ); Thu, 30 Nov 2023 10:20:19 -0500 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5B4810F8 for ; Thu, 30 Nov 2023 07:20:24 -0800 (PST) Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id ACC863FA53 for ; Thu, 30 Nov 2023 15:20:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1701357623; bh=x/4VKc6j7ZPLGeNJb06p6pcCmpUDLk01xwbpFjzzvZw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ap1qRYRraseSqCpDR3saeu4bryWspvFmdIcGYnSSvvvjGtKSq8qLb7Yx1hJElwaEm Ziv+Nu8IeQ7xU5D70a0ov8QnfUOpcv2v1nRQj5vgAPG20/YRH88VP1DlI9Iax0ziOP BAADJ5xYfxCJ+Gt90xD2K9hOc7e84I9oJDjqN8jv3rY5gKuSq6eCSucqzp+g9DBjqG cAvoLgMF1XWXSRk+PDFqHpS0Uo/YbuToTIbLkFW/0luT6TF3bG9/tE73aHXL0JD6Ad 5lGeXOBROj0XKGYfeG77c8ltJ3ZSyK9FPkGHVAoJTIHxGNfBD1zn+UHfBkptVh+thS zpujZSjzjVMGA== Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-6cddc344b98so1284089b3a.3 for ; Thu, 30 Nov 2023 07:20:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701357622; x=1701962422; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x/4VKc6j7ZPLGeNJb06p6pcCmpUDLk01xwbpFjzzvZw=; b=O1v41VkY7xIxF6RgLy66y7sWPmtjAaIBOdnDYgij1Cag5pppny606iSOZeUi0y4pit hcfFrp5DHSOQlE8lY/zJRKMv0KDCJaQWSgfJbDT+hQLGrdt+DscwaQ/R0SBJ+XJnTxsX U9F2k7zQqhZCeOtg+BjYJRsgt8087rwcZFtEzf/cb7hv4svuUMOUHmCOZjsaSUgNSfAr SbEv/J94NMrQUxfgSIM7Mp6Qsyw5QjNd2Pu5HkdTYQAyi2lKtxGDcBAIAAW4LaRSDl7q dpoqg/1L9GecXyovFab38N/Ss0NrO4jetunaRCSlC/fYrJbTQ7AguWCy0E7feakd8gzo Ti1w== X-Gm-Message-State: AOJu0Yy4kRLGFb2qxdCJtTPLbWt8X4Mefa+Aa0cnNO0RI4qv0p/33wO8 7Dy25MnvH/h4580lTXtQQ1OUe+f3HVdGoHFq0AdG+9uRqXx563lbA+0iCDCaWvDyc1GXG7zRwqA Y7ydzZ34y7rYzT2D4W3t08DlZ+gPNPA1PlZAtKKMOQg== X-Received: by 2002:a05:6a20:144b:b0:18c:548d:3d0f with SMTP id a11-20020a056a20144b00b0018c548d3d0fmr23512358pzi.5.1701357622022; Thu, 30 Nov 2023 07:20:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IEJual8Lkb2g8N/YiH3FRK7taRMkY4AzxQVOPrkbyzCXqvXjTjv3kTIlyWPfwhdcnKtKcS4lA== X-Received: by 2002:a05:6a20:144b:b0:18c:548d:3d0f with SMTP id a11-20020a056a20144b00b0018c548d3d0fmr23512330pzi.5.1701357621745; Thu, 30 Nov 2023 07:20:21 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id y125-20020a636483000000b005bd3d6e270dsm1356002pgb.68.2023.11.30.07.20.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 07:20:21 -0800 (PST) From: Emil Renner Berthing To: linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Paul Walmsley , Palmer Dabbelt , Emil Renner Berthing , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Cristian Ciocaltea , Geert Uytterhoeven Subject: [PATCH v2 5/8] riscv: dts: starfive: Add pool for coherent DMA memory on JH7100 boards Date: Thu, 30 Nov 2023 16:19:29 +0100 Message-Id: <20231130151932.729708-6-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231130151932.729708-1-emil.renner.berthing@canonical.com> References: <20231130151932.729708-1-emil.renner.berthing@canonical.com> 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" The StarFive JH7100 SoC has non-coherent device DMAs, but most drivers expect to be able to allocate coherent memory for DMA descriptors and such. However on the JH7100 DDR memory appears twice in the physical memory map, once cached and once uncached: 0x00_8000_0000 - 0x08_7fff_ffff : Off chip DDR memory, cached 0x10_0000_0000 - 0x17_ffff_ffff : Off chip DDR memory, uncached To use this uncached region we create a global DMA memory pool there and reserve the corresponding area in the cached region. However the uncached region is fully above the 32bit address limit, so add a dma-ranges map so the DMA address used for peripherals is still in the regular cached region below the limit. Link: https://github.com/starfive-tech/JH7100_Docs/blob/main/JH7100%20Data%= 20Sheet%20V01.01.04-EN%20(4-21-2021).pdf Signed-off-by: Emil Renner Berthing --- .../boot/dts/starfive/jh7100-common.dtsi | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi b/arch/riscv/b= oot/dts/starfive/jh7100-common.dtsi index b93ce351a90f..3af88e6970a3 100644 --- a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi @@ -39,6 +39,30 @@ led-ack { label =3D "ack"; }; }; + + reserved-memory { + #address-cells =3D <2>; + #size-cells =3D <2>; + ranges; + + dma-reserved@fa000000 { + reg =3D <0x0 0xfa000000 0x0 0x1000000>; + no-map; + }; + + linux,dma@107a000000 { + compatible =3D "shared-dma-pool"; + reg =3D <0x10 0x7a000000 0x0 0x1000000>; + no-map; + linux,dma-default; + }; + }; + + soc { + dma-ranges =3D <0x00 0x80000000 0x00 0x80000000 0x00 0x7a000000>, + <0x00 0xfa000000 0x10 0x7a000000 0x00 0x01000000>, + <0x00 0xfb000000 0x00 0xfb000000 0x07 0x85000000>; + }; }; =20 &gpio { --=20 2.40.1 From nobody Tue Dec 16 12:21:19 2025 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 04703C4167B for ; Thu, 30 Nov 2023 15:20:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346196AbjK3PUd (ORCPT ); Thu, 30 Nov 2023 10:20:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346265AbjK3PU3 (ORCPT ); Thu, 30 Nov 2023 10:20:29 -0500 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81E7C10F1 for ; Thu, 30 Nov 2023 07:20:32 -0800 (PST) Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id D26203FA53 for ; Thu, 30 Nov 2023 15:20:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1701357630; bh=OuMn6YJcnYA0SdFjV5QIvrMlS1FQMrQ/PHdRB99f0NE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Qfay1odAmPI2ThEtelo1cVm7XYA0zuOAwD63dO8pfJehiix9h7jR9TVYFwSOqcVej DBUSr89DY+UUZ1K/ogy/KQNaAJWCymbcYi0eYuH4JA334o2hvnGQiZHVAjmVmFc58M XXiXflIYogGsSHRDnQHCs4msfC50FGb28dIK3U6Dx7KSK83GSVs4C6b/Sy3rsl47YF Z8NDjgW/OjbzoZaIa8qVGm+QXn0XjJZwbG1Lz6uYFn2ChsuLIZX5JjOB3o+c1i+5Z/ cAQt6Rlp64ri4IugSWRRywNTz0OeWe9VdqNTMH9rfU8lOpHRulI5JRpT+HA6/GtKNH vnud3lZ6mZGAg== Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-6c334d2fd4cso1391210b3a.2 for ; Thu, 30 Nov 2023 07:20:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701357629; x=1701962429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OuMn6YJcnYA0SdFjV5QIvrMlS1FQMrQ/PHdRB99f0NE=; b=FjDSXGF5s1EkvgpXEZc31f7Dsn7ht1UnVXgonMQtgJoakWpsanKXRDL/2W3WmzbgIX zk+c/WhvBFvIqSSIv/vEsnyOuDjf85+snXRtbPS48ItDnD+0A+sFrHMUzwUOfvHCGf0o iZhDo1CMmGSNtn7pNRjMDGdAb2aYpgX7wRzCBvErZinXJLLuhlef+9lBAB5z8gM6YWO+ rOsY335TVqmSezTn48N9btBcsvzBCMEvroT1jWVCSK6M6EOL79wg9mbXi2wntbcXhloF j4DpCn7hqZlEMAnrHyJOBZqfvSISeqfV/UG7eQduq4dQ33pGdys225upeWGFfdEtvl/U LZcA== X-Gm-Message-State: AOJu0YziK1Ec4suHghwpBQeT5lY5SNGWsuBPXZOKGgbHncjCGO9T65wy O90fRWOsiVgRgQ3ebCrCYpd8DvvDEldFwSKvW8KX5xB8Rfqst2haXJ/ReUIyJJCW4hjNPQ8u4ez nhQ6+IMEaOhvtlCHnNtI1fIKLCIdxxRF8IQ5Yxyxr/w== X-Received: by 2002:a05:6a20:6a23:b0:186:aac2:26b9 with SMTP id p35-20020a056a206a2300b00186aac226b9mr20943944pzk.30.1701357629205; Thu, 30 Nov 2023 07:20:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IGc8h5qPGi0AL06XqejO2yd59FH5mJfnnR0twNHQ5dxExg0fBfVTX56EPNQ52lvJlQlNYmCOg== X-Received: by 2002:a05:6a20:6a23:b0:186:aac2:26b9 with SMTP id p35-20020a056a206a2300b00186aac226b9mr20943918pzk.30.1701357628950; Thu, 30 Nov 2023 07:20:28 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id y125-20020a636483000000b005bd3d6e270dsm1356002pgb.68.2023.11.30.07.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 07:20:28 -0800 (PST) From: Emil Renner Berthing To: linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Paul Walmsley , Palmer Dabbelt , Emil Renner Berthing , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Cristian Ciocaltea , Geert Uytterhoeven Subject: [PATCH v2 6/8] riscv: dts: starfive: Add JH7100 MMC nodes Date: Thu, 30 Nov 2023 16:19:30 +0100 Message-Id: <20231130151932.729708-7-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231130151932.729708-1-emil.renner.berthing@canonical.com> References: <20231130151932.729708-1-emil.renner.berthing@canonical.com> 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 device tree nodes for the Synopsis MMC controllers on the StarFive JH7100 SoC. Signed-off-by: Emil Renner Berthing --- arch/riscv/boot/dts/starfive/jh7100.dtsi | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/riscv/boot/dts/starfive/jh7100.dtsi b/arch/riscv/boot/dts= /starfive/jh7100.dtsi index 0cafac437746..c216aaecac53 100644 --- a/arch/riscv/boot/dts/starfive/jh7100.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7100.dtsi @@ -178,6 +178,32 @@ plic: interrupt-controller@c000000 { riscv,ndev =3D <133>; }; =20 + sdio0: mmc@10000000 { + compatible =3D "snps,dw-mshc"; + reg =3D <0x0 0x10000000 0x0 0x10000>; + clocks =3D <&clkgen JH7100_CLK_SDIO0_AHB>, + <&clkgen JH7100_CLK_SDIO0_CCLKINT_INV>; + clock-names =3D "biu", "ciu"; + interrupts =3D <4>; + data-addr =3D <0>; + fifo-depth =3D <32>; + fifo-watermark-aligned; + status =3D "disabled"; + }; + + sdio1: mmc@10010000 { + compatible =3D "snps,dw-mshc"; + reg =3D <0x0 0x10010000 0x0 0x10000>; + clocks =3D <&clkgen JH7100_CLK_SDIO1_AHB>, + <&clkgen JH7100_CLK_SDIO1_CCLKINT_INV>; + clock-names =3D "biu", "ciu"; + interrupts =3D <5>; + data-addr =3D <0>; + fifo-depth =3D <32>; + fifo-watermark-aligned; + status =3D "disabled"; + }; + clkgen: clock-controller@11800000 { compatible =3D "starfive,jh7100-clkgen"; reg =3D <0x0 0x11800000 0x0 0x10000>; --=20 2.40.1 From nobody Tue Dec 16 12:21:19 2025 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 2DC61C4167B for ; Thu, 30 Nov 2023 15:20:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346277AbjK3PUm (ORCPT ); Thu, 30 Nov 2023 10:20:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346248AbjK3PUe (ORCPT ); Thu, 30 Nov 2023 10:20:34 -0500 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D181010D5 for ; Thu, 30 Nov 2023 07:20:40 -0800 (PST) Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 1204144440 for ; Thu, 30 Nov 2023 15:20:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1701357639; bh=3BV4Vz9z3QHFiX3Dv1bjv4P8f3k40Tur0+jRMIWhjwA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=o56eawEOKUS33+zf1gpfg/Nb0+3qmEWbj31k7V4GKPb37ZblnGfcXUOt6TSbHmjdU 91rh/pC/spn9uZDhGFn6480ZUdl46d34ERbFpIBLnOUXK0h/Rgbl8RNV3QqNuppwG7 tV7+iIeSGsIbTVwdT2Vbizqi7mMJowMm2VCWaXgM0pDm9CiiQAFPs4iu/Byy7hZkwE UF+VvgyiHbI2kmEmfWxSQ+eI1IaL7OFgeRJ0Hv9jNWiog1TZb/v47/u43Ny/YgT/bw FsKumJkCavrVmKqpEJkINsNEMkRUZu95FgPNByNJWM7QuZJgI6C6gBDy9/qdbZeOGz kg1oAt5IZK4VA== Received: by mail-oi1-f198.google.com with SMTP id 5614622812f47-3b5665e00b6so1173943b6e.2 for ; Thu, 30 Nov 2023 07:20:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701357636; x=1701962436; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3BV4Vz9z3QHFiX3Dv1bjv4P8f3k40Tur0+jRMIWhjwA=; b=ct1MF8rkwJHcJqQsv+YNOAZpZgdTr8ah0HHkJfk7jUt1R+e9rU6R3ojYN/dR1lMVlV BatGl+tWgB/GD/3esyMvCx2o4MvuTjOL9e40ZcxznHBFvtfZyB3x0AxTqDU3tLIXOT6J 7LyuLtHM7HwcQMBZ3s7+JwtFPAIn6XFYoOwQcXsX0ziJPB3lFR7ADYM2TSRRNPUmlmNz ZAZaU/vkR5JvXNHJuEBkeI0WwxzNd4B6iamgSNzO2Th9GylCUclHJmgRPXyVqY0tacF6 GFgab3gV1O8XeFsd+aL7otS0WzC42mhyqsMiq4orexcwX3aloVS1P5xNupYxYiYGZ6tW EGZg== X-Gm-Message-State: AOJu0YwwPEbVMYDc6DamoEOLTKj6O0vJc95jwXzzVHTAcgKmhj5cGWpn VQvnbm9ybaV3+49ECwVXWt10SE7gA3pZTuuy/XB2/akIsFuWkQiB6r78VtNNZBggRfWbOeLTEbY ymdfmK7rQqk0C9jlNlkrqSkff3jIG39eUifuqnIrTvA== X-Received: by 2002:a05:6808:e83:b0:3b6:a7f2:f1fe with SMTP id k3-20020a0568080e8300b003b6a7f2f1femr26367626oil.47.1701357636381; Thu, 30 Nov 2023 07:20:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IF2rYNqi7HKvMn1CUtmkwOZKqWlU0WJNU5JfZrmmn+Bj6zgpLKPHoDP66fIgr2qToAWBfFRIA== X-Received: by 2002:a05:6808:e83:b0:3b6:a7f2:f1fe with SMTP id k3-20020a0568080e8300b003b6a7f2f1femr26367602oil.47.1701357636165; Thu, 30 Nov 2023 07:20:36 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id y125-20020a636483000000b005bd3d6e270dsm1356002pgb.68.2023.11.30.07.20.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 07:20:35 -0800 (PST) From: Emil Renner Berthing To: linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Paul Walmsley , Palmer Dabbelt , Emil Renner Berthing , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Cristian Ciocaltea , Geert Uytterhoeven Subject: [PATCH v2 7/8] riscv: dts: starfive: Enable SD-card on JH7100 boards Date: Thu, 30 Nov 2023 16:19:31 +0100 Message-Id: <20231130151932.729708-8-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231130151932.729708-1-emil.renner.berthing@canonical.com> References: <20231130151932.729708-1-emil.renner.berthing@canonical.com> 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 pinctrl and MMC device tree nodes for the SD-card on the BeagleV Starlight and StarFive VisionFive V1 boards. Signed-off-by: Emil Renner Berthing --- .../boot/dts/starfive/jh7100-common.dtsi | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi b/arch/riscv/b= oot/dts/starfive/jh7100-common.dtsi index 3af88e6970a3..adcdbbc4f57f 100644 --- a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi @@ -12,6 +12,7 @@ =20 / { aliases { + mmc0 =3D &sdio0; serial0 =3D &uart3; }; =20 @@ -108,6 +109,43 @@ GPO_I2C2_PAD_SDA_OEN, }; }; =20 + sdio0_pins: sdio0-0 { + clk-pins { + pinmux =3D ; + bias-disable; + input-disable; + input-schmitt-disable; + }; + sdio-pins { + pinmux =3D , + , + , + , + , + ; + bias-pull-up; + input-enable; + input-schmitt-enable; + }; + }; + uart3_pins: uart3-0 { rx-pins { pinmux =3D ; }; =20 +&sdio0 { + broken-cd; + bus-width =3D <4>; + cap-sd-highspeed; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdio0_pins>; + status =3D "okay"; +}; + &uart3 { pinctrl-names =3D "default"; pinctrl-0 =3D <&uart3_pins>; --=20 2.40.1 From nobody Tue Dec 16 12:21:19 2025 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 C2102C4167B for ; Thu, 30 Nov 2023 15:20:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346340AbjK3PUt (ORCPT ); Thu, 30 Nov 2023 10:20:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346292AbjK3PUm (ORCPT ); Thu, 30 Nov 2023 10:20:42 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56CF510EA for ; Thu, 30 Nov 2023 07:20:48 -0800 (PST) Received: from mail-oi1-f197.google.com (mail-oi1-f197.google.com [209.85.167.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 8D29340C50 for ; Thu, 30 Nov 2023 15:20:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1701357644; bh=Hegf0srFkbsTjzBuIfrKZwGyBpbOFAxXtDxYBC/BJOY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Kaul0nEDY9wrTIMaTztWeKgS+89ygJVSiRsmrefksU8nUguLXzpAflqdpvyRMecG1 YV99372DkzAIlSdLdWjh9PzdkKGoWZDRXRpLKsvr47/91Rqo7jKxANPbAv2xoY5nS5 MxkOe86Gpii47WcidrHZWIDvZh7jdvCiTP/DteirxJ8nYkl3cH0+m9Rjxad3wHGnX7 TPCpSUogy/YjMyPwZQ948iUv3Zx06CDxwiWAIphbp7opfiqEx0KYuhP0Tzfx+lU6nM 0/GQskSVT954vDYw1rnr/dqZZU3YIIotRfd1YUuNh5o4zg74X8H6ATnoio7bPLLWJR s6eAqwxFPEohg== Received: by mail-oi1-f197.google.com with SMTP id 5614622812f47-3b85fd1bdecso1280007b6e.1 for ; Thu, 30 Nov 2023 07:20:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701357643; x=1701962443; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Hegf0srFkbsTjzBuIfrKZwGyBpbOFAxXtDxYBC/BJOY=; b=Qs/sVEQm4oTLyKRvsD5p7wb0DEKPM121z4SFJzLjAHbzFt01jzGiT9Zplwzqai4nUh fx3WOJGgGkhy6OmvHhosh60tPPqYjwZZ8f+UpFDG/fa3kfbzKLj7k6jQ4C98OD/BGBcr 1n8G7+6+S8NwUNzZTMqGd6nohvcWUn4es7mw57Ie0XOv4BNcyI6T0YMMK5SWEplfOB/D udKtoEFhdhkGpInZAYDLQApYCLTENmaCM7ydPZIGU94pwcfXJvqXG5ljwast/15kavSB lKDBMklt/vvMKrVEmMfIRjeS2uV9SnVEQxNTzyMAgG/aZtv0p2p/ME6iVp+GJ+bN2Dyx oCCw== X-Gm-Message-State: AOJu0YweCBPhZEsllHg2jn+z0dzmywlCJjQmpYmkj44lS2+Xs0j+XwiG WvZKQiYhv9muv3kXzUBuAKwpCjQqxEgvOVZwG5tph4XAcG5yuwJQyyYuFBio/FqI7KipdEDkOfS Lxx4dFuMnsDRdD8Lnrk2/hWTyMe99q+QdixqCtDtQuw== X-Received: by 2002:a05:6808:20a0:b0:3b2:ee79:c0fd with SMTP id s32-20020a05680820a000b003b2ee79c0fdmr31848207oiw.1.1701357643557; Thu, 30 Nov 2023 07:20:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IEDv33VjZX5rToz283+PZ9me+zUyLCvtTvnVucpd5Vw8rGLY3r7NPHXqlLul8V0jCsywTS1sQ== X-Received: by 2002:a05:6808:20a0:b0:3b2:ee79:c0fd with SMTP id s32-20020a05680820a000b003b2ee79c0fdmr31848188oiw.1.1701357643362; Thu, 30 Nov 2023 07:20:43 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id y125-20020a636483000000b005bd3d6e270dsm1356002pgb.68.2023.11.30.07.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 07:20:43 -0800 (PST) From: Emil Renner Berthing To: linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Paul Walmsley , Palmer Dabbelt , Emil Renner Berthing , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Cristian Ciocaltea , Geert Uytterhoeven Subject: [PATCH v2 8/8] riscv: dts: starfive: Enable SDIO wifi on JH7100 boards Date: Thu, 30 Nov 2023 16:19:32 +0100 Message-Id: <20231130151932.729708-9-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231130151932.729708-1-emil.renner.berthing@canonical.com> References: <20231130151932.729708-1-emil.renner.berthing@canonical.com> 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 pinctrl and MMC controller nodes for the Broadcom wifi controller on the BeagleV Starlight and StarFive VisionFive V1 boards. Signed-off-by: Emil Renner Berthing --- .../boot/dts/starfive/jh7100-common.dtsi | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi b/arch/riscv/b= oot/dts/starfive/jh7100-common.dtsi index adcdbbc4f57f..42fb61c36068 100644 --- a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi @@ -13,6 +13,7 @@ / { aliases { mmc0 =3D &sdio0; + mmc1 =3D &sdio1; serial0 =3D &uart3; }; =20 @@ -64,6 +65,11 @@ soc { <0x00 0xfa000000 0x10 0x7a000000 0x00 0x01000000>, <0x00 0xfb000000 0x00 0xfb000000 0x07 0x85000000>; }; + + wifi_pwrseq: wifi-pwrseq { + compatible =3D "mmc-pwrseq-simple"; + reset-gpios =3D <&gpio 37 GPIO_ACTIVE_LOW>; + }; }; =20 &gpio { @@ -146,6 +152,41 @@ GPO_SDIO0_PAD_CDATA_OEN_BIT3, }; }; =20 + sdio1_pins: sdio1-0 { + clk-pins { + pinmux =3D ; + bias-disable; + input-disable; + input-schmitt-disable; + }; + sdio-pins { + pinmux =3D , + , + , + , + ; + bias-pull-up; + input-enable; + input-schmitt-enable; + }; + }; + uart3_pins: uart3-0 { rx-pins { pinmux =3D ; + #size-cells =3D <0>; + bus-width =3D <4>; + cap-sd-highspeed; + cap-sdio-irq; + cap-power-off-card; + mmc-pwrseq =3D <&wifi_pwrseq>; + non-removable; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdio1_pins>; + status =3D "okay"; + + wifi@1 { + compatible =3D "brcm,bcm4329-fmac"; + reg =3D <1>; + }; +}; + &uart3 { pinctrl-names =3D "default"; pinctrl-0 =3D <&uart3_pins>; --=20 2.40.1