Commit 9d5ce73a authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Ingo Molnar
Browse files

x86: intel-iommu: Convert detect_intel_iommu to use iommu_init hook 



This changes detect_intel_iommu() to set intel_iommu_init() to
iommu_init hook if detect_intel_iommu() finds the IOMMU.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: chrisw@sous-sol.org
Cc: dwmw2@infradead.org
Cc: joerg.roedel@amd.com
Cc: muli@il.ibm.com
LKML-Reference: <1257849980-22640-6-git-send-email-fujita.tomonori@lab.ntt.co.jp>
[ -v2: build fix for the !CONFIG_DMAR case ]
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ea1b0d39

arch/x86/kernel/pci-dma.c

+0 −2
Original line number Diff line number Diff line
@@ -294,8 +294,6 @@ static int __init pci_iommu_init(void) 


	x86_init.iommu.iommu_init();



	intel_iommu_init();



	no_iommu_init();

	return 0;

}

drivers/pci/dmar.c

+4 −0
Original line number Diff line number Diff line
@@ -616,6 +616,10 @@ void __init detect_intel_iommu(void) 
		if (ret && !no_iommu && !iommu_detected && !swiotlb &&

		    !dmar_disabled)

			iommu_detected = 1;

#endif

#ifdef CONFIG_X86

		if (ret)

			x86_init.iommu.iommu_init = intel_iommu_init;

#endif

	}

	early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);

include/linux/dmar.h

+4 −11
Original line number Diff line number Diff line
@@ -208,16 +208,9 @@ struct dmar_atsr_unit { 
	u8 include_all:1;		/* include all ports */

};



/* Intel DMAR  initialization functions */

extern int intel_iommu_init(void);

#else

static inline int intel_iommu_init(void)

{

#ifdef CONFIG_INTR_REMAP

	return dmar_dev_scope_init();

#else

	return -ENODEV;

#endif

}

#endif /* !CONFIG_DMAR */

#else /* !CONFIG_DMAR: */

static inline int intel_iommu_init(void) { return -ENODEV; }

#endif /* CONFIG_DMAR */



#endif /* __DMAR_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE