Skip to contentSkip to conversation

PATCH - Added support to YANU Nios2 uart

U-Boot Renato Andreola 2 participants 2 messages Aug 6, 2009

lore
Share & tools
lore
#0 lore raw

From 6e15ffc680ca75d5bd3a01fc9010c34637c6ab32 Mon Sep 17 00:00:00 2001
From: Renato Andreola <[email protected]>
Date: Thu, 6 Aug 2009 12:28:51 +0200
Subject: [PATCH] Yanu Support for U-Boot

with this patch YANU uart support will be added to u-boot. Remember to modify properly your board files for defining physical address etc etc

Signed-off-by Renato Andreola renato.andreola at imagos.it
---
  cpu/nios2/serial.c   |  158 
+++++++++++++++++++++++++++++++++++++++++++++++++-
  include/nios2-yanu.h |  119 +++++++++++++++++++++++++++++++++++++
  2 files changed, 276 insertions(+), 1 deletions(-)

create mode 100644 include/nios2-yanu.h

cpu/nios2/serial.c +23 -0
index 8bbb803..e77b2c6 100644
@@ -26,6 +26,8 @@
  #include <watchdog.h>
  #include <asm/io.h>
  #include <nios2-io.h>
+#include <nios2-yanu.h>
+
 
  DECLARE_GLOBAL_DATA_PTR;
 
@@ -73,11 +75,165 @@ int serial_getc (void)
  	c = val & 0x0ff;
  	return (c);
  }
+/*------------------------------------------------------------------
+ * YANU Imagos serial port
+ *-----------------------------------------------------------------*/
+#elif defined(CONFIG_CONSOLE_YANU)
+
+static yanu_uart_t *uart = (yanu_uart_t *)CONFIG_SYS_NIOS_CONSOLE;
+
+#if defined(CONFIG_NIOS_FIXEDBAUD)
+
+/* Everything's already setup for fixed-baud PTF
+ * assignment
+ */
+void serial_setbrg (void) {
+	int n, k;
+	const unsigned max_uns = 0xFFFFFFFF;
+	unsigned best_n, best_m, baud;
+
+	/* compute best N and M couple */
+	best_n = YANU_MAX_PRESCALER_N;
+	for (n = YANU_MAX_PRESCALER_N; n >= 0; n--)
+		if ((unsigned)CONFIG_SYS_CLK_FREQ / (1 << (n+4)) >= 

(unsigned)CONFIG_BAUDRATE) {
+ best_n = n;
+ break;
+ }
+ for (k=0; ; k++)
+ if ((unsigned)CONFIG_BAUDRATE <= (max_uns >> (15+n-k)))
+ break;
+ best_m = ((unsigned)CONFIG_BAUDRATE * (1 << (15+n-k))) /
((unsigned)CONFIG_SYS_CLK_FREQ >> k);
+
+ baud = best_m + best_n * YANU_BAUDE;
+ writel(&uart->baud, baud);
+
+ return;
+}
+
+#else
+
+void serial_setbrg (void)
+{
+ DECLARE_GLOBAL_DATA_PTR;
+ int n, k;
+ const unsigned max_uns = 0xFFFFFFFF;
+ unsigned best_n, best_m, baud;
+
+ /* compute best N and M couple */
+ best_n = YANU_MAX_PRESCALER_N;
+ for (n = YANU_MAX_PRESCALER_N; n >= 0; n--)
+ if ((unsigned)CONFIG_SYS_CLK_FREQ / (1 << (n+4)) >= gd->baudrate) {
+ best_n = n;
+ break;
+ }
+ for (k=0; ; k++)
+ if (gd->baudrate <= (max_uns >> (15+n-k)))
+ break;
+ best_m = (gd->baudrate * (1 << (15+n-k))) /
((unsigned)CONFIG_SYS_CLK_FREQ >> k);
+
+ baud = best_m + best_n * YANU_BAUDE;
+ writel(&uart->baud, baud);
+
+ return;
+}
+
+
+#endif /* CFG_NIOS_FIXEDBAUD */
+
+int serial_init (void)
+{
+ unsigned action,control;
+
+ /* status register cleanup */
+ action = YANU_ACTION_RRRDY |

+		YANU_ACTION_RTRDY       |
+		YANU_ACTION_ROE         |
+		YANU_ACTION_RBRK        |
+		YANU_ACTION_RFE         |
+		YANU_ACTION_RPE         |
+		YANU_ACTION_RFE         |
+		YANU_ACTION_RFIFO_CLEAR |

+ YANU_ACTION_TFIFO_CLEAR;
+
+ writel(&uart->action, action);
+
+ /* control register cleanup */
+ /* no interrupts enabled */
+ /* one stop bit */
+ /* hardware flow control disabled */
+ /* 8 bits */
+ control = (0x7 << YANU_CONTROL_BITS_POS);
+ /* enven parity just to be clean */
+ control |= YANU_CONTROL_PAREVEN;
+ /* we set threshold for fifo */
+ control |= YANU_CONTROL_RDYDLY * YANU_RXFIFO_DLY;
+ control |= YANU_CONTROL_TXTHR * YANU_TXFIFO_THR;
+
+ writel(&uart->control, control);
+
+ /* to set baud rate */
+ serial_setbrg();
+
+ return (0);
+}
+
+ +/*-----------------------------------------------------------------------
+ * YANU CONSOLE
+ *---------------------------------------------------------------------*/ +void serial_putc (char c)
+{
+ int tx_chars;
+ unsigned status;
+
+ if (c == '\n')
+ serial_putc ('\r');
+
+ while (1)
+ {
+ status = readl(&uart->status);
+ tx_chars = (status>>YANU_TFIFO_CHARS_POS) & ((1<<YANU_TFIFO_CHARS_N)-1);
+ if (tx_chars < YANU_TXFIFO_SIZE-1)
+ break;
+ WATCHDOG_RESET ();
+ }
+
+ writel(&uart->data, (unsigned char)c);
+}
+
+void serial_puts (const char *s)
+{
+ while (*s != 0) {
+ serial_putc (*s++);
+ }
+}
+
+
+int serial_tstc(void)
+{
+ unsigned status ;
+
+ status = readl(&uart->status);
+ return(((status>>YANU_RFIFO_CHARS_POS) & ((1<<YANU_RFIFO_CHARS_N)-1))

Quoted 1 line

0);

+}
+
+
+int serial_getc (void)
+{
+ while (serial_tstc() == 0)
+ WATCHDOG_RESET ();
+
+ /* first we pull the char */
+ writel(&uart->action, YANU_ACTION_RFIFO_PULL);
+
+ return(readl(&uart->data) & YANU_DATA_CHAR_MASK);
+}
+
+#else

/*------------------------------------------------------------------
* UART the serial port *-----------------------------------------------------------------*/
-#else

  static nios_uart_t *uart = (nios_uart_t *) CONFIG_SYS_NIOS_CONSOLE;
include/nios2-yanu.h new file +46 -0

46 lines not on this page · raw message

ready */

+#define YANU_CONTROL_IE_OE     (1<<1)	   /* ie on rx overrun    */
+#define YANU_CONTROL_IE_BRK    (1<<2)	   /* ie on break detect  */
+#define YANU_CONTROL_IE_FE     (1<<3)	   /* ie on framing error */
+#define YANU_CONTROL_IE_PE     (1<<4)	   /* ie on parity error  */
+#define YANU_CONTROL_IE_TRDY   (1<<5)	   /* ie interrupt on tranmitter 

ready */
+/* control bits */
+#define YANU_CONTROL_BITS_POS (6) /* bits number pos */
+#define YANU_CONTROL_BITS (1<<YANU_CONTROL_BITS_POS) /* number
of rx/tx bits per word. 3 bit unsigned integer */
+#define YANU_CONTROL_BITS_N (3) /* ... its bit filed length */
+#define YANU_CONTROL_PARENA (1<<9) /* enable parity bit
transmission/reception */

+#define YANU_CONTROL_PAREVEN   (1<<10)	   /* parity even */
+#define YANU_CONTROL_STOPS     (1<<11)	   /* number of stop bits */
+#define YANU_CONTROL_HHENA     (1<<12)	   /* Harware Handshake enable... */
+#define YANU_CONTROL_FORCEBRK  (1<<13)	   /* if set than txd = active 

