diff options
| author | Han, Weidong <weidong.han@intel.com> | 2009-04-04 17:21:26 +0800 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-04-04 10:41:32 +0100 |
| commit | 34aaaa948e3c9dd65b27fa499c5c9e8d8f1227cf (patch) | |
| tree | c6834b2bdc46032308f7bcb5cffa7205817841ea /drivers/pci | |
| parent | 161fde083f3403e7aa178dc944bf43c339e18491 (diff) | |
| download | linux-3.10-34aaaa948e3c9dd65b27fa499c5c9e8d8f1227cf.tar.gz linux-3.10-34aaaa948e3c9dd65b27fa499c5c9e8d8f1227cf.tar.bz2 linux-3.10-34aaaa948e3c9dd65b27fa499c5c9e8d8f1227cf.zip | |
x86, dmar: check if it's initialized before disable queue invalidation
If queue invalidation is disabled after it's already initialized,
dmar_enable_qi won't re-enable it due to iommu->qi is allocated.
It may result in system hang when use queue invalidation. Add this
check to avoid this case.
Signed-off-by: Weidong Han <weidong.han@intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/intr_remapping.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c index ef25caade54..472be1c3fff 100644 --- a/drivers/pci/intr_remapping.c +++ b/drivers/pci/intr_remapping.c @@ -524,6 +524,13 @@ int __init enable_intr_remapping(int eim) struct intel_iommu *iommu = drhd->iommu; /* + * If the queued invalidation is already initialized, + * shouldn't disable it. + */ + if (iommu->qi) + continue; + + /* * Clear previous faults. */ dmar_fault(-1, iommu); |