b7ab407
From patchwork Thu Jul 13 12:07:44 2017
b7ab407
Content-Type: text/plain; charset="utf-8"
b7ab407
MIME-Version: 1.0
b7ab407
Content-Transfer-Encoding: 7bit
b7ab407
Subject: [RESEND,1/4] Docs: dt: document qcom iommu bindings
b7ab407
From: Rob Clark <robdclark@gmail.com>
b7ab407
X-Patchwork-Id: 9838369
b7ab407
Message-Id: <20170713120747.20490-2-robdclark@gmail.com>
b7ab407
To: iommu@lists.linux-foundation.org
b7ab407
Cc: linux-arm-msm@vger.kernel.org, Archit Taneja <architt@codeaurora.org>,
b7ab407
 Rob Herring <robh@kernel.org>, Will Deacon <will.deacon@arm.com>,
b7ab407
 Sricharan <sricharan@codeaurora.org>,
b7ab407
 Mark Rutland <mark.rutland@arm.com>, Robin Murphy <robin.murphy@arm.com>,
b7ab407
 Rob Clark <robdclark@gmail.com>, devicetree@vger.kernel.org
b7ab407
Date: Thu, 13 Jul 2017 08:07:44 -0400
b7ab407
b7ab407
Cc: devicetree@vger.kernel.org
b7ab407
Signed-off-by: Rob Clark <robdclark@gmail.com>
b7ab407
Reviewed-by: Rob Herring <robh@kernel.org>
b7ab407
---
b7ab407
 .../devicetree/bindings/iommu/qcom,iommu.txt       | 121 +++++++++++++++++++++
b7ab407
 1 file changed, 121 insertions(+)
b7ab407
 create mode 100644 Documentation/devicetree/bindings/iommu/qcom,iommu.txt
b7ab407
b7ab407
diff --git a/Documentation/devicetree/bindings/iommu/qcom,iommu.txt b/Documentation/devicetree/bindings/iommu/qcom,iommu.txt
b7ab407
new file mode 100644
b7ab407
index 000000000000..b2641ceb2b40
b7ab407
--- /dev/null
b7ab407
+++ b/Documentation/devicetree/bindings/iommu/qcom,iommu.txt
b7ab407
@@ -0,0 +1,121 @@
b7ab407
+* QCOM IOMMU v1 Implementation
b7ab407
+
b7ab407
+Qualcomm "B" family devices which are not compatible with arm-smmu have
b7ab407
+a similar looking IOMMU but without access to the global register space,
b7ab407
+and optionally requiring additional configuration to route context irqs
b7ab407
+to non-secure vs secure interrupt line.
b7ab407
+
b7ab407
+** Required properties:
b7ab407
+
b7ab407
+- compatible       : Should be one of:
b7ab407
+
b7ab407
+                        "qcom,msm8916-iommu"
b7ab407
+
b7ab407
+                     Followed by "qcom,msm-iommu-v1".
b7ab407
+
b7ab407
+- clock-names      : Should be a pair of "iface" (required for IOMMUs
b7ab407
+                     register group access) and "bus" (required for
b7ab407
+                     the IOMMUs underlying bus access).
b7ab407
+
b7ab407
+- clocks           : Phandles for respective clocks described by
b7ab407
+                     clock-names.
b7ab407
+
b7ab407
+- #address-cells   : must be 1.
b7ab407
+
b7ab407
+- #size-cells      : must be 1.
b7ab407
+
b7ab407
+- #iommu-cells     : Must be 1.  Index identifies the context-bank #.
b7ab407
+
b7ab407
+- ranges           : Base address and size of the iommu context banks.
b7ab407
+
b7ab407
+- qcom,iommu-secure-id  : secure-id.
b7ab407
+
b7ab407
+- List of sub-nodes, one per translation context bank.  Each sub-node
b7ab407
+  has the following required properties:
b7ab407
+
b7ab407
+  - compatible     : Should be one of:
b7ab407
+        - "qcom,msm-iommu-v1-ns"  : non-secure context bank
b7ab407
+        - "qcom,msm-iommu-v1-sec" : secure context bank
b7ab407
+  - reg            : Base address and size of context bank within the iommu
b7ab407
+  - interrupts     : The context fault irq.
b7ab407
+
b7ab407
+** Optional properties:
b7ab407
+
b7ab407
+- reg              : Base address and size of the SMMU local base, should
b7ab407
+                     be only specified if the iommu requires configuration
b7ab407
+                     for routing of context bank irq's to secure vs non-
b7ab407
+                     secure lines.  (Ie. if the iommu contains secure
b7ab407
+                     context banks)
b7ab407
+
b7ab407
+
b7ab407
+** Examples:
b7ab407
+
b7ab407
+	apps_iommu: iommu@1e20000 {
b7ab407
+		#address-cells = <1>;
b7ab407
+		#size-cells = <1>;
b7ab407
+		#iommu-cells = <1>;
b7ab407
+		compatible = "qcom,msm8916-iommu", "qcom,msm-iommu-v1";
b7ab407
+		ranges = <0 0x1e20000 0x40000>;
b7ab407
+		reg = <0x1ef0000 0x3000>;
b7ab407
+		clocks = <&gcc GCC_SMMU_CFG_CLK>,
b7ab407
+			 <&gcc GCC_APSS_TCU_CLK>;
b7ab407
+		clock-names = "iface", "bus";
b7ab407
+		qcom,iommu-secure-id = <17>;
b7ab407
+
b7ab407
+		// mdp_0:
b7ab407
+		iommu-ctx@4000 {
b7ab407
+			compatible = "qcom,msm-iommu-v1-ns";
b7ab407
+			reg = <0x4000 0x1000>;
b7ab407
+			interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
b7ab407
+		};
b7ab407
+
b7ab407
+		// venus_ns:
b7ab407
+		iommu-ctx@5000 {
b7ab407
+			compatible = "qcom,msm-iommu-v1-sec";
b7ab407
+			reg = <0x5000 0x1000>;
b7ab407
+			interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
b7ab407
+		};
b7ab407
+	};
b7ab407
+
b7ab407
+	gpu_iommu: iommu@1f08000 {
b7ab407
+		#address-cells = <1>;
b7ab407
+		#size-cells = <1>;
b7ab407
+		#iommu-cells = <1>;
b7ab407
+		compatible = "qcom,msm8916-iommu", "qcom,msm-iommu-v1";
b7ab407
+		ranges = <0 0x1f08000 0x10000>;
b7ab407
+		clocks = <&gcc GCC_SMMU_CFG_CLK>,
b7ab407
+			 <&gcc GCC_GFX_TCU_CLK>;
b7ab407
+		clock-names = "iface", "bus";
b7ab407
+		qcom,iommu-secure-id = <18>;
b7ab407
+
b7ab407
+		// gfx3d_user:
b7ab407
+		iommu-ctx@1000 {
b7ab407
+			compatible = "qcom,msm-iommu-v1-ns";
b7ab407
+			reg = <0x1000 0x1000>;
b7ab407
+			interrupts = <GIC_SPI 241 IRQ_TYPE_LEVEL_HIGH>;
b7ab407
+		};
b7ab407
+
b7ab407
+		// gfx3d_priv:
b7ab407
+		iommu-ctx@2000 {
b7ab407
+			compatible = "qcom,msm-iommu-v1-ns";
b7ab407
+			reg = <0x2000 0x1000>;
b7ab407
+			interrupts = <GIC_SPI 242 IRQ_TYPE_LEVEL_HIGH>;
b7ab407
+		};
b7ab407
+	};
b7ab407
+
b7ab407
+	...
b7ab407
+
b7ab407
+	venus: video-codec@1d00000 {
b7ab407
+		...
b7ab407
+		iommus = <&apps_iommu 5>;
b7ab407
+	};
b7ab407
+
b7ab407
+	mdp: mdp@1a01000 {
b7ab407
+		...
b7ab407
+		iommus = <&apps_iommu 4>;
b7ab407
+	};
b7ab407
+
b7ab407
+	gpu@01c00000 {
b7ab407
+		...
b7ab407
+		iommus = <&gpu_iommu 1>, <&gpu_iommu 2>;
b7ab407
+	};
b7ab407
From patchwork Thu Jul 13 12:07:45 2017
b7ab407
Content-Type: text/plain; charset="utf-8"
b7ab407
MIME-Version: 1.0
b7ab407
Content-Transfer-Encoding: 7bit
b7ab407
Subject: [RESEND,2/4] iommu: arm-smmu: split out register defines
b7ab407
From: Rob Clark <robdclark@gmail.com>
b7ab407
X-Patchwork-Id: 9838371
b7ab407
Message-Id: <20170713120747.20490-3-robdclark@gmail.com>
b7ab407
To: iommu@lists.linux-foundation.org
b7ab407
Cc: linux-arm-msm@vger.kernel.org, Archit Taneja <architt@codeaurora.org>,
b7ab407
 Rob Herring <robh@kernel.org>, Will Deacon <will.deacon@arm.com>,
b7ab407
 Sricharan <sricharan@codeaurora.org>,
b7ab407
 Mark Rutland <mark.rutland@arm.com>, Robin Murphy <robin.murphy@arm.com>,
b7ab407
 Rob Clark <robdclark@gmail.com>
b7ab407
Date: Thu, 13 Jul 2017 08:07:45 -0400
b7ab407
b7ab407
I want to re-use some of these for qcom_iommu, which has (roughly) the
b7ab407
same context-bank registers.
b7ab407
b7ab407
Signed-off-by: Rob Clark <robdclark@gmail.com>
b7ab407
---
b7ab407
 drivers/iommu/arm-smmu-regs.h | 227 ++++++++++++++++++++++++++++++++++++++++++
b7ab407
 drivers/iommu/arm-smmu.c      | 203 +------------------------------------
b7ab407
 2 files changed, 228 insertions(+), 202 deletions(-)
b7ab407
 create mode 100644 drivers/iommu/arm-smmu-regs.h
b7ab407
b7ab407
diff --git a/drivers/iommu/arm-smmu-regs.h b/drivers/iommu/arm-smmu-regs.h
b7ab407
new file mode 100644
b7ab407
index 000000000000..87589c863068
b7ab407
--- /dev/null
b7ab407
+++ b/drivers/iommu/arm-smmu-regs.h
b7ab407
@@ -0,0 +1,227 @@
b7ab407
+/*
b7ab407
+ * IOMMU API for ARM architected SMMU implementations.
b7ab407
+ *
b7ab407
+ * This program is free software; you can redistribute it and/or modify
b7ab407
+ * it under the terms of the GNU General Public License version 2 as
b7ab407
+ * published by the Free Software Foundation.
b7ab407
+ *
b7ab407
+ * This program is distributed in the hope that it will be useful,
b7ab407
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
b7ab407
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
b7ab407
+ * GNU General Public License for more details.
b7ab407
+ *
b7ab407
+ * You should have received a copy of the GNU General Public License
b7ab407
+ * along with this program; if not, write to the Free Software
b7ab407
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
b7ab407
+ *
b7ab407
+ * Copyright (C) 2013 ARM Limited
b7ab407
+ *
b7ab407
+ * Author: Will Deacon <will.deacon@arm.com>
b7ab407
+ */
b7ab407
+
b7ab407
+#ifndef _ARM_SMMU_REGS_H
b7ab407
+#define _ARM_SMMU_REGS_H
b7ab407
+
b7ab407
+/* Configuration registers */
b7ab407
+#define ARM_SMMU_GR0_sCR0		0x0
b7ab407
+#define sCR0_CLIENTPD			(1 << 0)
b7ab407
+#define sCR0_GFRE			(1 << 1)
b7ab407
+#define sCR0_GFIE			(1 << 2)
b7ab407
+#define sCR0_EXIDENABLE			(1 << 3)
b7ab407
+#define sCR0_GCFGFRE			(1 << 4)
b7ab407
+#define sCR0_GCFGFIE			(1 << 5)
b7ab407
+#define sCR0_USFCFG			(1 << 10)
b7ab407
+#define sCR0_VMIDPNE			(1 << 11)
b7ab407
+#define sCR0_PTM			(1 << 12)
b7ab407
+#define sCR0_FB				(1 << 13)
b7ab407
+#define sCR0_VMID16EN			(1 << 31)
b7ab407
+#define sCR0_BSU_SHIFT			14
b7ab407
+#define sCR0_BSU_MASK			0x3
b7ab407
+
b7ab407
+/* Auxiliary Configuration register */
b7ab407
+#define ARM_SMMU_GR0_sACR		0x10
b7ab407
+
b7ab407
+/* Identification registers */
b7ab407
+#define ARM_SMMU_GR0_ID0		0x20
b7ab407
+#define ARM_SMMU_GR0_ID1		0x24
b7ab407
+#define ARM_SMMU_GR0_ID2		0x28
b7ab407
+#define ARM_SMMU_GR0_ID3		0x2c
b7ab407
+#define ARM_SMMU_GR0_ID4		0x30
b7ab407
+#define ARM_SMMU_GR0_ID5		0x34
b7ab407
+#define ARM_SMMU_GR0_ID6		0x38
b7ab407
+#define ARM_SMMU_GR0_ID7		0x3c
b7ab407
+#define ARM_SMMU_GR0_sGFSR		0x48
b7ab407
+#define ARM_SMMU_GR0_sGFSYNR0		0x50
b7ab407
+#define ARM_SMMU_GR0_sGFSYNR1		0x54
b7ab407
+#define ARM_SMMU_GR0_sGFSYNR2		0x58
b7ab407
+
b7ab407
+#define ID0_S1TS			(1 << 30)
b7ab407
+#define ID0_S2TS			(1 << 29)
b7ab407
+#define ID0_NTS				(1 << 28)
b7ab407
+#define ID0_SMS				(1 << 27)
b7ab407
+#define ID0_ATOSNS			(1 << 26)
b7ab407
+#define ID0_PTFS_NO_AARCH32		(1 << 25)
b7ab407
+#define ID0_PTFS_NO_AARCH32S		(1 << 24)
b7ab407
+#define ID0_CTTW			(1 << 14)
b7ab407
+#define ID0_NUMIRPT_SHIFT		16
b7ab407
+#define ID0_NUMIRPT_MASK		0xff
b7ab407
+#define ID0_NUMSIDB_SHIFT		9
b7ab407
+#define ID0_NUMSIDB_MASK		0xf
b7ab407
+#define ID0_EXIDS			(1 << 8)
b7ab407
+#define ID0_NUMSMRG_SHIFT		0
b7ab407
+#define ID0_NUMSMRG_MASK		0xff
b7ab407
+
b7ab407
+#define ID1_PAGESIZE			(1 << 31)
b7ab407
+#define ID1_NUMPAGENDXB_SHIFT		28
b7ab407
+#define ID1_NUMPAGENDXB_MASK		7
b7ab407
+#define ID1_NUMS2CB_SHIFT		16
b7ab407
+#define ID1_NUMS2CB_MASK		0xff
b7ab407
+#define ID1_NUMCB_SHIFT			0
b7ab407
+#define ID1_NUMCB_MASK			0xff
b7ab407
+
b7ab407
+#define ID2_OAS_SHIFT			4
b7ab407
+#define ID2_OAS_MASK			0xf
b7ab407
+#define ID2_IAS_SHIFT			0
b7ab407
+#define ID2_IAS_MASK			0xf
b7ab407
+#define ID2_UBS_SHIFT			8
b7ab407
+#define ID2_UBS_MASK			0xf
b7ab407
+#define ID2_PTFS_4K			(1 << 12)
b7ab407
+#define ID2_PTFS_16K			(1 << 13)
b7ab407
+#define ID2_PTFS_64K			(1 << 14)
b7ab407
+#define ID2_VMID16			(1 << 15)
b7ab407
+
b7ab407
+#define ID7_MAJOR_SHIFT			4
b7ab407
+#define ID7_MAJOR_MASK			0xf
b7ab407
+
b7ab407
+/* Global TLB invalidation */
b7ab407
+#define ARM_SMMU_GR0_TLBIVMID		0x64
b7ab407
+#define ARM_SMMU_GR0_TLBIALLNSNH	0x68
b7ab407
+#define ARM_SMMU_GR0_TLBIALLH		0x6c
b7ab407
+#define ARM_SMMU_GR0_sTLBGSYNC		0x70
b7ab407
+#define ARM_SMMU_GR0_sTLBGSTATUS	0x74
b7ab407
+#define sTLBGSTATUS_GSACTIVE		(1 << 0)
b7ab407
+#define TLB_LOOP_TIMEOUT		1000000	/* 1s! */
b7ab407
+#define TLB_SPIN_COUNT			10
b7ab407
+
b7ab407
+/* Stream mapping registers */
b7ab407
+#define ARM_SMMU_GR0_SMR(n)		(0x800 + ((n) << 2))
b7ab407
+#define SMR_VALID			(1 << 31)
b7ab407
+#define SMR_MASK_SHIFT			16
b7ab407
+#define SMR_ID_SHIFT			0
b7ab407
+
b7ab407
+#define ARM_SMMU_GR0_S2CR(n)		(0xc00 + ((n) << 2))
b7ab407
+#define S2CR_CBNDX_SHIFT		0
b7ab407
+#define S2CR_CBNDX_MASK			0xff
b7ab407
+#define S2CR_EXIDVALID			(1 << 10)
b7ab407
+#define S2CR_TYPE_SHIFT			16
b7ab407
+#define S2CR_TYPE_MASK			0x3
b7ab407
+enum arm_smmu_s2cr_type {
b7ab407
+	S2CR_TYPE_TRANS,
b7ab407
+	S2CR_TYPE_BYPASS,
b7ab407
+	S2CR_TYPE_FAULT,
b7ab407
+};
b7ab407
+
b7ab407
+#define S2CR_PRIVCFG_SHIFT		24
b7ab407
+#define S2CR_PRIVCFG_MASK		0x3
b7ab407
+enum arm_smmu_s2cr_privcfg {
b7ab407
+	S2CR_PRIVCFG_DEFAULT,
b7ab407
+	S2CR_PRIVCFG_DIPAN,
b7ab407
+	S2CR_PRIVCFG_UNPRIV,
b7ab407
+	S2CR_PRIVCFG_PRIV,
b7ab407
+};
b7ab407
+
b7ab407
+/* Context bank attribute registers */
b7ab407
+#define ARM_SMMU_GR1_CBAR(n)		(0x0 + ((n) << 2))
b7ab407
+#define CBAR_VMID_SHIFT			0
b7ab407
+#define CBAR_VMID_MASK			0xff
b7ab407
+#define CBAR_S1_BPSHCFG_SHIFT		8
b7ab407
+#define CBAR_S1_BPSHCFG_MASK		3
b7ab407
+#define CBAR_S1_BPSHCFG_NSH		3
b7ab407
+#define CBAR_S1_MEMATTR_SHIFT		12
b7ab407
+#define CBAR_S1_MEMATTR_MASK		0xf
b7ab407
+#define CBAR_S1_MEMATTR_WB		0xf
b7ab407
+#define CBAR_TYPE_SHIFT			16
b7ab407
+#define CBAR_TYPE_MASK			0x3
b7ab407
+#define CBAR_TYPE_S2_TRANS		(0 << CBAR_TYPE_SHIFT)
b7ab407
+#define CBAR_TYPE_S1_TRANS_S2_BYPASS	(1 << CBAR_TYPE_SHIFT)
b7ab407
+#define CBAR_TYPE_S1_TRANS_S2_FAULT	(2 << CBAR_TYPE_SHIFT)
b7ab407
+#define CBAR_TYPE_S1_TRANS_S2_TRANS	(3 << CBAR_TYPE_SHIFT)
b7ab407
+#define CBAR_IRPTNDX_SHIFT		24
b7ab407
+#define CBAR_IRPTNDX_MASK		0xff
b7ab407
+
b7ab407
+#define ARM_SMMU_GR1_CBA2R(n)		(0x800 + ((n) << 2))
b7ab407
+#define CBA2R_RW64_32BIT		(0 << 0)
b7ab407
+#define CBA2R_RW64_64BIT		(1 << 0)
b7ab407
+#define CBA2R_VMID_SHIFT		16
b7ab407
+#define CBA2R_VMID_MASK			0xffff
b7ab407
+
b7ab407
+#define ARM_SMMU_CB_SCTLR		0x0
b7ab407
+#define ARM_SMMU_CB_ACTLR		0x4
b7ab407
+#define ARM_SMMU_CB_RESUME		0x8
b7ab407
+#define ARM_SMMU_CB_TTBCR2		0x10
b7ab407
+#define ARM_SMMU_CB_TTBR0		0x20
b7ab407
+#define ARM_SMMU_CB_TTBR1		0x28
b7ab407
+#define ARM_SMMU_CB_TTBCR		0x30
b7ab407
+#define ARM_SMMU_CB_CONTEXTIDR		0x34
b7ab407
+#define ARM_SMMU_CB_S1_MAIR0		0x38
b7ab407
+#define ARM_SMMU_CB_S1_MAIR1		0x3c
b7ab407
+#define ARM_SMMU_CB_PAR			0x50
b7ab407
+#define ARM_SMMU_CB_FSR			0x58
b7ab407
+#define ARM_SMMU_CB_FAR			0x60
b7ab407
+#define ARM_SMMU_CB_FSYNR0		0x68
b7ab407
+#define ARM_SMMU_CB_S1_TLBIVA		0x600
b7ab407
+#define ARM_SMMU_CB_S1_TLBIASID		0x610
b7ab407
+#define ARM_SMMU_CB_S1_TLBIVAL		0x620
b7ab407
+#define ARM_SMMU_CB_S2_TLBIIPAS2	0x630
b7ab407
+#define ARM_SMMU_CB_S2_TLBIIPAS2L	0x638
b7ab407
+#define ARM_SMMU_CB_TLBSYNC		0x7f0
b7ab407
+#define ARM_SMMU_CB_TLBSTATUS		0x7f4
b7ab407
+#define ARM_SMMU_CB_ATS1PR		0x800
b7ab407
+#define ARM_SMMU_CB_ATSR		0x8f0
b7ab407
+
b7ab407
+#define SCTLR_S1_ASIDPNE		(1 << 12)
b7ab407
+#define SCTLR_CFCFG			(1 << 7)
b7ab407
+#define SCTLR_CFIE			(1 << 6)
b7ab407
+#define SCTLR_CFRE			(1 << 5)
b7ab407
+#define SCTLR_E				(1 << 4)
b7ab407
+#define SCTLR_AFE			(1 << 2)
b7ab407
+#define SCTLR_TRE			(1 << 1)
b7ab407
+#define SCTLR_M				(1 << 0)
b7ab407
+
b7ab407
+#define ARM_MMU500_ACTLR_CPRE		(1 << 1)
b7ab407
+
b7ab407
+#define ARM_MMU500_ACR_CACHE_LOCK	(1 << 26)
b7ab407
+#define ARM_MMU500_ACR_SMTNMB_TLBEN	(1 << 8)
b7ab407
+
b7ab407
+#define CB_PAR_F			(1 << 0)
b7ab407
+
b7ab407
+#define ATSR_ACTIVE			(1 << 0)
b7ab407
+
b7ab407
+#define RESUME_RETRY			(0 << 0)
b7ab407
+#define RESUME_TERMINATE		(1 << 0)
b7ab407
+
b7ab407
+#define TTBCR2_SEP_SHIFT		15
b7ab407
+#define TTBCR2_SEP_UPSTREAM		(0x7 << TTBCR2_SEP_SHIFT)
b7ab407
+#define TTBCR2_AS			(1 << 4)
b7ab407
+
b7ab407
+#define TTBRn_ASID_SHIFT		48
b7ab407
+
b7ab407
+#define FSR_MULTI			(1 << 31)
b7ab407
+#define FSR_SS				(1 << 30)
b7ab407
+#define FSR_UUT				(1 << 8)
b7ab407
+#define FSR_ASF				(1 << 7)
b7ab407
+#define FSR_TLBLKF			(1 << 6)
b7ab407
+#define FSR_TLBMCF			(1 << 5)
b7ab407
+#define FSR_EF				(1 << 4)
b7ab407
+#define FSR_PF				(1 << 3)
b7ab407
+#define FSR_AFF				(1 << 2)
b7ab407
+#define FSR_TF				(1 << 1)
b7ab407
+
b7ab407
+#define FSR_IGN				(FSR_AFF | FSR_ASF | \
b7ab407
+					 FSR_TLBMCF | FSR_TLBLKF)
b7ab407
+#define FSR_FAULT			(FSR_MULTI | FSR_SS | FSR_UUT | \
b7ab407
+					 FSR_EF | FSR_PF | FSR_TF | FSR_IGN)
b7ab407
+
b7ab407
+#define FSYNR0_WNR			(1 << 4)
b7ab407
+
b7ab407
+#endif /* _ARM_SMMU_REGS_H */
b7ab407
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
b7ab407
index 7ec30b08b3bd..ca9c20f915a8 100644
b7ab407
--- a/drivers/iommu/arm-smmu.c
b7ab407
+++ b/drivers/iommu/arm-smmu.c
b7ab407
@@ -54,6 +54,7 @@
b7ab407
 #include <linux/amba/bus.h>
b7ab407
 
b7ab407
 #include "io-pgtable.h"
b7ab407
+#include "arm-smmu-regs.h"
b7ab407
 
b7ab407
 /* Maximum number of context banks per SMMU */
b7ab407
 #define ARM_SMMU_MAX_CBS		128
b7ab407
@@ -83,211 +84,9 @@
b7ab407
 #define smmu_write_atomic_lq		writel_relaxed
b7ab407
 #endif
b7ab407
 
