From 6092c7573b8e083ce2123f9f741018a7eff4e11e Mon Sep 17 00:00:00 2001
From: "Han, Weidong" <weidong.han@intel.com>
Date: Sat, 4 Apr 2009 17:21:26 +0800
Subject: [PATCH] --- yaml --- r: 142253 b: refs/heads/master c:
 34aaaa948e3c9dd65b27fa499c5c9e8d8f1227cf h: refs/heads/master i:   142251:
 afe64a36df688151e38263ad9842c53f1f8de894 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/pci/intr_remapping.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a128fefad580..d430ec8da36e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 161fde083f3403e7aa178dc944bf43c339e18491
+refs/heads/master: 34aaaa948e3c9dd65b27fa499c5c9e8d8f1227cf
diff --git a/trunk/drivers/pci/intr_remapping.c b/trunk/drivers/pci/intr_remapping.c
index ef25caade54b..472be1c3fff0 100644
--- a/trunk/drivers/pci/intr_remapping.c
+++ b/trunk/drivers/pci/intr_remapping.c
@@ -523,6 +523,13 @@ int __init enable_intr_remapping(int eim)
 	for_each_drhd_unit(drhd) {
 		struct intel_iommu *iommu = drhd->iommu;
 
+		/*
+		 * If the queued invalidation is already initialized,
+		 * shouldn't disable it.
+		 */
+		if (iommu->qi)
+			continue;
+
 		/*
 		 * Clear previous faults.
 		 */