[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1215521236-21269-1-git-send-email-joerg.roedel@amd.com>
Date: Tue, 8 Jul 2008 14:47:16 +0200
From: Joerg Roedel <joerg.roedel@....com>
To: mingo@...hat.com, tglx@...utronix.de
CC: linux-kernel@...r.kernel.org, iommu@...ts.linux-foundation.org,
Joerg Roedel <joerg.roedel@....com>,
Robert Richter <robert.richter@....com>,
Bhavna Sarathy <Bhavna.Sarathy@....com>
Subject: [PATCH] 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@....com>
Cc: Bhavna Sarathy <Bhavna.Sarathy@....com>
Signed-off-by: Joerg Roedel <joerg.roedel@....com>
---
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 2a13e43..bb02800 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) {
--
1.5.3.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists