.36 patches

diff --git a/queue-2.6.36/rapidio-fix-hang-on-rapidio-doorbell-queue-full-condition.patch b/queue-2.6.36/rapidio-fix-hang-on-rapidio-doorbell-queue-full-condition.patch
new file mode 100644 (file)
index 0000000..35ddf8d
--- /dev/null
+++ b/queue-2.6.36/rapidio-fix-hang-on-rapidio-doorbell-queue-full-condition.patch
@@ -0,0 +1,44 @@
+From 12a4dc43911785f51a596f771ae0701b18d436f1 Mon Sep 17 00:00:00 2001
+From: Thomas Taranowski <tom@baringforge.com>
+Date: Wed, 12 Jan 2011 17:00:44 -0800
+Subject: rapidio: fix hang on RapidIO doorbell queue full condition
+
+From: Thomas Taranowski <tom@baringforge.com>
+
+commit 12a4dc43911785f51a596f771ae0701b18d436f1 upstream.
+
+In fsl_rio_dbell_handler() the code currently simply acknowledges the QFI
+queue full interrupt, but does nothing to resolve the queue full
+condition.  Instead, it jumps to the end of the isr.  When a queue full
+condition occurs, the isr is then re-entered immediately and continually,
+forever.
+
+The fix is to just fall through and read out current doorbell entries.
+
+Signed-off-by: Thomas Taranowski <tom@baringforge.com>
+Cc: Alexandre Bounine <alexandre.bounine@idt.com>
+Cc: Kumar Gala <galak@kernel.crashing.org>
+Cc: Matt Porter <mporter@kernel.crashing.org>
+Cc: Li Yang <leoli@freescale.com>
+Cc: Thomas Moll <thomas.moll@sysgo.com>
+Cc: Micha Nelissen <micha@neli.hopto.org>
+Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Cc: Grant Likely <grant.likely@secretlab.ca>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/powerpc/sysdev/fsl_rio.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/arch/powerpc/sysdev/fsl_rio.c
++++ b/arch/powerpc/sysdev/fsl_rio.c
+@@ -954,7 +954,6 @@ fsl_rio_dbell_handler(int irq, void *dev
+       if (dsr & DOORBELL_DSR_QFI) {
+               pr_info("RIO: doorbell queue full\n");
+               out_be32(&priv->msg_regs->dsr, DOORBELL_DSR_QFI);
+-              goto out;
+       }
+ 
+       /* XXX Need to check/dispatch until queue empty */

diff --git a/queue-2.6.36/series b/queue-2.6.36/series
index 31d3d9cf1724fee32015b8d75a37cc986abfc3d2..d6090b74fb6f16e06e1e5472843a3efb42c2ff38 100644 (file)
--- a/queue-2.6.36/series
+++ b/queue-2.6.36/series
@@ -94,3 +94,4 @@ proc-kcore-fix-seeking.patch
 rtc-cmos-fix-suspend-resume.patch
 mm-fix-migration-hangs-on-anon_vma-lock.patch
 ext4-fix-memory-leak-in-ext4_free_branches.patch
+rapidio-fix-hang-on-rapidio-doorbell-queue-full-condition.patch