[PATCH] ppc64: bugfix: don't silently ignore PCI errors
10-EEH-enable-bugfix.patch Bugfix: With the curent linux-2.6.14-rc2-git6, EEH errors are ignored because thier detection requires an unused, uninitialized flag to be set. This patch removes the unused flag. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Родитель
18126f35f6
Коммит
f8632c8227
|
@ -631,11 +631,12 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
|
||||||
pdn = PCI_DN(dn);
|
pdn = PCI_DN(dn);
|
||||||
|
|
||||||
/* Access to IO BARs might get this far and still not want checking. */
|
/* Access to IO BARs might get this far and still not want checking. */
|
||||||
if (!pdn->eeh_capable || !(pdn->eeh_mode & EEH_MODE_SUPPORTED) ||
|
if (!(pdn->eeh_mode & EEH_MODE_SUPPORTED) ||
|
||||||
pdn->eeh_mode & EEH_MODE_NOCHECK) {
|
pdn->eeh_mode & EEH_MODE_NOCHECK) {
|
||||||
__get_cpu_var(ignored_check)++;
|
__get_cpu_var(ignored_check)++;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
printk ("EEH:ignored check for %s %s\n", pci_name (dev), dn->full_name);
|
printk ("EEH:ignored check (%x) for %s %s\n",
|
||||||
|
pdn->eeh_mode, pci_name (dev), dn->full_name);
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,7 +63,6 @@ struct pci_dn {
|
||||||
int devfn; /* for pci devices */
|
int devfn; /* for pci devices */
|
||||||
int eeh_mode; /* See eeh.h for possible EEH_MODEs */
|
int eeh_mode; /* See eeh.h for possible EEH_MODEs */
|
||||||
int eeh_config_addr;
|
int eeh_config_addr;
|
||||||
int eeh_capable; /* from firmware */
|
|
||||||
int eeh_check_count; /* # times driver ignored error */
|
int eeh_check_count; /* # times driver ignored error */
|
||||||
int eeh_freeze_count; /* # times this device froze up. */
|
int eeh_freeze_count; /* # times this device froze up. */
|
||||||
int eeh_is_bridge; /* device is pci-to-pci bridge */
|
int eeh_is_bridge; /* device is pci-to-pci bridge */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче