aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2010-05-14 11:34:06 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-14 11:34:06 -0700
commitf4e5af99bc2eabddd00b2900a98056dd13f50dc0 (patch)
tree2fa3d28318314600fc8a34445ea369faba118df6
parent0aaa9f3dd7f1f994721ed5d2c8dbe6636c2f32fb (diff)
downloadpatches-f4e5af99bc2eabddd00b2900a98056dd13f50dc0.tar.gz
2.6.34-rc7-git6
Diffstat
-rw-r--r--series3
-rw-r--r--tty.current/serial-imx.c-fix-cts-trigger-level-lower-to-avoid-lost-chars.patch61
-rw-r--r--tty.current/serial-mpc52xx_uart-fix-null-pointer-dereference.patch35
-rw-r--r--tty.current/tty-fix-unbalanced-bkl-handling-in-error-path.patch36
-rw-r--r--usb/usb-remove-uses-of-urb_no_setup_dma_map.patch4
-rw-r--r--version2
6 files changed, 3 insertions, 138 deletions
diff --git a/series b/series
index 1f4051f5debe8a..5c607ca92af61d 100644
--- a/series
+++ b/series
@@ -14,9 +14,6 @@ driver-core.current/firmware_class-fix-memory-leak-free-allocated-pages.patch
#################################
# TTY patches for 2.6.34
#################################
-tty.current/serial-mpc52xx_uart-fix-null-pointer-dereference.patch
-tty.current/tty-fix-unbalanced-bkl-handling-in-error-path.patch
-tty.current/serial-imx.c-fix-cts-trigger-level-lower-to-avoid-lost-chars.patch
#################################
diff --git a/tty.current/serial-imx.c-fix-cts-trigger-level-lower-to-avoid-lost-chars.patch b/tty.current/serial-imx.c-fix-cts-trigger-level-lower-to-avoid-lost-chars.patch
deleted file mode 100644
index 990e1b274c52e4..00000000000000
--- a/tty.current/serial-imx.c-fix-cts-trigger-level-lower-to-avoid-lost-chars.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From valentin.longchamp@epfl.ch Wed May 5 11:15:04 2010
-From: Valentin Longchamp <valentin.longchamp@epfl.ch>
-Date: Wed, 05 May 2010 11:47:07 +0200
-Subject: serial: imx.c: fix CTS trigger level lower to avoid lost chars
-To: Alan Cox <alan@linux.intel.com>
-Cc: "s.hauer@pengutronix.de" <s.hauer@pengutronix.de>, "w.sang@pengutronix.de" <w.sang@pengutronix.de>, "linux-serial@vger.kernel.org" <linux-serial@vger.kernel.org>, Greg Kroah-Hartman <gregkh@suse.de>
-Message-ID: <4BE13E9B.6050406@epfl.ch>
-
-
-The imx CTS trigger level is left at its reset value that is 32
-chars. Since the RX FIFO has 32 entries, when CTS is raised, the
-FIFO already is full. However, some serial port devices first empty
-their TX FIFO before stopping when CTS is raised, resulting in lost
-chars.
-
-This patch sets the trigger level lower so that other chars arrive
-after CTS is raised, there is still room for 16 of them.
-
-Signed-off-by: Valentin Longchamp<valentin.longchamp@epfl.ch>
-Tested-by: Philippe Rétornaz<philippe.retornaz@epfl.ch>
-Acked-by: Wolfram Sang<w.sang@pengutronix.de>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/serial/imx.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
---- a/drivers/serial/imx.c
-+++ b/drivers/serial/imx.c
-@@ -120,7 +120,8 @@
- #define MX2_UCR3_RXDMUXSEL (1<<2) /* RXD Muxed Input Select, on mx2/mx3 */
- #define UCR3_INVT (1<<1) /* Inverted Infrared transmission */
- #define UCR3_BPEN (1<<0) /* Preset registers enable */
--#define UCR4_CTSTL_32 (32<<10) /* CTS trigger level (32 chars) */
-+#define UCR4_CTSTL_SHF 10 /* CTS trigger level shift */
-+#define UCR4_CTSTL_MASK 0x3F /* CTS trigger is 6 bits wide */
- #define UCR4_INVR (1<<9) /* Inverted infrared reception */
- #define UCR4_ENIRI (1<<8) /* Serial infrared interrupt enable */
- #define UCR4_WKEN (1<<7) /* Wake interrupt enable */
-@@ -591,6 +592,9 @@ static int imx_setup_ufcr(struct imx_por
- return 0;
- }
-
-+/* half the RX buffer size */
-+#define CTSTL 16
-+
- static int imx_startup(struct uart_port *port)
- {
- struct imx_port *sport = (struct imx_port *)port;
-@@ -607,6 +611,10 @@ static int imx_startup(struct uart_port
- if (USE_IRDA(sport))
- temp |= UCR4_IRSC;
-
-+ /* set the trigger level for CTS */
-+ temp &= ~(UCR4_CTSTL_MASK<< UCR4_CTSTL_SHF);
-+ temp |= CTSTL<< UCR4_CTSTL_SHF;
-+
- writel(temp & ~UCR4_DREN, sport->port.membase + UCR4);
-
- if (USE_IRDA(sport)) {
diff --git a/tty.current/serial-mpc52xx_uart-fix-null-pointer-dereference.patch b/tty.current/serial-mpc52xx_uart-fix-null-pointer-dereference.patch
deleted file mode 100644
index 0125446314e1c0..00000000000000
--- a/tty.current/serial-mpc52xx_uart-fix-null-pointer-dereference.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From agust@denx.de Wed May 5 11:13:44 2010
-From: Anatolij Gustschin <agust@denx.de>
-Date: Wed, 5 May 2010 00:18:59 +0200
-Subject: serial: mpc52xx_uart: fix null pointer dereference
-To: linux-kernel@vger.kernel.org
-Cc: linuxppc-dev@ozlabs.org, grant.likely@secretlab.ca, leonardo.lists@gmail.com, gregkh@suse.de, Anatolij Gustschin <agust@denx.de>
-Message-ID: <1273011539-13994-1-git-send-email-agust@denx.de>
-
-
-Commit 6acc6833510db8f72b5ef343296d97480555fda9
-introduced NULL pointer dereference and kernel crash
-on ppc32 machines while booting. Fix this bug now.
-
-Reported-by: Leonardo Chiquitto <leonardo.lists@gmail.com>
-Tested-by: Leonardo Chiquitto <leonardo.lists@gmail.com>
-Signed-off-by: Anatolij Gustschin <agust@denx.de>
-Cc: stable <stable@kernel.org>
-Acked-by: Grant Likely <grant.likely@secretlab.ca>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/serial/mpc52xx_uart.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/serial/mpc52xx_uart.c
-+++ b/drivers/serial/mpc52xx_uart.c
-@@ -1467,7 +1467,7 @@ mpc52xx_uart_init(void)
- /*
- * Map the PSC FIFO Controller and init if on MPC512x.
- */
-- if (psc_ops->fifoc_init) {
-+ if (psc_ops && psc_ops->fifoc_init) {
- ret = psc_ops->fifoc_init();
- if (ret)
- return ret;
diff --git a/tty.current/tty-fix-unbalanced-bkl-handling-in-error-path.patch b/tty.current/tty-fix-unbalanced-bkl-handling-in-error-path.patch
deleted file mode 100644
index 887a8cae284481..00000000000000
--- a/tty.current/tty-fix-unbalanced-bkl-handling-in-error-path.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From alan@linux.intel.com Wed May 5 11:14:17 2010
-From: Alan Cox <alan@linux.intel.com>
-Date: Tue, 4 May 2010 20:42:36 +0100
-Subject: tty: Fix unbalanced BKL handling in error path
-To: Arnd Bergmann <arnd@arndb.de>
-Cc: "Greg Kroah-Hartman" <gregkh@suse.de>
-Message-ID: <20100504204236.5dc6a34e@linux.intel.com>
-
-
-Arnd noted:
-
-After the "retry_open:" label, we first get the tty_mutex
-and then the BKL. However a the end of tty_open, we jump
-back to retry_open with the BKL still held. If we run into
-this case, the tty_open function will be left with the BKL
-still held.
-
-Signed-off-by: Alan Cox <alan@linux.intel.com>
-Acked-by: Arnd Bergmann <arnd@arndb.de>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/char/tty_io.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/char/tty_io.c
-+++ b/drivers/char/tty_io.c
-@@ -1875,6 +1875,7 @@ got_driver:
- */
- if (filp->f_op == &hung_up_tty_fops)
- filp->f_op = &tty_fops;
-+ unlock_kernel();
- goto retry_open;
- }
- unlock_kernel();
diff --git a/usb/usb-remove-uses-of-urb_no_setup_dma_map.patch b/usb/usb-remove-uses-of-urb_no_setup_dma_map.patch
index 95d97f81c7c90b..fbaa923181a3ab 100644
--- a/usb/usb-remove-uses-of-urb_no_setup_dma_map.patch
+++ b/usb/usb-remove-uses-of-urb_no_setup_dma_map.patch
@@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
usb_buffer_free(dev, usbhid->bufsize, usbhid->ctrlbuf, usbhid->ctrlbuf_dma);
}
-@@ -1014,9 +1013,8 @@ static int usbhid_start(struct hid_devic
+@@ -1007,9 +1006,8 @@ static int usbhid_start(struct hid_devic
usb_fill_control_urb(usbhid->urbctrl, dev, 0, (void *) usbhid->cr,
usbhid->ctrlbuf, 1, hid_ctrl, hid);
@@ -260,7 +260,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (is_out)
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
-@@ -775,7 +775,7 @@ EXPORT_SYMBOL_GPL(usb_buffer_free);
+@@ -775,7 +775,7 @@ EXPORT_SYMBOL_GPL(usb_free_coherent);
* @urb: urb whose transfer_buffer/setup_packet will be mapped
*
* Return value is either null (indicating no buffer could be mapped), or
diff --git a/version b/version
index 4ea6a5824f6610..6681e3b7cd92b3 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.34-rc7
+2.6.34-rc7-git6
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 20:39:18 +0000