Merge branch 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 iommu changes from Ingo Molnar:
 "Make it easier to turn off the old AMD GART code"

* 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/iommu: Clean up the CONFIG_GART_IOMMU config option a bit
  x86/iommu: Don't make AMD_GART depend on EXPERT and default y

1 files changed, 16 insertions, 11 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index dddba2663bbf..725e1573ea85 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -757,20 +757,25 @@ config DMI
           BIOS code.
 
 config GART_IOMMU
-        bool "GART IOMMU support" if EXPERT
-        default y
+        bool "Old AMD GART IOMMU support"
         select SWIOTLB
         depends on X86_64 && PCI && AMD_NB
         ---help---
-          Support for full DMA access of devices with 32bit memory access only
-          on systems with more than 3GB. This is usually needed for USB,
-          sound, many IDE/SATA chipsets and some other devices.
-          Provides a driver for the AMD Athlon64/Opteron/Turion/Sempron GART
-          based hardware IOMMU and a software bounce buffer based IOMMU used
-          on Intel systems and as fallback.
-          The code is only active when needed (enough memory and limited
-          device) unless CONFIG_IOMMU_DEBUG or iommu=force is specified
-          too.
+          Provides a driver for older AMD Athlon64/Opteron/Turion/Sempron
+          GART based hardware IOMMUs.
+
+          The GART supports full DMA access for devices with 32-bit access
+          limitations, on systems with more than 3 GB. This is usually needed
+          for USB, sound, many IDE/SATA chipsets and some other devices.
+
+          Newer systems typically have a modern AMD IOMMU, supported via
+          the CONFIG_AMD_IOMMU=y config option.
+
+          In normal configurations this driver is only active when needed:
+          there's more than 3 GB of memory and the system contains a
+          32-bit limited device.
+
+          If unsure, say Y.
 
 config CALGARY_IOMMU
         bool "IBM Calgary IOMMU support"