4.1-stable patches

added patches:
	mips-fix-console-output-for-fulong2e-system.patch

diff --git a/queue-4.1/mips-fix-console-output-for-fulong2e-system.patch b/queue-4.1/mips-fix-console-output-for-fulong2e-system.patch
new file mode 100644 (file)
index 0000000..714c255
--- /dev/null
+++ b/queue-4.1/mips-fix-console-output-for-fulong2e-system.patch
@@ -0,0 +1,41 @@
+From fc2ca674470bbfe11d72a20a3f19fd3dc43bfca0 Mon Sep 17 00:00:00 2001
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Sun, 30 Aug 2015 21:19:58 -0700
+Subject: MIPS: Fix console output for Fulong2e system
+
+From: Guenter Roeck <linux@roeck-us.net>
+
+commit fc2ca674470bbfe11d72a20a3f19fd3dc43bfca0 upstream.
+
+Commit 3adeb2566b9b ("MIPS: Loongson: Improve LEFI firmware interface")
+made the number of UARTs dynamic if LEFI_FIRMWARE_INTERFACE is configured.
+Unfortunately, it did not initialize the number of UARTs if
+LEFI_FIRMWARE_INTERFACE is not configured. As a result, the Fulong2e
+system has no console.
+
+Fixes: 3adeb2566b9b ("MIPS: Loongson: Improve LEFI firmware interface")
+Acked-by: Huacai Chen <chenhc@lemote.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Tested-by: Markos Chandras <markos.chandras@imgtec.com>
+Cc: linux-mips@linux-mips.org
+Cc: linux-kernel@vger.kernel.org
+Patchwork: https://patchwork.linux-mips.org/patch/11076/
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mips/loongson/common/env.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/arch/mips/loongson/common/env.c
++++ b/arch/mips/loongson/common/env.c
+@@ -64,6 +64,9 @@ void __init prom_init_env(void)
+       }
+       if (memsize == 0)
+               memsize = 256;
++
++      loongson_sysconf.nr_uarts = 1;
++
+       pr_info("memsize=%u, highmemsize=%u\n", memsize, highmemsize);
+ #else
+       struct boot_params *boot_p;

diff --git a/queue-4.1/series b/queue-4.1/series
index 08e41b9a5195c5568b21476e2625e75caae59c6d..5f41b80c6afa86b396be26f9c2250dba2ffc6d64 100644 (file)
--- a/queue-4.1/series
+++ b/queue-4.1/series
@@ -198,3 +198,4 @@ serial-8250-add-uart_config-entry-for-port_rt2880.patch
 serial-atmel-fix-error-path-of-probe-function.patch
 intel_pstate-fix-overflow-in-busy_scaled-due-to-long-delay.patch
 mm-slab-fix-unexpected-index-mapping-result-of-kmalloc_size-index_node-1.patch
+mips-fix-console-output-for-fulong2e-system.patch