b7ab407
-/* Configuration registers */
b7ab407
-#define ARM_SMMU_GR0_sCR0		0x0
b7ab407
-#define sCR0_CLIENTPD			(1 << 0)
b7ab407
-#define sCR0_GFRE			(1 << 1)
b7ab407
-#define sCR0_GFIE			(1 << 2)
b7ab407
-#define sCR0_EXIDENABLE			(1 << 3)
b7ab407
-#define sCR0_GCFGFRE			(1 << 4)
b7ab407
-#define sCR0_GCFGFIE			(1 << 5)
b7ab407
-#define sCR0_USFCFG			(1 << 10)
b7ab407
-#define sCR0_VMIDPNE			(1 << 11)
b7ab407
-#define sCR0_PTM			(1 << 12)
b7ab407
-#define sCR0_FB				(1 << 13)
b7ab407
-#define sCR0_VMID16EN			(1 << 31)
b7ab407
-#define sCR0_BSU_SHIFT			14
b7ab407
-#define sCR0_BSU_MASK			0x3
b7ab407
-
b7ab407
-/* Auxiliary Configuration register */
b7ab407
-#define ARM_SMMU_GR0_sACR		0x10
b7ab407
-
b7ab407
-/* Identification registers */
b7ab407
-#define ARM_SMMU_GR0_ID0		0x20
b7ab407
-#define ARM_SMMU_GR0_ID1		0x24
b7ab407
-#define ARM_SMMU_GR0_ID2		0x28
b7ab407
-#define ARM_SMMU_GR0_ID3		0x2c
b7ab407
-#define ARM_SMMU_GR0_ID4		0x30
b7ab407
-#define ARM_SMMU_GR0_ID5		0x34
b7ab407
-#define ARM_SMMU_GR0_ID6		0x38
b7ab407
-#define ARM_SMMU_GR0_ID7		0x3c
b7ab407
-#define ARM_SMMU_GR0_sGFSR		0x48
b7ab407
-#define ARM_SMMU_GR0_sGFSYNR0		0x50
b7ab407
-#define ARM_SMMU_GR0_sGFSYNR1		0x54
b7ab407
-#define ARM_SMMU_GR0_sGFSYNR2		0x58
b7ab407
-
b7ab407
-#define ID0_S1TS			(1 << 30)
b7ab407
-#define ID0_S2TS			(1 << 29)
b7ab407
-#define ID0_NTS				(1 << 28)
b7ab407
-#define ID0_SMS				(1 << 27)
b7ab407
-#define ID0_ATOSNS			(1 << 26)
b7ab407
-#define ID0_PTFS_NO_AARCH32		(1 << 25)
b7ab407
-#define ID0_PTFS_NO_AARCH32S		(1 << 24)
b7ab407
-#define ID0_CTTW			(1 << 14)
b7ab407
-#define ID0_NUMIRPT_SHIFT		16
b7ab407
-#define ID0_NUMIRPT_MASK		0xff
b7ab407
-#define ID0_NUMSIDB_SHIFT		9
b7ab407
-#define ID0_NUMSIDB_MASK		0xf
b7ab407
-#define ID0_EXIDS			(1 << 8)
b7ab407
-#define ID0_NUMSMRG_SHIFT		0
b7ab407
-#define ID0_NUMSMRG_MASK		0xff
b7ab407
-
b7ab407
-#define ID1_PAGESIZE			(1 << 31)
b7ab407
-#define ID1_NUMPAGENDXB_SHIFT		28
b7ab407
-#define ID1_NUMPAGENDXB_MASK		7
b7ab407
-#define ID1_NUMS2CB_SHIFT		16
b7ab407
-#define ID1_NUMS2CB_MASK		0xff
b7ab407
-#define ID1_NUMCB_SHIFT			0
b7ab407
-#define ID1_NUMCB_MASK			0xff
b7ab407
-
b7ab407
-#define ID2_OAS_SHIFT			4
b7ab407
-#define ID2_OAS_MASK			0xf
b7ab407
-#define ID2_IAS_SHIFT			0
b7ab407
-#define ID2_IAS_MASK			0xf
b7ab407
-#define ID2_UBS_SHIFT			8
b7ab407
-#define ID2_UBS_MASK			0xf
b7ab407
-#define ID2_PTFS_4K			(1 << 12)
b7ab407
-#define ID2_PTFS_16K			(1 << 13)
b7ab407
-#define ID2_PTFS_64K			(1 << 14)
b7ab407
-#define ID2_VMID16			(1 << 15)
b7ab407
-
b7ab407
-#define ID7_MAJOR_SHIFT			4
b7ab407
-#define ID7_MAJOR_MASK			0xf
b7ab407
-
b7ab407
-/* Global TLB invalidation */
b7ab407
-#define ARM_SMMU_GR0_TLBIVMID		0x64
b7ab407
-#define ARM_SMMU_GR0_TLBIALLNSNH	0x68
b7ab407
-#define ARM_SMMU_GR0_TLBIALLH		0x6c
b7ab407
-#define ARM_SMMU_GR0_sTLBGSYNC		0x70
b7ab407
-#define ARM_SMMU_GR0_sTLBGSTATUS	0x74
b7ab407
-#define sTLBGSTATUS_GSACTIVE		(1 << 0)
b7ab407
-#define TLB_LOOP_TIMEOUT		1000000	/* 1s! */
b7ab407
-#define TLB_SPIN_COUNT			10
b7ab407
-
b7ab407
-/* Stream mapping registers */
b7ab407
-#define ARM_SMMU_GR0_SMR(n)		(0x800 + ((n) << 2))
b7ab407
-#define SMR_VALID			(1 << 31)
b7ab407
-#define SMR_MASK_SHIFT			16
b7ab407
-#define SMR_ID_SHIFT			0
b7ab407
-
b7ab407
-#define ARM_SMMU_GR0_S2CR(n)		(0xc00 + ((n) << 2))
b7ab407
-#define S2CR_CBNDX_SHIFT		0
b7ab407
-#define S2CR_CBNDX_MASK			0xff
b7ab407
-#define S2CR_EXIDVALID			(1 << 10)
b7ab407
-#define S2CR_TYPE_SHIFT			16
b7ab407
-#define S2CR_TYPE_MASK			0x3
b7ab407
-enum arm_smmu_s2cr_type {
b7ab407
-	S2CR_TYPE_TRANS,
b7ab407
-	S2CR_TYPE_BYPASS,
b7ab407
-	S2CR_TYPE_FAULT,
b7ab407
-};
b7ab407
-
b7ab407
-#define S2CR_PRIVCFG_SHIFT		24
b7ab407
-#define S2CR_PRIVCFG_MASK		0x3
b7ab407
-enum arm_smmu_s2cr_privcfg {
b7ab407
-	S2CR_PRIVCFG_DEFAULT,
b7ab407
-	S2CR_PRIVCFG_DIPAN,
b7ab407
-	S2CR_PRIVCFG_UNPRIV,
b7ab407
-	S2CR_PRIVCFG_PRIV,
b7ab407
-};
b7ab407
-
b7ab407
-/* Context bank attribute registers */
b7ab407
-#define ARM_SMMU_GR1_CBAR(n)		(0x0 + ((n) << 2))
b7ab407
-#define CBAR_VMID_SHIFT			0
b7ab407
-#define CBAR_VMID_MASK			0xff
b7ab407
-#define CBAR_S1_BPSHCFG_SHIFT		8
b7ab407
-#define CBAR_S1_BPSHCFG_MASK		3
b7ab407
-#define CBAR_S1_BPSHCFG_NSH		3
b7ab407
-#define CBAR_S1_MEMATTR_SHIFT		12
b7ab407
-#define CBAR_S1_MEMATTR_MASK		0xf
b7ab407
-#define CBAR_S1_MEMATTR_WB		0xf
b7ab407
-#define CBAR_TYPE_SHIFT			16
b7ab407
-#define CBAR_TYPE_MASK			0x3
b7ab407
-#define CBAR_TYPE_S2_TRANS		(0 << CBAR_TYPE_SHIFT)
b7ab407
-#define CBAR_TYPE_S1_TRANS_S2_BYPASS	(1 << CBAR_TYPE_SHIFT)
b7ab407
-#define CBAR_TYPE_S1_TRANS_S2_FAULT	(2 << CBAR_TYPE_SHIFT)
b7ab407
-#define CBAR_TYPE_S1_TRANS_S2_TRANS	(3 << CBAR_TYPE_SHIFT)
b7ab407
-#define CBAR_IRPTNDX_SHIFT		24
b7ab407
-#define CBAR_IRPTNDX_MASK		0xff
b7ab407
-
b7ab407
-#define ARM_SMMU_GR1_CBA2R(n)		(0x800 + ((n) << 2))
b7ab407
-#define CBA2R_RW64_32BIT		(0 << 0)
b7ab407
-#define CBA2R_RW64_64BIT		(1 << 0)
b7ab407
-#define CBA2R_VMID_SHIFT		16
b7ab407
-#define CBA2R_VMID_MASK			0xffff
b7ab407
-
b7ab407
 /* Translation context bank */
b7ab407
 #define ARM_SMMU_CB(smmu, n)	((smmu)->cb_base + ((n) << (smmu)->pgshift))
b7ab407
 
b7ab407
-#define ARM_SMMU_CB_SCTLR		0x0
b7ab407
-#define ARM_SMMU_CB_ACTLR		0x4
b7ab407
-#define ARM_SMMU_CB_RESUME		0x8
b7ab407
-#define ARM_SMMU_CB_TTBCR2		0x10
b7ab407
-#define ARM_SMMU_CB_TTBR0		0x20
b7ab407
-#define ARM_SMMU_CB_TTBR1		0x28
b7ab407
-#define ARM_SMMU_CB_TTBCR		0x30
b7ab407
-#define ARM_SMMU_CB_CONTEXTIDR		0x34
b7ab407
-#define ARM_SMMU_CB_S1_MAIR0		0x38
b7ab407
-#define ARM_SMMU_CB_S1_MAIR1		0x3c
b7ab407
-#define ARM_SMMU_CB_PAR			0x50
b7ab407
-#define ARM_SMMU_CB_FSR			0x58
b7ab407
-#define ARM_SMMU_CB_FAR			0x60
b7ab407
-#define ARM_SMMU_CB_FSYNR0		0x68
b7ab407
-#define ARM_SMMU_CB_S1_TLBIVA		0x600
b7ab407
-#define ARM_SMMU_CB_S1_TLBIASID		0x610
b7ab407
-#define ARM_SMMU_CB_S1_TLBIVAL		0x620
b7ab407
-#define ARM_SMMU_CB_S2_TLBIIPAS2	0x630
b7ab407
-#define ARM_SMMU_CB_S2_TLBIIPAS2L	0x638
b7ab407
-#define ARM_SMMU_CB_TLBSYNC		0x7f0
b7ab407
-#define ARM_SMMU_CB_TLBSTATUS		0x7f4
b7ab407
-#define ARM_SMMU_CB_ATS1PR		0x800
b7ab407
-#define ARM_SMMU_CB_ATSR		0x8f0
b7ab407
-
b7ab407
-#define SCTLR_S1_ASIDPNE		(1 << 12)
b7ab407
-#define SCTLR_CFCFG			(1 << 7)
b7ab407
-#define SCTLR_CFIE			(1 << 6)
b7ab407
-#define SCTLR_CFRE			(1 << 5)
b7ab407
-#define SCTLR_E				(1 << 4)
b7ab407
-#define SCTLR_AFE			(1 << 2)
b7ab407
-#define SCTLR_TRE			(1 << 1)
b7ab407
-#define SCTLR_M				(1 << 0)
b7ab407
-
b7ab407
-#define ARM_MMU500_ACTLR_CPRE		(1 << 1)
b7ab407
-
b7ab407
-#define ARM_MMU500_ACR_CACHE_LOCK	(1 << 26)
b7ab407
-#define ARM_MMU500_ACR_SMTNMB_TLBEN	(1 << 8)
b7ab407
-
b7ab407
-#define CB_PAR_F			(1 << 0)
b7ab407
-
b7ab407
-#define ATSR_ACTIVE			(1 << 0)
b7ab407
-
b7ab407
-#define RESUME_RETRY			(0 << 0)
b7ab407
-#define RESUME_TERMINATE		(1 << 0)
b7ab407
-
b7ab407
-#define TTBCR2_SEP_SHIFT		15
b7ab407
-#define TTBCR2_SEP_UPSTREAM		(0x7 << TTBCR2_SEP_SHIFT)
b7ab407
-#define TTBCR2_AS			(1 << 4)
b7ab407
-
b7ab407
-#define TTBRn_ASID_SHIFT		48
b7ab407
-
b7ab407
-#define FSR_MULTI			(1 << 31)
b7ab407
-#define FSR_SS				(1 << 30)
b7ab407
-#define FSR_UUT				(1 << 8)
b7ab407
-#define FSR_ASF				(1 << 7)
b7ab407
-#define FSR_TLBLKF			(1 << 6)
b7ab407
-#define FSR_TLBMCF			(1 << 5)
b7ab407
-#define FSR_EF				(1 << 4)
b7ab407
-#define FSR_PF				(1 << 3)
b7ab407
-#define FSR_AFF				(1 << 2)
b7ab407
-#define FSR_TF				(1 << 1)
b7ab407
-
b7ab407
-#define FSR_IGN				(FSR_AFF | FSR_ASF | \
b7ab407
-					 FSR_TLBMCF | FSR_TLBLKF)
b7ab407
-#define FSR_FAULT			(FSR_MULTI | FSR_SS | FSR_UUT | \
b7ab407
-					 FSR_EF | FSR_PF | FSR_TF | FSR_IGN)
b7ab407
-
b7ab407
-#define FSYNR0_WNR			(1 << 4)
b7ab407
-
b7ab407
 #define MSI_IOVA_BASE			0x8000000
b7ab407
 #define MSI_IOVA_LENGTH			0x100000
b7ab407
 
b7ab407
From patchwork Thu Jul 13 12:07:46 2017
b7ab407
Content-Type: text/plain; charset="utf-8"
b7ab407
MIME-Version: 1.0
b7ab407
Content-Transfer-Encoding: 7bit
b7ab407
Subject: [RESEND,3/4] iommu: add qcom_iommu
b7ab407
From: Rob Clark <robdclark@gmail.com>
b7ab407
X-Patchwork-Id: 9838375
b7ab407
Message-Id: <20170713120747.20490-4-robdclark@gmail.com>
b7ab407
To: iommu@lists.linux-foundation.org
b7ab407
Cc: linux-arm-msm@vger.kernel.org, Archit Taneja <architt@codeaurora.org>,
b7ab407
 Rob Herring <robh@kernel.org>, Will Deacon <will.deacon@arm.com>,
b7ab407
 Sricharan <sricharan@codeaurora.org>,
b7ab407
 Mark Rutland <mark.rutland@arm.com>, Robin Murphy <robin.murphy@arm.com>,
b7ab407
 Rob Clark <robdclark@gmail.com>
