Commit a69ca340 authored Jun 26, 2008 by Joerg Roedel Committed by Ingo Molnar Jun 27, 2008

AMD_IOMMU: call detect and initialization functions from dma code

This patch adds the function calls to initialize the AMD IOMMU hardware and
dma_ops to the generic DMA code for the x86 architecture.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Cc: iommu@lists.linux-foundation.org
Cc: bhavna.sarathy@amd.com
Cc: Sebastian.Biemueller@amd.com
Cc: robert.richter@amd.com
Cc: joro@8bytes.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 8736197b

arch/x86/kernel/pci-dma.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@
		#include <asm/dma.h>
		#include <asm/gart.h>
		#include <asm/calgary.h>
		#include <asm/amd_iommu.h>

		int forbid_dac __read_mostly;
		EXPORT_SYMBOL(forbid_dac);
		@@ -122,6 +123,8 @@ void __init pci_iommu_alloc(void)

		detect_intel_iommu();

		amd_iommu_detect();

		#ifdef CONFIG_SWIOTLB
		pci_swiotlb_init();
		#endif
		@@ -502,6 +505,8 @@ static int __init pci_iommu_init(void)

		intel_iommu_init();

		amd_iommu_init();

		#ifdef CONFIG_GART_IOMMU
		gart_iommu_init();
		#endif