From fd2625a9f83985ff9b401b567a2fecd1d2c5fb34 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Mon, 25 Sep 2006 18:01:42 -0500 Subject: [PATCH] --- yaml --- r: 38171 b: refs/heads/master c: 022d51b1b28d25d50935c39d7968fefe34102a9f h: refs/heads/master i: 38169: 12ef3ecada9dc59279f1f456f1eeb10601cf6484 38167: edb164d5841a5155ad7708f9d74235fd91545e16 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/eeh.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6d6d7c6d9185..43483a95f23d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cec1b452c2cb6abf0589f35b69ce09c3e612bb4 +refs/heads/master: 022d51b1b28d25d50935c39d7968fefe34102a9f diff --git a/trunk/arch/powerpc/platforms/pseries/eeh.c b/trunk/arch/powerpc/platforms/pseries/eeh.c index 84bc8f7e17ef..3c2d63ebf787 100644 --- a/trunk/arch/powerpc/platforms/pseries/eeh.c +++ b/trunk/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); }