diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:51:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:51:23 -0700 |
| commit | f9752c181c0f7d8bc9c16df0124bf06c5a4d4d88 (patch) | |
| tree | 0ac0d5b4f977e623ec95b0ad9ad7a867788f48d0 /usb.current | |
| parent | 11a64ddefcc57c4c57aee99ce0dde04d8de60155 (diff) | |
| download | patches-f9752c181c0f7d8bc9c16df0124bf06c5a4d4d88.tar.gz | |
tty mess :(
Diffstat (limited to 'usb.current')
14 files changed, 12 insertions, 132 deletions
diff --git a/usb.current/usb-console-fix-kernel-crash-on-stty-a-dev-ttyusb0.patch b/usb.current/usb-console-fix-kernel-crash-on-stty-a-dev-ttyusb0.patch deleted file mode 100644 index 8738cf67c28698..00000000000000 --- a/usb.current/usb-console-fix-kernel-crash-on-stty-a-dev-ttyusb0.patch +++ /dev/null @@ -1,70 +0,0 @@ -From jason.wessel@windriver.com Fri Sep 11 14:52:33 2009 -From: Jason Wessel <jason.wessel@windriver.com> -Date: Sat, 5 Sep 2009 16:08:37 -0500 -Subject: USB: console: fix kernel crash on stty -a < /dev/ttyUSB0 -To: gregkh@suse.de, torvalds@linux-foundation.org -Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Jason Wessel <jason.wessel@windriver.com>, Alan Stern <stern@rowland.harvard.edu> -Message-ID: <1252184918-9577-2-git-send-email-jason.wessel@windriver.com> - - -* Boot with the kernel argument console=ttyUSB0,9600 -* Run: stty -a < /dev/ttyUSB0 -* Immediately you get an oops warning, which later leads to a hard - kernel crash - -The commit 335f8514f200e63d689113d29cb7253a5c282967 created the -original regression and commit -6e4061210150d1d6d388c5fba05f6b49a306a27e only fixed part of the -problem. - -Only protect the serial->type->open() from getting executed when the -device is used as a console. - -The wider scope of the console protection added in -6e4061210150d1d6d388c5fba05f6b49a306a27e causes the logic in -serial_open() to fall through and zero out the port->port.count with -the stty sys call. Once the port.count is zeroed the HW will get -closed while other drivers still have call backs to a non-initialized -device which crashes the kernel. - -Signed-off-by: Jason Wessel <jason.wessel@windriver.com> -Cc: Alan Stern <stern@rowland.harvard.edu> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- a/drivers/usb/serial/usb-serial.c -+++ b/drivers/usb/serial/usb-serial.c -@@ -223,8 +223,7 @@ static int serial_open (struct tty_struct *tty, struct file *filp) - tty->driver_data = port; - tty_port_tty_set(&port->port, tty); - -- /* If the console is attached, the device is already open */ -- if (port->port.count == 1 && !port->console) { -+ if (port->port.count == 1) { - first = 1; - /* lock this module before we call it - * this may fail, which means we must bail out, -@@ -242,11 +241,15 @@ static int serial_open (struct tty_struct *tty, struct file *filp) - if (retval) - goto bailout_module_put; - -- /* only call the device specific open if this -- * is the first time the port is opened */ -- retval = serial->type->open(tty, port, filp); -- if (retval) -- goto bailout_interface_put; -+ /* only call the device specific open if this is the -+ * first time the port is opened and it is not a -+ * console port where the HW has already been -+ * initialized */ -+ if (!port->console) { -+ retval = serial->type->open(tty, port, filp); -+ if (retval) -+ goto bailout_interface_put; -+ } - mutex_unlock(&serial->disc_mutex); - set_bit(ASYNCB_INITIALIZED, &port->port.flags); - } --- -1.6.3.1.9.g95405b - diff --git a/usb.current/usb-console-pass-initial-console-baud-on-to-first-tty-open.patch b/usb.current/usb-console-pass-initial-console-baud-on-to-first-tty-open.patch deleted file mode 100644 index 2fd8b60db7d229..00000000000000 --- a/usb.current/usb-console-pass-initial-console-baud-on-to-first-tty-open.patch +++ /dev/null @@ -1,62 +0,0 @@ -From jason.wessel@windriver.com Fri Sep 11 15:02:02 2009 -From: Jason Wessel <jason.wessel@windriver.com> -Date: Sat, 5 Sep 2009 16:08:38 -0500 -Subject: USB: console: pass initial console baud on to first tty open -To: gregkh@suse.de, torvalds@linux-foundation.org -Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Jason Wessel <jason.wessel@windriver.com>, Alan Stern <stern@rowland.harvard.edu> -Message-ID: <1252184918-9577-3-git-send-email-jason.wessel@windriver.com> - - -The first open of the usb serial HW has the termios initialized to the -default of 9600 baud, and this will override what ever was setup via -the original console initialization. - -The solution is to save the console baud rate and re-use it later on -the first open, so as to allow the use of baud rates other than 9600 -for the usb serial console. - -Signed-off-by: Jason Wessel <jason.wessel@windriver.com> -Cc: Alan Stern <stern@rowland.harvard.edu> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/usb/serial/console.c | 1 + - drivers/usb/serial/usb-serial.c | 4 +++- - include/linux/usb/serial.h | 1 + - 3 files changed, 5 insertions(+), 1 deletion(-) - ---- a/drivers/usb/serial/console.c -+++ b/drivers/usb/serial/console.c -@@ -175,6 +175,7 @@ static int usb_console_setup(struct cons - /* The console is special in terms of closing the device so - * indicate this port is now acting as a system console. */ - port->console = 1; -+ port->console_init_baud = baud; - retval = 0; - - out: ---- a/drivers/usb/serial/usb-serial.c -+++ b/drivers/usb/serial/usb-serial.c -@@ -245,7 +245,9 @@ static int serial_open (struct tty_struc - * first time the port is opened and it is not a - * console port where the HW has already been - * initialized */ -- if (!port->console) { -+ if (port->console) { -+ tty_encode_baud_rate(tty, port->console_init_baud, port->console_init_baud); -+ } else { - retval = serial->type->open(tty, port, filp); - if (retval) - goto bailout_interface_put; ---- a/include/linux/usb/serial.h -+++ b/include/linux/usb/serial.h -@@ -107,6 +107,7 @@ struct usb_serial_port { - char throttled; - char throttle_req; - char console; -+ int console_init_baud; - unsigned long sysrq; /* sysrq timeout */ - struct device dev; - enum port_dev_state dev_state; diff --git a/usb.current/usb-option.c-add-support-for-zte-ac2726-evdo-modem.patch b/usb.current/usb-option.c-add-support-for-zte-ac2726-evdo-modem.patch index 1adc0d5b51637e..8fa43d810d2163 100644 --- a/usb.current/usb-option.c-add-support-for-zte-ac2726-evdo-modem.patch +++ b/usb.current/usb-option.c-add-support-for-zte-ac2726-evdo-modem.patch @@ -14,6 +14,7 @@ I wrote a small patch for the options.c module to add the relevant usb ids to it. From: Huzaifa Sidhpurwala <sidhpurwala.huzaifa@gmail.com> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- diff --git a/usb.current/usb-serial-ftdi-handle-gnice-jtag-adaptors.patch b/usb.current/usb-serial-ftdi-handle-gnice-jtag-adaptors.patch index 0e24526226b495..5ac7ec75ff9862 100644 --- a/usb.current/usb-serial-ftdi-handle-gnice-jtag-adaptors.patch +++ b/usb.current/usb-serial-ftdi-handle-gnice-jtag-adaptors.patch @@ -14,6 +14,7 @@ JTAG port). Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/usb/serial/ftdi_sio.c | 2 ++ diff --git a/usb.current/usb-serial-ftdi_sio-new-hardware-support-hameg-power-supply.patch b/usb.current/usb-serial-ftdi_sio-new-hardware-support-hameg-power-supply.patch index c0b01ae6d2f873..8cf885a6f377c6 100644 --- a/usb.current/usb-serial-ftdi_sio-new-hardware-support-hameg-power-supply.patch +++ b/usb.current/usb-serial-ftdi_sio-new-hardware-support-hameg-power-supply.patch @@ -9,6 +9,7 @@ I'd like to present my small patch enabling to use Hameg HM8143 programmable power supply with linux. Signed-off-by: Pawel Ludwikow <pludwiko@rab.ict.pwr.wroc.pl> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb.current/usb-serial-pl2303-new-hardware-support-sanwa-multimeter.patch b/usb.current/usb-serial-pl2303-new-hardware-support-sanwa-multimeter.patch index fb6c98aae3d26a..b5c1d3818b0c7b 100644 --- a/usb.current/usb-serial-pl2303-new-hardware-support-sanwa-multimeter.patch +++ b/usb.current/usb-serial-pl2303-new-hardware-support-sanwa-multimeter.patch @@ -9,6 +9,7 @@ I'd like to present my small patch enabling to use Sanwa PC5000 mulitimeter with linux. Signed-off-by: Pawel Ludwikow <pludwiko@rab.ict.pwr.wroc.pl> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb.current/usb-storage-fix-a-resume-path-gfp_noio-must-be-used.patch b/usb.current/usb-storage-fix-a-resume-path-gfp_noio-must-be-used.patch index 996f8a09d13a70..f2d7462e66eca4 100644 --- a/usb.current/usb-storage-fix-a-resume-path-gfp_noio-must-be-used.patch +++ b/usb.current/usb-storage-fix-a-resume-path-gfp_noio-must-be-used.patch @@ -12,6 +12,7 @@ avoid a possible deadlock. The onetouch subdriver of storage violates the requirement. Signed-off-by: Oliver Neukum <oliver@neukum.org> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- diff --git a/usb.current/usb-xhci-add-quirk-for-fresco-logic-xhci-hardware.patch b/usb.current/usb-xhci-add-quirk-for-fresco-logic-xhci-hardware.patch index ba836bc64ee55a..8479350cc30816 100644 --- a/usb.current/usb-xhci-add-quirk-for-fresco-logic-xhci-hardware.patch +++ b/usb.current/usb-xhci-add-quirk-for-fresco-logic-xhci-hardware.patch @@ -26,6 +26,7 @@ for evaluation purposes only, and should not reach consumer hands. Fresco Logic's next chip rev should have this bug fixed. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/usb/host/xhci-hcd.c | 77 +++++++++++++++++++++++++++++++++++++------ diff --git a/usb.current/usb-xhci-configure-endpoint-code-refactoring.patch b/usb.current/usb-xhci-configure-endpoint-code-refactoring.patch index 402c1f1f6dc721..7bdd476aa12a5c 100644 --- a/usb.current/usb-xhci-configure-endpoint-code-refactoring.patch +++ b/usb.current/usb-xhci-configure-endpoint-code-refactoring.patch @@ -15,6 +15,7 @@ functions to copy parts of the output context into the input context (which will be used in the evaluate context command). Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/usb/host/xhci-hcd.c | 169 +++++++++++++++++++++++++++++-------------- diff --git a/usb.current/usb-xhci-fix-slot-and-endpoint-context-debugging.patch b/usb.current/usb-xhci-fix-slot-and-endpoint-context-debugging.patch index 845b6dc34d9b03..60641e51738980 100644 --- a/usb.current/usb-xhci-fix-slot-and-endpoint-context-debugging.patch +++ b/usb.current/usb-xhci-fix-slot-and-endpoint-context-debugging.patch @@ -12,6 +12,7 @@ Use the virtual address of the memory hardware uses, not the address for the container of that memory. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/usb/host/xhci-dbg.c | 5 +++-- diff --git a/usb.current/usb-xhci-handle-stalled-control-endpoints.patch b/usb.current/usb-xhci-handle-stalled-control-endpoints.patch index 9221efa9d66bf9..b726d55001ce7e 100644 --- a/usb.current/usb-xhci-handle-stalled-control-endpoints.patch +++ b/usb.current/usb-xhci-handle-stalled-control-endpoints.patch @@ -26,6 +26,7 @@ commands complete. The endpoint queue will be restarted once both commands complete. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/usb/host/xhci-hcd.c | 35 ++++++++++++++++++++++++----------- diff --git a/usb.current/usb-xhci-set-correct-max-packet-size-for-hs-fs-control-endpoints.patch b/usb.current/usb-xhci-set-correct-max-packet-size-for-hs-fs-control-endpoints.patch index 07671fc51109ca..7cf3744e84ec58 100644 --- a/usb.current/usb-xhci-set-correct-max-packet-size-for-hs-fs-control-endpoints.patch +++ b/usb.current/usb-xhci-set-correct-max-packet-size-for-hs-fs-control-endpoints.patch @@ -20,6 +20,7 @@ descriptor fetch. Change the initial setup for the xHCI internal representation of the full speed device to have a 64 byte max packet size. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/usb/host/xhci-mem.c | 23 ++++++++++++++++++----- diff --git a/usb.current/usb-xhci-support-full-speed-devices.patch b/usb.current/usb-xhci-support-full-speed-devices.patch index 1177dd0774e62a..b4b23c0c6f3a3a 100644 --- a/usb.current/usb-xhci-support-full-speed-devices.patch +++ b/usb.current/usb-xhci-support-full-speed-devices.patch @@ -21,6 +21,7 @@ the initialization and device descriptor fetching steps in the khubd thread, so blocking should be fine. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/usb/host/xhci-hcd.c | 88 ++++++++++++++++++++++++++++++++++++++++--- diff --git a/usb.current/usb-xhci-work-around-for-chain-bit-in-link-trbs.patch b/usb.current/usb-xhci-work-around-for-chain-bit-in-link-trbs.patch index 6561c97dcfd759..d4bfea66c97187 100644 --- a/usb.current/usb-xhci-work-around-for-chain-bit-in-link-trbs.patch +++ b/usb.current/usb-xhci-work-around-for-chain-bit-in-link-trbs.patch @@ -33,6 +33,7 @@ work if the ring is stopped exactly on a link TRB with chain bit set, but cancellation should be a relatively uncommon case. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- |