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

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

[POWERPC] EEH: Drivers that need reset trump others 



Bugfix: if a driver controlling one part of a multi-function PCI card
has asked for a reset, honor that request above all others.

Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 638799b3

arch/powerpc/platforms/pseries/eeh_driver.c

+6 −4
Original line number Diff line number Diff line
@@ -105,9 +105,10 @@ static void eeh_report_error(struct pci_dev *dev, void *userdata) 
		return;



	rc = driver->err_handler->error_detected (dev, pci_channel_io_frozen);



	/* A driver that needs a reset trumps all others */

	if (rc == PCI_ERS_RESULT_NEED_RESET) *res = rc;

	if (*res == PCI_ERS_RESULT_NONE) *res = rc;

	if (*res == PCI_ERS_RESULT_DISCONNECT &&

	     rc == PCI_ERS_RESULT_NEED_RESET) *res = rc;

}



/**
@@ -129,9 +130,10 @@ static void eeh_report_mmio_enabled(struct pci_dev *dev, void *userdata) 
		return;



	rc = driver->err_handler->mmio_enabled (dev);



	/* A driver that needs a reset trumps all others */

	if (rc == PCI_ERS_RESULT_NEED_RESET) *res = rc;

	if (*res == PCI_ERS_RESULT_NONE) *res = rc;

	if (*res == PCI_ERS_RESULT_DISCONNECT &&

	     rc == PCI_ERS_RESULT_NEED_RESET) *res = rc;

}



/**