diff options
| author |   Joerg Roedel <joerg.roedel@amd.com> | 2008-07-08 14:47:16 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-07-09 10:56:49 +0200 |
| commit | 299a140dacaa514be5e567b5851c187c42ec38c4 (patch) | |
| tree | 17842f776b393e5fa8092390555343630b29487c /arch/x86/kernel/amd_iommu_init.c | |
| parent | x86: clean up amd_iommu documentation (diff) | |
| download | linux-dev-299a140dacaa514be5e567b5851c187c42ec38c4.tar.xz linux-dev-299a140dacaa514be5e567b5851c187c42ec38c4.zip | |
x86, AMD IOMMU: ignore detection of GART IOMMU
One of the last IOMMU updates covered a bug in the AMD IOMMU code. The early
detection code does not succeed if the GART is already detected. This patch
fixes this.
Cc: Robert Richter <robert.richter@amd.com>
Cc: Bhavna Sarathy <Bhavna.Sarathy@amd.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Cc: iommu@lists.linux-foundation.org
Cc: Joerg Roedel <joerg.roedel@amd.com>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Bhavna Sarathy <Bhavna.Sarathy@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/amd_iommu_init.c')
| -rw-r--r-- | arch/x86/kernel/amd_iommu_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index 2a13e430437d..bb0280077a32 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c @@ -828,7 +828,7 @@ static int __init early_amd_iommu_detect(struct acpi_table_header *table) void __init amd_iommu_detect(void) { - if (swiotlb || no_iommu || iommu_detected) + if (swiotlb || no_iommu || (iommu_detected && !gart_iommu_aperture)) return; if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) { |