From 889c9015fd30ce904a7a7d8c9a4e40cd2f99b79b Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Thu, 3 Nov 2005 18:49:45 -0600 Subject: [PATCH] --- yaml --- r: 13711 b: refs/heads/master c: f8632c822719cce08cfb128859e354007744cbba h: refs/heads/master i: 13709: dc5b5149d9ddf0be77ca4950a8acfd842c9fb6c8 13707: 1d5408ab843ef5f1f663c99774c50f14d8b4cf29 13703: 65adaf1412f70d6c2e07bf262b1723f151605b74 13695: 38637e5eb7c421ceee10619baa56035b257b3b40 v: v3 --- [refs] | 2 +- trunk/arch/ppc64/kernel/eeh.c | 5 +++-- trunk/include/asm-ppc64/pci-bridge.h | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 501dc7a35305..f6c46a1dd6a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18126f35f69c928af26ec1dda2cb91b23220cdd4 +refs/heads/master: f8632c822719cce08cfb128859e354007744cbba diff --git a/trunk/arch/ppc64/kernel/eeh.c b/trunk/arch/ppc64/kernel/eeh.c index 0c52c2de92e0..9df1d5018363 100644 --- a/trunk/arch/ppc64/kernel/eeh.c +++ b/trunk/arch/ppc64/kernel/eeh.c @@ -631,11 +631,12 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev) pdn = PCI_DN(dn); /* 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) { __get_cpu_var(ignored_check)++; #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 return 0; } diff --git a/trunk/include/asm-ppc64/pci-bridge.h b/trunk/include/asm-ppc64/pci-bridge.h index 60cf8c838af0..efbdaece0cf0 100644 --- a/trunk/include/asm-ppc64/pci-bridge.h +++ b/trunk/include/asm-ppc64/pci-bridge.h @@ -63,7 +63,6 @@ struct pci_dn { int devfn; /* for pci devices */ int eeh_mode; /* See eeh.h for possible EEH_MODEs */ int eeh_config_addr; - int eeh_capable; /* from firmware */ int eeh_check_count; /* # times driver ignored error */ int eeh_freeze_count; /* # times this device froze up. */ int eeh_is_bridge; /* device is pci-to-pci bridge */