summaryrefslogtreecommitdiffstats
path: root/drivers/pci/dmar.c
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2010-08-26 13:58:04 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2010-08-26 15:14:40 -0700
commit4db77ff3237a88ea74f691dd776e92b2f86a8f3f (patch)
treeeeafdd3213e4a54674c241ea57bb0a4431755ea5 /drivers/pci/dmar.c
parent22e6daf41ba28ddc06295e42859b266f737b3e99 (diff)
downloadop-kernel-dev-4db77ff3237a88ea74f691dd776e92b2f86a8f3f.zip
op-kernel-dev-4db77ff3237a88ea74f691dd776e92b2f86a8f3f.tar.gz
x86, VT-d: Make Intel VT-d IOMMU use IOMMU_INIT_* macros.
We utilize the IOMMU_INIT macros to create this dependency: [null] | [pci_xen_swiotlb_detect] | [pci_swiotlb_detect_override] | [pci_swiotlb_detect_4gb] | +-------+--------+---------------------+ / \ \ [detect_calgary] [gart_iommu_hole_init] [detect_intel_iommu] | [amd_iommu_detect] Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> LKML-Reference: <1282845485-8991-10-git-send-email-konrad.wilk@oracle.com> CC: Fujita Tomonori <fujita.tomonori@lab.ntt.co.jp> CC: Jesse Barnes <jbarnes@virtuousgeek.org> CC: David Woodhouse <David.Woodhouse@intel.com> CC: Len Brown <len.brown@intel.com> CC: Chris Wright <chrisw@sous-sol.org> CC: Yinghai Lu <yinghai@kernel.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'drivers/pci/dmar.c')
-rw-r--r--drivers/pci/dmar.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 5fa64ea..4ef56a0 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -36,6 +36,7 @@
#include <linux/tboot.h>
#include <linux/dmi.h>
#include <linux/slab.h>
+#include <asm/iommu_table.h>
#define PREFIX "DMAR: "
@@ -724,7 +725,7 @@ int __init detect_intel_iommu(void)
early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
dmar_tbl = NULL;
- return (ret ? 1 : -ENODEV);
+ return ret ? 1 : -ENODEV;
}
@@ -1457,3 +1458,4 @@ int __init dmar_ir_support(void)
return 0;
return dmar->flags & 0x1;
}
+IOMMU_INIT_POST(detect_intel_iommu);
OpenPOWER on IntegriCloud