mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] AMD IOMMU: ignore detection of GART IOMMU
@ 2008-07-08 12:47 Joerg Roedel
  2008-07-09  8:57 ` Ingo Molnar
  0 siblings, 1 reply; 2+ messages in thread
From: Joerg Roedel @ 2008-07-08 12:47 UTC (permalink / raw)
  To: mingo, tglx
  Cc: linux-kernel, iommu, Joerg Roedel, Robert Richter, Bhavna Sarathy

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>
---
 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



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-07-09  8:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-07-08 12:47 [PATCH] AMD IOMMU: ignore detection of GART IOMMU Joerg Roedel
2008-07-09  8:57 ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®