intr_remap: Call dmar_dev_scope_init() explicitly
authorSuresh Siddha <suresh.b.siddha@intel.com>
Wed, 24 Aug 2011 00:05:19 +0000 (17:05 -0700)
committerHiroshi DOYU <hdoyu@nvidia.com>
Mon, 23 Jan 2012 09:11:33 +0000 (11:11 +0200)
commitff8aa426dd78d753ca269e4cab85b318ddb8c8ff
tree46cc55b75b687f4d7ecf6ed6fb5ce4494f73272b
parentfb599376b7dbc5c3ffa1e4d4a2497bb352fa573e
intr_remap: Call dmar_dev_scope_init() explicitly

Both DMA-remapping aswell as Interrupt-remapping depend on the
dmar dev scope to be initialized. When both DMA and
IRQ-remapping are enabled, we depend on DMA-remapping init code
to call dmar_dev_scope_init(). This resulted in not doing this
init when DMA-remapping was turned off but interrupt-remapping
turned on in the kernel config.

This caused interrupt routing to break with CONFIG_INTR_REMAP=y
and CONFIG_DMAR=n.

This issue was introduced by this commit:

 | commit 9d5ce73a64be2be8112147a3e0b551ad9cd1247b
 | Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 | Date:   Tue Nov 10 19:46:16 2009 +0900
 |
 |    x86: intel-iommu: Convert detect_intel_iommu to use iommu_init hook

Fix this by calling dmar_dev_scope_init() explicitly from the
interrupt remapping code too.

Reported-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: yinghai@kernel.org
Cc: youquan.song@intel.com
Cc: joerg.roedel@amd.com
Cc: tony.luck@intel.com
Cc: dwmw2@infradead.org
Link: http://lkml.kernel.org/r/20110824001456.229207526@sbsiddha-desk.sc.intel.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
drivers/iommu/dmar.c
drivers/iommu/intel-iommu.c
drivers/iommu/intr_remapping.c