Patch "MIPS: Fix console output for Fulong2e system" has been added to the 4.2-stable tree

Patch "MIPS: Fix console output for Fulong2e system" has been added to the 4.2-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    MIPS: Fix console output for Fulong2e system

to the 4.2-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     mips-fix-console-output-for-fulong2e-system.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>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/loongson64/common/env.c |    3 +++
 1 file changed, 3 insertions(+)

--- a/arch/mips/loongson64/common/env.c
+++ b/arch/mips/loongson64/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;


Patches currently in stable-queue which might be from linux@roeck-us.net are

queue-4.2/spi-fix-documentation-of-spi_alloc_master.patch
queue-4.2/lib-iommu-common.c-do-not-try-to-deref-a-null-iommu-lazy_flush-pointer-when-n-pool-hint.patch
queue-4.2/hwmon-nct6775-swap-step_up_time-and-step_down_time-registers-for-most-chips.patch
queue-4.2/cpu-cacheinfo-fix-teardown-path.patch
queue-4.2/watchdog-sunxi-fix-activation-of-system-reset.patch
queue-4.2/mips-fix-console-output-for-fulong2e-system.patch
queue-4.2/watchdog-imgpdc-unregister-restart-handler-on-remove.patch