diff options
| author | Suresh Siddha <suresh.b.siddha@intel.com> | 2010-11-30 22:22:29 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-21 12:44:28 -0700 |
| commit | b1b82a34ab0b647e7df0367f9cbe5c96a7b4dd0c (patch) | |
| tree | e535c27cb8934758306eda070c7ed79dfcff8afa /drivers/pci | |
| parent | 64d19b04aeea1585b1f4808d5b962218eb607992 (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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
| -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 83aae4747594..9e71eee8a8f6 100644 --- a/drivers/pci/dmar.c +++ b/drivers/pci/dmar.c @@ -1423,6 +1423,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; |