AMD IOMMU: fail if there is no southbridge IO-APIC ... but interrupt remapping is requested (with per-device remapping tables). Without it, the timer interrupt is usually not working. Inspired by Linux'es "iommu/amd: Work around wrong IOAPIC device-id in IVRS table" (commit c2ff5cf5294bcbd7fa50f7d860e90a66db7e5059) by Joerg Roedel . Reported-by: Eric Houby Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -984,6 +984,7 @@ static int __init parse_ivrs_table(struc const struct acpi_ivrs_header *ivrs_block; unsigned long length; unsigned int apic; + bool_t sb_ioapic = !iommu_intremap; int error = 0; BUG_ON(!table); @@ -1017,8 +1018,15 @@ static int __init parse_ivrs_table(struc /* Each IO-APIC must have been mentioned in the table. */ for ( apic = 0; !error && iommu_intremap && apic < nr_ioapics; ++apic ) { - if ( !nr_ioapic_entries[apic] || - ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) + if ( !nr_ioapic_entries[apic] ) + continue; + + if ( !ioapic_sbdf[IO_APIC_ID(apic)].seg && + /* SB IO-APIC is always on this device in AMD systems. */ + ioapic_sbdf[IO_APIC_ID(apic)].bdf == PCI_BDF(0, 0x14, 0) ) + sb_ioapic = 1; + + if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) continue; if ( !test_bit(IO_APIC_ID(apic), ioapic_cmdline) ) @@ -1041,6 +1049,14 @@ static int __init parse_ivrs_table(struc } } + if ( !error && !sb_ioapic ) + { + if ( amd_iommu_perdev_intremap ) + error = -ENXIO; + printk("%sNo southbridge IO-APIC found in IVRS table\n", + amd_iommu_perdev_intremap ? XENLOG_ERR : XENLOG_WARNING); + } + return error; }