Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d05f4de authored by Jon Mason's avatar Jon Mason Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Make GART_IOMMU kconfig help text more specific (trivial) 



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: default avatarJon Mason <jdmason@us.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ba22f135

arch/x86_64/Kconfig

+9 −7
Original line number Original line Diff line number Diff line
@@ -364,13 +364,15 @@ config GART_IOMMU 
	select SWIOTLB

	select SWIOTLB

	depends on PCI

	depends on PCI

	help

	help

	  Support the IOMMU. Needed to run systems with more than 3GB of memory

	  Support for hardware IOMMU in AMD's Opteron/Athlon64 Processors

	  properly with 32-bit PCI devices that do not support DAC (Double Address

	  and for the bounce buffering software IOMMU.

	  Cycle). The IOMMU can be turned off at runtime with the iommu=off parameter.

	  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.

  	  Normally the kernel will take the right choice by itself.

	  This option includes a driver for the AMD Opteron/Athlon64 northbridge IOMMU

  	  This option includes a driver for the AMD Opteron/Athlon64 IOMMU

	  and a software emulation used on other systems.

  	  northbridge and a software emulation used on other systems without

	  If unsure, say Y.

	  hardware IOMMU.  If unsure, say Y.





# need this always enabled with GART_IOMMU for the VIA workaround

# need this always enabled with GART_IOMMU for the VIA workaround

config SWIOTLB

config SWIOTLB