OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

x86-iommu: turn on IR by default if proper

Browse Source 
When the user didn't specify "intremap" for the IOMMU device, we turn
it on by default if it is supported.  This will turn IR on for the
default Q35 platform as long as the IOMMU device is specified on new
kernels.

Signed-off-by: Peter Xu <peterx@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Peter Xu 2018-12-20 13:40:37 +08:00 committed by Michael S. Tsirkin
parent a924b3d8df
commit 47748bbba2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/i386/x86-iommu.c
View File

@ -112,6 +112,7 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)
PCMachineState *pcms = PCMachineState *pcms =
PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE)); PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));
QLIST_INIT(&x86_iommu->iec_notifiers); QLIST_INIT(&x86_iommu->iec_notifiers);
bool irq_all_kernel = kvm_irqchip_in_kernel() && !kvm_irqchip_is_split();
if (!pcms || !pcms->bus) { if (!pcms || !pcms->bus) {
error_setg(errp, "Machine-type '%s' not supported by IOMMU", error_setg(errp, "Machine-type '%s' not supported by IOMMU",
@ -121,12 +122,12 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)
/* If the user didn't specify IR, choose a default value for it */ /* If the user didn't specify IR, choose a default value for it */
if (x86_iommu->intr_supported == ON_OFF_AUTO_AUTO) { if (x86_iommu->intr_supported == ON_OFF_AUTO_AUTO) {
x86_iommu->intr_supported = ON_OFF_AUTO_OFF; x86_iommu->intr_supported = irq_all_kernel ?
ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON;
} }
/* Both Intel and AMD IOMMU IR only support "kernel-irqchip={off|split}" */ /* Both Intel and AMD IOMMU IR only support "kernel-irqchip={off|split}" */
if (x86_iommu_ir_supported(x86_iommu) && kvm_irqchip_in_kernel() && if (x86_iommu_ir_supported(x86_iommu) && irq_all_kernel) {
!kvm_irqchip_is_split()) {
error_setg(errp, "Interrupt Remapping cannot work with " error_setg(errp, "Interrupt Remapping cannot work with "
"kernel-irqchip=on, please use 'split|off'."); "kernel-irqchip=on, please use 'split|off'.");
return; return;