diff options
| author | Suresh Siddha <suresh.b.siddha@intel.com> | 2010-11-30 22:22:29 -0800 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-04-17 16:16:11 -0400 |
| commit | 8b98fee00f591defb9f9d2f6b57f3902d5f83821 (patch) | |
| tree | 1f83b45599d4358b9c2664a8433d21e56d197b55 | |
| parent | 825b35ab8425bbc397ae6927d9b31823388cf440 (diff) | |
x86, vt-d: Handle previous faults after enabling fault handling
commit 7f99d946e71e71d484b7543b49e990508e70d0c0 upstream.
Fault handling is getting enabled after enabling the interrupt-remapping (as
the success of interrupt-remapping can affect the apic mode and hence the
fault handling mode).
Hence there can potentially be some faults between the window of enabling
interrupt-remapping in the vt-d and the fault-handling of the vt-d units.
Handle any previous faults after enabling the vt-d fault handling.
For v2.6.38 cleanup, need to check if we can remove the dmar_fault() in the
enable_intr_remapping() and see if we can enable fault handling along with
enabling intr-remapping.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
LKML-Reference: <20101201062244.630417138@intel.com>
Acked-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | drivers/pci/dmar.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c index 33ead97f0c4b..0afcc4e758e0 100644 --- a/drivers/pci/dmar.c +++ b/drivers/pci/dmar.c @@ -1424,6 +1424,11 @@ int __init enable_drhd_fault_handling(void) (unsigned long long)drhd->reg_base_addr, ret); return -1; } + + /* + * Clear any previous faults. + */ + dmar_fault(iommu->irq, iommu); } return 0; |