mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Joerg Roedel <joerg.roedel@amd.com>
To: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org
Cc: Joerg Roedel <joerg.roedel@amd.com>
Subject: [PATCH 8/8] x86/amd-iommu: Reset command buffer if wait loop fails
Date: Fri, 4 Sep 2009 11:44:42 +0200	[thread overview]
Message-ID: <1252057482-32207-9-git-send-email-joerg.roedel@amd.com> (raw)
In-Reply-To: <1252057482-32207-1-git-send-email-joerg.roedel@amd.com>

Instead of a panic on an comletion wait loop failure, try to
recover from that event from resetting the command buffer.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
 arch/x86/kernel/amd_iommu.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index b62a2f6..cfca80b 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -318,8 +318,11 @@ static void __iommu_wait_for_completion(struct amd_iommu *iommu)
 	status &= ~MMIO_STATUS_COM_WAIT_INT_MASK;
 	writel(status, iommu->mmio_base + MMIO_STATUS_OFFSET);
 
-	if (unlikely(i == EXIT_LOOP_COUNT))
-		panic("AMD IOMMU: Completion wait loop failed\n");
+	if (unlikely(i == EXIT_LOOP_COUNT)) {
+		spin_unlock(&iommu->lock);
+		reset_iommu_command_buffer(iommu);
+		spin_lock(&iommu->lock);
+	}
 }
 
 /*
-- 
1.6.3.3



      parent reply	other threads:[~2009-09-04  9:46 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-04  9:44 [PATCH 0/8] Improved fault handling for AMD-IOMMU (AMD-Vi) Joerg Roedel
2009-09-04  9:44 ` [PATCH 1/8] x86/amd-iommu: Dump fault entry on DTE error Joerg Roedel
2009-09-04  9:44 ` [PATCH 2/8] x86/amd-iommu: Dump illegal command on ILLEGAL_COMMAND_ERROR Joerg Roedel
2009-09-04  9:44 ` [PATCH 3/8] x86/amd-iommu: Introduce function for iommu-local domain flush Joerg Roedel
2009-09-04  9:44 ` [PATCH 4/8] x86/amd-iommu: Add function to flush all DTEs on one IOMMU Joerg Roedel
2009-09-04  9:44 ` [PATCH 5/8] x86/amd-iommu: Add reset function for command buffers Joerg Roedel
2009-09-04  9:44 ` [PATCH 6/8] x86/amd-iommu: Reset command buffer on ILLEGAL_COMMAND_ERROR Joerg Roedel
2009-09-04  9:44 ` [PATCH 7/8] x86/amd-iommu: Panic if IOMMU command buffer reset fails Joerg Roedel
2009-09-04  9:44 ` Joerg Roedel [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1252057482-32207-9-git-send-email-joerg.roedel@amd.com \
    --to=joerg.roedel@amd.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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®