From mboxrd@z Thu Jan 1 00:00:00 1970 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 1FCE4C3DA6E for ; Sat, 17 Dec 2022 00:10:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229894AbiLQAKn (ORCPT ); Fri, 16 Dec 2022 19:10:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229907AbiLQAKN (ORCPT ); Fri, 16 Dec 2022 19:10:13 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5B1C7508B; Fri, 16 Dec 2022 16:10:12 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 53390622CD; Sat, 17 Dec 2022 00:10:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 921B4C433A7; Sat, 17 Dec 2022 00:10:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671235811; bh=CXmucn0J03Axtpcw6702OrV6p72VnX2zeyU26jEVdfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sDnBa042EjqdbD9jXK9HLeibPczDZp2FaGD60NRscb+yY120nEanp2oUvOarGZ/TC GhggiVYxDhuUpaxpdSsT4w2fkpu48GwdDn9e90F4Su+fXqoKcxsXNTbIRFIeo8wEBn vq/CtZK7PxoJQ0onjGFDuSXvZRqP7vrfgFgim/xiKO+LZc+RKnqIN6C970VhJBBPMi uVgC/C7TChxOf3U867Bbjh/zduMY/Zxjllr4GAJeiwdUezoYYGLEorUDrn+mkA5sQu 5t7j/kPmzY+phNLzBHugwiyu18b/+nz61hO0g23xSQT0MbOdnctFFlZ93XtONZv4LT kD/v/8sjjeJEg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marijn Suijten , Konrad Dybcio , Luca Weiss , Bjorn Andersson , Sasha Levin , agross@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 9/9] arm64: dts: qcom: sm6350: Add apps_smmu with streamID to SDHCI 1/2 nodes Date: Fri, 16 Dec 2022 19:09:36 -0500 Message-Id: <20221217000937.41115-9-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221217000937.41115-1-sashal@kernel.org> References: <20221217000937.41115-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Marijn Suijten [ Upstream commit 7372b944a6ba5ac86628eaacc89ed4f103435cb9 ] 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: Luca Weiss Tested-by: Luca Weiss # sm7225-fairphone-fp4 Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20221030073232.22726-11-marijn.suijten@somainline.org Signed-off-by: Sasha Levin --- 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 c39de7d3ace0..df07ae42511d 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>, @@ -1063,6 +1064,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>, -- 2.35.1