diff options
| author | Joerg Roedel | 2015-01-07 08:31:39 +0100 |
|---|---|---|
| committer | Thomas Gleixner | 2015-01-15 11:24:23 +0100 |
| commit | 84d0779304b5c45134311dfc31b5a2325ce3ad84 (patch) | |
| tree | d1c6151f745bfa229337e842a57aacc6b1f70bbf /drivers/iommu/amd_iommu_init.c | |
| parent | x86/apic: Only disable CPU x2apic mode when necessary (diff) | |
| download | kernel-qcow2-linux-84d0779304b5c45134311dfc31b5a2325ce3ad84.tar.gz kernel-qcow2-linux-84d0779304b5c45134311dfc31b5a2325ce3ad84.tar.xz kernel-qcow2-linux-84d0779304b5c45134311dfc31b5a2325ce3ad84.zip | |
iommu/amd: Check for irq-remap support amd_iommu_prepare()
This allows to get rid of the irq_remapping_supported() function and
all its call-backs into the Intel and AMD IOMMU drivers.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Tested-by: Joerg Roedel <joro@8bytes.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: iommu@lists.linux-foundation.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/1420615903-28253-13-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/iommu/amd_iommu_init.c')
| -rw-r--r-- | drivers/iommu/amd_iommu_init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index b0522f15730f..0039f87f48b8 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -2123,6 +2123,9 @@ static int __init iommu_go_to_state(enum iommu_init_state state) #ifdef CONFIG_IRQ_REMAP int __init amd_iommu_prepare(void) { + if (!amd_iommu_irq_remap) + return -1; + return iommu_go_to_state(IOMMU_ACPI_FINISHED); } |