summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-09-05 16:00:24 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2016-09-05 16:00:24 +0200
commit4174879b2e5a2620d9f5c1935de0c9204b34cd1c (patch)
tree361983445ed32af589f9d502e8f0a65c94cb85b6 /Documentation
parent8e3562f6f8d28804b5499bf3cff520598aa25323 (diff)
parentd98de49a53e48f51332e97568127e722415e1232 (diff)
downloadlinux-4174879b2e5a2620d9f5c1935de0c9204b34cd1c.tar.bz2
Merge branch 'x86/amd-avic' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into HEAD
Merge IOMMU bits for virtualization of interrupt injection into virtual machines.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 46c030a49186..748ef7bdd64d 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -460,6 +460,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
driver will print ACPI tables for AMD IOMMU during
IOMMU initialization.
+ amd_iommu_intr= [HW,X86-64]
+ Specifies one of the following AMD IOMMU interrupt
+ remapping modes:
+ legacy - Use legacy interrupt remapping mode.
+ vapic - Use virtual APIC mode, which allows IOMMU
+ to inject interrupts directly into guest.
+ This mode requires kvm-amd.avic=1.
+ (Default when IOMMU HW support is present.)
+
amijoy.map= [HW,JOY] Amiga joystick support
Map of devices attached to JOY0DAT and JOY1DAT
Format: <a>,<b>