x86: remove ifdef CONFIG_GART_IOMMU in pci-dma.c (ac7ded2a) · Commits · 戴 / test

Our way to handle gart_* functions for CONFIG_GART_IOMMU and !CONFIG_GART_IOMMU cases is inconsistent. We have some dummy gart_* functions in !CONFIG_GART_IOMMU case and also use ifdef CONFIG_GART_IOMMU tricks in pci-dma.c to call some gart_* functions in only CONFIG_GART_IOMMU case. This patch removes ifdef CONFIG_GART_IOMMU in pci-dma.c and always use dummy gart_* functions in iommu.h. Signed-off-by:

FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by:

Muli Ben-Yehuda <muli@il.ibm.com> Signed-off-by:

Ingo Molnar <mingo@elte.hu>

arch/x86/kernel/pci-dma.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -114,9 +114,7 @@ void __init pci_iommu_alloc(void)
		* The order of these functions is important for
		* fall-back/fail-over reasons
		*/
		#ifdef CONFIG_GART_IOMMU
		gart_iommu_hole_init();
		#endif

		#ifdef CONFIG_CALGARY_IOMMU
		detect_calgary();
		@@ -184,9 +182,7 @@ static __init int iommu_setup(char *p)
		swiotlb = 1;
		#endif

		#ifdef CONFIG_GART_IOMMU
		gart_parse_options(p);
		#endif

		#ifdef CONFIG_CALGARY_IOMMU
		if (!strncmp(p, "calgary", 7))
		@@ -508,9 +504,7 @@ static int __init pci_iommu_init(void)

		amd_iommu_init();

		#ifdef CONFIG_GART_IOMMU
		gart_iommu_init();
		#endif

		no_iommu_init();
		return 0;

include/asm-x86/iommu.h

+9 −1

Original line number	Diff line number	Diff line
		@@ -25,10 +25,18 @@ extern void gart_iommu_hole_init(void);
		static inline void early_gart_iommu_check(void)
		{
		}

		static inline void gart_iommu_init(void)
		{
		}
		static inline void gart_iommu_shutdown(void)
		{
		}
		static inline void gart_parse_options(char *options)
		{
		}
		static inline void gart_iommu_hole_init(void)
		{
		}
		#endif

		#endif

Admin message