b7ab407
Date: Thu, 13 Jul 2017 08:07:46 -0400
b7ab407
b7ab407
An iommu driver for Qualcomm "B" family devices which do implement the
b7ab407
ARM SMMU spec, but not in a way that is compatible with how the arm-smmu
b7ab407
driver is designed.  It seems SMMU_SCR1.GASRAE=1 so the global register
b7ab407
space is not accessible.  This means it needs to get configuration from
b7ab407
devicetree instead of setting it up dynamically.
b7ab407
b7ab407
In the end, other than register definitions, there is not much code to
b7ab407
share with arm-smmu (other than what has already been refactored out
b7ab407
into the pgtable helpers).
b7ab407
b7ab407
Signed-off-by: Rob Clark <robdclark@gmail.com>
b7ab407
Tested-by: Riku Voipio <riku.voipio@linaro.org>
b7ab407
---
b7ab407
v1: original
b7ab407
v2: bindings cleanups and kconfig issues that kbuild robot pointed out
b7ab407
v3: fix issues pointed out by Rob H. and actually make device removal
b7ab407
    work
b7ab407
v4: fix WARN_ON() splats reported by Archit
b7ab407
v5: some fixes to build as a module.. note that it cannot actually
b7ab407
    be built as a module yet (at minimum a bunch of other iommu syms
b7ab407
    that are needed are not exported, but there may be more to it
b7ab407
    than that), but at least qcom_iommu is ready should it become
b7ab407
    possible to build iommu drivers as modules.
b7ab407
v6: Add additional pm-runtime get/puts around paths that can hit
b7ab407
    TLB inv, to avoid unclocked register access if device using the
b7ab407
    iommu is not powered on.  And pre-emptively clear interrupts
b7ab407
    before registering IRQ handler just in case the bootloader has
b7ab407
    left us a surpise.
b7ab407
v7: Address review comments from Robin (don't associate iommu_group
b7ab407
    with context bank, table lookup instead of list to find context
b7ab407
    bank, etc)
b7ab407
v8: Fix silly bug on detach.  Actually Robin already pointed it out
b7ab407
    but I somehow overlooked that comment when preparing v7.
b7ab407
b7ab407
 drivers/iommu/Kconfig      |  10 +
b7ab407
 drivers/iommu/Makefile     |   1 +
b7ab407
 drivers/iommu/qcom_iommu.c | 868 +++++++++++++++++++++++++++++++++++++++++++++
b7ab407
 3 files changed, 879 insertions(+)
b7ab407
 create mode 100644 drivers/iommu/qcom_iommu.c
b7ab407
b7ab407
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
b7ab407
index 6ee3a25ae731..aa4b62893fe1 100644
b7ab407
--- a/drivers/iommu/Kconfig
b7ab407
+++ b/drivers/iommu/Kconfig
b7ab407
@@ -367,4 +367,14 @@ config MTK_IOMMU_V1
b7ab407
 
b7ab407
 	  if unsure, say N here.
b7ab407
 
b7ab407
+config QCOM_IOMMU
b7ab407
+	# Note: iommu drivers cannot (yet?) be built as modules
b7ab407
+	bool "Qualcomm IOMMU Support"
b7ab407
+	depends on ARCH_QCOM || COMPILE_TEST
b7ab407
+	select IOMMU_API
b7ab407
+	select IOMMU_IO_PGTABLE_LPAE
b7ab407
+	select ARM_DMA_USE_IOMMU
b7ab407
+	help
b7ab407
+	  Support for IOMMU on certain Qualcomm SoCs.
b7ab407
+
b7ab407
 endif # IOMMU_SUPPORT
b7ab407
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
b7ab407
index 195f7b997d8e..b910aea813a1 100644
b7ab407
--- a/drivers/iommu/Makefile
b7ab407
+++ b/drivers/iommu/Makefile
b7ab407
@@ -27,3 +27,4 @@ obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o
b7ab407
 obj-$(CONFIG_EXYNOS_IOMMU) += exynos-iommu.o
b7ab407
 obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o
b7ab407
 obj-$(CONFIG_S390_IOMMU) += s390-iommu.o
