1 From 5219981646071abb6731634bf47781a53e248764 Mon Sep 17 00:00:00 2001
2 From: Hauke Mehrtens <hauke@hauke-m.de>
3 Date: Sun, 18 Jul 2010 15:11:26 +0200
4 Subject: [PATCH 6/6] MIPS: BCM47xx: Remove CFE console
6 Do not use the CFE console. It causes hangs on some devices like the
8 This was reported in https://dev.openwrt.org/ticket/4061 and
9 https://forum.openwrt.org/viewtopic.php?id=17063
11 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
13 arch/mips/Kconfig | 1 -
14 arch/mips/bcm47xx/prom.c | 82 +++------------------------------------------
15 2 files changed, 6 insertions(+), 77 deletions(-)
17 --- a/arch/mips/Kconfig
18 +++ b/arch/mips/Kconfig
19 @@ -118,7 +118,6 @@ config BCM47XX
21 select SYS_SUPPORTS_32BIT_KERNEL
22 select SYS_SUPPORTS_LITTLE_ENDIAN
23 - select SYS_HAS_EARLY_PRINTK
25 Support for BCM47XX based boards
27 --- a/arch/mips/bcm47xx/prom.c
28 +++ b/arch/mips/bcm47xx/prom.c
31 #include <bcm47xx_board.h>
33 -static int cfe_cons_handle;
35 static char bcm47xx_system_type[20] = "Broadcom BCM47XX";
37 const char *get_system_type(void)
38 @@ -52,89 +50,23 @@ __init void bcm47xx_set_system_type(u16
42 -void prom_putchar(char c)
44 - while (cfe_write(cfe_cons_handle, &c, 1) == 0)
48 -static __init void prom_init_cfe(void)
49 +static __init int prom_init_cfe(void)
55 - char **envp = (char **) fw_arg2;
56 - int *prom_vec = (int *) fw_arg3;
59 - * Check if a loader was used; if NOT, the 4 arguments are
60 - * what CFE gives us (handle, 0, EPT and EPTSEAL)
63 - cfe_handle = (uint32_t)argc;
64 - cfe_ept = (uint32_t)envp;
65 - cfe_eptseal = (uint32_t)prom_vec;
67 - if ((int)prom_vec < 0) {
69 - * Old loader; all it gives us is the handle,
70 - * so use the "known" entrypoint and assume
73 - cfe_handle = (uint32_t)prom_vec;
74 - cfe_ept = 0xBFC00500;
75 - cfe_eptseal = CFE_EPTSEAL;
78 - * Newer loaders bundle the handle/ept/eptseal
79 - * Note: prom_vec is in the loader's useg
80 - * which is still alive in the TLB.
82 - cfe_handle = prom_vec[0];
83 - cfe_ept = prom_vec[2];
84 - cfe_eptseal = prom_vec[3];
88 + cfe_eptseal = (uint32_t) fw_arg3;
89 + cfe_handle = (uint32_t) fw_arg0;
90 + cfe_ept = (uint32_t) fw_arg2;
92 if (cfe_eptseal != CFE_EPTSEAL) {
93 - /* too early for panic to do any good */
94 printk(KERN_ERR "CFE's entrypoint seal doesn't match.");
99 cfe_init(cfe_handle, cfe_ept);
102 -static __init void prom_init_console(void)
104 - /* Initialize CFE console */
105 - cfe_cons_handle = cfe_getstdhandle(CFE_STDHANDLE_CONSOLE);
108 -static __init void prom_init_cmdline(void)
110 - static char buf[COMMAND_LINE_SIZE] __initdata;
112 - /* Get the kernel command line from CFE */
113 - if (cfe_getenv("LINUX_CMDLINE", buf, COMMAND_LINE_SIZE) >= 0) {
114 - buf[COMMAND_LINE_SIZE - 1] = 0;
115 - strcpy(arcs_cmdline, buf);
118 - /* Force a console handover by adding a console= argument if needed,
119 - * as CFE is not available anymore later in the boot process. */
120 - if ((strstr(arcs_cmdline, "console=")) == NULL) {
121 - /* Try to read the default serial port used by CFE */
122 - if ((cfe_getenv("BOOT_CONSOLE", buf, COMMAND_LINE_SIZE) < 0)
123 - || (strncmp("uart", buf, 4)))
124 - /* Default to uart0 */
125 - strcpy(buf, "uart0");
127 - /* Compute the new command line */
128 - snprintf(arcs_cmdline, COMMAND_LINE_SIZE, "%s console=ttyS%c,115200",
129 - arcs_cmdline, buf[4]);
134 static __init void prom_init_mem(void)
135 @@ -185,8 +117,6 @@ static __init void prom_init_mem(void)
136 void __init prom_init(void)
139 - prom_init_console();
140 - prom_init_cmdline();