From nobody Wed Sep 17 17:47:52 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 B43C9C3DA7D for ; Fri, 16 Dec 2022 22:00:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229850AbiLPWAL (ORCPT ); Fri, 16 Dec 2022 17:00:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229510AbiLPWAH (ORCPT ); Fri, 16 Dec 2022 17:00:07 -0500 Received: from relay04.th.seeweb.it (relay04.th.seeweb.it [5.144.164.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E581317A94; Fri, 16 Dec 2022 14:00:04 -0800 (PST) Received: from localhost.localdomain (94-209-172-39.cable.dynamic.v4.ziggo.nl [94.209.172.39]) (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 m-r1.th.seeweb.it (Postfix) with ESMTPSA id 6A9892010A; Fri, 16 Dec 2022 23:00:02 +0100 (CET) From: Marijn Suijten To: phone-devel@vger.kernel.org, Will Deacon , Joerg Roedel , Bjorn Andersson Cc: ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno , Konrad Dybcio , Martin Botka , Jami Kettunen , Marijn Suijten , Lux Aliaga , Robin Murphy , Rob Herring , Krzysztof Kozlowski , Andy Gross , Konrad Dybcio , Dmitry Baryshkov , Thierry Reding , Melody Olvera , Greg Kroah-Hartman , Bhupesh Sharma , Douglas Anderson , linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 1/4] dt-bindings: arm-smmu: Document smmu-500 binding for SM6125 Date: Fri, 16 Dec 2022 22:58:16 +0100 Message-Id: <20221216215819.1164973-2-marijn.suijten@somainline.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221216215819.1164973-1-marijn.suijten@somainline.org> References: <20221216215819.1164973-1-marijn.suijten@somainline.org> 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: Martin Botka Document smmu-500 compatibility with the SM6125 SoC. Signed-off-by: Martin Botka [Marijn: Move compatible to the new, generic, qcom,smmu-500 list] Signed-off-by: Marijn Suijten Acked-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml b/Docume= ntation/devicetree/bindings/iommu/arm,smmu.yaml index b28c5c2b0ff2..95b03fd86e18 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml @@ -43,6 +43,7 @@ properties: - qcom,sdm670-smmu-500 - qcom,sdm845-smmu-500 - qcom,sm6115-smmu-500 + - qcom,sm6125-smmu-500 - qcom,sm6350-smmu-500 - qcom,sm6375-smmu-500 - qcom,sm8150-smmu-500 --=20 2.39.0 From nobody Wed Sep 17 17:47:52 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 1FB90C4332F for ; Fri, 16 Dec 2022 22:00:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229918AbiLPWAT (ORCPT ); Fri, 16 Dec 2022 17:00:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229838AbiLPWAH (ORCPT ); Fri, 16 Dec 2022 17:00:07 -0500 Received: from relay03.th.seeweb.it (relay03.th.seeweb.it [5.144.164.164]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A796A12AC4; Fri, 16 Dec 2022 14:00:05 -0800 (PST) Received: from localhost.localdomain (94-209-172-39.cable.dynamic.v4.ziggo.nl [94.209.172.39]) (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 m-r1.th.seeweb.it (Postfix) with ESMTPSA id 7B4CE20101; Fri, 16 Dec 2022 23:00:03 +0100 (CET) From: Marijn Suijten To: phone-devel@vger.kernel.org, Will Deacon , Joerg Roedel , Bjorn Andersson Cc: ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno , Konrad Dybcio , Martin Botka , Jami Kettunen , Marijn Suijten , Lux Aliaga , Robin Murphy , Rob Herring , Krzysztof Kozlowski , Andy Gross , Konrad Dybcio , Dmitry Baryshkov , Thierry Reding , Melody Olvera , Greg Kroah-Hartman , Bhupesh Sharma , Douglas Anderson , linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 2/4] arm64: dts: qcom: sm6125: Configure APPS SMMU Date: Fri, 16 Dec 2022 22:58:17 +0100 Message-Id: <20221216215819.1164973-3-marijn.suijten@somainline.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221216215819.1164973-1-marijn.suijten@somainline.org> References: <20221216215819.1164973-1-marijn.suijten@somainline.org> 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: Martin Botka Add a node for the APPS SMMU, to which various devices such as USB and storage nodes are connected. Signed-off-by: Martin Botka [Marijn: add the new, generic, "qcom,smmu-500" compatible, add patch description, reorder # properties] Signed-off-by: Marijn Suijten Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm6125.dtsi | 73 ++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qco= m/sm6125.dtsi index bf9e8d45ee44..347665c2067c 100644 --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi @@ -573,6 +573,79 @@ spmi_bus: spmi@1c40000 { cell-index =3D <0>; }; =20 + apps_smmu: iommu@c600000 { + compatible =3D "qcom,sm6125-smmu-500", "qcom,smmu-500", "arm,mmu-500"; + reg =3D <0xc600000 0x80000>; + interrupts =3D , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + + #global-interrupts =3D <1>; + #iommu-cells =3D <2>; + }; + apcs_glb: mailbox@f111000 { compatible =3D "qcom,sm6125-apcs-hmss-global"; reg =3D <0x0f111000 0x1000>; --=20 2.39.0 From nobody Wed Sep 17 17:47:52 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 B2536C4332F for ; Fri, 16 Dec 2022 22:00:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229582AbiLPWA0 (ORCPT ); Fri, 16 Dec 2022 17:00:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229820AbiLPWAL (ORCPT ); Fri, 16 Dec 2022 17:00:11 -0500 Received: from relay03.th.seeweb.it (relay03.th.seeweb.it [IPv6:2001:4b7a:2000:18::164]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D15D17A94; Fri, 16 Dec 2022 14:00:06 -0800 (PST) Received: from localhost.localdomain (94-209-172-39.cable.dynamic.v4.ziggo.nl [94.209.172.39]) (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 m-r1.th.seeweb.it (Postfix) with ESMTPSA id 8CD3F2013B; Fri, 16 Dec 2022 23:00:04 +0100 (CET) From: Marijn Suijten To: phone-devel@vger.kernel.org, Will Deacon , Joerg Roedel , Bjorn Andersson Cc: ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno , Konrad Dybcio , Martin Botka , Jami Kettunen , Marijn Suijten , Lux Aliaga , Robin Murphy , Rob Herring , Krzysztof Kozlowski , Andy Gross , Konrad Dybcio , Dmitry Baryshkov , Thierry Reding , Melody Olvera , Greg Kroah-Hartman , Bhupesh Sharma , Douglas Anderson , linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 3/4] arm64: dts: qcom: sm6125: Add apps_smmu with streamID to SDHCI 1/2 nodes Date: Fri, 16 Dec 2022 22:58:18 +0100 Message-Id: <20221216215819.1164973-4-marijn.suijten@somainline.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221216215819.1164973-1-marijn.suijten@somainline.org> References: <20221216215819.1164973-1-marijn.suijten@somainline.org> 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" When enabling the APPS SMMU the mainline driver reconfigures the SMMU from its bootloader configuration, loosing the stream mapping for (among which) the SDHCI hardware and breaking its ADMA feature. This feature can be disabled with: sdhci.debug_quirks=3D0x40 But it is of course desired to have this feature enabled and working through the SMMU. Signed-off-by: Marijn Suijten Reviewed-by: Konrad Dybcio Reviewed-by: Martin Botka --- arch/arm64/boot/dts/qcom/sm6125.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qco= m/sm6125.dtsi index 347665c2067c..f560499cc0ca 100644 --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi @@ -468,6 +468,7 @@ sdhc_1: mmc@4744000 { <&gcc GCC_SDCC1_APPS_CLK>, <&xo_board>; clock-names =3D "iface", "core", "xo"; + iommus =3D <&apps_smmu 0x160 0>; =20 power-domains =3D <&rpmpd SM6125_VDDCX>; =20 @@ -494,6 +495,7 @@ sdhc_2: mmc@4784000 { <&gcc GCC_SDCC2_APPS_CLK>, <&xo_board>; clock-names =3D "iface", "core", "xo"; + iommus =3D <&apps_smmu 0x180 0>; =20 pinctrl-0 =3D <&sdc2_on_state>; pinctrl-1 =3D <&sdc2_off_state>; --=20 2.39.0 From nobody Wed Sep 17 17:47:52 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 3A61FC4332F for ; Fri, 16 Dec 2022 22:00:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229867AbiLPWAX (ORCPT ); Fri, 16 Dec 2022 17:00:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229894AbiLPWAJ (ORCPT ); Fri, 16 Dec 2022 17:00:09 -0500 Received: from relay02.th.seeweb.it (relay02.th.seeweb.it [IPv6:2001:4b7a:2000:18::163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 413D91A39A for ; Fri, 16 Dec 2022 14:00:07 -0800 (PST) Received: from localhost.localdomain (94-209-172-39.cable.dynamic.v4.ziggo.nl [94.209.172.39]) (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 m-r1.th.seeweb.it (Postfix) with ESMTPSA id A74832017E; Fri, 16 Dec 2022 23:00:05 +0100 (CET) From: Marijn Suijten To: phone-devel@vger.kernel.org, Will Deacon , Joerg Roedel , Bjorn Andersson Cc: ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno , Konrad Dybcio , Martin Botka , Jami Kettunen , Marijn Suijten , Lux Aliaga , Robin Murphy , Rob Herring , Krzysztof Kozlowski , Andy Gross , Konrad Dybcio , Dmitry Baryshkov , Thierry Reding , Melody Olvera , Greg Kroah-Hartman , Bhupesh Sharma , Douglas Anderson , linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 4/4] arm64: dts: qcom: sm6125: Add IOMMU context to DWC3 Date: Fri, 16 Dec 2022 22:58:19 +0100 Message-Id: <20221216215819.1164973-5-marijn.suijten@somainline.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221216215819.1164973-1-marijn.suijten@somainline.org> References: <20221216215819.1164973-1-marijn.suijten@somainline.org> 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: AngeloGioacchino Del Regno Add an IOMMU context to the USB DWC3 controller, required to get USB functionality upon enablement of apps_smmu. Signed-off-by: AngeloGioacchino Del Regno Signed-off-by: Marijn Suijten Reviewed-by: Konrad Dybcio Reviewed-by: Martin Botka --- arch/arm64/boot/dts/qcom/sm6125.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qco= m/sm6125.dtsi index f560499cc0ca..a205121ab4a7 100644 --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi @@ -542,6 +542,7 @@ usb3_dwc3: usb@4e00000 { compatible =3D "snps,dwc3"; reg =3D <0x04e00000 0xcd00>; interrupts =3D ; + iommus =3D <&apps_smmu 0x100 0x0>; phys =3D <&hsusb_phy1>; phy-names =3D "usb2-phy"; snps,dis_u2_susphy_quirk; --=20 2.39.0