b7ab407
+obj-$(CONFIG_QCOM_IOMMU) += qcom_iommu.o
b7ab407
diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c
b7ab407
new file mode 100644
b7ab407
index 000000000000..860cad1cb167
b7ab407
--- /dev/null
b7ab407
+++ b/drivers/iommu/qcom_iommu.c
b7ab407
@@ -0,0 +1,868 @@
b7ab407
+/*
b7ab407
+ * IOMMU API for QCOM secure IOMMUs.  Somewhat based on arm-smmu.c
b7ab407
+ *
b7ab407
+ * This program is free software; you can redistribute it and/or modify
b7ab407
+ * it under the terms of the GNU General Public License version 2 as
b7ab407
+ * published by the Free Software Foundation.
b7ab407
+ *
b7ab407
+ * This program is distributed in the hope that it will be useful,
b7ab407
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
b7ab407
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
b7ab407
+ * GNU General Public License for more details.
b7ab407
+ *
b7ab407
+ * You should have received a copy of the GNU General Public License
b7ab407
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
b7ab407
+ *
b7ab407
+ * Copyright (C) 2013 ARM Limited
b7ab407
+ * Copyright (C) 2017 Red Hat
b7ab407
+ */
b7ab407
+
b7ab407
+#include <linux/atomic.h>
b7ab407
+#include <linux/clk.h>
b7ab407
+#include <linux/delay.h>
b7ab407
+#include <linux/dma-iommu.h>
b7ab407
+#include <linux/dma-mapping.h>
b7ab407
+#include <linux/err.h>
b7ab407
+#include <linux/interrupt.h>
b7ab407
+#include <linux/io.h>
b7ab407
+#include <linux/io-64-nonatomic-hi-lo.h>
b7ab407
+#include <linux/iommu.h>
b7ab407
+#include <linux/iopoll.h>
b7ab407
+#include <linux/kconfig.h>
b7ab407
+#include <linux/module.h>
b7ab407
+#include <linux/mutex.h>
b7ab407
+#include <linux/of.h>
b7ab407
+#include <linux/of_address.h>
b7ab407
+#include <linux/of_device.h>
b7ab407
+#include <linux/of_iommu.h>
b7ab407
+#include <linux/platform_device.h>
b7ab407
+#include <linux/pm.h>
b7ab407
+#include <linux/pm_runtime.h>
b7ab407
+#include <linux/qcom_scm.h>
b7ab407
+#include <linux/slab.h>
b7ab407
+#include <linux/spinlock.h>
b7ab407
+
b7ab407
+#include "io-pgtable.h"
b7ab407
+#include "arm-smmu-regs.h"
b7ab407
+
b7ab407
+#define SMMU_INTR_SEL_NS     0x2000
b7ab407
+
b7ab407
+struct qcom_iommu_ctx;
b7ab407
+
b7ab407
+struct qcom_iommu_dev {
b7ab407
+	/* IOMMU core code handle */
b7ab407
+	struct iommu_device	 iommu;
b7ab407
+	struct device		*dev;
b7ab407
+	struct clk		*iface_clk;
b7ab407
+	struct clk		*bus_clk;
b7ab407
+	void __iomem		*local_base;
b7ab407
+	u32			 sec_id;
b7ab407
+	u8			 num_ctxs;
b7ab407
+	struct qcom_iommu_ctx	*ctxs[0];   /* indexed by asid-1 */
b7ab407
+};
b7ab407
+
b7ab407
+struct qcom_iommu_ctx {
b7ab407
+	struct device		*dev;
b7ab407
+	void __iomem		*base;
b7ab407
+	bool			 secure_init;
b7ab407
+	u8			 asid;      /* asid and ctx bank # are 1:1 */
b7ab407
+};
b7ab407
+
b7ab407
+struct qcom_iommu_domain {
b7ab407
+	struct io_pgtable_ops	*pgtbl_ops;
b7ab407
+	spinlock_t		 pgtbl_lock;
b7ab407
+	struct mutex		 init_mutex; /* Protects iommu pointer */
b7ab407
+	struct iommu_domain	 domain;
b7ab407
+	struct qcom_iommu_dev	*iommu;
b7ab407
+};
b7ab407
+
b7ab407
+static struct qcom_iommu_domain *to_qcom_iommu_domain(struct iommu_domain *dom)
b7ab407
+{
b7ab407
+	return container_of(dom, struct qcom_iommu_domain, domain);
b7ab407
+}
b7ab407
+
b7ab407
+static const struct iommu_ops qcom_iommu_ops;
b7ab407
+
b7ab407
+static struct qcom_iommu_dev * to_iommu(struct iommu_fwspec *fwspec)
b7ab407
+{
b7ab407
+	if (!fwspec || fwspec->ops != &qcom_iommu_ops)
b7ab407
+		return NULL;
b7ab407
+	return fwspec->iommu_priv;
b7ab407
+}
b7ab407
+
b7ab407
+static struct qcom_iommu_ctx * to_ctx(struct iommu_fwspec *fwspec, unsigned asid)
b7ab407
+{
b7ab407
+	struct qcom_iommu_dev *qcom_iommu = to_iommu(fwspec);
b7ab407
+	if (!qcom_iommu)
b7ab407
+		return NULL;
b7ab407
+	return qcom_iommu->ctxs[asid - 1];
b7ab407
+}
b7ab407
+
b7ab407
+static inline void
b7ab407
+iommu_writel(struct qcom_iommu_ctx *ctx, unsigned reg, u32 val)
b7ab407
+{
b7ab407
+	writel_relaxed(val, ctx->base + reg);
b7ab407
+}
b7ab407
+
b7ab407
+static inline void
b7ab407
+iommu_writeq(struct qcom_iommu_ctx *ctx, unsigned reg, u64 val)
b7ab407
+{
b7ab407
+	writeq_relaxed(val, ctx->base + reg);
b7ab407
+}
b7ab407
+
b7ab407
+static inline u32
b7ab407
+iommu_readl(struct qcom_iommu_ctx *ctx, unsigned reg)
b7ab407
+{
b7ab407
+	return readl_relaxed(ctx->base + reg);
b7ab407
+}
b7ab407
+
b7ab407
+static inline u64
b7ab407
+iommu_readq(struct qcom_iommu_ctx *ctx, unsigned reg)
b7ab407
+{
b7ab407
+	return readq_relaxed(ctx->base + reg);
b7ab407
+}
b7ab407
+
b7ab407
+static void qcom_iommu_tlb_sync(void *cookie)
b7ab407
+{
b7ab407
+	struct iommu_fwspec *fwspec = cookie;
b7ab407
+	unsigned i;
b7ab407
+
b7ab407
+	for (i = 0; i < fwspec->num_ids; i++) {
b7ab407
+		struct qcom_iommu_ctx *ctx = to_ctx(fwspec, fwspec->ids[i]);
b7ab407
+		unsigned int val, ret;
b7ab407
+
b7ab407
+		iommu_writel(ctx, ARM_SMMU_CB_TLBSYNC, 0);
b7ab407
+
b7ab407
+		ret = readl_poll_timeout(ctx->base + ARM_SMMU_CB_TLBSTATUS, val,
b7ab407
+					 (val & 0x1) == 0, 0, 5000000);
b7ab407
+		if (ret)
b7ab407
+			dev_err(ctx->dev, "timeout waiting for TLB SYNC\n");
b7ab407
+	}
b7ab407
+}
b7ab407
+
b7ab407
+static void qcom_iommu_tlb_inv_context(void *cookie)
b7ab407
+{
b7ab407
+	struct iommu_fwspec *fwspec = cookie;
b7ab407
+	unsigned i;
b7ab407
+
b7ab407
+	for (i = 0; i < fwspec->num_ids; i++) {
b7ab407
+		struct qcom_iommu_ctx *ctx = to_ctx(fwspec, fwspec->ids[i]);
b7ab407
+		iommu_writel(ctx, ARM_SMMU_CB_S1_TLBIASID, ctx->asid);
b7ab407
+	}
b7ab407
+
b7ab407
+	qcom_iommu_tlb_sync(cookie);
b7ab407
+}
b7ab407
+
b7ab407
+static void qcom_iommu_tlb_inv_range_nosync(unsigned long iova, size_t size,
b7ab407
+					    size_t granule, bool leaf, void *cookie)
b7ab407
+{
b7ab407
+	struct iommu_fwspec *fwspec = cookie;
b7ab407
+	unsigned i, reg;
b7ab407
+
b7ab407
+	reg = leaf ? ARM_SMMU_CB_S1_TLBIVAL : ARM_SMMU_CB_S1_TLBIVA;
b7ab407
+
b7ab407
+	for (i = 0; i < fwspec->num_ids; i++) {
b7ab407
+		struct qcom_iommu_ctx *ctx = to_ctx(fwspec, fwspec->ids[i]);
b7ab407
+		size_t s = size;
b7ab407
+
b7ab407
+		iova &= ~12UL;
b7ab407
+		iova |= ctx->asid;
b7ab407
+		do {
b7ab407
+			iommu_writel(ctx, reg, iova);
b7ab407
+			iova += granule;
b7ab407
+		} while (s -= granule);
b7ab407
+	}
b7ab407
+}
b7ab407
+
b7ab407
+static const struct iommu_gather_ops qcom_gather_ops = {
b7ab407
+	.tlb_flush_all	= qcom_iommu_tlb_inv_context,
b7ab407
+	.tlb_add_flush	= qcom_iommu_tlb_inv_range_nosync,
b7ab407
+	.tlb_sync	= qcom_iommu_tlb_sync,
b7ab407
+};
b7ab407
+
b7ab407
+static irqreturn_t qcom_iommu_fault(int irq, void *dev)
b7ab407
+{
b7ab407
+	struct qcom_iommu_ctx *ctx = dev;
b7ab407
+	u32 fsr, fsynr;
b7ab407
+	u64 iova;
b7ab407
+
b7ab407
+	fsr = iommu_readl(ctx, ARM_SMMU_CB_FSR);
b7ab407
+
b7ab407
+	if (!(fsr & FSR_FAULT))
b7ab407
+		return IRQ_NONE;
b7ab407
+
b7ab407
+	fsynr = iommu_readl(ctx, ARM_SMMU_CB_FSYNR0);
b7ab407
+	iova = iommu_readq(ctx, ARM_SMMU_CB_FAR);
b7ab407
+
b7ab407
+	dev_err_ratelimited(ctx->dev,
b7ab407
+			    "Unhandled context fault: fsr=0x%x, "
b7ab407
+			    "iova=0x%016llx, fsynr=0x%x, cb=%d\n",
b7ab407
+			    fsr, iova, fsynr, ctx->asid);
b7ab407
+
b7ab407
+	iommu_writel(ctx, ARM_SMMU_CB_FSR, fsr);
b7ab407
+
b7ab407
+	return IRQ_HANDLED;
b7ab407
+}
b7ab407
+
b7ab407
+static int qcom_iommu_init_domain(struct iommu_domain *domain,
b7ab407
+				  struct qcom_iommu_dev *qcom_iommu,
b7ab407
+				  struct iommu_fwspec *fwspec)
b7ab407
+{
b7ab407
+	struct qcom_iommu_domain *qcom_domain = to_qcom_iommu_domain(domain);
b7ab407
+	struct io_pgtable_ops *pgtbl_ops;
b7ab407
+	struct io_pgtable_cfg pgtbl_cfg;
b7ab407
+	int i, ret = 0;
b7ab407
+	u32 reg;
b7ab407
+
b7ab407
+	mutex_lock(&qcom_domain->init_mutex);
b7ab407
+	if (qcom_domain->iommu)
b7ab407
+		goto out_unlock;
b7ab407
+
b7ab407
+	pgtbl_cfg = (struct io_pgtable_cfg) {
b7ab407
+		.pgsize_bitmap	= qcom_iommu_ops.pgsize_bitmap,
b7ab407
+		.ias		= 32,
b7ab407
+		.oas		= 40,
b7ab407
+		.tlb		= &qcom_gather_ops,
b7ab407
+		.iommu_dev	= qcom_iommu->dev,
b7ab407
+	};
b7ab407
+
b7ab407
+	qcom_domain->iommu = qcom_iommu;
b7ab407
+	pgtbl_ops = alloc_io_pgtable_ops(ARM_32_LPAE_S1, &pgtbl_cfg, fwspec);
b7ab407
+	if (!pgtbl_ops) {
b7ab407
+		dev_err(qcom_iommu->dev, "failed to allocate pagetable ops\n");
b7ab407
+		ret = -ENOMEM;
b7ab407
+		goto out_clear_iommu;
b7ab407
+	}
b7ab407
+
b7ab407
+	/* Update the domain's page sizes to reflect the page table format */
b7ab407
+	domain->pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
b7ab407
+	domain->geometry.aperture_end = (1ULL << pgtbl_cfg.ias) - 1;
b7ab407
+	domain->geometry.force_aperture = true;
b7ab407
+
b7ab407
+	for (i = 0; i < fwspec->num_ids; i++) {
b7ab407
+		struct qcom_iommu_ctx *ctx = to_ctx(fwspec, fwspec->ids[i]);
b7ab407
+
b7ab407
+		if (!ctx->secure_init) {
b7ab407
+			ret = qcom_scm_restore_sec_cfg(qcom_iommu->sec_id, ctx->asid);
b7ab407
+			if (ret) {
b7ab407
+				dev_err(qcom_iommu->dev, "secure init failed: %d\n", ret);
b7ab407
+				goto out_clear_iommu;
b7ab407
+			}
b7ab407
+			ctx->secure_init = true;
b7ab407
+		}
b7ab407
+
b7ab407
+		/* TTBRs */
b7ab407
+		iommu_writeq(ctx, ARM_SMMU_CB_TTBR0,
b7ab407
+				pgtbl_cfg.arm_lpae_s1_cfg.ttbr[0] |
b7ab407
+				((u64)ctx->asid << TTBRn_ASID_SHIFT));
b7ab407
+		iommu_writeq(ctx, ARM_SMMU_CB_TTBR1,
b7ab407
+				pgtbl_cfg.arm_lpae_s1_cfg.ttbr[1] |
b7ab407
+				((u64)ctx->asid << TTBRn_ASID_SHIFT));
b7ab407
+
b7ab407
+		/* TTBCR */
b7ab407
+		iommu_writel(ctx, ARM_SMMU_CB_TTBCR2,
b7ab407
+				(pgtbl_cfg.arm_lpae_s1_cfg.tcr >> 32) |
b7ab407
+				TTBCR2_SEP_UPSTREAM);
b7ab407
+		iommu_writel(ctx, ARM_SMMU_CB_TTBCR,
b7ab407
+				pgtbl_cfg.arm_lpae_s1_cfg.tcr);
b7ab407
+
b7ab407
+		/* MAIRs (stage-1 only) */
b7ab407
+		iommu_writel(ctx, ARM_SMMU_CB_S1_MAIR0,
b7ab407
+				pgtbl_cfg.arm_lpae_s1_cfg.mair[0]);
b7ab407
+		iommu_writel(ctx, ARM_SMMU_CB_S1_MAIR1,
b7ab407
+				pgtbl_cfg.arm_lpae_s1_cfg.mair[1]);
b7ab407
+
b7ab407
+		/* SCTLR */
b7ab407
+		reg = SCTLR_CFIE | SCTLR_CFRE | SCTLR_AFE | SCTLR_TRE |
b7ab407
+			SCTLR_M | SCTLR_S1_ASIDPNE;
b7ab407
+
b7ab407
+		if (IS_ENABLED(CONFIG_BIG_ENDIAN))
b7ab407
+			reg |= SCTLR_E;
b7ab407
+
b7ab407
+		iommu_writel(ctx, ARM_SMMU_CB_SCTLR, reg);
b7ab407
+	}
b7ab407
+
b7ab407
+	mutex_unlock(&qcom_domain->init_mutex);
b7ab407
+
b7ab407
+	/* Publish page table ops for map/unmap */
b7ab407
+	qcom_domain->pgtbl_ops = pgtbl_ops;
b7ab407
+
b7ab407
+	return 0;
b7ab407
+
b7ab407
+out_clear_iommu:
b7ab407
+	qcom_domain->iommu = NULL;
b7ab407
+out_unlock:
b7ab407
+	mutex_unlock(&qcom_domain->init_mutex);
b7ab407
+	return ret;
b7ab407
+}
b7ab407
+
b7ab407
+static struct iommu_domain *qcom_iommu_domain_alloc(unsigned type)
b7ab407
+{
b7ab407
+	struct qcom_iommu_domain *qcom_domain;
b7ab407
+
b7ab407
+	if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_DMA)
b7ab407
+		return NULL;
b7ab407
+	/*
b7ab407
+	 * Allocate the domain and initialise some of its data structures.
b7ab407
+	 * We can't really do anything meaningful until we've added a
b7ab407
+	 * master.
b7ab407
+	 */
b7ab407
+	qcom_domain = kzalloc(sizeof(*qcom_domain), GFP_KERNEL);
b7ab407
+	if (!qcom_domain)
b7ab407
+		return NULL;
b7ab407
+
b7ab407
+	if (type == IOMMU_DOMAIN_DMA &&
b7ab407
+	    iommu_get_dma_cookie(&qcom_domain->domain)) {
b7ab407
+		kfree(qcom_domain);
b7ab407
+		return NULL;
b7ab407
+	}
b7ab407
+
b7ab407
+	mutex_init(&qcom_domain->init_mutex);
b7ab407
+	spin_lock_init(&qcom_domain->pgtbl_lock);
b7ab407
+
b7ab407
+	return &qcom_domain->domain;
b7ab407
+}
b7ab407
+
b7ab407
+static void qcom_iommu_domain_free(struct iommu_domain *domain)
b7ab407
+{
b7ab407
+	struct qcom_iommu_domain *qcom_domain = to_qcom_iommu_domain(domain);
b7ab407
+
b7ab407
+	if (WARN_ON(qcom_domain->iommu))    /* forgot to detach? */
b7ab407
+		return;
b7ab407
+
b7ab407
+	iommu_put_dma_cookie(domain);
b7ab407
+
b7ab407
+	/* NOTE: unmap can be called after client device is powered off,
b7ab407
+	 * for example, with GPUs or anything involving dma-buf.  So we
b7ab407
+	 * cannot rely on the device_link.  Make sure the IOMMU is on to
b7ab407
+	 * avoid unclocked accesses in the TLB inv path:
b7ab407
+	 */
b7ab407
+	pm_runtime_get_sync(qcom_domain->iommu->dev);
b7ab407
+
b7ab407
+	free_io_pgtable_ops(qcom_domain->pgtbl_ops);
b7ab407
+
b7ab407
+	pm_runtime_put_sync(qcom_domain->iommu->dev);
b7ab407
+
b7ab407
+	kfree(qcom_domain);
b7ab407
+}
b7ab407
+
b7ab407
+static int qcom_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)
b7ab407
+{
b7ab407
+	struct qcom_iommu_dev *qcom_iommu = to_iommu(dev->iommu_fwspec);
b7ab407
+	struct qcom_iommu_domain *qcom_domain = to_qcom_iommu_domain(domain);
b7ab407
+	int ret;
b7ab407
+
b7ab407
+	if (!qcom_iommu) {
b7ab407
+		dev_err(dev, "cannot attach to IOMMU, is it on the same bus?\n");
b7ab407
+		return -ENXIO;
b7ab407
+	}
b7ab407
+
b7ab407
+	/* Ensure that the domain is finalized */
b7ab407
+	pm_runtime_get_sync(qcom_iommu->dev);
b7ab407
+	ret = qcom_iommu_init_domain(domain, qcom_iommu, dev->iommu_fwspec);
b7ab407
+	pm_runtime_put_sync(qcom_iommu->dev);
b7ab407
+	if (ret < 0)
b7ab407
+		return ret;
b7ab407
+
b7ab407
+	/*
b7ab407
+	 * Sanity check the domain. We don't support domains across
b7ab407
+	 * different IOMMUs.
b7ab407
+	 */
b7ab407
+	if (qcom_domain->iommu != qcom_iommu) {
b7ab407
+		dev_err(dev, "cannot attach to IOMMU %s while already "
b7ab407
+			"attached to domain on IOMMU %s\n",
b7ab407
+			dev_name(qcom_domain->iommu->dev),
b7ab407
+			dev_name(qcom_iommu->dev));
b7ab407
+		return -EINVAL;
b7ab407
+	}
b7ab407
+
b7ab407
+	return 0;
b7ab407
+}
b7ab407
+
b7ab407
+static void qcom_iommu_detach_dev(struct iommu_domain *domain, struct device *dev)
b7ab407
+{
b7ab407
+	struct iommu_fwspec *fwspec = dev->iommu_fwspec;
b7ab407
+	struct qcom_iommu_dev *qcom_iommu = to_iommu(fwspec);
b7ab407
+	struct qcom_iommu_domain *qcom_domain = to_qcom_iommu_domain(domain);
b7ab407
+	unsigned i;
b7ab407
+
b7ab407
+	if (!qcom_domain->iommu)
b7ab407
+		return;
b7ab407
+
b7ab407
+	pm_runtime_get_sync(qcom_iommu->dev);
b7ab407
+	for (i = 0; i < fwspec->num_ids; i++) {
b7ab407
+		struct qcom_iommu_ctx *ctx = to_ctx(fwspec, fwspec->ids[i]);
b7ab407
+
b7ab407
+		/* Disable the context bank: */
b7ab407
+		iommu_writel(ctx, ARM_SMMU_CB_SCTLR, 0);
b7ab407
+	}
b7ab407
+	pm_runtime_put_sync(qcom_iommu->dev);
b7ab407
+
b7ab407
+	qcom_domain->iommu = NULL;
b7ab407
+}
b7ab407
+
b7ab407
+static int qcom_iommu_map(struct iommu_domain *domain, unsigned long iova,
b7ab407
+			  phys_addr_t paddr, size_t size, int prot)
b7ab407
+{
b7ab407
+	int ret;
b7ab407
+	unsigned long flags;
b7ab407
+	struct qcom_iommu_domain *qcom_domain = to_qcom_iommu_domain(domain);
b7ab407
+	struct io_pgtable_ops *ops = qcom_domain->pgtbl_ops;
b7ab407
+
b7ab407
+	if (!ops)
b7ab407
+		return -ENODEV;
b7ab407
+
b7ab407
+	spin_lock_irqsave(&qcom_domain->pgtbl_lock, flags);
b7ab407
+	ret = ops->map(ops, iova, paddr, size, prot);
b7ab407
+	spin_unlock_irqrestore(&qcom_domain->pgtbl_lock, flags);
b7ab407
+	return ret;
b7ab407
+}
b7ab407
+
b7ab407
+static size_t qcom_iommu_unmap(struct iommu_domain *domain, unsigned long iova,
b7ab407
+			       size_t size)
b7ab407
+{
b7ab407
+	size_t ret;
b7ab407
+	unsigned long flags;
b7ab407
+	struct qcom_iommu_domain *qcom_domain = to_qcom_iommu_domain(domain);
b7ab407
+	struct io_pgtable_ops *ops = qcom_domain->pgtbl_ops;
b7ab407
+
b7ab407
+	if (!ops)
b7ab407
+		return 0;
b7ab407
+
b7ab407
+	/* NOTE: unmap can be called after client device is powered off,
b7ab407
+	 * for example, with GPUs or anything involving dma-buf.  So we
b7ab407
+	 * cannot rely on the device_link.  Make sure the IOMMU is on to
b7ab407
+	 * avoid unclocked accesses in the TLB inv path:
b7ab407
+	 */
b7ab407
+	pm_runtime_get_sync(qcom_domain->iommu->dev);
b7ab407
+	spin_lock_irqsave(&qcom_domain->pgtbl_lock, flags);
b7ab407
+	ret = ops->unmap(ops, iova, size);
b7ab407
+	spin_unlock_irqrestore(&qcom_domain->pgtbl_lock, flags);
b7ab407
+	pm_runtime_put_sync(qcom_domain->iommu->dev);
b7ab407
+
b7ab407
+	return ret;
b7ab407
+}
b7ab407
+
b7ab407
+static phys_addr_t qcom_iommu_iova_to_phys(struct iommu_domain *domain,
b7ab407
+					   dma_addr_t iova)
b7ab407
+{
b7ab407
+	phys_addr_t ret;
b7ab407
+	unsigned long flags;
b7ab407
+	struct qcom_iommu_domain *qcom_domain = to_qcom_iommu_domain(domain);
b7ab407
+	struct io_pgtable_ops *ops = qcom_domain->pgtbl_ops;
b7ab407
+
b7ab407
+	if (!ops)
b7ab407
+		return 0;
b7ab407
+
b7ab407
+	spin_lock_irqsave(&qcom_domain->pgtbl_lock, flags);
b7ab407
+	ret = ops->iova_to_phys(ops, iova);
b7ab407
+	spin_unlock_irqrestore(&qcom_domain->pgtbl_lock, flags);
b7ab407
+
b7ab407
+	return ret;
b7ab407
+}
b7ab407
+
b7ab407
+static bool qcom_iommu_capable(enum iommu_cap cap)
b7ab407
+{
b7ab407
+	switch (cap) {
b7ab407
+	case IOMMU_CAP_CACHE_COHERENCY:
b7ab407
+		/*
b7ab407
+		 * Return true here as the SMMU can always send out coherent
b7ab407
+		 * requests.
b7ab407
+		 */
b7ab407
+		return true;
b7ab407
+	case IOMMU_CAP_NOEXEC:
b7ab407
+		return true;
b7ab407
+	default:
b7ab407
+		return false;
b7ab407
+	}
b7ab407
+}
b7ab407
+
b7ab407
+static int qcom_iommu_add_device(struct device *dev)
b7ab407
+{
b7ab407
+	struct qcom_iommu_dev *qcom_iommu = to_iommu(dev->iommu_fwspec);
b7ab407
+	struct iommu_group *group;
b7ab407
+	struct device_link *link;
b7ab407
+
b7ab407
+	if (!qcom_iommu)
b7ab407
+		return -ENODEV;
b7ab407
+
b7ab407
+	/*
b7ab407
+	 * Establish the link between iommu and master, so that the
b7ab407
+	 * iommu gets runtime enabled/disabled as per the master's
b7ab407
+	 * needs.
b7ab407
+	 */
b7ab407
+	link = device_link_add(dev, qcom_iommu->dev, DL_FLAG_PM_RUNTIME);
b7ab407
+	if (!link) {
b7ab407
+		dev_err(qcom_iommu->dev, "Unable to create device link between %s and %s\n",
b7ab407
+			dev_name(qcom_iommu->dev), dev_name(dev));
b7ab407
+		return -ENODEV;
b7ab407
+	}
b7ab407
+
b7ab407
+	group = iommu_group_get_for_dev(dev);
b7ab407
+	if (IS_ERR_OR_NULL(group))
b7ab407
+		return PTR_ERR_OR_ZERO(group);
b7ab407
+
b7ab407
+	iommu_group_put(group);
b7ab407
+	iommu_device_link(&qcom_iommu->iommu, dev);
b7ab407
+
b7ab407
+	return 0;
b7ab407
+}
b7ab407
+
b7ab407
+static void qcom_iommu_remove_device(struct device *dev)
b7ab407
+{
b7ab407
+	struct qcom_iommu_dev *qcom_iommu = to_iommu(dev->iommu_fwspec);
b7ab407
+
b7ab407
+	if (!qcom_iommu)
b7ab407
+		return;
b7ab407
+
b7ab407
+	iommu_device_unlink(&qcom_iommu->iommu, dev);
b7ab407
+	iommu_group_remove_device(dev);
b7ab407
+	iommu_fwspec_free(dev);
b7ab407
+}
b7ab407
+
b7ab407
+static int qcom_iommu_of_xlate(struct device *dev, struct of_phandle_args *args)
b7ab407
+{
b7ab407
+	struct qcom_iommu_dev *qcom_iommu;
b7ab407
+	struct platform_device *iommu_pdev;
b7ab407
+	unsigned asid = args->args[0];
b7ab407
+
b7ab407
+	if (args->args_count != 1) {
b7ab407
+		dev_err(dev, "incorrect number of iommu params found for %s "
b7ab407
+			"(found %d, expected 1)\n",
b7ab407
+			args->np->full_name, args->args_count);
b7ab407
+		return -EINVAL;
b7ab407
+	}
b7ab407
+
b7ab407
+	iommu_pdev = of_find_device_by_node(args->np);
b7ab407
+	if (WARN_ON(!iommu_pdev))
b7ab407
+		return -EINVAL;
b7ab407
+
b7ab407
+	qcom_iommu = platform_get_drvdata(iommu_pdev);
b7ab407
+
b7ab407
+	/* make sure the asid specified in dt is valid, so we don't have
b7ab407
+	 * to sanity check this elsewhere, since 'asid - 1' is used to
b7ab407
+	 * index into qcom_iommu->ctxs:
b7ab407
+	 */
b7ab407
+	if (WARN_ON(asid < 1) ||
b7ab407
+	    WARN_ON(asid > qcom_iommu->num_ctxs))
b7ab407
+		return -EINVAL;
b7ab407
+
b7ab407
+	if (!dev->iommu_fwspec->iommu_priv) {
b7ab407
+		dev->iommu_fwspec->iommu_priv = qcom_iommu;
b7ab407
+	} else {
b7ab407
+		/* make sure devices iommus dt node isn't referring to
b7ab407
+		 * multiple different iommu devices.  Multiple context
b7ab407
+		 * banks are ok, but multiple devices are not:
b7ab407
+		 */
b7ab407
+		if (WARN_ON(qcom_iommu != dev->iommu_fwspec->iommu_priv))
b7ab407
+			return -EINVAL;
b7ab407
+	}
b7ab407
+
b7ab407
+	return iommu_fwspec_add_ids(dev, &asid, 1);
b7ab407
+}
b7ab407
+
b7ab407
+static const struct iommu_ops qcom_iommu_ops = {
b7ab407
+	.capable	= qcom_iommu_capable,
b7ab407
+	.domain_alloc	= qcom_iommu_domain_alloc,
b7ab407
+	.domain_free	= qcom_iommu_domain_free,
b7ab407
+	.attach_dev	= qcom_iommu_attach_dev,
b7ab407
+	.detach_dev	= qcom_iommu_detach_dev,
b7ab407
+	.map		= qcom_iommu_map,
b7ab407
+	.unmap		= qcom_iommu_unmap,
b7ab407
+	.map_sg		= default_iommu_map_sg,
b7ab407
+	.iova_to_phys	= qcom_iommu_iova_to_phys,
b7ab407
+	.add_device	= qcom_iommu_add_device,
b7ab407
+	.remove_device	= qcom_iommu_remove_device,
b7ab407
+	.device_group	= generic_device_group,
b7ab407
+	.of_xlate	= qcom_iommu_of_xlate,
b7ab407
+	.pgsize_bitmap	= SZ_4K | SZ_64K | SZ_1M | SZ_16M,
b7ab407
+};
b7ab407
+
b7ab407
+static int qcom_iommu_enable_clocks(struct qcom_iommu_dev *qcom_iommu)
b7ab407
+{
b7ab407
+	int ret;
b7ab407
+
b7ab407
+	ret = clk_prepare_enable(qcom_iommu->iface_clk);
b7ab407
+	if (ret) {
b7ab407
+		dev_err(qcom_iommu->dev, "Couldn't enable iface_clk\n");
b7ab407
+		return ret;
b7ab407
+	}
b7ab407
+
b7ab407
+	ret = clk_prepare_enable(qcom_iommu->bus_clk);
b7ab407
+	if (ret) {
b7ab407
+		dev_err(qcom_iommu->dev, "Couldn't enable bus_clk\n");
b7ab407
+		clk_disable_unprepare(qcom_iommu->iface_clk);
b7ab407
+		return ret;
b7ab407
+	}
b7ab407
+
b7ab407
+	return 0;
b7ab407
+}
b7ab407
+
b7ab407
+static void qcom_iommu_disable_clocks(struct qcom_iommu_dev *qcom_iommu)
b7ab407
+{
b7ab407
+	clk_disable_unprepare(qcom_iommu->bus_clk);
b7ab407
+	clk_disable_unprepare(qcom_iommu->iface_clk);
b7ab407
+}
b7ab407
+
b7ab407
+static int get_asid(const struct device_node *np)
b7ab407
+{
b7ab407
+	u32 reg;
b7ab407
+
b7ab407
+	/* read the "reg" property directly to get the relative address
b7ab407
+	 * of the context bank, and calculate the asid from that:
b7ab407
+	 */
b7ab407
+	if (of_property_read_u32_index(np, "reg", 0, &reg))
b7ab407
+		return -ENODEV;
b7ab407
+
b7ab407
+	return reg / 0x1000;      /* context banks are 0x1000 apart */
b7ab407
+}
b7ab407
+
b7ab407
+static int qcom_iommu_ctx_probe(struct platform_device *pdev)
b7ab407
+{
b7ab407
+	struct qcom_iommu_ctx *ctx;
b7ab407
+	struct device *dev = &pdev->dev;
b7ab407
+	struct qcom_iommu_dev *qcom_iommu = dev_get_drvdata(dev->parent);
b7ab407
+	struct resource *res;
b7ab407
+	int ret, irq;
b7ab407
+
b7ab407
+	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
b7ab407
+	if (!ctx)
b7ab407
+		return -ENOMEM;
b7ab407
+
b7ab407
+	ctx->dev = dev;
b7ab407
+	platform_set_drvdata(pdev, ctx);
b7ab407
+
b7ab407
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
b7ab407
+	ctx->base = devm_ioremap_resource(dev, res);
b7ab407
+	if (IS_ERR(ctx->base))
b7ab407
+		return PTR_ERR(ctx->base);
b7ab407
+
b7ab407
+	irq = platform_get_irq(pdev, 0);
b7ab407
+	if (irq < 0) {
b7ab407
+		dev_err(dev, "failed to get irq\n");
b7ab407
+		return -ENODEV;
b7ab407
+	}
b7ab407
+
b7ab407
+	/* clear IRQs before registering fault handler, just in case the
b7ab407
+	 * boot-loader left us a surprise:
b7ab407
+	 */
b7ab407
+	iommu_writel(ctx, ARM_SMMU_CB_FSR, iommu_readl(ctx, ARM_SMMU_CB_FSR));
b7ab407
+
b7ab407
+	ret = devm_request_irq(dev, irq,
b7ab407
+			       qcom_iommu_fault,
b7ab407
+			       IRQF_SHARED,
b7ab407
+			       "qcom-iommu-fault",
b7ab407
+			       ctx);
b7ab407
+	if (ret) {
b7ab407
+		dev_err(dev, "failed to request IRQ %u\n", irq);
b7ab407
+		return ret;
b7ab407
+	}
b7ab407
+
b7ab407
+	ret = get_asid(dev->of_node);
b7ab407
+	if (ret < 0) {
b7ab407
+		dev_err(dev, "missing reg property\n");
b7ab407
+		return ret;
b7ab407
+	}
b7ab407
+
b7ab407
+	ctx->asid = ret;
b7ab407
+
b7ab407
+	dev_dbg(dev, "found asid %u\n", ctx->asid);
b7ab407
+
b7ab407
+	qcom_iommu->ctxs[ctx->asid - 1] = ctx;
b7ab407
+
b7ab407
+	return 0;
b7ab407
+}
b7ab407
+
b7ab407
+static int qcom_iommu_ctx_remove(struct platform_device *pdev)
b7ab407
+{
b7ab407
+	struct qcom_iommu_dev *qcom_iommu = dev_get_drvdata(pdev->dev.parent);
b7ab407
+	struct qcom_iommu_ctx *ctx = platform_get_drvdata(pdev);
b7ab407
+
b7ab407
+	platform_set_drvdata(pdev, NULL);
b7ab407
+
b7ab407
+	qcom_iommu->ctxs[ctx->asid - 1] = NULL;
b7ab407
+
b7ab407
+	return 0;
b7ab407
+}
b7ab407
+
b7ab407
+static const struct of_device_id ctx_of_match[] = {
b7ab407
+	{ .compatible = "qcom,msm-iommu-v1-ns" },
b7ab407
+	{ .compatible = "qcom,msm-iommu-v1-sec" },
b7ab407
+	{ /* sentinel */ }
b7ab407
+};
b7ab407
+
b7ab407
+static struct platform_driver qcom_iommu_ctx_driver = {
b7ab407
+	.driver	= {
b7ab407
+		.name		= "qcom-iommu-ctx",
b7ab407
+		.of_match_table	= of_match_ptr(ctx_of_match),
b7ab407
+	},
b7ab407
+	.probe	= qcom_iommu_ctx_probe,
b7ab407
+	.remove = qcom_iommu_ctx_remove,
b7ab407
+};
b7ab407
+
b7ab407
+static int qcom_iommu_device_probe(struct platform_device *pdev)
b7ab407
+{
b7ab407
+	struct device_node *child;
b7ab407
+	struct qcom_iommu_dev *qcom_iommu;
b7ab407
+	struct device *dev = &pdev->dev;
b7ab407
+	struct resource *res;
b7ab407
+	int ret, sz, max_asid = 0;
b7ab407
+
b7ab407
+	/* find the max asid (which is 1:1 to ctx bank idx), so we know how
b7ab407
+	 * many child ctx devices we have:
b7ab407
+	 */
b7ab407
+	for_each_child_of_node(dev->of_node, child)
b7ab407
+		max_asid = max(max_asid, get_asid(child));
b7ab407
+
b7ab407
+	sz = sizeof(*qcom_iommu) + (max_asid * sizeof(qcom_iommu->ctxs[0]));
b7ab407
+
b7ab407
+	qcom_iommu = devm_kzalloc(dev, sz, GFP_KERNEL);
b7ab407
+	if (!qcom_iommu)
b7ab407
+		return -ENOMEM;
b7ab407
+	qcom_iommu->num_ctxs = max_asid;
b7ab407
+	qcom_iommu->dev = dev;
b7ab407
+
b7ab407
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
b7ab407
+	if (res)
b7ab407
+		qcom_iommu->local_base = devm_ioremap_resource(dev, res);
b7ab407
+
b7ab407
+	qcom_iommu->iface_clk = devm_clk_get(dev, "iface");
b7ab407
+	if (IS_ERR(qcom_iommu->iface_clk)) {
b7ab407
+		dev_err(dev, "failed to get iface clock\n");
b7ab407
+		return PTR_ERR(qcom_iommu->iface_clk);
b7ab407
+	}
b7ab407
+
b7ab407
+	qcom_iommu->bus_clk = devm_clk_get(dev, "bus");
b7ab407
+	if (IS_ERR(qcom_iommu->bus_clk)) {
b7ab407
+		dev_err(dev, "failed to get bus clock\n");
b7ab407
+		return PTR_ERR(qcom_iommu->bus_clk);
b7ab407
+	}
b7ab407
+
b7ab407
+	if (of_property_read_u32(dev->of_node, "qcom,iommu-secure-id",
b7ab407
+				 &qcom_iommu->sec_id)) {
b7ab407
+		dev_err(dev, "missing qcom,iommu-secure-id property\n");
b7ab407
+		return -ENODEV;
b7ab407
+	}
b7ab407
+
b7ab407
+	platform_set_drvdata(pdev, qcom_iommu);
b7ab407
+
b7ab407
+	pm_runtime_enable(dev);
b7ab407
+
b7ab407
+	/* register context bank devices, which are child nodes: */
b7ab407
+	ret = devm_of_platform_populate(dev);
b7ab407
+	if (ret) {
b7ab407
+		dev_err(dev, "Failed to populate iommu contexts\n");
b7ab407
+		return ret;
b7ab407
+	}
b7ab407
+
b7ab407
+	ret = iommu_device_sysfs_add(&qcom_iommu->iommu, dev, NULL,
b7ab407
+				     dev_name(dev));
b7ab407
+	if (ret) {
b7ab407
+		dev_err(dev, "Failed to register iommu in sysfs\n");
b7ab407
+		return ret;
b7ab407
+	}
b7ab407
+
b7ab407
+	iommu_device_set_ops(&qcom_iommu->iommu, &qcom_iommu_ops);
b7ab407
+	iommu_device_set_fwnode(&qcom_iommu->iommu, dev->fwnode);
b7ab407
+
b7ab407
+	ret = iommu_device_register(&qcom_iommu->iommu);
b7ab407
+	if (ret) {
b7ab407
+		dev_err(dev, "Failed to register iommu\n");
b7ab407
+		return ret;
b7ab407
+	}
b7ab407
+
b7ab407
+	bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
b7ab407
+
b7ab407
+	if (qcom_iommu->local_base) {
b7ab407
+		pm_runtime_get_sync(dev);
b7ab407
+		writel_relaxed(0xffffffff, qcom_iommu->local_base + SMMU_INTR_SEL_NS);
b7ab407
+		pm_runtime_put_sync(dev);
b7ab407
+	}
b7ab407
+
b7ab407
+	return 0;
b7ab407
+}
b7ab407
+
b7ab407
+static int qcom_iommu_device_remove(struct platform_device *pdev)
b7ab407
+{
b7ab407
+	struct qcom_iommu_dev *qcom_iommu = platform_get_drvdata(pdev);
b7ab407
+
b7ab407
+	bus_set_iommu(&platform_bus_type, NULL);
b7ab407
+
b7ab407
+	pm_runtime_force_suspend(&pdev->dev);
b7ab407
+	platform_set_drvdata(pdev, NULL);
b7ab407
+	iommu_device_sysfs_remove(&qcom_iommu->iommu);
b7ab407
+	iommu_device_unregister(&qcom_iommu->iommu);
b7ab407
+
b7ab407
+	return 0;
b7ab407
+}
b7ab407
+
b7ab407
+#ifdef CONFIG_PM
b7ab407
+static int qcom_iommu_resume(struct device *dev)
b7ab407
+{
b7ab407
+	struct platform_device *pdev = to_platform_device(dev);
b7ab407
+	struct qcom_iommu_dev *qcom_iommu = platform_get_drvdata(pdev);
b7ab407
+
b7ab407
+	return qcom_iommu_enable_clocks(qcom_iommu);
b7ab407
+}
b7ab407
+
b7ab407
+static int qcom_iommu_suspend(struct device *dev)
b7ab407
+{
b7ab407
+	struct platform_device *pdev = to_platform_device(dev);
b7ab407
+	struct qcom_iommu_dev *qcom_iommu = platform_get_drvdata(pdev);
b7ab407
+
b7ab407
+	qcom_iommu_disable_clocks(qcom_iommu);
b7ab407
+
b7ab407
+	return 0;
b7ab407
+}
b7ab407
+#endif
b7ab407
+
b7ab407
+static const struct dev_pm_ops qcom_iommu_pm_ops = {
b7ab407
+	SET_RUNTIME_PM_OPS(qcom_iommu_suspend, qcom_iommu_resume, NULL)
b7ab407
+	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
b7ab407
+				pm_runtime_force_resume)
b7ab407
+};
b7ab407
+
b7ab407
+static const struct of_device_id qcom_iommu_of_match[] = {
b7ab407
+	{ .compatible = "qcom,msm-iommu-v1" },
b7ab407
+	{ /* sentinel */ }
b7ab407
+};
b7ab407
+MODULE_DEVICE_TABLE(of, qcom_iommu_of_match);
b7ab407
+
b7ab407
+static struct platform_driver qcom_iommu_driver = {
b7ab407
+	.driver	= {
b7ab407
+		.name		= "qcom-iommu",
b7ab407
+		.of_match_table	= of_match_ptr(qcom_iommu_of_match),
b7ab407
+		.pm		= &qcom_iommu_pm_ops,
b7ab407
+	},
b7ab407
+	.probe	= qcom_iommu_device_probe,
b7ab407
+	.remove	= qcom_iommu_device_remove,
b7ab407
+};
b7ab407
+
b7ab407
+static int __init qcom_iommu_init(void)
b7ab407
+{
b7ab407
+	int ret;
b7ab407
+
b7ab407
+	ret = platform_driver_register(&qcom_iommu_ctx_driver);
b7ab407
+	if (ret)
b7ab407
+		return ret;
b7ab407
+
b7ab407
+	ret = platform_driver_register(&qcom_iommu_driver);
b7ab407
+	if (ret)
b7ab407
+		platform_driver_unregister(&qcom_iommu_ctx_driver);
b7ab407
+
b7ab407
+	return ret;
b7ab407
+}
b7ab407
+
b7ab407
+static void __exit qcom_iommu_exit(void)
b7ab407
+{
b7ab407
+	platform_driver_unregister(&qcom_iommu_driver);
b7ab407
+	platform_driver_unregister(&qcom_iommu_ctx_driver);
b7ab407
+}
b7ab407
+
b7ab407
+module_init(qcom_iommu_init);
b7ab407
+module_exit(qcom_iommu_exit);
b7ab407
+
b7ab407
+IOMMU_OF_DECLARE(qcom_iommu_dev, "qcom,msm-iommu-v1", NULL);
b7ab407
+
b7ab407
+MODULE_DESCRIPTION("IOMMU API for QCOM IOMMU v1 implementations");
b7ab407
+MODULE_LICENSE("GPL v2");
b7ab407
From patchwork Thu Jul 13 12:07:47 2017
b7ab407
Content-Type: text/plain; charset="utf-8"
b7ab407
MIME-Version: 1.0
b7ab407
Content-Transfer-Encoding: 7bit
b7ab407
Subject: [RESEND,4/4] iommu: qcom: initialize secure page table
b7ab407
From: Rob Clark <robdclark@gmail.com>
b7ab407
X-Patchwork-Id: 9838373
b7ab407
Message-Id: <20170713120747.20490-5-robdclark@gmail.com>
b7ab407
To: iommu@lists.linux-foundation.org
b7ab407
Cc: linux-arm-msm@vger.kernel.org, Archit Taneja <architt@codeaurora.org>,
b7ab407
 Rob Herring <robh@kernel.org>, Will Deacon <will.deacon@arm.com>,
b7ab407
 Sricharan <sricharan@codeaurora.org>,
b7ab407
 Mark Rutland <mark.rutland@arm.com>, Robin Murphy <robin.murphy@arm.com>,
b7ab407
 Stanimir Varbanov <stanimir.varbanov@linaro.org>,
b7ab407
 Rob Clark <robdclark@gmail.com>
b7ab407
Date: Thu, 13 Jul 2017 08:07:47 -0400
b7ab407
b7ab407
From: Stanimir Varbanov <stanimir.varbanov@linaro.org>
b7ab407
b7ab407
This basically gets the secure page table size, allocates memory for
b7ab407
secure pagetables and passes the physical address to the trusted zone.
b7ab407
b7ab407
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
b7ab407
Signed-off-by: Rob Clark <robdclark@gmail.com>
b7ab407
---
b7ab407
 drivers/iommu/qcom_iommu.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++
b7ab407
 1 file changed, 64 insertions(+)
b7ab407
b7ab407
diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c
b7ab407
index 860cad1cb167..48b62aa52787 100644
b7ab407
--- a/drivers/iommu/qcom_iommu.c
b7ab407
+++ b/drivers/iommu/qcom_iommu.c
b7ab407
@@ -604,6 +604,51 @@ static void qcom_iommu_disable_clocks(struct qcom_iommu_dev *qcom_iommu)
b7ab407
 	clk_disable_unprepare(qcom_iommu->iface_clk);