(0) */
+/* tuning part */
+#define YANU_CONTROL_RDYDLY (1<<14) /* delay from "first" before
setting rrdy (in bit) */
+#define YANU_CONTROL_RDYDLY_N (8) /* ... its bit filed length */
+#define YANU_CONTROL_TXTHR (1<<22) /* tx interrupt threshold:
the trdy set if txfifo_chars<= txthr (chars) */
+#define YANU_CONTROL_TXTHR_N (4) /* ... its bit field length */
+
+

+#define YANU_BAUD_OFFSET  (8)        /* baud register offset */
+#define YANU_BAUDM        (1<<0)     /* baud mantissa lsb */
+#define YANU_BAUDM_N      (12)       /* ...its bit filed length */
+#define YANU_BAUDE        (1<<12)    /* baud exponent lsb */
+#define YANU_BAUDE_N      (4)	/* ...its bit field length */
+
+#define YANU_ACTION_OFFSET   (12)    /* action register... write only */
+#define YANU_ACTION_RRRDY    (1<<0)	/* reset rrdy */
+#define YANU_ACTION_ROE      (1<<1)	/* reset oe */
+#define YANU_ACTION_RBRK     (1<<2)	/* reset brk */
+#define YANU_ACTION_RFE      (1<<3)	/* reset fe  */
+#define YANU_ACTION_RPE      (1<<4)	/* reset pe  */
+#define YANU_ACTION_SRRDY    (1<<5)	/* set rrdy  */
+#define YANU_ACTION_SOE      (1<<6)	/* set oe    */
+#define YANU_ACTION_SBRK     (1<<7)	/* set brk   */
+#define YANU_ACTION_SFE      (1<<8)	/* set fe    */
+#define YANU_ACTION_SPE      (1<<9)	/* set pe    */

+#define YANU_ACTION_RFIFO_PULL (1<<10) /* pull a char from rx fifo we
MUST do it before taking a char */
+#define YANU_ACTION_RFIFO_CLEAR (1<<11) /* clear rx fifo */
+#define YANU_ACTION_TFIFO_CLEAR (1<<12) /* clear tx fifo */

+#define YANU_ACTION_RTRDY       (1<<13)	/* clear trdy    */
+#define YANU_ACTION_STRDY       (1<<14)	/* set trdy      */
+
+#define YANU_STATUS_OFFSET   (16)
+#define YANU_STATUS_RRDY     (1<<0)	        /* rxrdy flag */
+#define YANU_STATUS_TRDY     (1<<1)		/* txrdy flag */
+#define YANU_STATUS_OE       (1<<2)		/* rx overrun error */
+#define YANU_STATUS_BRK      (1<<3)		/* rx break detect flag */
+#define YANU_STATUS_FE       (1<<4)		/* rx framing error flag */
+#define YANU_STATUS_PE       (1<<5)		/* rx parity erro flag */

+#define YANU_RFIFO_CHARS_POS (6)
+#define YANU_RFIFO_CHARS (1<<RFIFO_CHAR_POS) /* number of chars
into rx fifo */
+#define YANU_RFIFO_CHARS_N (5) /* ...its bit field length: 32 chars */
+#define YANU_TFIFO_CHARS_POS (11)
+#define YANU_TFIFO_CHARS (1<<TFIFO_CHAR_POS) /* number of chars
into tx fifo */
+#define YANU_TFIFO_CHARS_N (5) /* ...its bit field length: 32 chars */
+
+typedef volatile struct yanu_uart_t {
+ volatile unsigned data;
+/* control register (RW) 32-bit */
+ volatile unsigned control;
+/* baud/prescaler register (RW) 32-bit */
+ volatile unsigned baud;
+/* action register (W) 32-bit */
+ volatile unsigned action;
+/* status register (R) 32-bit */
+ volatile unsigned status;
+/* magic register (R) 32-bit */
+ volatile unsigned magic;
+} yanu_uart_t;
+
+#endif

Signature · 1 line
1.5.5
#1 lore raw

Dear Renato Andreola,

