lkml.org 
[lkml]   [2013]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[GIT PULL] x86/iommu changes for v3.13
Linus,

Please pull the latest x86-iommu-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-iommu-for-linus

# HEAD: ced3c42c9fcba049ec9c76c8461ac194cafb20ba x86/iommu: Clean up the CONFIG_GART_IOMMU config option a bit

Make it easier to turn off the old AMD GART code.

Thanks,

Ingo

------------------>
Andi Kleen (1):
x86/iommu: Don't make AMD_GART depend on EXPERT and default y

Ingo Molnar (1):
x86/iommu: Clean up the CONFIG_GART_IOMMU config option a bit


arch/x86/Kconfig | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ee2fb9d..7081958 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -756,20 +756,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"

\
 
 \ /
  Last update: 2013-11-11 19:21    [W:0.052 / U:0.140 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site