b7ab407
 }
b7ab407
 
b7ab407
+static int qcom_iommu_sec_ptbl_init(struct device *dev)
b7ab407
+{
b7ab407
+	size_t psize = 0;
b7ab407
+	unsigned int spare = 0;
b7ab407
+	void *cpu_addr;
b7ab407
+	dma_addr_t paddr;
b7ab407
+	unsigned long attrs;
b7ab407
+	static bool allocated = false;
b7ab407
+	int ret;
b7ab407
+
b7ab407
+	if (allocated)
b7ab407
+		return 0;
b7ab407
+
b7ab407
+	ret = qcom_scm_iommu_secure_ptbl_size(spare, &psize);
b7ab407
+	if (ret) {
b7ab407
+		dev_err(dev, "failed to get iommu secure pgtable size (%d)\n",
b7ab407
+			ret);
b7ab407
+		return ret;
b7ab407
+	}
b7ab407
+
b7ab407
+	dev_info(dev, "iommu sec: pgtable size: %zu\n", psize);
b7ab407
+
b7ab407
+	attrs = DMA_ATTR_NO_KERNEL_MAPPING;
b7ab407
+
b7ab407
+	cpu_addr = dma_alloc_attrs(dev, psize, &paddr, GFP_KERNEL, attrs);
b7ab407
+	if (!cpu_addr) {
b7ab407
+		dev_err(dev, "failed to allocate %zu bytes for pgtable\n",
b7ab407
+			psize);
b7ab407
+		return -ENOMEM;
b7ab407
+	}
b7ab407
+
b7ab407
+	ret = qcom_scm_iommu_secure_ptbl_init(paddr, psize, spare);
b7ab407
+	if (ret) {
b7ab407
+		dev_err(dev, "failed to init iommu pgtable (%d)\n", ret);
b7ab407
+		goto free_mem;
b7ab407
+	}
b7ab407
+
b7ab407
+	allocated = true;
b7ab407
+	return 0;
b7ab407
+
b7ab407
+free_mem:
b7ab407
+	dma_free_attrs(dev, psize, cpu_addr, paddr, attrs);
b7ab407
+	return ret;
b7ab407
+}
b7ab407
+
b7ab407
 static int get_asid(const struct device_node *np)
