From patchwork Wed Mar 1 17:42:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 9598865 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3080160547 for ; Wed, 1 Mar 2017 17:43:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2801728306 for ; Wed, 1 Mar 2017 17:43:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CA6F283F9; Wed, 1 Mar 2017 17:43:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03ADC28306 for ; Wed, 1 Mar 2017 17:43:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752889AbdCARn1 (ORCPT ); Wed, 1 Mar 2017 12:43:27 -0500 Received: from mail-qk0-f195.google.com ([209.85.220.195]:33090 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752462AbdCARnZ (ORCPT ); Wed, 1 Mar 2017 12:43:25 -0500 Received: by mail-qk0-f195.google.com with SMTP id n186so12449002qkb.0 for ; Wed, 01 Mar 2017 09:43:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QmKofNo7+jyTkTsSE/+qQRt/EgSnNkA5z42TToyuOH4=; b=Mf7vRmLbWt72io9zPx1GcVBNEuzrAJpmTU6cC3AiP2mc/GhnBaZn3S8fgzeHkDD7an QsUYIGf4i9hJCTmezphw7MgKAslpu/n/HVLCaS7lo5WBkjKksIFX0eWqDgAEyf/SfDqw WMpwGs7G7t8IInI/7Gbk3iTsiRpayThlNeSANJvV815WZtbnnOiTJAw4MJ0iLSFMvQx6 xO7GJYmcrAU6pjy0pv7FjHgZzxlcdEEA1kcoaLoc8tPffQDgQhEo3ex7yrTY0QfP3kiN 6LfZ63PBbCHy2Tzr45ILbDk4ILREBd5zlSUrv0GQIPKvf+LRNmFSowBgqdTTe6rsKeO/ hKvQ== 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; bh=QmKofNo7+jyTkTsSE/+qQRt/EgSnNkA5z42TToyuOH4=; b=FlgrILy1piPxnL9+z25tnUzhNc5t2ykjRyQTG+dT9q4OhrR+lQNugFhmjNv0ToWPPV U4ngNJDe1vrpbUH+refH830saekyGUES2nHQ1o03p7uVbUg4tDE8MYCSLRlNwoJpw3eO tf1ZHDZs3JobsTxJCDcDpQVrflGLLxIow31foWlKtyYNIEKhnFgUt0+YmFuxaTdAtJwI jhdc2HNJ+CICIz7ILfvmJQk73jDD4aGEw/3ju8uiR3ioGeEfWS/bu6Kcg8bk2wD8gJ/F kRj5gTvUGRjzis5r8LrexV4qZ/1zj0eeKRShr3VWYyEqanMvkX8qBDlNuBhwGMLNw7EP rsoQ== X-Gm-Message-State: AMke39k4P2tIeaMVW3fJYveSU5l3sXjofmMcAjqRDD+tgxS99t1AxCR/FhEPI1X1ye7KIw== X-Received: by 10.55.164.207 with SMTP id n198mr11317645qke.95.1488390204047; Wed, 01 Mar 2017 09:43:24 -0800 (PST) Received: from localhost ([2601:184:4780:aac0:25f8:dd96:a084:785a]) by smtp.gmail.com with ESMTPSA id g66sm3562552qkb.55.2017.03.01.09.43.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2017 09:43:23 -0800 (PST) From: Rob Clark To: iommu@lists.linux-foundation.org Cc: linux-arm-msm@vger.kernel.org, Robin Murphy , Will Deacon , Sricharan , Mark Rutland , Stanimir Varbanov , Rob Clark Subject: [PATCH 9/9] ARM64: DT: add iommu for msm8916 Date: Wed, 1 Mar 2017 12:42:58 -0500 Message-Id: <20170301174258.14618-10-robdclark@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170301174258.14618-1-robdclark@gmail.com> References: <20170301174258.14618-1-robdclark@gmail.com> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Rob Clark --- arch/arm64/boot/dts/qcom/msm8916.dtsi | 57 +++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 7bcf4cd..10ca05a 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -705,6 +705,59 @@ #thermal-sensor-cells = <1>; }; + apps_iommu: msm-iommu-v1@1e20000 { + #address-cells = <1>; + #size-cells = <1>; + #iommu-cells = <1>; + compatible = "qcom,msm-iommu-v1"; + ranges = <0 0x1e20000 0x40000>; + reg = <0x1ef0000 0x3000>; + clocks = <&gcc GCC_SMMU_CFG_CLK>, + <&gcc GCC_APSS_TCU_CLK>; + clock-names = "iface_clk", "bus_clk"; + qcom,iommu-secure-id = <17>; + + // mdp_0: + msm-iommu-v1-ctx@4000 { + compatible = "qcom,msm-iommu-v1-ns"; + reg = <0x4000 0x1000>; + interrupts = ; + }; + + // venus_ns: + msm-iommu-v1-ctx@5000 { + compatible = "qcom,msm-iommu-v1-sec"; + reg = <0x5000 0x1000>; + interrupts = ; + }; + }; + + gpu_iommu: msm-iommu-v1@1f08000 { + #address-cells = <1>; + #size-cells = <1>; + #iommu-cells = <1>; + compatible = "qcom,msm-iommu-v1"; + ranges = <0 0x1f08000 0x10000>; + clocks = <&gcc GCC_SMMU_CFG_CLK>, + <&gcc GCC_GFX_TCU_CLK>; + clock-names = "iface_clk", "bus_clk"; + qcom,iommu-secure-id = <18>; + + // gfx3d_user: + msm-iommu-v1-ctx@1f09000 { + compatible = "qcom,msm-iommu-v1-ns"; + reg = <0x1000 0x1000>; + interrupts = ; + }; + + // gfx3d_priv: + msm-iommu-v1-ctx@1f0a000 { + compatible = "qcom,msm-iommu-v1-ns"; + reg = <0x2000 0x1000>; + interrupts = ; + }; + }; + gpu@01c00000 { compatible = "qcom,adreno-306.0", "qcom,adreno"; reg = <0x01c00000 0x20000>; @@ -726,6 +779,7 @@ <&gcc GCC_BIMC_GPU_CLK>, <&gcc GFX3D_CLK_SRC>; power-domains = <&gcc OXILI_GDSC>; + iommus = <&gpu_iommu 1>, <&gpu_iommu 2>; }; mdss: mdss@1a00000 { @@ -769,6 +823,8 @@ "core_clk", "vsync_clk"; + iommus = <&apps_iommu 4>; + ports { #address-cells = <1>; #size-cells = <0>; @@ -1207,6 +1263,7 @@ <&gcc GCC_VENUS0_AHB_CLK>, <&gcc GCC_VENUS0_AXI_CLK>; clock-names = "core", "iface", "bus"; + iommus = <&apps_iommu 5>; memory-region = <&venus_mem>; status = "okay";