iommu/amd: Set iommu->int_enabled consistently when interrupts are set up
authorDavid Woodhouse <dwmw@amazon.co.uk>
Tue, 5 Jan 2021 01:32:51 +0000 (01:32 +0000)
committerWill Deacon <will@kernel.org>
Tue, 5 Jan 2021 19:20:21 +0000 (19:20 +0000)
commit12bc4570c14e24e6244d66466aeda994f805634b
tree6f1a52104a90f9b17c1103390dd2e8f1d5de2626
parentff2b46d7cff80d27d82f7f3252711f4ca1666129
iommu/amd: Set iommu->int_enabled consistently when interrupts are set up

When I made the INTCAPXT support stop gratuitously pretending to be MSI,
I missed the fact that iommu_setup_msi() also sets the ->int_enabled
flag. I missed this in the iommu_setup_intcapxt() code path, which means
that a resume from suspend will try to allocate the IRQ domains again,
accidentally re-enabling interrupts as it does, resulting in much sadness.

Lift out the bit which sets iommu->int_enabled into the iommu_init_irq()
function which is also where it gets checked.

Link: https://lore.kernel.org/r/20210104132250.GE32151@zn.tnic/
Fixes: d1adcfbb520c ("iommu/amd: Fix IOMMU interrupt generation in X2APIC mode")
Reported-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Tested-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/50cd5f55be8ead0937ac315cd2f5b89364f6a9a5.camel@infradead.org
Signed-off-by: Will Deacon <will@kernel.org>
drivers/iommu/amd/init.c