b7ab407
 {
b7ab407
 	u32 reg;
b7ab407
@@ -700,6 +745,17 @@ static struct platform_driver qcom_iommu_ctx_driver = {
b7ab407
 	.remove = qcom_iommu_ctx_remove,
b7ab407
 };
b7ab407
 
b7ab407
+static bool qcom_iommu_has_secure_context(struct qcom_iommu_dev *qcom_iommu)
b7ab407
+{
b7ab407
+	struct device_node *child;
b7ab407
+
b7ab407
+	for_each_child_of_node(qcom_iommu->dev->of_node, child)
b7ab407
+		if (of_device_is_compatible(child, "qcom,msm-iommu-v1-sec"))
b7ab407
+			return true;
b7ab407
+
b7ab407
+	return false;
b7ab407
+}
b7ab407
+
b7ab407
 static int qcom_iommu_device_probe(struct platform_device *pdev)
b7ab407
 {
b7ab407
 	struct device_node *child;
b7ab407
@@ -744,6 +800,14 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
b7ab407
 		return -ENODEV;
b7ab407
 	}
b7ab407
 
b7ab407
+	if (qcom_iommu_has_secure_context(qcom_iommu)) {
b7ab407
+		ret = qcom_iommu_sec_ptbl_init(dev);
b7ab407
+		if (ret) {
b7ab407
+			dev_err(dev, "cannot init secure pg table(%d)\n", ret);
b7ab407
+			return ret;
b7ab407
+		}
b7ab407
+	}
b7ab407
+
b7ab407
 	platform_set_drvdata(pdev, qcom_iommu);
b7ab407
 
b7ab407
 	pm_runtime_enable(dev);
b7ab407
From patchwork Mon Jun 12 12:43:15 2017
b7ab407
Content-Type: text/plain; charset="utf-8"
b7ab407
MIME-Version: 1.0
b7ab407
Content-Transfer-Encoding: 7bit
b7ab407
Subject: [1/3] ARM64: DT: add gpu for msm8916
b7ab407
From: Rob Clark <robdclark@gmail.com>
b7ab407
X-Patchwork-Id: 9781057
b7ab407
Message-Id: <20170612124317.29313-1-robdclark@gmail.com>
b7ab407
To: linux-arm-msm@vger.kernel.org
b7ab407
Cc: Stephen Boyd <sboyd@codeaurora.org>, Andy Gross <agross@codeaurora.org>,
b7ab407
 Stanimir Varbanov <stanimir.varbanov@linaro.org>,
b7ab407
 Rob Clark <robdclark@gmail.com>
b7ab407
Date: Mon, 12 Jun 2017 08:43:15 -0400
b7ab407
b7ab407
Signed-off-by: Rob Clark <robdclark@gmail.com>
b7ab407
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
b7ab407
---
b7ab407
 arch/arm64/boot/dts/qcom/msm8916.dtsi | 35 +++++++++++++++++++++++++++++++++++
b7ab407
 1 file changed, 35 insertions(+)
b7ab407
b7ab407
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
b7ab407
index ab30939..24c24ab 100644
b7ab407
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
b7ab407
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
b7ab407
@@ -204,6 +204,17 @@
b7ab407
 
b7ab407
 	};
b7ab407
 
b7ab407
+	gpu_opp_table: opp_table {
b7ab407
+		compatible = "operating-points-v2";
b7ab407
+
b7ab407
+		opp-400000000 {
b7ab407
+			opp-hz = /bits/ 64 <400000000>;
b7ab407
+		};
b7ab407
+		opp-19200000 {
b7ab407
+			opp-hz = /bits/ 64 <19200000>;
b7ab407
+		};
b7ab407
+	};
b7ab407
+
b7ab407
 	timer {
b7ab407
 		compatible = "arm,armv8-timer";
b7ab407
 		interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
b7ab407
@@ -698,6 +709,30 @@
b7ab407
 			#thermal-sensor-cells = <1>;
b7ab407
 		};
b7ab407
 
b7ab407
+		gpu@1c00000 {
b7ab407
+			compatible = "qcom,adreno-306.0", "qcom,adreno";
b7ab407
+			reg = <0x01c00000 0x20000>;
b7ab407
+			reg-names = "kgsl_3d0_reg_memory";
b7ab407
+			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
b7ab407
+			interrupt-names = "kgsl_3d0_irq";
b7ab407
+			clock-names =
b7ab407
+			    "core",
b7ab407
+			    "iface",
b7ab407
+			    "mem",
b7ab407
+			    "mem_iface",
b7ab407
+			    "alt_mem_iface",
b7ab407
+			    "gfx3d";
b7ab407
+			clocks =
b7ab407
+			    <&gcc GCC_OXILI_GFX3D_CLK>,
b7ab407
+			    <&gcc GCC_OXILI_AHB_CLK>,
b7ab407
+			    <&gcc GCC_OXILI_GMEM_CLK>,
b7ab407
+			    <&gcc GCC_BIMC_GFX_CLK>,
b7ab407
+			    <&gcc GCC_BIMC_GPU_CLK>,
b7ab407
+			    <&gcc GFX3D_CLK_SRC>;
b7ab407
+			power-domains = <&gcc OXILI_GDSC>;
b7ab407
+			operating-points-v2 = <&gpu_opp_table>;
b7ab407
+		};
b7ab407
+
b7ab407
 		mdss: mdss@1a00000 {
b7ab407
 			compatible = "qcom,mdss";
b7ab407
 			reg = <0x1a00000 0x1000>,
b7ab407
From patchwork Mon Jun 12 12:43:16 2017
b7ab407
Content-Type: text/plain; charset="utf-8"
b7ab407
MIME-Version: 1.0
b7ab407
Content-Transfer-Encoding: 7bit
b7ab407
Subject: [2/3] ARM64: DT: add video codec devicetree node
b7ab407
From: Rob Clark <robdclark@gmail.com>
b7ab407
X-Patchwork-Id: 9781059
b7ab407
Message-Id: <20170612124317.29313-2-robdclark@gmail.com>
b7ab407
To: linux-arm-msm@vger.kernel.org
b7ab407
Cc: Stephen Boyd <sboyd@codeaurora.org>, Andy Gross <agross@codeaurora.org>,
b7ab407
 Stanimir Varbanov <stanimir.varbanov@linaro.org>,
b7ab407
 Rob Clark <robdclark@gmail.com>
b7ab407
Date: Mon, 12 Jun 2017 08:43:16 -0400
b7ab407
b7ab407
From: Stanimir Varbanov <stanimir.varbanov@linaro.org>
b7ab407
b7ab407
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
b7ab407
Signed-off-by: Rob Clark <robdclark@gmail.com>
b7ab407
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
b7ab407
---
b7ab407
 arch/arm64/boot/dts/qcom/msm8916.dtsi | 28 ++++++++++++++++++++++++++++
b7ab407
 1 file changed, 28 insertions(+)
b7ab407
b7ab407
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
b7ab407
index 24c24ab..1dcd632 100644
b7ab407
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
b7ab407
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
b7ab407
@@ -88,6 +88,13 @@
b7ab407
 			no-map;
b7ab407
 		};
b7ab407
 
b7ab407
+		venus_mem: venus@89900000 {
b7ab407
+			compatible = "shared-dma-pool";
b7ab407
+			reg = <0x0 0x89900000 0x0 0x800000>;
b7ab407
+			alignment = <0x1000>;
b7ab407
+			no-map;
b7ab407
+		};
b7ab407
+
b7ab407
 		mba_mem: mba@8ea00000 {
b7ab407
 			no-map;
b7ab407
 			reg = <0 0x8ea00000 0 0x100000>;
b7ab407
@@ -1214,6 +1221,27 @@
b7ab407
 				};
b7ab407
 			};
b7ab407
 		};
b7ab407
+
b7ab407
+		venus: video-codec@1d00000 {
b7ab407
+			compatible = "qcom,msm8916-venus";
b7ab407
+			reg = <0x01d00000 0xff000>;
b7ab407
+			interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
b7ab407
+			power-domains = <&gcc VENUS_GDSC>;
b7ab407
+			clocks = <&gcc GCC_VENUS0_VCODEC0_CLK>,
b7ab407
+				 <&gcc GCC_VENUS0_AHB_CLK>,
b7ab407
+				 <&gcc GCC_VENUS0_AXI_CLK>;
b7ab407
+			clock-names = "core", "iface", "bus";
b7ab407
+			memory-region = <&venus_mem>;
b7ab407
+			status = "okay";
b7ab407
+
b7ab407
+			video-decoder {
b7ab407
+				compatible = "venus-decoder";
b7ab407
+			};
b7ab407
+
b7ab407
+			video-encoder {
b7ab407
+				compatible = "venus-encoder";
b7ab407
+			};
b7ab407
+		};
b7ab407
 	};
b7ab407
 
b7ab407
 	smd {
b7ab407
From patchwork Mon Jun 12 12:43:17 2017
b7ab407
Content-Type: text/plain; charset="utf-8"
b7ab407
MIME-Version: 1.0
b7ab407
Content-Transfer-Encoding: 7bit
b7ab407
Subject: [3/3] ARM64: DT: add iommu for msm8916
b7ab407
From: Rob Clark <robdclark@gmail.com>
b7ab407
X-Patchwork-Id: 9781061
b7ab407
Message-Id: <20170612124317.29313-3-robdclark@gmail.com>
b7ab407
To: linux-arm-msm@vger.kernel.org
b7ab407
Cc: Stephen Boyd <sboyd@codeaurora.org>, Andy Gross <agross@codeaurora.org>,
b7ab407
 Stanimir Varbanov <stanimir.varbanov@linaro.org>,
b7ab407
 Rob Clark <robdclark@gmail.com>
b7ab407
Date: Mon, 12 Jun 2017 08:43:17 -0400
b7ab407
b7ab407
Signed-off-by: Rob Clark <robdclark@gmail.com>
b7ab407
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
b7ab407
---
b7ab407
 arch/arm64/boot/dts/qcom/msm8916.dtsi | 57 +++++++++++++++++++++++++++++++++++
b7ab407
 1 file changed, 57 insertions(+)
b7ab407
b7ab407
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
b7ab407
index 1dcd632..9a1d7ef 100644
b7ab407
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
b7ab407
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
b7ab407
@@ -716,6 +716,59 @@
b7ab407
 			#thermal-sensor-cells = <1>;
b7ab407
 		};
b7ab407
 
b7ab407
+		apps_iommu: iommu@1ef0000 {
b7ab407
+			#address-cells = <1>;
b7ab407
+			#size-cells = <1>;
b7ab407
+			#iommu-cells = <1>;
b7ab407
+			compatible = "qcom,msm8916-iommu", "qcom,msm-iommu-v1";
b7ab407
+			ranges = <0 0x1e20000 0x40000>;
b7ab407
+			reg = <0x1ef0000 0x3000>;
b7ab407
+			clocks = <&gcc GCC_SMMU_CFG_CLK>,
b7ab407
+				 <&gcc GCC_APSS_TCU_CLK>;
b7ab407
+			clock-names = "iface", "bus";
b7ab407
+			qcom,iommu-secure-id = <17>;
b7ab407
+
b7ab407
+			// mdp_0:
b7ab407
+			iommu-ctx@4000 {
b7ab407
+				compatible = "qcom,msm-iommu-v1-ns";
b7ab407
+				reg = <0x4000 0x1000>;
b7ab407
+				interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
b7ab407
+			};
b7ab407
+
b7ab407
+			// venus_ns:
b7ab407
+			iommu-ctx@5000 {
b7ab407
+				compatible = "qcom,msm-iommu-v1-sec";
b7ab407
+				reg = <0x5000 0x1000>;
b7ab407
+				interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
b7ab407
+			};
b7ab407
+		};
b7ab407
+
b7ab407
+		gpu_iommu: iommu@1f08000 {
b7ab407
+			#address-cells = <1>;
b7ab407
+			#size-cells = <1>;
b7ab407
+			#iommu-cells = <1>;
b7ab407
+			compatible = "qcom,msm8916-iommu", "qcom,msm-iommu-v1";
b7ab407
+			ranges = <0 0x1f08000 0x10000>;
b7ab407
+			clocks = <&gcc GCC_SMMU_CFG_CLK>,
b7ab407
+				 <&gcc GCC_GFX_TCU_CLK>;
b7ab407
+			clock-names = "iface", "bus";
b7ab407
+			qcom,iommu-secure-id = <18>;
b7ab407
+
b7ab407
+			// gfx3d_user:
b7ab407
+			iommu-ctx@1000 {
b7ab407
+				compatible = "qcom,msm-iommu-v1-ns";
b7ab407
+				reg = <0x1000 0x1000>;
b7ab407
+				interrupts = <GIC_SPI 241 IRQ_TYPE_LEVEL_HIGH>;
b7ab407
+			};
b7ab407
+
b7ab407
+			// gfx3d_priv:
b7ab407
+			iommu-ctx@2000 {
b7ab407
+				compatible = "qcom,msm-iommu-v1-ns";
b7ab407
+				reg = <0x2000 0x1000>;
b7ab407
+				interrupts = <GIC_SPI 242 0>;
b7ab407
+			};
b7ab407
+		};
b7ab407
+
b7ab407
 		gpu@1c00000 {
b7ab407
 			compatible = "qcom,adreno-306.0", "qcom,adreno";
b7ab407
 			reg = <0x01c00000 0x20000>;
b7ab407
@@ -738,6 +791,7 @@
b7ab407
 			    <&gcc GFX3D_CLK_SRC>;
b7ab407
 			power-domains = <&gcc OXILI_GDSC>;
b7ab407
 			operating-points-v2 = <&gpu_opp_table>;
b7ab407
+			iommus = <&gpu_iommu 1>, <&gpu_iommu 2>;
b7ab407
 		};
b7ab407
 
b7ab407
 		mdss: mdss@1a00000 {
b7ab407
@@ -781,6 +835,8 @@
b7ab407
 					      "core_clk",
b7ab407
 					      "vsync_clk";
b7ab407
 
b7ab407
+				iommus = <&apps_iommu 4>;
b7ab407
+
b7ab407
 				ports {
b7ab407
 					#address-cells = <1>;
b7ab407
 					#size-cells = <0>;
b7ab407
@@ -1231,6 +1287,7 @@
b7ab407
 				 <&gcc GCC_VENUS0_AHB_CLK>,
b7ab407
 				 <&gcc GCC_VENUS0_AXI_CLK>;
b7ab407
 			clock-names = "core", "iface", "bus";
b7ab407
+			iommus = <&apps_iommu 5>;
b7ab407
 			memory-region = <&venus_mem>;
b7ab407
 			status = "okay";
b7ab407