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)
 {
         pr_err("AMD-Vi: Resetting IOMMU command buffer\n");
 
+        if (iommu->reset_in_progress)
+                panic("AMD-Vi: ILLEGAL_COMMAND_ERROR while resetting command buffer\n");
+
+        iommu->reset_in_progress = true;
+
         amd_iommu_reset_cmd_buffer(iommu);
         flush_all_devices_for_iommu(iommu);
         flush_all_domains_on_iommu(iommu);
+
+        iommu->reset_in_progress = false;
 }
 
 /****************************************************************************