From patchwork Sun Oct 30 07:32:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marijn Suijten X-Patchwork-Id: 12945 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1682343wru; Sun, 30 Oct 2022 00:34:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6H2kNJMXPdTV2cgPo5pShy7CsfVhd1ATjLC5iKlgQgUaIPdev5w5GYUkI5rqovwQ2fPGTW X-Received: by 2002:a17:90a:be14:b0:213:c304:1d68 with SMTP id a20-20020a17090abe1400b00213c3041d68mr3737222pjs.80.1667115269820; Sun, 30 Oct 2022 00:34:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667115269; cv=none; d=google.com; s=arc-20160816; b=O/wypR8W3L1p4ydOrwuoOgXLWBffPMwI0Y0ATxUKzP12Atmn6nc0S40frCwknvP2g+ 4KrW0YCMPdvupWZ4NK5r88kQ6bVpzhZpwIOpA4Z+rADwzPtgTr3tjuLL1vWOr26f43RB 1HHS2exLH7bldTNUuur9zgcwqJ7s6CPJvRpSWNthwv5r9XZC7+Cd6o9qutDu5VwC8bus xKAA7IvPuOrZ1FealJ5F1ligcS//HzdtPtFWKffXkXGFEVvim3w4h77aXGD2ZP3zEA7/ ScuJ81QMVq34W2uEepvmrSyC/IqizpDOz1ejg5fPHbjopiuKL5Pg24pWL1LKyM6C1FV0 n1Pw== 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=82/j9lbVNUIckm+LhYHZjpeeKQzg4pDsYrcNrlXcoRI=; b=yP4g09y3CGNltUdvFitpmL3iwtXT2+r6y8lyO5m7K6yujXcvrVwymemg5dv8sMTTNx fMGbO6/82O4Ky5Cj5hD4Lh+aC6MoIaQiuU3+qd/bin7BM2dM/6rEobAe//n/77tFWNVV pNnQmyeT99UxCxER9lqdCLtc1tJUbQE82Rsh5ZJAiKcR5gKM032Aze+nUIthP92lNKUh 8beoUJ2IEYywXqLnzHLI+PfKVj4rSMBzlEr3/C+bOGL0qOZOxrZuhzROy86uOVNDi9Zw llMDatqgexP2WiSKAH3jEZzYheW/GoqzBSDrHHSQxtEIpycQTZXRBM5Gd/4lfPD+0fer aPKw== 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 h11-20020a170902f70b00b00186a5b86ea3si4949007plo.50.2022.10.30.00.34.16; Sun, 30 Oct 2022 00:34:29 -0700 (PDT) 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 S230182AbiJ3Hdd (ORCPT + 99 others); Sun, 30 Oct 2022 03:33:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229727AbiJ3Hcx (ORCPT ); Sun, 30 Oct 2022 03:32:53 -0400 Received: from relay02.th.seeweb.it (relay02.th.seeweb.it [IPv6:2001:4b7a:2000:18::163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E064A615C; Sun, 30 Oct 2022 00:32:50 -0700 (PDT) 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 82D06200DF; Sun, 30 Oct 2022 08:32:48 +0100 (CET) From: Marijn Suijten To: phone-devel@vger.kernel.org Cc: ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno , Konrad Dybcio , Martin Botka , Jami Kettunen , Marijn Suijten , Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Luca Weiss , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/10] arm64: dts: qcom: sm6350: Add apps_smmu with streamID to SDHCI 1/2 nodes Date: Sun, 30 Oct 2022 08:32:32 +0100 Message-Id: <20221030073232.22726-11-marijn.suijten@somainline.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221030073232.22726-1-marijn.suijten@somainline.org> References: <20221030073232.22726-1-marijn.suijten@somainline.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1748097061003367744?= X-GMAIL-MSGID: =?utf-8?q?1748097061003367744?= 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: Luca Weiss Tested-by: Luca Weiss # sm7225-fairphone-fp4 Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm6350.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi index b98b881ebe7e..c309a359ded9 100644 --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi @@ -485,6 +485,7 @@ sdhc_1: mmc@7c4000 { interrupts = , ; interrupt-names = "hc_irq", "pwr_irq"; + iommus = <&apps_smmu 0x60 0x0>; clocks = <&gcc GCC_SDCC1_AHB_CLK>, <&gcc GCC_SDCC1_APPS_CLK>, @@ -1064,6 +1065,7 @@ sdhc_2: mmc@8804000 { interrupts = , ; interrupt-names = "hc_irq", "pwr_irq"; + iommus = <&apps_smmu 0x560 0x0>; clocks = <&gcc GCC_SDCC2_AHB_CLK>, <&gcc GCC_SDCC2_APPS_CLK>,