Skip to contentSkip to conversation

cpm_uart: Disable CPM udbg when re-initing CPM uart, even if not the console.

PATCH Applied Scott Wood 2 participants 2 messages Apr 3, 2009 – Apr 6, 2009

lore
Share & tools
lore

Scott Wood

author
#0 lore raw

PATCH 1/1 cpm_uart: Disable CPM udbg when re-initing CPM uart, even if not the console.

Previously, if udbg was using the CPM uart, and the normal CPM uart driver was enabled, but the console was directed elsewhere, udbg would not be stopped prior to initialization. This resulted in udbg hanging forever waiting for the CPM to process a descriptor.

---
 drivers/serial/cpm_uart/cpm_uart_core.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/serial/cpm_uart/cpm_uart_core.c +4 -4
index 4dd00be..f8df068 100644
@@ -1106,6 +1106,10 @@ static int cpm_uart_init_port(struct device_node *np,
 	for (i = 0; i < NUM_GPIOS; i++)
 		pinfo->gpios[i] = of_get_gpio(np, i);
 
+#ifdef CONFIG_PPC_EARLY_DEBUG_CPM
+	udbg_putc = NULL;
+#endif
+
 	return cpm_uart_request_port(&pinfo->port);
 
 out_pram:
@@ -1255,10 +1259,6 @@ static int __init cpm_uart_console_setup(struct console *co, char *options)
 			baud = 9600;
 	}
 
-#ifdef CONFIG_PPC_EARLY_DEBUG_CPM
-	udbg_putc = NULL;
-#endif
-
 	if (IS_SMC(pinfo)) {
 		out_be16(&pinfo->smcup->smc_brkcr, 0);
 		cpm_line_cr_cmd(pinfo, CPM_CR_STOP_TX);
Signature · 1 line
1.5.6.rc1.6.gc53ad.dirty
Applied
#1 lore raw
Quoted 9 lines · Scott Wood

Previously, if udbg was using the CPM uart, and the normal CPM uart driver was enabled, but the console was directed elsewhere, udbg would not be stopped prior to initialization. This resulted in udbg hanging forever waiting for the CPM to process a descriptor.

---
drivers/serial/cpm_uart/cpm_uart_core.c | 8 ++++----

1 files changed, 4 insertions(+), 4 deletions(-)

applied

- k