This is a note to let you know that I've just added the patch titled
x86, vt-d: Handle previous faults after enabling fault handling
to the 2.6.36-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-vt-d-handle-previous-faults-after-enabling-fault-handling.patch
and it can be found in the queue-2.6.36 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 7f99d946e71e71d484b7543b49e990508e70d0c0 Mon Sep 17 00:00:00 2001
From: Suresh Siddha <[email protected]>
Date: Tue, 30 Nov 2010 22:22:29 -0800
Subject: x86, vt-d: Handle previous faults after enabling fault handling
From: Suresh Siddha <[email protected]>
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 <[email protected]>
LKML-Reference: <[email protected]>
Acked-by: Chris Wright <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/pci/dmar.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -1414,6 +1414,11 @@ int __init enable_drhd_fault_handling(vo
(unsigned long long)drhd->reg_base_addr, ret);
return -1;
}
+
+ /*
+ * Clear any previous faults.
+ */
+ dmar_fault(iommu->irq, iommu);
}
return 0;
Patches currently in stable-queue which might be from [email protected]
are
queue-2.6.36/x86-xsave-use-alloc_bootmem_align-instead-of-alloc_bootmem.patch
queue-2.6.36/x86-vt-d-fix-the-vt-d-fault-handling-irq-migration-in-the-x2apic-mode.patch
queue-2.6.36/x86-enable-the-intr-remap-fault-handling-after-local-apic-setup.patch
queue-2.6.36/bootmem-add-alloc_bootmem_align.patch
queue-2.6.36/x86-vt-d-quirk-for-masking-vtd-spec-errors-to-platform-error-handling-logic.patch
queue-2.6.36/x86-vt-d-handle-previous-faults-after-enabling-fault-handling.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
