Commit 339a4b72 authored by Linus Torvalds's avatar Linus Torvalds

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
parents dba538ff ced3c42c
...@@ -757,20 +757,25 @@ config DMI ...@@ -757,20 +757,25 @@ config DMI
BIOS code. BIOS code.
config GART_IOMMU config GART_IOMMU
bool "GART IOMMU support" if EXPERT bool "Old AMD GART IOMMU support"
default y
select SWIOTLB select SWIOTLB
depends on X86_64 && PCI && AMD_NB depends on X86_64 && PCI && AMD_NB
---help--- ---help---
Support for full DMA access of devices with 32bit memory access only Provides a driver for older AMD Athlon64/Opteron/Turion/Sempron
on systems with more than 3GB. This is usually needed for USB, GART based hardware IOMMUs.
sound, many IDE/SATA chipsets and some other devices.
Provides a driver for the AMD Athlon64/Opteron/Turion/Sempron GART The GART supports full DMA access for devices with 32-bit access
based hardware IOMMU and a software bounce buffer based IOMMU used limitations, on systems with more than 3 GB. This is usually needed
on Intel systems and as fallback. for USB, sound, many IDE/SATA chipsets and some other devices.
The code is only active when needed (enough memory and limited
device) unless CONFIG_IOMMU_DEBUG or iommu=force is specified Newer systems typically have a modern AMD IOMMU, supported via
too. 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 config CALGARY_IOMMU
bool "IBM Calgary IOMMU support" bool "IBM Calgary IOMMU support"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment