[meego-commits] 15281: Changes to Trunk:Testing/kernel-adaptation-connext

[Virgil Bucoci]

Hi,
I have made the following changes to kernel-adaptation-connext in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Virgil Bucoci

[This message was auto-generated]

---

Request #15281:

  submit:   home:vbucoci:branches:Trunk:Testing/kernel-adaptation-connext(r2)(cleanup) -> Trunk:Testing/kernel-adaptation-connext


Message:
    * Fri Mar 25 2011 Virgil Bucoci <virgil.bucoci at windriver.com> - 2.6.37.2
- BCM #14905.  Disable UART DMA.

State:   new          2011-03-25T11:58:56 vbucoci
Comment: None



changes files:
--------------
--- kernel-adaptation-connext.changes
+++ kernel-adaptation-connext.changes
@@ -0,0 +1,3 @@
+* Fri Mar 25 2011 Virgil Bucoci <virgil.bucoci at windriver.com> - 2.6.37.2
+- BCM #14905.  Disable UART DMA.
+

new:
----
  linux-2.6.37-connext-0029-disable-uart-dma.patch

spec files:
-----------
--- kernel-adaptation-connext.spec
+++ kernel-adaptation-connext.spec
@@ -243,16 +243,17 @@
 Patch227: linux-2.6.37-connext-0026-usb-otg-cut1.patch
 Patch228: linux-2.6.37-connext-0027-tsc2007.patch
 Patch229: linux-2.6.37-connext-0028-mapper.patch
-Patch230: linux-2.6.37-tsc2007-touch-fixing-leftbutton.patch
+Patch230: linux-2.6.37-connext-0029-disable-uart-dma.patch
+Patch231: linux-2.6.37-tsc2007-touch-fixing-leftbutton.patch
 
 #
 # EMGD
 # 
-Patch231: linux-2.6.37-emgd-0001-add-makefile.patch
-Patch232: linux-2.6.37-emgd-0002-1893-build.patch
+Patch232: linux-2.6.37-emgd-0001-add-makefile.patch
+Patch233: linux-2.6.37-emgd-0002-1893-build.patch
 # turn on "print fatal signals" by default, so that we can debug /sbin/init
 # crashes
-Patch233: linux-2.6.35-fatal-signals.patch
+Patch234: linux-2.6.35-fatal-signals.patch
 
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -490,20 +491,22 @@
 %patch228 -p1
 # linux-2.6.37-connext-0028-mapper.patch
 %patch229 -p1
-# linux-2.6.37-tsc2007-touch-fixing-leftbutton.patch
+# linux-2.6.37-connext-0029-disable-uart-dma.patch
 %patch230 -p1
+# linux-2.6.37-tsc2007-touch-fixing-leftbutton.patch
+%patch231 -p1
 
 #
 # EMGD
 # 
 # linux-2.6.37-emgd-0001-add-makefile.patch
-%patch231 -p1
-# linux-2.6.37-emgd-0002-1893-build.patch
 %patch232 -p1
+# linux-2.6.37-emgd-0002-1893-build.patch
+%patch233 -p1
 # turn on "print fatal signals" by default, so that we can debug /sbin/init
 # crashes
 # linux-2.6.35-fatal-signals.patch
-%patch233 -p1
+%patch234 -p1
 
 # Drop some necessary files from the source dir into the buildroot
 cp $RPM_SOURCE_DIR/config-* .

other changes:
--------------

++++++ linux-2.6.37-connext-0029-disable-uart-dma.patch (new)
--- linux-2.6.37-connext-0029-disable-uart-dma.patch
+++ linux-2.6.37-connext-0029-disable-uart-dma.patch
+From e003f95a60482a5a10451080b4d6be1a8550c3ff Mon Sep 17 00:00:00 2001
+From: Virgil Bucoci <virgil.bucoci at windriver.com>
+Date: Fri, 25 Mar 2011 20:35:13 +0200
+Subject: [PATCH] pl011: Disable UART DMA
+
+UARTs with DMA enabled cause kernel panics.  Disable by default
+DMA on all UARTs.
+---
+ drivers/serial/pl011-pci-dma.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/serial/pl011-pci-dma.h b/drivers/serial/pl011-pci-dma.h
+index 1ceab27..bd89220 100644
+--- a/drivers/serial/pl011-pci-dma.h
++++ b/drivers/serial/pl011-pci-dma.h
+@@ -50,9 +50,9 @@ struct pl011_dma_tx_transaction {
+ #define DMA_RX_COMPLETE 0x0
+ #define DMA_TX_COMPLETE 0x1
+ 
+-static int dma_port0 = true;
++static int dma_port0;
+ module_param(dma_port0, bool, S_IRUGO);
+-MODULE_PARM_DESC(dma_port0, "Use DMA transfer for port0 (default=1)");
++MODULE_PARM_DESC(dma_port0, "Use DMA transfer for port0 (default=0)");
+ 
+ static int dma_port1;
+ module_param(dma_port1, bool, S_IRUGO);
+-- 
+1.7.1
+

++++++ series
--- series
+++ series
@@ -93,6 +93,7 @@
 linux-2.6.37-connext-0026-usb-otg-cut1.patch
 linux-2.6.37-connext-0027-tsc2007.patch
 linux-2.6.37-connext-0028-mapper.patch
+linux-2.6.37-connext-0029-disable-uart-dma.patch
 linux-2.6.37-tsc2007-touch-fixing-leftbutton.patch
 
 #