Commit 5b1d2a63 authored by David Woodhouse's avatar David Woodhouse Committed by PvsNarasimha
Browse files

iommu/amd: Don't register interrupt remapping irqdomain when IR is disabled 

mainline inclusion
from mainline-v5.11-rc1
commit 2df985f5
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAU6ZD

Reference: https://github.com/torvalds/linux/commit/2df985f5e44c43f5d29d8cc3aaa8e8ac697e9de6



--------------------------------

commit 2df985f5 upstream

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: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20201111144322.1659970-1-dwmw2@infradead.org


Signed-off-by: default avatarPvsNarasimha <PVS.NarasimhaRao@amd.com>
parent d63e1040

drivers/iommu/amd/init.c

+5 −3
Original line number Diff line number Diff line
@@ -1650,9 +1650,11 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h) 
	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