[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: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Родитель
638799b335
Коммит
2a50f144fc
|
@ -105,9 +105,10 @@ static void eeh_report_error(struct pci_dev *dev, void *userdata)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
rc = driver->err_handler->error_detected (dev, pci_channel_io_frozen);
|
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_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;
|
return;
|
||||||
|
|
||||||
rc = driver->err_handler->mmio_enabled (dev);
|
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_NONE) *res = rc;
|
||||||
if (*res == PCI_ERS_RESULT_DISCONNECT &&
|
|
||||||
rc == PCI_ERS_RESULT_NEED_RESET) *res = rc;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Загрузка…
Ссылка в новой задаче