The patch titled
powerpc: EEH failure to mark pci slot as frozen.
has been removed from the -mm tree. Its filename is
powerpc-eeh-failure-to-mark-pci-slot-as-frozen.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: powerpc: EEH failure to mark pci slot as frozen.
From: linas@xxxxxxxxxxxxxx (Linas Vepstas)
Bug fix: when marking a slot as frozen, we forgot to mark pci device itself
as frozen. (we did manage to mark the pci children, but forget the parent
itself.)
This is needed so that some device drivers can check the pci status in
critical sections (e.g. in spin loops with interrupts disabled).
Signed-off-by: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/powerpc/platforms/pseries/eeh.c | 7 +++++++
1 file changed, 7 insertions(+)
diff -puN arch/powerpc/platforms/pseries/eeh.c~powerpc-eeh-failure-to-mark-pci-slot-as-frozen arch/powerpc/platforms/pseries/eeh.c
--- a/arch/powerpc/platforms/pseries/eeh.c~powerpc-eeh-failure-to-mark-pci-slot-as-frozen
+++ a/arch/powerpc/platforms/pseries/eeh.c
@@ -225,6 +225,7 @@ static void __eeh_mark_slot (struct devi
void eeh_mark_slot (struct device_node *dn, int mode_flag)
{
+ struct pci_dev *dev;
dn = find_device_pe (dn);
/* Back up one, since config addrs might be shared */
@@ -232,6 +233,12 @@ void eeh_mark_slot (struct device_node *
dn = dn->parent;
PCI_DN(dn)->eeh_mode |= mode_flag;
+
+ /* Mark the pci device too */
+ dev = PCI_DN(dn)->pcidev;
+ if (dev)
+ dev->error_state = pci_channel_io_frozen;
+
__eeh_mark_slot (dn->child, mode_flag);
}
_
Patches currently in -mm which might be from linas@xxxxxxxxxxxxxx are
origin.patch
git-powerpc.patch
pci-error-recovery-symbios-scsi-device-driver.patch
chardev-checking-of-overlapping-ranges.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
