[PATCH] x86: move the descriptions of VT-d toDocumentations/x86/x86_64/boot-options.txt

[FUJITA Tomonori]

Documentations/x86/x86_64/boot-options.txt is the more appropriate
place for the descriptions of the VT-d IOMMU kernel parameters.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
---
 Documentation/kernel-parameters.txt       |   22 ----------------------
 Documentation/x86/x86_64/boot-options.txt |   21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index cd98762..a96f6f7 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -874,28 +874,6 @@ and is between 256 and 4096 characters. It is defined in the file
 		forcesac
 		soft
 
-
-	intel_iommu=	[DMAR] Intel IOMMU driver (DMAR) option
-		off
-			Disable intel iommu driver.
-		igfx_off [Default Off]
-			By default, gfx is mapped as normal device. If a gfx
-			device has a dedicated DMAR unit, the DMAR unit is
-			bypassed by not enabling DMAR with this option. In
-			this case, gfx device will use physical address for
-			DMA.
-		forcedac [x86_64]
-			With this option iommu will not optimize to look
-			for io virtual address below 32 bit forcing dual
-			address cycle on pci bus for cards supporting greater
-			than 32 bit addressing. The default is to look
-			for translation below 32 bit and if not available
-			then look in the higher range.
-		strict [Default Off]
-			With this option on every unmap_single operation will
-			result in a hardware IOTLB flush operation as opposed
-			to batching them for performance.
-
 	io_delay=	[X86-32,X86-64] I/O delay method
 		0x80
 			Standard port 0x80 based delay
diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt
index b0c7b6c..46cef05 100644
--- a/Documentation/x86/x86_64/boot-options.txt
+++ b/Documentation/x86/x86_64/boot-options.txt
@@ -216,6 +216,10 @@ IOMMU (input/output memory management unit)
       mapping with memory protection, etc.
       Kernel boot message: "PCI-DMA: Using Calgary IOMMU"
 
+   5. <drivers/pci/intel-iommu.c> : Intel VT-d hardware IOMMU.
+      Kernel boot message: "PCI-DMA: Intel(R) Virtualization Technology for
+      Directed I/O\n"
+
  iommu=[<size>][,noagp][,off][,force][,noforce][,leak[=<nr_of_leak_pages>]
 	[,memaper[=<order>]][,merge][,forcesac][,fullflush][,nomerge]
 	[,noaperture][,calgary]
@@ -287,6 +291,23 @@ IOMMU (input/output memory management unit)
     space might stop working. Use this option if you have devices that
     are accessed from userspace directly on some PCI host bridge.
 
+  iommu options only relevant to the Intel VT-d hardware IOMMU:
+    off                Disable intel iommu driver.
+    igfx_off           By default, gfx is mapped as normal device. If a gfx
+                       device has a dedicated DMAR unit, the DMAR unit is
+                       bypassed by not enabling DMAR with this option. In
+                       this case, gfx device will use physical address for
+                       DMA (Default Off).
+    forcedac           With this option iommu will not optimize to look
+                       for io virtual address below 32 bit forcing dual
+                       address cycle on pci bus for cards supporting greater
+                       than 32 bit addressing. The default is to look
+                       for translation below 32 bit and if not available
+                       then look in the higher range.
+    strict             With this option on every unmap_single operation will
+                       result in a hardware IOTLB flush operation as opposed
+                       to batching them for performance (Default Off).
+
 Debugging
 
   oops=panic	Always panic on oopses. Default is to just kill the process,
-- 
1.5.5.GIT

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/