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

Pull IOMMU updates from Joerg Roedel:
 "A few updates this time, most important and exiciting (to me) is:

   - The new ARM SMMU driver.  This is a common IOMMU driver that will
     hopefully be used in a lot of upcoming ARM chips.  So the mess in
     the past where every SOC had its own IOMMU will be over.

  Besides that:

   - Some important fixes in the IOMMU unmap path.  There are fixes in
     the common code and also in the AMD IOMMU driver.
   - Other random fixes"

* tag 'iommu-updates-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  MAINTAINERS: add entry for ARM system MMU driver
  iommu/arm: Add support for ARM Ltd. System MMU architecture
  documentation/iommu: Add description of ARM System MMU binding
  iommu: Use %pa and %zx instead of casting
  iommu/amd: Only unmap large pages from the first pte
  iommu: Fix compiler warning on pr_debug
  iommu/amd: Fix memory leak in free_pagetable
  iommu: Split iommu_unmaps
  iommu/{vt-d,amd}: Remove multifunction assumption around grouping
  iommu/omap: fix checkpatch warnings in omap iommu code
  iommu/omap: fix printk formats for dma_addr_t
  iommu/vt-d: DMAR reporting table needs at least one DRHD
  iommu/vt-d: Downgrade the warning if enabling irq remapping fails

diff --cc MAINTAINERS
index 37f9a71c744f38c4b8b0e2671eda3871425d0d25,1eb2a72617875b6b403a7e2d3ea18f020737fff0..af4c3be44ac395661af213ddb482f81cda6d98b0
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1331,8 -1309,13 +1331,14 @@@ W:    http://wiki.xilinx.co
  T:    git git://git.xilinx.com/linux-xlnx.git
  S:    Supported
  F:    arch/arm/mach-zynq/
 +F:    drivers/cpuidle/cpuidle-zynq.c
  
+ ARM SMMU DRIVER
+ M:    Will Deacon <will.deacon@arm.com>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    drivers/iommu/arm-smmu.c
+ 
  ARM64 PORT (AARCH64 ARCHITECTURE)
  M:    Catalin Marinas <catalin.marinas@arm.com>
  M:    Will Deacon <will.deacon@arm.com>

diff --cc drivers/iommu/Kconfig
index 01730b2b9954e21bd69208f51847b11f78246f5c,957cfd4f80654bdc9b1a972266e05fe72fa10707..820d85c4a4a0f8c2b8fc813adfa30a07c529a953
--- 1/drivers/iommu/Kconfig
--- 2/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@@ -261,12 -261,17 +261,25 @@@ config SHMOBILE_IOMMU_L1SIZ
        default 256 if SHMOBILE_IOMMU_ADDRSIZE_64MB
        default 128 if SHMOBILE_IOMMU_ADDRSIZE_32MB
  
 +config SPAPR_TCE_IOMMU
 +      bool "sPAPR TCE IOMMU Support"
 +      depends on PPC_POWERNV || PPC_PSERIES
 +      select IOMMU_API
 +      help
 +        Enables bits of IOMMU API required by VFIO. The iommu_ops
 +        is not implemented as it is not necessary for VFIO.
 +
+ config ARM_SMMU
+       bool "ARM Ltd. System MMU (SMMU) Support"
+       depends on ARM64 || (ARM_LPAE && OF)
+       select IOMMU_API
+       select ARM_DMA_USE_IOMMU if ARM
+       help
+         Support for implementations of the ARM System MMU architecture
+         versions 1 and 2. The driver supports both v7l and v8l table
+         formats with 4k and 64k page sizes.
+ 
+         Say Y here if your SoC includes an IOMMU device implementing
+         the ARM SMMU architecture.
+ 
  endif # IOMMU_SUPPORT