Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0e70341 authored by Linas Vepstas's avatar Linas Vepstas Committed by Paul Mackerras
Browse files

[POWERPC] EEH recovery tweaks 



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: default avatarLinas Vepstas <linas@austin.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 3a1d1ac2

arch/powerpc/platforms/pseries/eeh.c

+1 −0
Original line number Diff line number Diff line
@@ -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",

			        pdn->eeh_check_count);

			dump_stack();

			msleep(5000);

			

			/* re-read the slot reset state */

			if (read_slot_reset_state(pdn, rets) != 0)

arch/powerpc/platforms/pseries/eeh_driver.c

+10 −3
Original line number Diff line number Diff line
@@ -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)

{

	struct pci_driver *driver = dev->driver;

	struct device_node *dn = pci_device_to_OF_node(dev);



	dev->error_state = pci_channel_io_normal;



	if (!driver)

		return;

	if (!driver->err_handler)

		return;

	if (!driver->err_handler->resume)



	if ((PCI_DN(dn)->eeh_mode) & EEH_MODE_IRQ_DISABLED) {

		PCI_DN(dn)->eeh_mode &= ~EEH_MODE_IRQ_DISABLED;

		enable_irq(dev->irq);

	}

	if (!driver->err_handler ||

	    !driver->err_handler->resume)

		return;



	driver->err_handler->resume(dev);
@@ -407,6 +412,8 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event) 


		if (rc)

			result = PCI_ERS_RESULT_NEED_RESET;

		else

			result = PCI_ERS_RESULT_RECOVERED;

	}



	/* If any device has a hard failure, then shut off everything. */