Merge tag 'iommu-updates-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull IOMMU Updates from Joerg Roedel:
 "Besides some fixes and cleanups in the code there are three more
  important changes to point out this time:

	* New IOMMU driver for the ARM SHMOBILE platform
	* An IOMMU-API extension for non-paging IOMMUs (required for
	  upcoming PAMU driver)
	* Rework of the way the Tegra IOMMU driver accesses its
	  registetrs - register windows are easier to extend now.

  There are also a few changes to non-iommu code, but that is acked by
  the respective maintainers."

* tag 'iommu-updates-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (23 commits)
  iommu/tegra: assume CONFIG_OF in SMMU driver
  iommu/tegra: assume CONFIG_OF in gart driver
  iommu/amd: Remove redundant NULL check before dma_ops_domain_free().
  iommu/amd: Initialize device table after dma_ops
  iommu/vt-d: Zero out allocated memory in dmar_enable_qi
  iommu/tegra: smmu: Fix incorrect mask for regbase
  iommu/exynos: Make exynos_sysmmu_disable static
  ARM: mach-shmobile: r8a7740: Add IPMMU device
  ARM: mach-shmobile: sh73a0: Add IPMMU device
  ARM: mach-shmobile: sh7372: Add IPMMU device
  iommu/shmobile: Add iommu driver for Renesas IPMMU modules
  iommu: Add DOMAIN_ATTR_WINDOWS domain attribute
  iommu: Add domain window handling functions
  iommu: Implement DOMAIN_ATTR_PAGING attribute
  iommu: Check for valid pgsize_bitmap in iommu_map/unmap
  iommu: Make sure DOMAIN_ATTR_MAX is really the maximum
  iommu/tegra: smmu: Change SMMU's dependency on ARCH_TEGRA
  iommu/tegra: smmu: Use helper function to check for valid register offset
  iommu/tegra: smmu: Support variable MMIO ranges/blocks
  iommu/tegra: Add missing spinlock initialization
  ...

1 files changed, 75 insertions, 1 deletions

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 01068987809d..5c514d0711d1 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -158,7 +158,7 @@ config TEGRA_IOMMU_GART
 
 config TEGRA_IOMMU_SMMU
         bool "Tegra SMMU IOMMU Support"
-        depends on ARCH_TEGRA_3x_SOC && TEGRA_AHB
+        depends on ARCH_TEGRA && TEGRA_AHB
         select IOMMU_API
         help
           Enables support for remapping discontiguous physical memory
@@ -187,4 +187,78 @@ config EXYNOS_IOMMU_DEBUG
 
           Say N unless you need kernel log message for IOMMU debugging
 
+config SHMOBILE_IPMMU
+        bool
+
+config SHMOBILE_IPMMU_TLB
+        bool
+
+config SHMOBILE_IOMMU
+        bool "IOMMU for Renesas IPMMU/IPMMUI"
+        default n
+        depends on (ARM && ARCH_SHMOBILE)
+        select IOMMU_API
+        select ARM_DMA_USE_IOMMU
+        select SHMOBILE_IPMMU
+        select SHMOBILE_IPMMU_TLB
+        help
+          Support for Renesas IPMMU/IPMMUI. This option enables
+          remapping of DMA memory accesses from all of the IP blocks
+          on the ICB.
+
+          Warning: Drivers (including userspace drivers of UIO
+          devices) of the IP blocks on the ICB *must* use addresses
+          allocated from the IPMMU (iova) for DMA with this option
+          enabled.
+
+          If unsure, say N.
+
+choice
+        prompt "IPMMU/IPMMUI address space size"
+        default SHMOBILE_IOMMU_ADDRSIZE_2048MB
+        depends on SHMOBILE_IOMMU
+        help
+          This option sets IPMMU/IPMMUI address space size by
+          adjusting the 1st level page table size. The page table size
+          is calculated as follows:
+
+              page table size = number of page table entries * 4 bytes
+              number of page table entries = address space size / 1 MiB
+
+          For example, when the address space size is 2048 MiB, the
+          1st level page table size is 8192 bytes.
+
+        config SHMOBILE_IOMMU_ADDRSIZE_2048MB
+                bool "2 GiB"
+
+        config SHMOBILE_IOMMU_ADDRSIZE_1024MB
+                bool "1 GiB"
+
+        config SHMOBILE_IOMMU_ADDRSIZE_512MB
+                bool "512 MiB"
+
+        config SHMOBILE_IOMMU_ADDRSIZE_256MB
+                bool "256 MiB"
+
+        config SHMOBILE_IOMMU_ADDRSIZE_128MB
+                bool "128 MiB"
+
+        config SHMOBILE_IOMMU_ADDRSIZE_64MB
+                bool "64 MiB"
+
+        config SHMOBILE_IOMMU_ADDRSIZE_32MB
+                bool "32 MiB"
+
+endchoice
+
+config SHMOBILE_IOMMU_L1SIZE
+        int
+        default 8192 if SHMOBILE_IOMMU_ADDRSIZE_2048MB
+        default 4096 if SHMOBILE_IOMMU_ADDRSIZE_1024MB
+        default 2048 if SHMOBILE_IOMMU_ADDRSIZE_512MB
+        default 1024 if SHMOBILE_IOMMU_ADDRSIZE_256MB
+        default 512 if SHMOBILE_IOMMU_ADDRSIZE_128MB
+        default 256 if SHMOBILE_IOMMU_ADDRSIZE_64MB
+        default 128 if SHMOBILE_IOMMU_ADDRSIZE_32MB
+
 endif # IOMMU_SUPPORT