Skip to content

Commit

Permalink
[PATCH] x86_64: Make GART_IOMMU kconfig help text more specific (triv…
Browse files Browse the repository at this point in the history
…ial)

Have the GART_IOMMU help text specify that this is the hardware IOMMU in
amd64 processors.  This will be significant if/when other IOMMUs are
added to the x86-64 architecture. :-)

Also, note that the previous help text stated that IOMMU was needed for
>3GB memory instead of >4GB.  This is fixed in the newer version.

Signed-off-by: Jon Mason <jdmason@us.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jon Mason authored and Linus Torvalds committed Mar 25, 2006
1 parent ba22f13 commit 5d05f4d
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions arch/x86_64/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -364,13 +364,15 @@ config GART_IOMMU
select SWIOTLB
depends on PCI
help
Support the IOMMU. Needed to run systems with more than 3GB of memory
properly with 32-bit PCI devices that do not support DAC (Double Address
Cycle). The IOMMU can be turned off at runtime with the iommu=off parameter.
Normally the kernel will take the right choice by itself.
This option includes a driver for the AMD Opteron/Athlon64 northbridge IOMMU
and a software emulation used on other systems.
If unsure, say Y.
Support for hardware IOMMU in AMD's Opteron/Athlon64 Processors
and for the bounce buffering software IOMMU.
Needed to run systems with more than 3GB of memory properly with
32-bit PCI devices that do not support DAC (Double Address Cycle).
The IOMMU can be turned off at runtime with the iommu=off parameter.
Normally the kernel will take the right choice by itself.
This option includes a driver for the AMD Opteron/Athlon64 IOMMU
northbridge and a software emulation used on other systems without
hardware IOMMU. If unsure, say Y.

# need this always enabled with GART_IOMMU for the VIA workaround
config SWIOTLB
Expand Down

0 comments on commit 5d05f4d

Please sign in to comment.