Quoted 22 lines · In message <[email protected]> you wrote:

From 6e15ffc680ca75d5bd3a01fc9010c34637c6ab32 Mon Sep 17 00:00:00 2001
From: Renato Andreola <[email protected]>
Date: Thu, 6 Aug 2009 12:28:51 +0200
Subject: [PATCH] Yanu Support for U-Boot

with this patch YANU uart support will be added to u-boot. Remember to modify properly your board files for defining physical address etc etc

Signed-off-by Renato Andreola renato.andreola at imagos.it
---
  cpu/nios2/serial.c   |  158 
+++++++++++++++++++++++++++++++++++++++++++++++++-
  include/nios2-yanu.h |  119 +++++++++++++++++++++++++++++++++++++
  2 files changed, 276 insertions(+), 1 deletions(-)

create mode 100644 include/nios2-yanu.h

cpu/nios2/serial.c +0 -0
index 8bbb803..e77b2c6 100644

cpu/nios2/serial.c line 30

Quoted 5 lines
cpu/nios2/serial.c +2 -0
@@ -26,6 +26,8 @@
  #include <watchdog.h>
  #include <asm/io.h>
  #include <nios2-io.h>
+#include <nios2-yanu.h>
+

This patch is seriously white-space corrupted. Please use git-send-email to submit patches.

cpu/nios2/serial.c int serial_getc (void) · line 81

Quoted 4 lines
cpu/nios2/serial.c +4 -0
+/*------------------------------------------------------------------
+ * YANU Imagos serial port
+ *-----------------------------------------------------------------*/
+#elif defined(CONFIG_CONSOLE_YANU)

Incorrect multiline comment. Check globally.

And should the comment not go below the #elif ?

Quoted 16 lines
cpu/nios2/serial.c +16 -0
+static yanu_uart_t *uart = (yanu_uart_t *)CONFIG_SYS_NIOS_CONSOLE;
+
+#if defined(CONFIG_NIOS_FIXEDBAUD)
+
+/* Everything's already setup for fixed-baud PTF
+ * assignment
+ */
+void serial_setbrg (void) {
+	int n, k;
+	const unsigned max_uns = 0xFFFFFFFF;
+	unsigned best_n, best_m, baud;
+
+	/* compute best N and M couple */
+	best_n = YANU_MAX_PRESCALER_N;
+	for (n = YANU_MAX_PRESCALER_N; n >= 0; n--)
+		if ((unsigned)CONFIG_SYS_CLK_FREQ / (1 << (n+4)) >= 
Quoted 1 line

(unsigned)CONFIG_BAUDRATE) {

Patch also line-wrapped.

...

cpu/nios2/serial.c

Quoted 6 lines
cpu/nios2/serial.c +6 -0
+	best_n = YANU_MAX_PRESCALER_N;
+	for (n = YANU_MAX_PRESCALER_N; n >= 0; n--)
+		if ((unsigned)CONFIG_SYS_CLK_FREQ / (1 << (n+4)) >= gd->baudrate) {
+			best_n = n;
+			break;
+		}

Please use braces around multi-line statements.

cpu/nios2/serial.c

Quoted 3 lines
cpu/nios2/serial.c +3 -0
+	for (k=0; ; k++)
+		if (gd->baudrate <= (max_uns >> (15+n-k)))
+			break;

Ditto.

cpu/nios2/serial.c

Quoted 12 lines
cpu/nios2/serial.c +12 -0
+void serial_putc (char c)
+{
+	int tx_chars;
+	unsigned status;
+
+	if (c == '\n')
+		serial_putc ('\r');
+	
+	while (1)
+	{
+		status = readl(&uart->status);
+		tx_chars = (status>>YANU_TFIFO_CHARS_POS) & ((1<<YANU_TFIFO_CHARS_N)-1);

Line too long. Check globally.

cpu/nios2/serial.c

Quoted 4 lines
cpu/nios2/serial.c +4 -0
+		if (tx_chars < YANU_TXFIFO_SIZE-1)
+			break;
+		WATCHDOG_RESET ();
+	}

Incorrect brace style. Check globally.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Deliver yesterday, code today, think tomorrow."