---

yaml --- r: 38171 b: refs/heads/master c: 022d51b h: refs/heads/master i: 38169: 12ef3ec 38167: edb164d v: v3
git-mirror · Sep 26, 2006 · fd2625a · fd2625a
1 parent 5a12ad0
commit fd2625a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -225,13 +225,20 @@ 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 */
 	if (PCI_DN(dn) && PCI_DN(dn)->eeh_pe_config_addr)
 		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);
 }