From patchwork Fri Jul 13 16:27:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thor Thayer X-Patchwork-Id: 10523817 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 2E0B6601C2 for ; Fri, 13 Jul 2018 16:26:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1932D284CE for ; Fri, 13 Jul 2018 16:26:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BAC428692; Fri, 13 Jul 2018 16:26:16 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9A646284CE for ; Fri, 13 Jul 2018 16:26:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=MgojgEGC25uP5pNhbyCgeo5/3Axnnz3FSUiRz92CuCQ=; b=D6M0A5l4UXDusjftekbSKLH6jm 3ZRg25TbF4Lk3VVqGwbZIW+H+OJMXDwsQkwYMqS5LYAY7KibFQcUWWyeyFe2f99tMAww/j9MWGlwd fhKR5ZC8s+egCSNin/Zdnr9lKD5JlFuRfVNQV8VtkLlSmgZfvqu9mTucC5s7Rjy/PovTMu4xxsZ5H MaZ0K4spHEhEnqVrOJx/+JQu5R03XSIvgoVsL+ziXvd1Fj8lVFwb2PCzJ2BClpDHhtCf6wq1lmxDq oNVKyI1gjlRli61DhVSlgPU4GL+UHrk6W4VAad3GqzIaBjKUzb58jJOTNfg41UjkvivVA/QxzGqD7 0MiEWDLA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fe0tW-00041o-Qt; Fri, 13 Jul 2018 16:26:10 +0000 Received: from mga05.intel.com ([192.55.52.43]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fe0t1-0003FZ-Eq for linux-arm-kernel@lists.infradead.org; Fri, 13 Jul 2018 16:25:41 +0000 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jul 2018 09:25:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,348,1526367600"; d="scan'208";a="56665384" Received: from tthayer-hp-z620-workstation.an.intel.com ([10.122.105.144]) by orsmga008.jf.intel.com with ESMTP; 13 Jul 2018 09:25:28 -0700 From: thor.thayer@linux.intel.com To: dinguyen@kernel.org, robh+dt@kernel.org, joro@8bytes.org, mark.rutland@arm.com, robin.murphy@arm.com Subject: [PATCH 3/3] arm64: dts: stratix10: Add SMMU Node Date: Fri, 13 Jul 2018 11:27:58 -0500 Message-Id: <1531499278-32132-4-git-send-email-thor.thayer@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531499278-32132-1-git-send-email-thor.thayer@linux.intel.com> References: <1531499278-32132-1-git-send-email-thor.thayer@linux.intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180713_092539_615340_B91B94B8 X-CRM114-Status: GOOD ( 10.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Thor Thayer , catalin.marinas@arm.com, will.deacon@arm.com, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Thor Thayer Add the SMMU node and IOMMU parameters to the Stratix10 Device Tree. Signed-off-by: Thor Thayer --- arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 44 +++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi index ca67ecb5866e..9b6ead87ae70 100644 --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi @@ -162,6 +162,8 @@ reset-names = "stmmaceth", "stmmaceth-ocp"; clocks = <&clkmgr STRATIX10_EMAC0_CLK>; clock-names = "stmmaceth"; + #stream-id-cells = <1>; + iommus = <&smmu 1>; status = "disabled"; }; @@ -175,6 +177,8 @@ reset-names = "stmmaceth", "stmmaceth-ocp"; clocks = <&clkmgr STRATIX10_EMAC1_CLK>; clock-names = "stmmaceth"; + #stream-id-cells = <1>; + iommus = <&smmu 2>; status = "disabled"; }; @@ -188,6 +192,8 @@ reset-names = "stmmaceth", "stmmaceth-ocp"; clocks = <&clkmgr STRATIX10_EMAC2_CLK>; clock-names = "stmmaceth"; + #stream-id-cells = <1>; + iommus = <&smmu 3>; status = "disabled"; }; @@ -298,6 +304,8 @@ clocks = <&clkmgr STRATIX10_L4_MP_CLK>, <&clkmgr STRATIX10_SDMMC_CLK>; clock-names = "biu", "ciu"; + #stream-id-cells = <1>; + iommus = <&smmu 5>; status = "disabled"; }; @@ -323,6 +331,8 @@ #dma-requests = <32>; clocks = <&clkmgr STRATIX10_L4_MAIN_CLK>; clock-names = "apb_pclk"; + #stream-id-cells = <1>; + iommus = <&smmu 8>; }; rst: rstmgr@ffd11000 { @@ -332,6 +342,36 @@ altr,modrst-offset = <0x20>; }; + smmu: iommu@fa000000 { + compatible = "arm,mmu-500", "arm,smmu-v2"; + reg = <0xfa000000 0x40000>; + #global-interrupts = <9>; + #iommu-cells = <1>; + clocks = <&clkmgr STRATIX10_L4_MAIN_CLK>; + clock-names = "smmu_clk"; + interrupt-parent = <&intc>; + interrupts = <0 128 4>, /* Global Secure Fault */ + <0 129 4>, /* Global Non-secure Fault */ + <0 130 4>, /* FPGA Performance Counter */ + <0 131 4>, /* DMA Performance Counter */ + <0 132 4>, /* EMAC Performance Counter */ + <0 133 4>, /* IO Performance Counter */ + <0 134 4>, /* SDM Performance Counter */ + <0 136 4>, /* Non-secure Combined Interrupt */ + <0 137 4>, /* Secure Combined Interrupt */ + /* Non-secure Context Interrupts (32) */ + <0 138 4>, <0 139 4>, <0 140 4>, <0 141 4>, + <0 142 4>, <0 143 4>, <0 144 4>, <0 145 4>, + <0 146 4>, <0 147 4>, <0 148 4>, <0 149 4>, + <0 150 4>, <0 151 4>, <0 152 4>, <0 153 4>, + <0 154 4>, <0 155 4>, <0 156 4>, <0 157 4>, + <0 158 4>, <0 159 4>, <0 160 4>, <0 161 4>, + <0 162 4>, <0 163 4>, <0 164 4>, <0 165 4>, + <0 166 4>, <0 167 4>, <0 168 4>, <0 169 4>; + stream-match-mask = <0x7ff0>; + status = "disabled"; + }; + spi0: spi@ffda4000 { compatible = "snps,dw-apb-ssi"; #address-cells = <1>; @@ -439,6 +479,8 @@ resets = <&rst USB0_RESET>, <&rst USB0_OCP_RESET>; reset-names = "dwc2", "dwc2-ecc"; clocks = <&clkmgr STRATIX10_USB_CLK>; + #stream-id-cells = <1>; + iommus = <&smmu 6>; status = "disabled"; }; @@ -451,6 +493,8 @@ resets = <&rst USB1_RESET>, <&rst USB1_OCP_RESET>; reset-names = "dwc2", "dwc2-ecc"; clocks = <&clkmgr STRATIX10_USB_CLK>; + #stream-id-cells = <1>; + iommus = <&smmu 7>; status = "disabled"; };