aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorOhad Ben-Cohen <ohad@wizery.com>2011-06-01 19:48:05 -0400
committerJoerg Roedel <joerg.roedel@amd.com>2011-06-14 08:47:41 -0400
commitab493a0f0f55d28636ac860ea682d57b84257f10 (patch)
tree41c1801407e25060ae415a7c2bb1cb6a8df45884 /arch
parent74315cccd2104a953f493acca2c6b0519d6f5c6f (diff)
drivers: iommu: move to a dedicated folder
Create a dedicated folder for iommu drivers, and move the base iommu implementation over there. Grouping the various iommu drivers in a single location will help finding similar problems shared by different platforms, so they could be solved once, in the iommu framework, instead of solved differently (or duplicated) in each driver. Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-msm/Kconfig3
-rw-r--r--arch/ia64/Kconfig3
-rw-r--r--arch/x86/Kconfig5
3 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 1516896e8d17..efb7b7dfc20b 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -205,9 +205,6 @@ config MSM_GPIOMUX
205config MSM_V2_TLMM 205config MSM_V2_TLMM
206 bool 206 bool
207 207
208config IOMMU_API
209 bool
210
211config MSM_SCM 208config MSM_SCM
212 bool 209 bool
213endif 210endif
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 38280ef4a2af..9929e4e11ea0 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -681,6 +681,3 @@ source "lib/Kconfig"
681 681
682config IOMMU_HELPER 682config IOMMU_HELPER
683 def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB) 683 def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
684
685config IOMMU_API
686 def_bool (DMAR)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index da349723d411..460d57370016 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -685,6 +685,7 @@ config AMD_IOMMU
685 select SWIOTLB 685 select SWIOTLB
686 select PCI_MSI 686 select PCI_MSI
687 select PCI_IOV 687 select PCI_IOV
688 select IOMMU_API
688 depends on X86_64 && PCI && ACPI 689 depends on X86_64 && PCI && ACPI
689 ---help--- 690 ---help---
690 With this option you can enable support for AMD IOMMU hardware in 691 With this option you can enable support for AMD IOMMU hardware in
@@ -720,9 +721,6 @@ config SWIOTLB
720config IOMMU_HELPER 721config IOMMU_HELPER
721 def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU) 722 def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)
722 723
723config IOMMU_API
724 def_bool (AMD_IOMMU || DMAR)
725
726config MAXSMP 724config MAXSMP
727 bool "Enable Maximum number of SMP Processors and NUMA Nodes" 725 bool "Enable Maximum number of SMP Processors and NUMA Nodes"
728 depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL 726 depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL
@@ -1945,6 +1943,7 @@ config PCI_CNB20LE_QUIRK
1945config DMAR 1943config DMAR
1946 bool "Support for DMA Remapping Devices (EXPERIMENTAL)" 1944 bool "Support for DMA Remapping Devices (EXPERIMENTAL)"
1947 depends on PCI_MSI && ACPI && EXPERIMENTAL 1945 depends on PCI_MSI && ACPI && EXPERIMENTAL
1946 select IOMMU_API
1948 help 1947 help
1949 DMA remapping (DMAR) devices support enables independent address 1948 DMA remapping (DMAR) devices support enables independent address
1950 translations for Direct Memory Access (DMA) from devices. 1949 translations for Direct Memory Access (DMA) from devices.