Commit b97a7972 authored by Niklas Schnelle's avatar Niklas Schnelle Committed by Alexander Gordeev
Browse files

s390/pci: Do not try re-enabling load/store if device is disabled 



If a device is disabled unblocking load/store on its own is not useful
as a full re-enable of the function is necessary anyway. Note that SCLP
Write Event Data Action Qualifier 0 (Reset) leaves the device disabled
and triggers this case unless the driver already requests a reset.

Cc: stable@vger.kernel.org
Fixes: 4cdf2f4e ("s390/pci: implement minimal PCI error recovery")
Reviewed-by: default avatarFarhan Ali <alifm@linux.ibm.com>
Signed-off-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent 45537926

arch/s390/pci/pci_event.c

+4 −0
Original line number Diff line number Diff line
@@ -106,6 +106,10 @@ static pci_ers_result_t zpci_event_do_error_state_clear(struct pci_dev *pdev, 
	struct zpci_dev *zdev = to_zpci(pdev);

	int rc;



	/* The underlying device may have been disabled by the event */

	if (!zdev_enabled(zdev))

		return PCI_ERS_RESULT_NEED_RESET;



	pr_info("%s: Unblocking device access for examination\n", pci_name(pdev));

	rc = zpci_reset_load_store_blocked(zdev);

	if (rc) {