Skip to content

Commit 505c1f7

Browse files
committed
Merge: [s390] s390/pci: Handle PCI error codes other than 0x3a
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6206 JIRA: https://issues.redhat.com/browse/RHEL-74382 Tested-By: IBM Commits: ``` 3cd03ea ``` Signed-off-by: Mete Durlu <mdurlu@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Rado Vrbovsky <rvrbovsk@redhat.com>
2 parents 351b450 + 12036f9 commit 505c1f7

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

arch/s390/pci/pci_event.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -292,18 +292,19 @@ static void __zpci_event_error(struct zpci_ccdf_err *ccdf)
292292
goto no_pdev;
293293

294294
switch (ccdf->pec) {
295-
case 0x003a: /* Service Action or Error Recovery Successful */
295+
case 0x002a: /* Error event concerns FMB */
296+
case 0x002b:
297+
case 0x002c:
298+
break;
299+
case 0x0040: /* Service Action or Error Recovery Failed */
300+
case 0x003b:
301+
zpci_event_io_failure(pdev, pci_channel_io_perm_failure);
302+
break;
303+
default: /* PCI function left in the error state attempt to recover */
296304
ers_res = zpci_event_attempt_error_recovery(pdev);
297305
if (ers_res != PCI_ERS_RESULT_RECOVERED)
298306
zpci_event_io_failure(pdev, pci_channel_io_perm_failure);
299307
break;
300-
default:
301-
/*
302-
* Mark as frozen not permanently failed because the device
303-
* could be subsequently recovered by the platform.
304-
*/
305-
zpci_event_io_failure(pdev, pci_channel_io_frozen);
306-
break;
307308
}
308309
pci_dev_put(pdev);
309310
no_pdev:

0 commit comments

Comments
 (0)