Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[POWERPC] EEH recovery tweaks

Browse source 
If one attempts to create a device driver recovery sequence that
does not depend on a hard reset of the device, but simply just
attempts to resume processing, then one discovers that the
recovery sequence implemented on powerpc is not quite right.
This patch fixes this up.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Linas Vepstas 2006-12-06 12:32:20 -06:00 committed by Paul Mackerras
parent 3a1d1ac279
commit d0e70341c0
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/powerpc/platforms/pseries/eeh.c
View file

@ -337,6 +337,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
printk (KERN_ERR "EEH: Device driver ignored %d bad reads, panicing\n", printk (KERN_ERR "EEH: Device driver ignored %d bad reads, panicing\n",
pdn->eeh_check_count); pdn->eeh_check_count);
dump_stack(); dump_stack();
msleep(5000);
/* re-read the slot reset state */ /* re-read the slot reset state */
if (read_slot_reset_state(pdn, rets) != 0) if (read_slot_reset_state(pdn, rets) != 0)

13
arch/powerpc/platforms/pseries/eeh_driver.c
View file

@ -170,14 +170,19 @@ static void eeh_report_reset(struct pci_dev *dev, void *userdata)
static void eeh_report_resume(struct pci_dev *dev, void *userdata) static void eeh_report_resume(struct pci_dev *dev, void *userdata)
{ {
struct pci_driver *driver = dev->driver; struct pci_driver *driver = dev->driver;
struct device_node *dn = pci_device_to_OF_node(dev);
dev->error_state = pci_channel_io_normal; dev->error_state = pci_channel_io_normal;
if (!driver) if (!driver)
return; return;
if (!driver->err_handler)
return; if ((PCI_DN(dn)->eeh_mode) & EEH_MODE_IRQ_DISABLED) {
if (!driver->err_handler->resume) PCI_DN(dn)->eeh_mode &= ~EEH_MODE_IRQ_DISABLED;
enable_irq(dev->irq);
}
if (!driver->err_handler ||
!driver->err_handler->resume)
return; return;
driver->err_handler->resume(dev); driver->err_handler->resume(dev);
@ -407,6 +412,8 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
if (rc) if (rc)
result = PCI_ERS_RESULT_NEED_RESET; result = PCI_ERS_RESULT_NEED_RESET;
else
result = PCI_ERS_RESULT_RECOVERED;
} }
/* If any device has a hard failure, then shut off everything. */ /* If any device has a hard failure, then shut off everything. */