Acked-by: Huacai Chen <chenhc@xxxxxxxxxx>
------------------ Original ------------------
From: "Guenter Roeck"<linux@xxxxxxxxxxxx>;
Date: Fri, Aug 7, 2015 01:57 PM
To: "Ralf Baechle"<ralf@xxxxxxxxxxxxxx>;
Cc: "Huacai Chen"<chenhc@xxxxxxxxxx>; "linux-mips"<linux-mips@xxxxxxxxxxxxxx>; "linux-kernel"<linux-kernel@xxxxxxxxxxxxxxx>; "Guenter Roeck"<linux@xxxxxxxxxxxx>;
Subject: [PATCH] mips: Fix console output for Fulong2e system
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")
Cc: Huacai Chen <chenhc@xxxxxxxxxx>
Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
---
Never mind my earlier e-mail, I figured it out.
Should be a candidate for stable (v3.19+, ie v4.1 in practice).
arch/mips/loongson64/common/env.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/mips/loongson64/common/env.c b/arch/mips/loongson64/common/env.c
index f6c44dd332e2..d6d07ad56180 100644
--- 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;
--
2.1.4
