From patchwork Thu Dec 22 19:32:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marijn Suijten X-Patchwork-Id: 35932 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp133088wrn; Thu, 22 Dec 2022 11:47:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXuhHfKl2ugishDjjsXQFb3OLZUyPJzER2dBHyLaP/8DYPA7Q9+LhMPKhkN2qpQ/aho8VfwO X-Received: by 2002:a17:903:2793:b0:189:8f64:deac with SMTP id jw19-20020a170903279300b001898f64deacmr6551233plb.2.1671738468206; Thu, 22 Dec 2022 11:47:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671738468; cv=none; d=google.com; s=arc-20160816; b=T7shwWauslNCH3HXje7M0gmbMK4smd0cnxJW0E6U6KloUJ9peB5TwRKIDnJrTFOnlY NJ9y54feT4GffkQAPAiRQ0MpuCoYn1tU+VJMBc3o/GPkTeqRvQxCuEvR03TES/9MEk/i 6N1mTAbH1MUI7hV+5E2kFRgXztCGY74ymFXAIO2WI9kCp/k509L7Ti1UEo1QkdYyAvzF zEslq3fsKlDB4fWJ//u7w70aTsfzSiVERKkjNS6UT207xx/rzpJeOe0uicK37D/d9mS/ cuOFcurf5jAQcM9ViqUcMljRMqJp2JRXpuYpp8KXMsHE6HxuqzjkVSYLoqt+8msQ/H1Y /Pyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=SdjdjIvTaLyRQQpvmjlU3YcYmPRAjdlTGj/2CXlwHnI=; b=SxoPsM0wxr7qERiwWicMTc4zVyw9iQb50lnCB7wqC3ejen/ert1aAwNwyG6xgZkyI/ cMunNp4edWhJ3XYztjyzHqswKKd2lYbSa8ryQoJu4Y4HZ/asxjcb3kRZr8LiY9mdU9rw h/1aROVV5tYUV3Ah3/Nsq/xWehBWs9BqvZkWQpyjkdwzR0HwOMYOrshI1ZloJj4H4xIh gBK/Tzlfexc4jVAyIpDmTLuraydnsPqAiiDzE4kgKXGXSGu3KxWy9RnH9Yb4g5rUtszS dIXXT4iUZNK8zVf13p5P40pAQKiPsOkHlkF/GBzSwqLAjS9XNCkBikAnLsyaCRxRQClO 7sOw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i3-20020a170902c94300b001892d820a1fsi1444110pla.571.2022.12.22.11.47.35; Thu, 22 Dec 2022 11:47:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235755AbiLVTdw (ORCPT + 99 others); Thu, 22 Dec 2022 14:33:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235709AbiLVTdc (ORCPT ); Thu, 22 Dec 2022 14:33:32 -0500 Received: from m-r1.th.seeweb.it (m-r1.th.seeweb.it [IPv6:2001:4b7a:2000:18::170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8928EEE1C for ; Thu, 22 Dec 2022 11:33:28 -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 4C0642021C; Thu, 22 Dec 2022 20:33:26 +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 , 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 v5 3/4] arm64: dts: qcom: sm6125: Add apps_smmu with streamID to SDHCI 1/2 nodes Date: Thu, 22 Dec 2022 20:32:53 +0100 Message-Id: <20221222193254.126925-4-marijn.suijten@somainline.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221222193254.126925-1-marijn.suijten@somainline.org> References: <20221222193254.126925-1-marijn.suijten@somainline.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752944836187148786?= X-GMAIL-MSGID: =?utf-8?q?1752944836187148786?= When enabling the APPS SMMU the mainline driver reconfigures the SMMU from its bootloader configuration, losing 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..32dd172ea104 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 0x0>; 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 0x0>; pinctrl-0 = <&sdc2_on_state>; pinctrl-1 = <&sdc2_off_state>;