diff options
| author | Jon Mason <jdmason@us.ibm.com> | 2006-06-26 13:58:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 19:48:18 +0200 |
| commit | 8d4f6b93a4aaa6b56b600cd1165c971f4395e4b3 (patch) | |
| tree | 23955634ded577e53c46390714a6f069b4587c86 /arch/x86_64/kernel/aperture.c | |
| parent | [PATCH] x86_64: Change assembly to use regular cpuid_count macro (diff) | |
| download | linux-8d4f6b93a4aaa6b56b600cd1165c971f4395e4b3.tar.xz linux-8d4f6b93a4aaa6b56b600cd1165c971f4395e4b3.zip | |
[PATCH] x86_64: Calgary IOMMU - introduce iommu_detected
swiotlb relies on the gart specific iommu_aperture variable to know if
we discovered a hardware IOMMU before swiotlb initialization. Introduce
iommu_detected to do the same thing, but in a HW IOMMU neutral manner,
in preparation for adding the Calgary HW IOMMU.
Signed-Off-By: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-Off-By: Jon Mason <jdmason@us.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/kernel/aperture.c')
| -rw-r--r-- | arch/x86_64/kernel/aperture.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c index 9ea723bab16c..a195ef06ec55 100644 --- a/arch/x86_64/kernel/aperture.c +++ b/arch/x86_64/kernel/aperture.c @@ -209,6 +209,7 @@ void __init iommu_hole_init(void) if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00))) continue; + iommu_detected = 1; iommu_aperture = 1; aper_order = (read_pci_config(0, num, 3, 0x90) >> 1) & 7; |