From: David Woodhouse Date: Wed, 11 Nov 2020 14:43:20 +0000 (+0000) Subject: iommu/amd: Don't register interrupt remapping irqdomain when IR is disabled X-Git-Tag: v5.11-rc1~171^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2df985f5e44c43f5d29d8cc3aaa8e8ac697e9de6;p=thirdparty%2Fkernel%2Flinux.git iommu/amd: Don't register interrupt remapping irqdomain when IR is disabled Registering the remapping irq domain unconditionally is potentially allowing I/O-APIC and MSI interrupts to be parented in the IOMMU IR domain even when IR is disabled. Don't do that. Signed-off-by: David Woodhouse Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20201111144322.1659970-1-dwmw2@infradead.org --- diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c index c2769f2b2abd2..a94b96f1e13ae 100644 --- a/drivers/iommu/amd/init.c +++ b/drivers/iommu/amd/init.c @@ -1601,9 +1601,11 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h) if (ret) return ret; - ret = amd_iommu_create_irq_domain(iommu); - if (ret) - return ret; + if (amd_iommu_irq_remap) { + ret = amd_iommu_create_irq_domain(iommu); + if (ret) + return ret; + } /* * Make sure IOMMU is not considered to translate itself. The IVRS