Skip to contentSkip to conversation

blackfin: Enable early print via the generic serial API.

PATCH New Sonic Zhang 1 participant 3 messages Mar 14, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 blackfin: Enable early print via the generic serial API.

From: Sonic Zhang <[email protected]>

Remove blackfin specific implementation of the generic serial API when early print macro is defined.

In BFIN_BOOT_BYPASS mode, don't call generic serial_puts, because early print in bypass mode is running before code binary is relocated to the link address.

---
 arch/blackfin/cpu/serial.c        |   71 ++++++++++++------------------------
 arch/blackfin/cpu/serial.h        |   10 +++---
 include/configs/bfin_adi_common.h |    3 --
 3 files changed, 29 insertions(+), 55 deletions(-)
arch/blackfin/cpu/serial.c +24 -47
index 36d2a5c..89290d6 100644
@@ -197,13 +197,16 @@ static void uart_loop(uint32_t uart_base, int state)
 
 static inline void __serial_set_baud(uint32_t uart_base, uint32_t baud)
 {
+#ifdef CONFIG_DEBUG_EARLY_SERIAL
+	serial_early_set_baud(uart_base, baud);
+#else
 	uint16_t divisor = (get_uart_clk() + (baud * 8)) / (baud * 16)
 			- ANOMALY_05000230;
 
 	/* Program the divisor to get the baud rate we want */
 	serial_set_divisor(uart_base, divisor);
+#endif
 }
-#ifdef CONFIG_SYS_BFIN_UART
 
 static void uart_puts(uint32_t uart_base, const char *s)
 {
@@ -313,65 +316,39 @@ void bfin_serial_initialize(void)
 #endif
 }
 
-#else
-
-/* Symbol for our assembly to call. */
-void serial_set_baud(uint32_t baud)
-{
-	serial_early_set_baud(UART_BASE, baud);
-}
-
-/* Symbol for common u-boot code to call.
- * Setup the baudrate (brg: baudrate generator).
- */
-void serial_setbrg(void)
+#ifdef CONFIG_DEBUG_EARLY_SERIAL
+inline void uart_early_putc(uint32_t uart_base, const char c)
 {
-	serial_set_baud(gd->baudrate);
-}
-
-/* Symbol for our assembly to call. */
-void serial_initialize(void)
-{
-	serial_early_init(UART_BASE);
-}
-
-/* Symbol for common u-boot code to call. */
-int serial_init(void)
-{
-	serial_initialize();
-	serial_setbrg();
-	uart_lsr_clear(UART_BASE);
-	return 0;
-}
+	/* send a \r for compatibility */
+	if (c == '\n')
+		uart_early_putc(uart_base, '\r');
 
-int serial_tstc(void)
-{
-	return uart_tstc(UART_BASE);
-}
+	/* wait for the hardware fifo to clear up */
+	while (!(_lsr_read(pUART) & THRE))
+		continue;
 
-int serial_getc(void)
-{
-	return uart_getc(UART_BASE);
+	/* queue the character for transmission */
+	bfin_write(&pUART->thr, c);
+	SSYNC();
 }
 
-void serial_putc(const char c)
+void uart_early_puts(const char *s)
 {
-	uart_putc(UART_BASE, c);
+	while (*s)
+		uart_early_putc(UART_BASE, *s++);
 }
 
-void serial_puts(const char *s)
+/* Symbol for our assembly to call. */
+void _serial_early_set_baud(uint32_t baud)
 {
-	while (*s)
-		serial_putc(*s++);
+	serial_early_set_baud(UART_BASE, baud);
 }
 
-LOOP(
-void serial_loop(int state)
+/* Symbol for our assembly to call. */
+void _serial_early_init(void)
 {
-	uart_loop(UART_BASE, state);
+	serial_early_init(UART_BASE);
 }
-)
-
 #endif
 
 #endif
arch/blackfin/cpu/serial.h +5 -5
index d67fd81..87a337d 100644
@@ -78,16 +78,16 @@ static inline void serial_early_puts(const char *s)
 #else
 
 .macro serial_early_init
-#if defined(CONFIG_DEBUG_EARLY_SERIAL) && defined(BFIN_BOOT_BYPASS)
-	call _serial_initialize;
+#if defined(CONFIG_DEBUG_EARLY_SERIAL) && !defined(CONFIG_UART_MEM)
+	call __serial_early_init;
 #endif
 .endm
 
 .macro serial_early_set_baud
