From patchwork Fri Dec 16 21:58:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marijn Suijten X-Patchwork-Id: 13075495 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E4814C4167B for ; Fri, 16 Dec 2022 22:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=71i+Jxzk8r2tE2cGD8WRN8DVhKuH/E6DRn0tQ8J5Ke8=; b=aAejdRhqm2weBR 1YEDI7d2iF60+BDkiapwvLBO5G0Fvc9ruPo0e6Sv3DAgBrTihCT6oOHmX568b10cZh0mCMU3gpi4q /dC6xgOuBbpPPNbW8pKC0Qc5DvJ5sZNkqvXoJQipZ+KAQZsSz5yvC3Bbs+ltw/Wza3kj1WFHQBNTW 1lSOuBqTPvyWAM8oZlDKucGhW7SnEA99b1sxBGkA7B6IQD1lrYDqOrrsmkmt7oeak0EwtPSqr6/5b GnNHHRk+LfAcnhjqjReg5k/UGuldjf7bh2cfRWgfQ08IF0dQfMthoE0+qbuag8cg+tM7IBz0F95p3 u/2rokmrbnbTtDjFGpwA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p6Ikf-001cQ2-3E; Fri, 16 Dec 2022 22:00:21 +0000 Received: from relay03.th.seeweb.it ([2001:4b7a:2000:18::164]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p6IkR-001cBe-Up for linux-arm-kernel@lists.infradead.org; Fri, 16 Dec 2022 22:00:10 +0000 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221216_140008_183109_A6BCB78F X-CRM114-Status: GOOD ( 10.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=0x40 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/qcom/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 = "iface", "core", "xo"; + iommus = <&apps_smmu 0x160 0>; power-domains = <&rpmpd SM6125_VDDCX>; @@ -494,6 +495,7 @@ sdhc_2: mmc@4784000 { <&gcc GCC_SDCC2_APPS_CLK>, <&xo_board>; clock-names = "iface", "core", "xo"; + iommus = <&apps_smmu 0x180 0>; pinctrl-0 = <&sdc2_on_state>; pinctrl-1 = <&sdc2_off_state>;