Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8632c82 authored by Linas Vepstas's avatar Linas Vepstas Committed by Paul Mackerras
Browse files

[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: default avatarLinas Vepstas <linas@austin.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 18126f35

arch/ppc64/kernel/eeh.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

	}

include/asm-ppc64/pci-bridge.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */