From: Joerg Roedel <jroedel@suse.de>
Date: Wed, 4 Feb 2015 15:53:44 +0000 (+0100)
Subject: Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and ... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a20cc76b9efae10c20123049df361adcd7f0e0b3;p=linux-beck.git

Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next

Conflicts:
	drivers/iommu/Kconfig
	drivers/iommu/Makefile
---

a20cc76b9efae10c20123049df361adcd7f0e0b3
diff --cc drivers/iommu/Kconfig
index b7c656c84f51,87060ad6829d,325188eef1c1,325188eef1c1,325188eef1c1,db98eb706466..baa0d9786f50
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@@@@@@ -13,32 -13,32 -13,6 -13,6 -13,6 -14,9 +14,35 @@@@@@@ menuconfig IOMMU_SUPPOR
      
      if IOMMU_SUPPORT
      
  ++++menu "Generic IOMMU Pagetable Support"
  ++++
  ++++# Selected by the actual pagetable implementations
  ++++config IOMMU_IO_PGTABLE
  ++++	bool
  ++++
  ++++config IOMMU_IO_PGTABLE_LPAE
  ++++	bool "ARMv7/v8 Long Descriptor Format"
  ++++	select IOMMU_IO_PGTABLE
  ++++	help
  ++++	  Enable support for the ARM long descriptor pagetable format.
  ++++	  This allocator supports 4K/2M/1G, 16K/32M and 64K/512M page
  ++++	  sizes at both stage-1 and stage-2, as well as address spaces
  ++++	  up to 48-bits in size.
  ++++
  ++++config IOMMU_IO_PGTABLE_LPAE_SELFTEST
  ++++	bool "LPAE selftests"
  ++++	depends on IOMMU_IO_PGTABLE_LPAE
  ++++	help
  ++++	  Enable self-tests for LPAE page table allocator. This performs
  ++++	  a series of page-table consistency checks during boot.
  ++++
  ++++	  If unsure, say N here.
  ++++
  ++++endmenu
  ++++
+++++ config IOMMU_IOVA
+++++ 	bool
+++++ 
      config OF_IOMMU
             def_bool y
             depends on OF && IOMMU_API
@@@@@@@ -331,9 -330,9 -304,8 -304,8 -304,8 -312,9 +339,9 @@@@@@@ config SPAPR_TCE_IOMM
      
      config ARM_SMMU
      	bool "ARM Ltd. System MMU (SMMU) Support"
--    	depends on ARM64 || ARM
  ----	depends on ARM64 || (ARM_LPAE && OF)
     -	depends on MMU
++++++	depends on (ARM64 || ARM) && MMU
      	select IOMMU_API
  ++++	select IOMMU_IO_PGTABLE_LPAE
      	select ARM_DMA_USE_IOMMU if ARM
      	help
      	  Support for implementations of the ARM System MMU architecture
diff --cc drivers/iommu/Makefile
index d6889b487d55,d6889b487d55,7b976f294a69,7b976f294a69,7b976f294a69,0b1b94ef13ab..080ffab4ed1c
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@@@@@@ -1,8 -1,8 -1,6 -1,6 -1,6 -1,7 +1,9 @@@@@@@
      obj-$(CONFIG_IOMMU_API) += iommu.o
      obj-$(CONFIG_IOMMU_API) += iommu-traces.o
      obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o
  ++++obj-$(CONFIG_IOMMU_IO_PGTABLE) += io-pgtable.o
  ++++obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE) += io-pgtable-arm.o
+++++ obj-$(CONFIG_IOMMU_IOVA) += iova.o
      obj-$(CONFIG_OF_IOMMU)	+= of_iommu.o
      obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o
      obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o