Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'edac_urgent_for_v6.10_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC fixes from Borislav Petkov:
- Convert PCI core error codes to proper error numbers since latter get
propagated all the way up to the module loading functions
* tag 'edac_urgent_for_v6.10_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
EDAC/igen6: Convert PCIBIOS_* return codes to errnos
EDAC/amd64: Convert PCIBIOS_* return codes to errnos
+7
-5
+5
-3
drivers/edac/amd64_edac.c
+5
-3
drivers/edac/amd64_edac.c
···
81
81
amd64_warn("%s: error reading F%dx%03x.\n",
82
82
func, PCI_FUNC(pdev->devfn), offset);
83
83
84
-
return err;
84
+
return pcibios_err_to_errno(err);
85
85
}
86
86
87
87
int __amd64_write_pci_cfg_dword(struct pci_dev *pdev, int offset,
···
94
94
amd64_warn("%s: error writing to F%dx%03x.\n",
95
95
func, PCI_FUNC(pdev->devfn), offset);
96
96
97
-
return err;
97
+
return pcibios_err_to_errno(err);
98
98
}
99
99
100
100
/*
···
1025
1025
}
1026
1026
1027
1027
ret = pci_read_config_dword(pdev, REG_LOCAL_NODE_TYPE_MAP, &tmp);
1028
-
if (ret)
1028
+
if (ret) {
1029
+
ret = pcibios_err_to_errno(ret);
1029
1030
goto out;
1031
+
}
1030
1032
1031
1033
gpu_node_map.node_count = FIELD_GET(LNTM_NODE_COUNT, tmp);
1032
1034
gpu_node_map.base_node_id = FIELD_GET(LNTM_BASE_NODE_ID, tmp);
+2
-2
drivers/edac/igen6_edac.c
+2
-2
drivers/edac/igen6_edac.c
···
800
800
801
801
rc = pci_read_config_word(imc->pdev, ERRCMD_OFFSET, &errcmd);
802
802
if (rc)
803
-
return rc;
803
+
return pcibios_err_to_errno(rc);
804
804
805
805
if (enable)
806
806
errcmd |= ERRCMD_CE | ERRSTS_UE;
···
809
809
810
810
rc = pci_write_config_word(imc->pdev, ERRCMD_OFFSET, errcmd);
811
811
if (rc)
812
-
return rc;
812
+
return pcibios_err_to_errno(rc);
813
813
814
814
return 0;
815
815
}