-#if defined(CONFIG_DEBUG_EARLY_SERIAL) && defined(BFIN_BOOT_BYPASS)
+#if defined(CONFIG_DEBUG_EARLY_SERIAL) && !defined(CONFIG_UART_MEM)
 	R0.L = LO(CONFIG_BAUDRATE);
 	R0.H = HI(CONFIG_BAUDRATE);
-	call _serial_set_baud;
+	call __serial_early_set_baud;
 #endif
 .endm
 
@@ -121,7 +121,7 @@ static inline void serial_early_puts(const char *s)
 	R0.L = 7b; \
 	R0.H = 7b; \
 	update_serial_early_string_addr \
-	call _serial_puts;
+	call _uart_early_puts;
 #else
 # define serial_early_puts(str)
 #endif
include/configs/bfin_adi_common.h +0 -3
index d3ae3a7..c986ba3 100644
@@ -111,9 +111,6 @@
 #ifndef CONFIG_BAUDRATE
 # define CONFIG_BAUDRATE	57600
 #endif
-#ifndef CONFIG_DEBUG_EARLY_SERIAL
-# define CONFIG_SYS_BFIN_UART
-#endif
 
 /*
  * Debug Settings
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 2/3 blackfin: Add memory virtual console to blackfin serial driver.

From: Sonic Zhang <[email protected]>

---
 arch/blackfin/cpu/serial.c |   60 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 59 insertions(+), 1 deletions(-)
arch/blackfin/cpu/serial.c +59 -1
index 89290d6..c453a03 100644
@@ -351,4 +351,62 @@ void _serial_early_init(void)
 }
 #endif
 
-#endif
+#elif defined(CONFIG_UART_MEM)
+
+char serial_logbuf[CONFIG_UART_MEM];
+char *serial_logbuf_head = serial_logbuf;
+
+int serial_mem_init(void)
+{
+	serial_logbuf_head = serial_logbuf;
+	return 0;
+}
+
+void serial_mem_setbrg(void)
+{
+}
+
+int serial_mem_tstc(void)
+{
+	return 0;
+}
+
+int serial_mem_getc(void)
+{
+	return 0;
+}
+
+void serial_mem_putc(const char c)
+{
+	*serial_logbuf_head = c;
+	if (++serial_logbuf_head == serial_logbuf + CONFIG_UART_MEM)
+		serial_logbuf_head = serial_logbuf;
+}
+
+void serial_mem_puts(const char *s)
+{
+	while (*s)
+		serial_putc(*s++);
+}
+
+struct serial_device bfin_serial_mem_device = {
+	.name   = "bfin_uart_mem",
+	.start  = serial_mem_init,
+	.setbrg = serial_mem_setbrg,
+	.getc   = serial_mem_getc,
+	.tstc   = serial_mem_tstc,
+	.putc   = serial_mem_putc,
+	.puts   = serial_mem_puts,
+};
+
+
+__weak struct serial_device *default_serial_console(void)
+{
+	return &bfin_serial_mem_device;
+}
+
+void bfin_serial_initialize(void)
+{
+	serial_register(&bfin_serial_mem_device);
+}
+#endif /* CONFIG_UART_MEM */
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 3/3 blackfin: Uart divisor should be set after their values are generated.

In reply to Sonic Zhang

From: Sonic Zhang <[email protected]>

---
 arch/blackfin/cpu/initcode.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
arch/blackfin/cpu/initcode.c +5 -2
index 4b10b6c..8ef0b92 100644
@@ -715,8 +715,8 @@ update_serial_clocks(ADI_BOOT_DATA *bs, uint sdivB, uint divB, uint vcoB)
 	 * for dividing which means we'd generate a libgcc reference.
 	 */
 	unsigned int sdivR, vcoR;
-	unsigned int dividend = sdivB * divB * vcoR;
-	unsigned int divisor = vcoB * sdivR;
+	unsigned int dividend;
+	unsigned int divisor;
 	unsigned int quotient;
 
 	serial_putc('a');
@@ -729,6 +729,9 @@ update_serial_clocks(ADI_BOOT_DATA *bs, uint sdivB, uint divB, uint vcoB)
 	sdivR = bfin_read_PLL_DIV() & 0xf;
 	vcoR = (bfin_read_PLL_CTL() >> 9) & 0x3f;
 #endif
+
+	dividend = sdivB * divB * vcoR;
+	divisor = vcoB * sdivR;
 	quotient = early_division(dividend, divisor);
 	serial_early_put_div(quotient - ANOMALY_05000230);
 	serial_putc('c');
Signature · 1 line
1.7.0.4