diff options
| author |   Joerg Roedel <joerg.roedel@amd.com> | 2009-09-03 15:15:10 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-09-03 15:56:19 +0200 |
| commit | 6a1eddd2f951656a6abbd42e2cddc2267c4a639d (patch) | |
| tree | d9290794ae58aef32738b332e8613b5f2b761ffb /arch/x86/kernel/amd_iommu.c | |
| parent | x86/amd-iommu: Panic if IOMMU command buffer reset fails (diff) | |
| download | linux-dev-6a1eddd2f951656a6abbd42e2cddc2267c4a639d.tar.xz linux-dev-6a1eddd2f951656a6abbd42e2cddc2267c4a639d.zip | |
x86/amd-iommu: Reset command buffer if wait loop fails
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>
Diffstat (limited to 'arch/x86/kernel/amd_iommu.c')
| -rw-r--r-- | 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 b62a2f64dfc5..cfca80bfe75f 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); + } } /* |