| From c85df399d1ba5ae1a73e28ea2d7405493f0c4e35 Mon Sep 17 00:00:00 2001 |
| From: Suresh Siddha <suresh.b.siddha@intel.com> |
| Date: Tue, 30 Nov 2010 22:22:29 -0800 |
| Subject: [PATCH] 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> |
| |
| diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c |
| index 33ead97..0afcc4e 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; |
| -- |
| 1.7.4.4 |
| |
