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 X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UPPERCASE_50_75,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E866C433DF for ; Sun, 24 May 2020 02:38:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0E9B720899 for ; Sun, 24 May 2020 02:38:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=marek-ca.20150623.gappssmtp.com header.i=@marek-ca.20150623.gappssmtp.com header.b="ouHoECnr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388325AbgEXCiW (ORCPT ); Sat, 23 May 2020 22:38:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388225AbgEXCiV (ORCPT ); Sat, 23 May 2020 22:38:21 -0400 Received: from mail-qv1-xf42.google.com (mail-qv1-xf42.google.com [IPv6:2607:f8b0:4864:20::f42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 331CBC061A0E for ; Sat, 23 May 2020 19:38:21 -0700 (PDT) Received: by mail-qv1-xf42.google.com with SMTP id fb16so6630971qvb.5 for ; Sat, 23 May 2020 19:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AGQqc7r2iXVVcHDvCNA+9EaTskSsmpJQN52xqWTAPbI=; b=ouHoECnrX4F2EeGrEXAz/3Kj3oqEbGlaoGjeFAX/0q9iM1N1Ump7M0HOn34z0Iuna1 oNUmRnt9o6E4RVDNncQoqsK/MMCk+1Lson9vS/3Ww3coK4Zr2nKAj1vymCni54prO1Op PHbCHoKAxYN9FiZ5ZI8ML0nnEg3htYYdpfJkiN9b03bit5itGBcYZgw/IUu/URL1f7Ge PeOa1LTpUoIeVFqxLxzJctNGs+gVOPsLfmEP5wOJVEK69lTriZAVHSe9uXOcqgfbi/rd Bfn1Ir41ARWmCiNaZUJsGeUVFgF7DcUKAMg3OiapJ0BD3DHBRQQDrFmgrXTwW53URsdF uJ4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AGQqc7r2iXVVcHDvCNA+9EaTskSsmpJQN52xqWTAPbI=; b=oy1iKotdyI0y/4dU2DskND0fsTN87+aLCYZrxKQW/zavxCMCVgz707NOcTZSgaMEky w8zv+SJHKpMqB76sIffqOyDsVEfLToBJOXqyln3AqWpBRInIC0bUzQGO29ExvZSRcpLk FVJwOXJkHQL42hgZ3dcYWntMATnDCPzW0MTgn0JhlZV1QywSV1sLqWGSXBTETc1AWRD7 ex7cfs79dugayZGTsWM9I0c2yZj2QU3C9R1kczf3otC+TbzkX345FhyoCum83C+StGTV 9w+Ln2fatnwWLaW4RfNBwCWw/FeIFDxL44hxB+pvJ73whkLdoNDWtomdj8t+bMPanN2k CcOg== X-Gm-Message-State: AOAM533AzDpw11HejF7G6BPPm8N8TzTXG9NmUddyCFNAxGBnxpxkDHUI 9t50qI71l7JHBEdNiCosHaB1AQ== X-Google-Smtp-Source: ABdhPJwdar9ibWzrTU55Dd3I6qotN2Zns43BoqKnB/WjZ2JVuSMYO/IG4jIX6OnLmwuyf/tYdbJPBQ== X-Received: by 2002:a05:6214:9c8:: with SMTP id dp8mr10155292qvb.109.1590287900453; Sat, 23 May 2020 19:38:20 -0700 (PDT) Received: from localhost.localdomain ([147.253.86.153]) by smtp.gmail.com with ESMTPSA id e3sm11187666qtj.25.2020.05.23.19.38.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 19:38:19 -0700 (PDT) From: Jonathan Marek To: linux-arm-msm@vger.kernel.org Cc: Andy Gross , Bjorn Andersson , Rob Herring , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/6] arm64: dts: qcom: sm8250: add apps_smmu node Date: Sat, 23 May 2020 22:38:08 -0400 Message-Id: <20200524023815.21789-3-jonathan@marek.ca> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200524023815.21789-1-jonathan@marek.ca> References: <20200524023815.21789-1-jonathan@marek.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add the apps_smmu node for sm8250. Note that adding the iommus field for UFS is required because initializing the iommu removes the bypass mapping that created by the bootloader. Signed-off-by: Jonathan Marek --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 107 +++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index 2f99c350c287..43c5e48c15e2 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -323,6 +323,8 @@ ufs_mem_hc: ufshc@1d84000 { power-domains = <&gcc UFS_PHY_GDSC>; + iommus = <&apps_smmu 0x0e0 0>, <&apps_smmu 0x4e0 0>; + clock-names = "core_clk", "bus_aggr_clk", @@ -428,6 +430,111 @@ tlmm: pinctrl@f100000 { wakeup-parent = <&pdc>; }; + apps_smmu: iommu@15000000 { + compatible = "qcom,sdm845-smmu-500", "arm,mmu-500"; + reg = <0 0x15000000 0 0x100000>; + #iommu-cells = <2>; + #global-interrupts = <2>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + }; + intc: interrupt-controller@17a00000 { compatible = "arm,gic-v3"; #interrupt-cells = <3>; -- 2.26.1