3.13-stable patches

added patches:
	serial-omap-serial-move-info-message-to-probe-function.patch
	usb-qcserial-add-netgear-aircard-340u.patch
	vt-fix-secure-clear-screen.patch

diff --git a/queue-3.13/serial-omap-serial-move-info-message-to-probe-function.patch b/queue-3.13/serial-omap-serial-move-info-message-to-probe-function.patch
new file mode 100644 (file)
index 0000000..ce552be
--- /dev/null
+++ b/queue-3.13/serial-omap-serial-move-info-message-to-probe-function.patch
@@ -0,0 +1,55 @@
+From ce6acca65ee42c06ac54ec9ba918865d06cee29d Mon Sep 17 00:00:00 2001
+From: Markus Pargmann <mpa@pengutronix.de>
+Date: Fri, 24 Jan 2014 18:09:41 +0100
+Subject: serial: omap-serial: Move info message to probe function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Markus Pargmann <mpa@pengutronix.de>
+
+commit ce6acca65ee42c06ac54ec9ba918865d06cee29d upstream.
+
+Currently the info message about a missing wakeirq for uart is printed
+every time the serial driver's startup function is called. This happens
+multiple times and not just once.
+
+This can cause lots of extra messages at boot time, slowing things down.  It is
+caused by commit 2a0b965cfb6e (serial: omap: Add support for optional wake-up)
+which was applied for v3.13-rc1.
+
+This patch moves the infomessage to the probe function to display it
+only once.
+
+Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Acked-by: Tony Lindgren <tony@atomide.com>
+Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
+Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/tty/serial/omap-serial.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/tty/serial/omap-serial.c
++++ b/drivers/tty/serial/omap-serial.c
+@@ -738,9 +738,6 @@ static int serial_omap_startup(struct ua
+                       return retval;
+               }
+               disable_irq(up->wakeirq);
+-      } else {
+-              dev_info(up->port.dev, "no wakeirq for uart%d\n",
+-                       up->port.line);
+       }
+ 
+       dev_dbg(up->port.dev, "serial_omap_startup+%d\n", up->port.line);
+@@ -1687,6 +1684,9 @@ static int serial_omap_probe(struct plat
+       up->port.iotype = UPIO_MEM;
+       up->port.irq = uartirq;
+       up->wakeirq = wakeirq;
++      if (!up->wakeirq)
++              dev_info(up->port.dev, "no wakeirq for uart%d\n",
++                       up->port.line);
+ 
+       up->port.regshift = 2;
+       up->port.fifosize = 64;

diff --git a/queue-3.13/series b/queue-3.13/series
index 73e0842df2feb708bc0d435b794331f050798aee..b499f7c42f5151f7f2e017d21cb36df7e6c27aaa 100644 (file)
--- a/queue-3.13/series
+++ b/queue-3.13/series
@@ -41,3 +41,6 @@ drm-i915-fix-intel_pipe_to_cpu_transcoder-for-ums.patch
 drm-i915-pair-va_copy-with-va_end-in-i915_error_vprintf.patch
 drm-radeon-consolidate-sdma-hdp-flushing-code-for-cik.patch
 drm-radeon-cik-use-poll_reg_mem-special-op-for-sdma-hdp.patch
+vt-fix-secure-clear-screen.patch
+serial-omap-serial-move-info-message-to-probe-function.patch
+usb-qcserial-add-netgear-aircard-340u.patch

diff --git a/queue-3.13/usb-qcserial-add-netgear-aircard-340u.patch b/queue-3.13/usb-qcserial-add-netgear-aircard-340u.patch
new file mode 100644 (file)
index 0000000..862515e
--- /dev/null
+++ b/queue-3.13/usb-qcserial-add-netgear-aircard-340u.patch
@@ -0,0 +1,36 @@
+From f948dcf9e9973c05d957bc65b3185682f45feda3 Mon Sep 17 00:00:00 2001
+From: Bjørn Mork <bjorn@mork.no>
+Date: Tue, 4 Feb 2014 13:02:31 +0100
+Subject: usb: qcserial: add Netgear Aircard 340U
+
+From: Bjørn Mork <bjorn@mork.no>
+
+commit f948dcf9e9973c05d957bc65b3185682f45feda3 upstream.
+
+This device was mentioned in an OpenWRT forum.  Seems to have a "standard"
+Sierra Wireless ifnumber to function layout:
+ 0: qcdm
+ 2: nmea
+ 3: modem
+ 8: qmi
+ 9: storage
+
+Signed-off-by: Bjørn Mork <bjorn@mork.no>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/qcserial.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/usb/serial/qcserial.c
++++ b/drivers/usb/serial/qcserial.c
+@@ -139,6 +139,9 @@ static const struct usb_device_id id_tab
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 0)},       /* Sierra Wireless EM7700 Device Management */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 2)},       /* Sierra Wireless EM7700 NMEA */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 3)},       /* Sierra Wireless EM7700 Modem */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 0)},       /* Netgear AirCard 340U Device Management */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 2)},       /* Netgear AirCard 340U NMEA */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 3)},       /* Netgear AirCard 340U Modem */
+ 
+       { }                             /* Terminating entry */
+ };

diff --git a/queue-3.13/vt-fix-secure-clear-screen.patch b/queue-3.13/vt-fix-secure-clear-screen.patch
new file mode 100644 (file)
index 0000000..98679b6
--- /dev/null
+++ b/queue-3.13/vt-fix-secure-clear-screen.patch
@@ -0,0 +1,38 @@
+From 0930b0950a8996aa88b0d2ba4bb2bab27cc36bc7 Mon Sep 17 00:00:00 2001
+From: Petr Písař <petr.pisar@atlas.cz>
+Date: Thu, 6 Feb 2014 21:01:23 +0100
+Subject: vt: Fix secure clear screen
+
+From: Petr Písař <petr.pisar@atlas.cz>
+
+commit 0930b0950a8996aa88b0d2ba4bb2bab27cc36bc7 upstream.
+
+\E[3J console code (secure clear screen) needs to update_screen(vc)
+in order to write-through blanks into off-screen video memory.
+
+This has been removed accidentally in 3.6 by:
+
+commit 81732c3b2fede049a692e58a7ceabb6d18ffb18c
+Author: Jean-François Moine <moinejf@free.fr>
+Date:   Thu Sep 6 19:24:13 2012 +0200
+
+    tty vt: Fix line garbage in virtual console on command line edition
+
+Signed-off-by: Petr Písař <petr.pisar@atlas.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/tty/vt/vt.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/tty/vt/vt.c
++++ b/drivers/tty/vt/vt.c
+@@ -1164,6 +1164,8 @@ static void csi_J(struct vc_data *vc, in
+                       scr_memsetw(vc->vc_screenbuf, vc->vc_video_erase_char,
+                                   vc->vc_screenbuf_size >> 1);
+                       set_origin(vc);
++                      if (CON_IS_VISIBLE(vc))
++                              update_screen(vc);
+                       /* fall through */
+               case 2: /* erase whole display */
+                       count = vc->vc_cols * vc->vc_rows;