- powerpc-pseries-increment-fail-counter-in-pci-recovery.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     powerpc/pseries: Increment fail counter in PCI recovery

has been removed from the -mm tree.  Its filename is

     powerpc-pseries-increment-fail-counter-in-pci-recovery.patch

This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.

------------------------------------------------------
Subject: powerpc/pseries: Increment fail counter in PCI recovery
From: Linas Vepstas <linas@xxxxxxxxxxxxxx>


When a PCI device driver does not support PCI error recovery, the
powerpc/pseries code takes a walk through a branch of code that resets the
failure counter.  Because of this, if a broken PCI card is present, the
kernel will attempt to reset it an infinite number of times.  (This is
annoying but mostly harmless: each reset takes about 10-20 seconds, and
uses almost no CPU time).

This patch preserves the failure count across resets.

Signed-off-by: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 arch/powerpc/platforms/pseries/eeh_driver.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

diff -puN arch/powerpc/platforms/pseries/eeh_driver.c~powerpc-pseries-increment-fail-counter-in-pci-recovery arch/powerpc/platforms/pseries/eeh_driver.c
--- 25/arch/powerpc/platforms/pseries/eeh_driver.c~powerpc-pseries-increment-fail-counter-in-pci-recovery	Mon May  8 12:36:40 2006
+++ 25-akpm/arch/powerpc/platforms/pseries/eeh_driver.c	Mon May  8 12:36:40 2006
@@ -201,7 +201,11 @@ static void eeh_report_failure(struct pc
 
 static int eeh_reset_device (struct pci_dn *pe_dn, struct pci_bus *bus)
 {
-	int rc;
+	int cnt, rc;
+
+	/* pcibios will clear the counter; save the value */
+	cnt = pe_dn->eeh_freeze_count;
+
 	if (bus)
 		pcibios_remove_pci_devices(bus);
 
@@ -240,6 +244,7 @@ static int eeh_reset_device (struct pci_
 		ssleep (5);
 		pcibios_add_pci_devices(bus);
 	}
+	pe_dn->eeh_freeze_count = cnt;
 
 	return 0;
 }
_

Patches currently in -mm which might be from linas@xxxxxxxxxxxxxx are

pci-error-recovery-e100-network-device-driver.patch
e1000-prevent-statistics-from-getting-garbled-during-reset.patch
git-powerpc.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux