diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2009-09-03 09:08:09 -0400 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-09-03 09:55:35 -0400 |
commit | b26e81b871bd18184968f0bb3f12945906eadfce (patch) | |
tree | ee8b734952e0bfb6386d7edbff797f4192cdb062 /arch/x86/kernel/amd_iommu.c | |
parent | a345b23b79f1900e7d87c3165182504419180de4 (diff) |
x86/amd-iommu: Panic if IOMMU command buffer reset fails
To prevent the driver from doing recursive command buffer
resets, just panic when that recursion happens.
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, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 2333d615f5ee..b62a2f64dfc5 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
@@ -553,9 +553,16 @@ static void reset_iommu_command_buffer(struct amd_iommu *iommu) | |||
553 | { | 553 | { |
554 | pr_err("AMD-Vi: Resetting IOMMU command buffer\n"); | 554 | pr_err("AMD-Vi: Resetting IOMMU command buffer\n"); |
555 | 555 | ||
556 | if (iommu->reset_in_progress) | ||
557 | panic("AMD-Vi: ILLEGAL_COMMAND_ERROR while resetting command buffer\n"); | ||
558 | |||
559 | iommu->reset_in_progress = true; | ||
560 | |||
556 | amd_iommu_reset_cmd_buffer(iommu); | 561 | amd_iommu_reset_cmd_buffer(iommu); |
557 | flush_all_devices_for_iommu(iommu); | 562 | flush_all_devices_for_iommu(iommu); |
558 | flush_all_domains_on_iommu(iommu); | 563 | flush_all_domains_on_iommu(iommu); |
564 | |||
565 | iommu->reset_in_progress = false; | ||
559 | } | 566 | } |
560 | 567 | ||
561 | /**************************************************************************** | 568 | /**************************************************************************** |