diff options
| author | Linas Vepstas <linas@austin.ibm.com> | 2006-09-25 18:01:42 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-09-26 15:41:03 +1000 |
| commit | 022d51b1b28d25d50935c39d7968fefe34102a9f (patch) | |
| tree | a0c821bc88572a77be2caa9623bb16310049d527 | |
| parent | 2cec1b452c2cb6abf0589f35b69ce09c3e612bb4 (diff) | |
| download | linux-stable-022d51b1b28d25d50935c39d7968fefe34102a9f.tar.gz linux-stable-022d51b1b28d25d50935c39d7968fefe34102a9f.tar.bz2 linux-stable-022d51b1b28d25d50935c39d7968fefe34102a9f.zip | |
[POWERPC] EEH failure to mark pci slot as frozen.
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@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/platforms/pseries/eeh.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c index 84bc8f7e17ef..3c2d63ebf787 100644 --- a/arch/powerpc/platforms/pseries/eeh.c +++ b/arch/powerpc/platforms/pseries/eeh.c @@ -225,6 +225,7 @@ static void __eeh_mark_slot (struct device_node *dn, int mode_flag) 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, int mode_flag) 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); } |