* [7/7] LEON SPARC V8 processor support for linux-2.6.10
@ 2005-01-04 19:04 Jiri Gaisler
2005-01-04 19:22 ` Roland Dreier
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jiri Gaisler @ 2005-01-04 19:04 UTC (permalink / raw)
To: sparclinux; +Cc: linux-kernel, wli
[-- Attachment #1: Type: text/plain, Size: 97 bytes --]
Leon2 serial+ethermac driver:
[7/7] diff2.6.10_driver_serial.diff: diff for drivers/serial
[-- Attachment #2: diff2.6.10_driver_serial.diff --]
[-- Type: text/plain, Size: 17319 bytes --]
diff -Naur ../linux-2.6.10/drivers/serial/Kconfig linux-2.6.10/drivers/serial/Kconfig
--- ../linux-2.6.10/drivers/serial/Kconfig 2004-12-24 22:35:28.000000000 +0100
+++ linux-2.6.10/drivers/serial/Kconfig 2005-01-03 11:36:33.000000000 +0100
@@ -779,4 +779,17 @@
If you use an M3T-M32700UT or an OPSPUT platform,
please say Y.
+config SERIAL_LEON
+ tristate "Leon SoC serial support"
+ depends on LEON
+ help
+ UArt driver for the Leon Soc (www.gaisler.com)
+
+config SERIAL_LEON_CONSOLE
+ bool "Leon serial console"
+ depends on LEON && SERIAL_LEON
+ select SERIAL_CORE_CONSOLE
+ help
+ Running a console on Leon uart
+
endmenu
diff -Naur ../linux-2.6.10/drivers/serial/Makefile linux-2.6.10/drivers/serial/Makefile
--- ../linux-2.6.10/drivers/serial/Makefile 2004-12-24 22:34:45.000000000 +0100
+++ linux-2.6.10/drivers/serial/Makefile 2005-01-03 11:36:33.000000000 +0100
@@ -29,6 +29,9 @@
obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o
obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o
+ifneq ($(CONFIG_LEON_3),y)
+obj-$(CONFIG_SERIAL_LEON) += leon.o
+endif
obj-$(CONFIG_SERIAL_MUX) += mux.o
obj-$(CONFIG_SERIAL_68328) += 68328serial.o
obj-$(CONFIG_SERIAL_68360) += 68360serial.o
diff -Naur ../linux-2.6.10/drivers/serial/leon.c linux-2.6.10/drivers/serial/leon.c
--- ../linux-2.6.10/drivers/serial/leon.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.10/drivers/serial/leon.c 2005-01-03 11:36:33.000000000 +0100
@@ -0,0 +1,648 @@
+/*
+ * linux/drivers/serial/leon.c
+ *
+ * Driver for Leon serial ports
+ *
+ * Based on linux/drivers/serial/amba.c , Documentation/serial/driver
+ *
+ * Copyright 1999 ARM Limited
+ * Copyright (C) 2000 Deep Blue Solutions Ltd.
+ *
+ * Modified for Leon by Konrad Eisele <eiselekd@web.de>, 2003
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/oplib.h>
+
+#if defined(CONFIG_SERIAL_LEON_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/serial_core.h>
+#include <asm/leon.h>
+
+#define UART_NR 2
+
+#define SERIAL_LEON_MAJOR TTY_MAJOR
+#define SERIAL_LEON_MINOR 64
+#define SERIAL_LEON_NR UART_NR
+
+#define AMBA_ISR_PASS_LIMIT 256
+
+#define UART_GET_CHAR(p) (LEON_BYPASS_LOAD_PA((port)->membase + (LEON_OFF_UDATA)))
+#define UART_PUT_CHAR(p, v) (LEON_BYPASS_STORE_PA((port)->membase + (LEON_OFF_UDATA),v))
+#define UART_GET_STATUS(p) (LEON_BYPASS_LOAD_PA((port)->membase + (LEON_OFF_USTAT)))
+#define UART_PUT_STATUS(p,v) (LEON_BYPASS_STORE_PA((port)->membase + (LEON_OFF_USTAT),v))
+#define UART_GET_CTRL(port) (LEON_BYPASS_LOAD_PA((port)->membase + (LEON_OFF_UCTRL)))
+#define UART_PUT_CTRL(port,v) (LEON_BYPASS_STORE_PA((port)->membase + (LEON_OFF_UCTRL),v))
+#define UART_GET_SCAL(port) (LEON_BYPASS_LOAD_PA((port)->membase + (LEON_OFF_USCAL)))
+#define UART_PUT_SCAL(port,v) (LEON_BYPASS_STORE_PA((port)->membase + (LEON_OFF_USCAL),v))
+#define UART_RX_DATA(s) (((s) & LEON_USTAT_DR) != 0)
+#define UART_TX_READY(s) (((s) & LEON_USTAT_TH) != 0)
+
+#define UART_DUMMY_RSR_RX 0x8000 /* for ignore all read */
+
+/* We wrap our port structure around the generic uart_port */
+struct uart_leon_port {
+ struct uart_port port;
+ unsigned int old_status;
+};
+
+static void leonuart_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+ unsigned int cr;
+
+ cr = UART_GET_CTRL(port);
+ cr &= ~LEON_UCTRL_TI;
+ UART_PUT_CTRL(port, cr);
+}
+
+static void leonuart_tx_chars(struct uart_port *port);
+static void leonuart_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+ unsigned int cr;
+
+ cr = UART_GET_CTRL(port);
+ cr |= LEON_UCTRL_TI;
+ UART_PUT_CTRL(port, cr);
+
+ if (UART_GET_STATUS(port) & LEON_USTAT_TH) {
+ leonuart_tx_chars (port);
+ }
+}
+
+static void leonuart_stop_rx(struct uart_port *port)
+{
+ unsigned int cr;
+
+ cr = UART_GET_CTRL(port);
+ cr &= ~(LEON_UCTRL_RI);
+ UART_PUT_CTRL(port, cr);
+}
+
+static void leonuart_enable_ms(struct uart_port *port)
+{
+ /* no modem status for leon */
+}
+
+static void
+#ifdef SUPPORT_SYSRQ
+leonuart_rx_chars(struct uart_port *port, struct pt_regs *regs)
+#else
+leonuart_rx_chars(struct uart_port *port)
+#endif
+{
+ struct tty_struct *tty = port->info->tty;
+ unsigned int status, ch, rsr;
+
+ status = UART_GET_STATUS(port);
+ if (UART_RX_DATA(status)) {
+
+ if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+ tty->flip.work.func((void *)tty);
+ if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+ printk(KERN_WARNING "TTY_DONT_FLIP set\n");
+ return;
+ }
+ }
+
+ ch = UART_GET_CHAR(port);
+
+ *tty->flip.char_buf_ptr = ch;
+ *tty->flip.flag_buf_ptr = TTY_NORMAL;
+ port->icount.rx++;
+
+ /*
+ * Note that the error handling code is
+ * out of the main execution path
+ */
+ rsr = UART_GET_STATUS(port) | UART_DUMMY_RSR_RX;
+ UART_PUT_STATUS(port,0);
+ if (rsr & LEON_USTAT_ERROR) {
+
+ if (rsr & LEON_USTAT_BR) {
+ rsr &= ~(LEON_USTAT_FE | LEON_USTAT_PE);
+ port->icount.brk++;
+ if (uart_handle_break(port))
+ goto ignore_char;
+ } else if (rsr & LEON_USTAT_PE) {
+ port->icount.parity++;
+ } else if (rsr & LEON_USTAT_FE) {
+ port->icount.frame++;
+ }
+ if (rsr & LEON_USTAT_OV)
+ port->icount.overrun++;
+
+ rsr &= port->read_status_mask;
+
+ if (rsr & LEON_USTAT_PE)
+ *tty->flip.flag_buf_ptr = TTY_PARITY;
+ else if (rsr & LEON_USTAT_FE)
+ *tty->flip.flag_buf_ptr = TTY_FRAME;
+ }
+
+ if (uart_handle_sysrq_char(port, ch, regs))
+ goto ignore_char;
+
+ if ((rsr & port->ignore_status_mask) == 0) {
+ tty->flip.flag_buf_ptr++;
+ tty->flip.char_buf_ptr++;
+ tty->flip.count++;
+ }
+ if ((rsr & LEON_USTAT_OV) &&
+ tty->flip.count < TTY_FLIPBUF_SIZE) {
+ /*
+ * Overrun is special, since it's reported
+ * immediately, and doesn't affect the current
+ * character
+ */
+ *tty->flip.char_buf_ptr++ = 0;
+ *tty->flip.flag_buf_ptr++ = TTY_OVERRUN;
+ tty->flip.count++;
+ }
+ }
+ignore_char:
+ tty_flip_buffer_push(tty);
+ return;
+}
+
+static void leonuart_tx_chars(struct uart_port *port)
+{
+ struct circ_buf *xmit = &port->info->xmit;
+ int count;
+
+ if (port->x_char) {
+ UART_PUT_CHAR(port, port->x_char);
+ port->icount.tx++;
+ port->x_char = 0;
+ return;
+ }
+ if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
+ leonuart_stop_tx(port, 0);
+ return;
+ }
+
+ count = port->fifosize >> 1; //amba: fill FIFO
+ do {
+ UART_PUT_CHAR(port, xmit->buf[xmit->tail]);
+ xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+ port->icount.tx++;
+ if (uart_circ_empty(xmit))
+ break;
+ } while (--count > 0);
+
+ if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+ uart_write_wakeup(port);
+
+ if (uart_circ_empty(xmit))
+ leonuart_stop_tx(port, 0);
+}
+
+static irqreturn_t leonuart_int(int irq, void *dev_id, struct pt_regs *regs)
+{
+ struct uart_port *port = dev_id;
+ unsigned int status;
+
+ spin_lock(port ->lock);
+
+ status = UART_GET_STATUS(port);
+ if (status & LEON_USTAT_DR) {
+#ifdef SUPPORT_SYSRQ
+ leonuart_rx_chars(port,regs);
+#else
+ leonuart_rx_chars(port);
+#endif
+ }
+ if (status & LEON_USTAT_TH) {
+ leonuart_tx_chars(port);
+ }
+ spin_unlock(port ->lock);
+ return IRQ_HANDLED;
+}
+
+static unsigned int leonuart_tx_empty(struct uart_port *port)
+{
+ return UART_GET_STATUS(port) & LEON_USTAT_TH ? TIOCSER_TEMT : 0;
+}
+
+static unsigned int leonuart_get_mctrl(struct uart_port *port)
+{
+ unsigned int result = 0;
+
+ /*
+ no modem status for leon
+ */
+
+ return result;
+}
+
+static void leonuart_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+ /* no modem status for leon */
+}
+
+static void leonuart_break_ctl(struct uart_port *port, int break_state)
+{
+ /* no break for leon */
+}
+
+static int leonuart_startup(struct uart_port *port)
+{
+ struct uart_leon_port *uap = (struct uart_leon_port *)port;
+ int retval;
+ unsigned int cr;
+
+ /*
+ * Allocate the IRQ
+ */
+ retval = request_irq(port->irq, leonuart_int, 0, "leon", port);
+ if (retval)
+ return retval;
+
+ /*
+ * initialise the old status of the modem signals
+ */
+ uap->old_status = 0;
+
+ /*
+ * Finally, enable interrupts
+ */
+ cr = UART_GET_CTRL(port);
+ UART_PUT_CTRL(port, cr | LEON_UCTRL_RE | LEON_UCTRL_TE | LEON_UCTRL_RI | LEON_UCTRL_TI );
+
+ return 0;
+}
+
+static void leonuart_shutdown(struct uart_port *port)
+{
+ unsigned int cr;
+
+ /*
+ * Free the interrupt
+ */
+ free_irq(port->irq, port);
+
+ /*
+ * disable all interrupts, disable the port
+ */
+ cr = UART_GET_CTRL(port);
+ UART_PUT_CTRL(port, cr & ~( LEON_UCTRL_RE | LEON_UCTRL_TE | LEON_UCTRL_RI | LEON_UCTRL_TI ));
+
+}
+
+static void
+leonuart_set_termios(struct uart_port *port, struct termios *termios,
+ struct termios *old)
+{
+ unsigned int cr;
+ unsigned long flags;
+ unsigned int baud, quot;
+
+ /*
+ * Ask the core to calculate the divisor for us.
+ */
+ baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
+ if (baud == 0) {
+ panic("invalid baudrate %i\n", port->uartclk/16);
+ }
+ quot = (uart_get_divisor(port, baud)) * 2; //uart_get_divisor calc a *16 uart freq, leon is *8
+ cr = UART_GET_CTRL(port);
+ cr &= ~( LEON_UCTRL_PE | LEON_UCTRL_PS );
+
+ if (termios->c_cflag & PARENB) {
+ cr |= LEON_UCTRL_PE;
+ if ((termios->c_cflag & PARODD))
+ cr |= LEON_UCTRL_PS;
+ }
+
+ spin_lock_irqsave(&port->lock, flags);
+
+ /*
+ * Update the per-port timeout.
+ */
+ uart_update_timeout(port, termios->c_cflag, baud);
+
+ port->read_status_mask = LEON_USTAT_OV;
+ if (termios->c_iflag & INPCK)
+ port->read_status_mask |= LEON_USTAT_FE | LEON_USTAT_PE ;
+
+ /*
+ * Characters to ignore
+ */
+ port->ignore_status_mask = 0;
+ if (termios->c_iflag & IGNPAR)
+ port->ignore_status_mask |= LEON_USTAT_FE | LEON_USTAT_PE;
+
+ /*
+ * Ignore all characters if CREAD is not set.
+ */
+ if ((termios->c_cflag & CREAD) == 0)
+ port->ignore_status_mask |= LEON_USTAT_OV | LEON_USTAT_FE | LEON_USTAT_PE;
+
+ /* Set baud rate */
+ quot -= 1;
+ UART_PUT_SCAL(port, quot);
+ UART_PUT_CTRL(port, cr);
+
+ spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static const char *leonuart_type(struct uart_port *port)
+{
+ return port->type == PORT_LEON ? "Leon" : NULL;
+}
+
+/*
+ * Release the memory region(s) being used by 'port'
+ */
+static void leonuart_release_port(struct uart_port *port)
+{
+}
+
+/*
+ * Request the memory region(s) being used by 'port'
+ */
+static int leonuart_request_port(struct uart_port *port)
+{
+ return 0;
+}
+
+/*
+ * Configure/autoconfigure the port.
+ */
+static void leonuart_config_port(struct uart_port *port, int flags)
+{
+ if (flags & UART_CONFIG_TYPE) {
+ port->type = PORT_LEON;
+ leonuart_request_port(port);
+ }
+}
+
+/*
+ * verify the new serial_struct (for TIOCSSERIAL).
+ */
+static int leonuart_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+ int ret = 0;
+ if (ser->type != PORT_UNKNOWN && ser->type != PORT_LEON)
+ ret = -EINVAL;
+ if (ser->irq < 0 || ser->irq >= NR_IRQS)
+ ret = -EINVAL;
+ if (ser->baud_base < 9600)
+ ret = -EINVAL;
+ return ret;
+}
+
+static struct uart_ops leon_pops = {
+ .tx_empty = leonuart_tx_empty,
+ .set_mctrl = leonuart_set_mctrl,
+ .get_mctrl = leonuart_get_mctrl,
+ .stop_tx = leonuart_stop_tx,
+ .start_tx = leonuart_start_tx,
+ .stop_rx = leonuart_stop_rx,
+ .enable_ms = leonuart_enable_ms,
+ .break_ctl = leonuart_break_ctl,
+ .startup = leonuart_startup,
+ .shutdown = leonuart_shutdown,
+ .set_termios = leonuart_set_termios,
+ .type = leonuart_type,
+ .release_port = leonuart_release_port,
+ .request_port = leonuart_request_port,
+ .config_port = leonuart_config_port,
+ .verify_port = leonuart_verify_port,
+};
+
+static struct uart_leon_port leon_ports[UART_NR] = {
+ {
+ .port = {
+ .membase = (void*) (LEON_PREGS+LEON_UART0),
+ .mapbase = (LEON_PREGS+LEON_UART0),
+ .iotype = SERIAL_IO_MEM,
+ .irq = LEON_INTERRUPT_UART_0_RX_TX,
+ .uartclk = 0,
+ .fifosize = 1,
+ .ops = &leon_pops,
+ .flags = ASYNC_BOOT_AUTOCONF,
+ .line = 0,
+ },
+ },
+ {
+ .port = {
+ .membase = (void*) (LEON_PREGS+LEON_UART1),
+ .mapbase = (LEON_PREGS+LEON_UART1),
+ .iotype = SERIAL_IO_MEM,
+ .irq = LEON_INTERRUPT_UART_1_RX_TX,
+ .uartclk = 0,
+ .fifosize = 1,
+ .ops = &leon_pops,
+ .flags = ASYNC_BOOT_AUTOCONF,
+ .line = 1,
+ },
+ }
+};
+
+#ifdef CONFIG_SERIAL_LEON_CONSOLE
+
+static void
+leonuart_console_write(struct console *co, const char *s, unsigned int count)
+{
+ struct uart_port *port = &leon_ports[co->index].port;
+ unsigned int status, old_cr;
+ int i;
+
+ /*
+ * First save the CR then disable the interrupts
+ */
+ old_cr = UART_GET_CTRL(port);
+ UART_PUT_CTRL(port, (old_cr & ~(LEON_UCTRL_RI | LEON_UCTRL_TI)) | (LEON_UCTRL_RE | LEON_UCTRL_TE) );
+
+ /*
+ * Now, do each character
+ */
+ for (i = 0; i < count; i++) {
+ do {
+ status = UART_GET_STATUS(port);
+ } while (!UART_TX_READY(status));
+ UART_PUT_CHAR(port, s[i]);
+ if (s[i] == '\n') {
+ do {
+ status = UART_GET_STATUS(port);
+ } while (!UART_TX_READY(status));
+ UART_PUT_CHAR(port, '\r');
+ }
+ }
+
+ /*
+ * Finally, wait for transmitter to become empty
+ * and restore the TCR
+ */
+ do {
+ status = UART_GET_STATUS(port);
+ } while (!UART_TX_READY(status));
+ UART_PUT_CTRL(port, old_cr);
+}
+
+static void __init
+leonuart_console_get_options(struct uart_port *port, int *baud,
+ int *parity, int *bits)
+{
+ if (UART_GET_CTRL(port) & (LEON_UCTRL_RE | LEON_UCTRL_TE)) {
+
+ unsigned int quot, status;
+ status = UART_GET_STATUS(port);
+
+ *parity = 'n';
+ if (status & LEON_UCTRL_PE) {
+ if ((status & LEON_UCTRL_PS) == 0 )
+ *parity = 'e';
+ else
+ *parity = 'o';
+ }
+
+ *bits = 8;
+ quot = UART_GET_SCAL(port) / 8;
+ *baud = port->uartclk / (16 * (quot + 1));
+ }
+}
+
+static int __init leonuart_console_setup(struct console *co, char *options)
+{
+ struct uart_port *port;
+ int baud = 38400;
+ int bits = 8;
+ int parity = 'n';
+ int flow = 'n';
+
+ /*
+ * Check whether an invalid uart number has been specified, and
+ * if so, search for the first available port that does have
+ * console support.
+ */
+ if (co->index >= UART_NR)
+ co->index = 0;
+ port = &leon_ports[co->index].port;
+
+ if (options)
+ uart_parse_options(options, &baud, &parity, &bits, &flow);
+ else
+ leonuart_console_get_options(port, &baud, &parity, &bits);
+
+ return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+static void __init leonuart_early_setup(void) {
+
+ static int first = 1;
+ int i;
+
+ if (!first)
+ return;
+ first = 0;
+
+ for (i = 0; i < UART_NR; i++) {
+ /* assuming that bootloader or the dsumon has set up LEON_SRLD,
+ * so that timer ticks on 1mhz
+ */
+ leon_ports[i].port.uartclk =
+ (LEON_REGLOAD_PA(LEON_SRLD)+1) * 1000 * 1000;
+ }
+}
+
+static struct uart_driver leon_reg;
+static struct console leon_console = {
+ .name = "ttyS",
+ .write = leonuart_console_write,
+ .device = uart_console_device,
+ .setup = leonuart_console_setup,
+ .flags = CON_PRINTBUFFER,
+ .index = -1,
+ .data = &leon_reg,
+};
+
+static int leonuart_init(void);
+static int __init leonuart_console_init(void)
+{
+ leonuart_early_setup();
+ register_console(&leon_console);
+ return 0;
+}
+console_initcall(leonuart_console_init);
+
+#define LEON_CONSOLE &leon_console
+#else
+#define LEON_CONSOLE NULL
+#endif
+
+static struct uart_driver leon_reg = {
+ .owner = THIS_MODULE,
+ .driver_name = "serial",
+ .devfs_name = "tts/",
+ .dev_name = "ttyS",
+ .major = SERIAL_LEON_MAJOR,
+ .minor = SERIAL_LEON_MINOR,
+ .nr = UART_NR,
+ .cons = LEON_CONSOLE,
+};
+
+
+static int __init leonuart_init(void)
+{
+ int ret;
+ int i;
+ int node;
+ int freq_khz;
+ int baud_rates[UART_NR];
+
+ printk(KERN_INFO "Serial: Leon driver, author: Konrad Eisele<eiselekd@web.de>\n");
+
+ node = prom_getchild(prom_root_node);
+ freq_khz = prom_getint(node, "frequency");
+ baud_rates[0] = prom_getintdefault(node, "uart1_baud", 9600);
+ baud_rates[1] = prom_getintdefault(node, "uart2_baud", 9600);
+
+ printk(KERN_INFO "Serial: system frequency: %i khz, baud rates: %i %i\n", freq_khz, baud_rates[0], baud_rates[1]);
+
+ ret = uart_register_driver(&leon_reg);
+ leon_reg.tty_driver->init_termios.c_cflag =
+ (leon_reg.tty_driver->init_termios.c_cflag & ~CBAUD) | B38400;
+
+ if (ret) return ret;
+
+ for (i = 0; i < UART_NR; i++) {
+ struct console co;
+ leon_ports[i].port.uartclk = freq_khz * 1000;
+ uart_add_one_port(&leon_reg, &leon_ports[i].port);
+ uart_set_options(&leon_ports[i].port, &co,
+ baud_rates[i], 'n', 8, 'n');
+ }
+
+ return ret;
+}
+
+static void __exit leonuart_exit(void)
+{
+ int i;
+
+ for (i = 0; i < UART_NR; i++)
+ uart_remove_one_port(&leon_reg, &leon_ports[i].port);
+
+ uart_unregister_driver(&leon_reg);
+}
+
+module_init(leonuart_init);
+module_exit(leonuart_exit);
+
+MODULE_AUTHOR("Konrad Eisele<eiselekd@web.de>, based on AMBA serial");
+MODULE_DESCRIPTION("Leon serial port driver");
+MODULE_LICENSE("GPL");
+
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [7/7] LEON SPARC V8 processor support for linux-2.6.10
2005-01-04 19:04 [7/7] LEON SPARC V8 processor support for linux-2.6.10 Jiri Gaisler
@ 2005-01-04 19:22 ` Roland Dreier
2005-01-05 0:01 ` Alan Cox
2005-01-09 9:36 ` Clemens Buchacher
2 siblings, 0 replies; 6+ messages in thread
From: Roland Dreier @ 2005-01-04 19:22 UTC (permalink / raw)
To: Jiri Gaisler; +Cc: sparclinux, linux-kernel, wli
Is there no way to do this:
> +ifneq ($(CONFIG_LEON_3),y)
> +obj-$(CONFIG_SERIAL_LEON) += leon.o
> +endif
by using dependencies in Kconfig rather than adding conditionals to
the Makefile? Does it work to make SERIAL_LEON depend on LEON && !LEON_3?
- R.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [7/7] LEON SPARC V8 processor support for linux-2.6.10
2005-01-04 19:04 [7/7] LEON SPARC V8 processor support for linux-2.6.10 Jiri Gaisler
2005-01-04 19:22 ` Roland Dreier
@ 2005-01-05 0:01 ` Alan Cox
2005-01-05 15:19 ` Jiri Gaisler
2005-01-09 9:36 ` Clemens Buchacher
2 siblings, 1 reply; 6+ messages in thread
From: Alan Cox @ 2005-01-05 0:01 UTC (permalink / raw)
To: Jiri Gaisler; +Cc: sparclinux, Linux Kernel Mailing List, wli
On Maw, 2005-01-04 at 19:04, Jiri Gaisler wrote:
> + if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
> + tty->flip.work.func((void *)tty);
> + if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
> + printk(KERN_WARNING "TTY_DONT_FLIP set\n");
> + return;
> + }
This code is broken. Please copy the fixes from the other
drivers/serial/*.c files as you've copied a bug from the reference code.
There are some other small cleanups in the base code that are worth
adding too in particular removing direct (ab)use of tty->flip. because
that will be changing some time in the future (when I finish debugging
the tty layer mess)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [7/7] LEON SPARC V8 processor support for linux-2.6.10
2005-01-05 0:01 ` Alan Cox
@ 2005-01-05 15:19 ` Jiri Gaisler
2005-01-06 12:41 ` Alan Cox
0 siblings, 1 reply; 6+ messages in thread
From: Jiri Gaisler @ 2005-01-05 15:19 UTC (permalink / raw)
To: sparclinux; +Cc: Linux Kernel Mailing List, wli
[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]
Leon2 serial+ethermac driver, updated.
[7/7] diff2.6.10_driver_serial.diff: diff for drivers/serial
Alan Cox wrote:
> On Maw, 2005-01-04 at 19:04, Jiri Gaisler wrote:
>
>>+ if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
>>+ tty->flip.work.func((void *)tty);
>>+ if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
>>+ printk(KERN_WARNING "TTY_DONT_FLIP set\n");
>>+ return;
>>+ }
>
>
> This code is broken. Please copy the fixes from the other
> drivers/serial/*.c files as you've copied a bug from the reference code.
> There are some other small cleanups in the base code that are worth
> adding too in particular removing direct (ab)use of tty->flip. because
> that will be changing some time in the future (when I finish debugging
> the tty layer mess)
>
>
> .
>
--
--------------------------------------------------------------------------
Gaisler Research, 1:a Långgatan 19, 413 27 Goteborg, Sweden, +46-317758650
fax: +46-31421407 email: info@gaisler.com, home page: www.gaisler.com
--------------------------------------------------------------------------
[-- Attachment #2: diff2.6.10_driver_serial.diff --]
[-- Type: text/plain, Size: 17354 bytes --]
diff -Naur ../linux-2.6.10/drivers/serial/Kconfig linux-2.6.10/drivers/serial/Kconfig
--- ../linux-2.6.10/drivers/serial/Kconfig 2004-12-24 22:35:28.000000000 +0100
+++ linux-2.6.10/drivers/serial/Kconfig 2005-01-05 12:07:18.000000000 +0100
@@ -779,4 +779,17 @@
If you use an M3T-M32700UT or an OPSPUT platform,
please say Y.
+config SERIAL_LEON
+ tristate "Leon SoC serial support"
+ depends on LEON && !LEON_3
+ help
+ UArt driver for the Leon Soc (www.gaisler.com)
+
+config SERIAL_LEON_CONSOLE
+ bool "Leon serial console"
+ depends on LEON && SERIAL_LEON
+ select SERIAL_CORE_CONSOLE
+ help
+ Running a console on Leon uart
+
endmenu
diff -Naur ../linux-2.6.10/drivers/serial/Makefile linux-2.6.10/drivers/serial/Makefile
--- ../linux-2.6.10/drivers/serial/Makefile 2004-12-24 22:34:45.000000000 +0100
+++ linux-2.6.10/drivers/serial/Makefile 2005-01-05 12:03:52.000000000 +0100
@@ -29,6 +29,7 @@
obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o
obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o
+obj-$(CONFIG_SERIAL_LEON) += leon.o
obj-$(CONFIG_SERIAL_MUX) += mux.o
obj-$(CONFIG_SERIAL_68328) += 68328serial.o
obj-$(CONFIG_SERIAL_68360) += 68360serial.o
diff -Naur ../linux-2.6.10/drivers/serial/leon.c linux-2.6.10/drivers/serial/leon.c
--- ../linux-2.6.10/drivers/serial/leon.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.10/drivers/serial/leon.c 2005-01-05 12:12:00.000000000 +0100
@@ -0,0 +1,650 @@
+/*
+ * linux/drivers/serial/leon.c
+ *
+ * Driver for Leon serial ports
+ *
+ * Based on linux/drivers/serial/amba.c , Documentation/serial/driver
+ *
+ * Copyright 1999 ARM Limited
+ * Copyright (C) 2000 Deep Blue Solutions Ltd.
+ *
+ * Modified for Leon by Konrad Eisele <eiselekd@web.de>, 2003
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/oplib.h>
+
+#if defined(CONFIG_SERIAL_LEON_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/serial_core.h>
+#include <asm/leon.h>
+
+#define UART_NR 2
+
+#define SERIAL_LEON_MAJOR TTY_MAJOR
+#define SERIAL_LEON_MINOR 64
+#define SERIAL_LEON_NR UART_NR
+
+#define AMBA_ISR_PASS_LIMIT 256
+
+#define UART_GET_CHAR(p) (LEON_BYPASS_LOAD_PA((port)->membase + (LEON_OFF_UDATA)))
+#define UART_PUT_CHAR(p, v) (LEON_BYPASS_STORE_PA((port)->membase + (LEON_OFF_UDATA),v))
+#define UART_GET_STATUS(p) (LEON_BYPASS_LOAD_PA((port)->membase + (LEON_OFF_USTAT)))
+#define UART_PUT_STATUS(p,v) (LEON_BYPASS_STORE_PA((port)->membase + (LEON_OFF_USTAT),v))
+#define UART_GET_CTRL(port) (LEON_BYPASS_LOAD_PA((port)->membase + (LEON_OFF_UCTRL)))
+#define UART_PUT_CTRL(port,v) (LEON_BYPASS_STORE_PA((port)->membase + (LEON_OFF_UCTRL),v))
+#define UART_GET_SCAL(port) (LEON_BYPASS_LOAD_PA((port)->membase + (LEON_OFF_USCAL)))
+#define UART_PUT_SCAL(port,v) (LEON_BYPASS_STORE_PA((port)->membase + (LEON_OFF_USCAL),v))
+#define UART_RX_DATA(s) (((s) & LEON_USTAT_DR) != 0)
+#define UART_TX_READY(s) (((s) & LEON_USTAT_TH) != 0)
+
+#define UART_DUMMY_RSR_RX 0x8000 /* for ignore all read */
+
+/* We wrap our port structure around the generic uart_port */
+struct uart_leon_port {
+ struct uart_port port;
+ unsigned int old_status;
+};
+
+static void leonuart_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+ unsigned int cr;
+
+ cr = UART_GET_CTRL(port);
+ cr &= ~LEON_UCTRL_TI;
+ UART_PUT_CTRL(port, cr);
+}
+
+static void leonuart_tx_chars(struct uart_port *port);
+static void leonuart_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+ unsigned int cr;
+
+ cr = UART_GET_CTRL(port);
+ cr |= LEON_UCTRL_TI;
+ UART_PUT_CTRL(port, cr);
+
+ if (UART_GET_STATUS(port) & LEON_USTAT_TH) {
+ leonuart_tx_chars (port);
+ }
+}
+
+static void leonuart_stop_rx(struct uart_port *port)
+{
+ unsigned int cr;
+
+ cr = UART_GET_CTRL(port);
+ cr &= ~(LEON_UCTRL_RI);
+ UART_PUT_CTRL(port, cr);
+}
+
+static void leonuart_enable_ms(struct uart_port *port)
+{
+ /* no modem status for leon */
+}
+
+static void
+#ifdef SUPPORT_SYSRQ
+leonuart_rx_chars(struct uart_port *port, struct pt_regs *regs)
+#else
+leonuart_rx_chars(struct uart_port *port)
+#endif
+{
+ struct tty_struct *tty = port->info->tty;
+ unsigned int status, ch, flag, rsr, max_count = 256;
+
+ status = UART_GET_STATUS(port);
+ while (UART_RX_DATA(status) && max_count--) {
+
+ if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+ if (tty->low_latency)
+ tty_flip_buffer_push(tty);
+ /*
+ * If this failed then we will throw away the
+ * bytes but must do so to clear interrupts.
+ */
+ }
+
+ ch = UART_GET_CHAR(port);
+ flag = TTY_NORMAL;
+
+ port->icount.rx++;
+
+ /*
+ * Note that the error handling code is
+ * out of the main execution path
+ */
+ rsr = UART_GET_STATUS(port) | UART_DUMMY_RSR_RX;
+ UART_PUT_STATUS(port,0);
+ if (rsr & LEON_USTAT_ERROR) {
+
+ if (rsr & LEON_USTAT_BR) {
+ rsr &= ~(LEON_USTAT_FE | LEON_USTAT_PE);
+ port->icount.brk++;
+ if (uart_handle_break(port))
+ goto ignore_char;
+ } else if (rsr & LEON_USTAT_PE) {
+ port->icount.parity++;
+ } else if (rsr & LEON_USTAT_FE) {
+ port->icount.frame++;
+ }
+ if (rsr & LEON_USTAT_OV)
+ port->icount.overrun++;
+
+ rsr &= port->read_status_mask;
+
+ if (rsr & LEON_USTAT_BR)
+ flag = TTY_BREAK;
+ else if (rsr & LEON_USTAT_PE)
+ flag = TTY_PARITY;
+ else if (rsr & LEON_USTAT_FE)
+ flag = TTY_FRAME;
+ }
+
+ if (uart_handle_sysrq_char(port, ch, regs))
+ goto ignore_char;
+
+ if ((rsr & port->ignore_status_mask) == 0) {
+ tty_insert_flip_char(tty, ch, flag);
+ }
+ if ((rsr & LEON_USTAT_OV) &&
+ tty->flip.count < TTY_FLIPBUF_SIZE) {
+ /*
+ * Overrun is special, since it's reported
+ * immediately, and doesn't affect the current
+ * character
+ */
+ tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+ }
+ignore_char:
+ status = UART_GET_STATUS(port);
+ }
+ tty_flip_buffer_push(tty);
+ return;
+}
+
+static void leonuart_tx_chars(struct uart_port *port)
+{
+ struct circ_buf *xmit = &port->info->xmit;
+ int count;
+
+ if (port->x_char) {
+ UART_PUT_CHAR(port, port->x_char);
+ port->icount.tx++;
+ port->x_char = 0;
+ return;
+ }
+ if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
+ leonuart_stop_tx(port, 0);
+ return;
+ }
+
+ count = port->fifosize >> 1; //amba: fill FIFO
+ do {
+ UART_PUT_CHAR(port, xmit->buf[xmit->tail]);
+ xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+ port->icount.tx++;
+ if (uart_circ_empty(xmit))
+ break;
+ } while (--count > 0);
+
+ if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+ uart_write_wakeup(port);
+
+ if (uart_circ_empty(xmit))
+ leonuart_stop_tx(port, 0);
+}
+
+static irqreturn_t leonuart_int(int irq, void *dev_id, struct pt_regs *regs)
+{
+ struct uart_port *port = dev_id;
+ unsigned int status;
+
+ spin_lock(&port ->lock);
+
+ status = UART_GET_STATUS(port);
+ if (status & LEON_USTAT_DR) {
+#ifdef SUPPORT_SYSRQ
+ leonuart_rx_chars(port,regs);
+#else
+ leonuart_rx_chars(port);
+#endif
+ }
+ if (status & LEON_USTAT_TH) {
+ leonuart_tx_chars(port);
+ }
+
+ spin_unlock(&port ->lock);
+
+ return IRQ_HANDLED;
+}
+
+static unsigned int leonuart_tx_empty(struct uart_port *port)
+{
+ return UART_GET_STATUS(port) & LEON_USTAT_TH ? TIOCSER_TEMT : 0;
+}
+
+static unsigned int leonuart_get_mctrl(struct uart_port *port)
+{
+ unsigned int result = 0;
+
+ /*
+ no modem status for leon
+ */
+
+ return result;
+}
+
+static void leonuart_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+ /* no modem status for leon */
+}
+
+static void leonuart_break_ctl(struct uart_port *port, int break_state)
+{
+ /* no break for leon */
+}
+
+static int leonuart_startup(struct uart_port *port)
+{
+ struct uart_leon_port *uap = (struct uart_leon_port *)port;
+ int retval;
+ unsigned int cr;
+
+ /*
+ * Allocate the IRQ
+ */
+ retval = request_irq(port->irq, leonuart_int, 0, "leon", port);
+ if (retval)
+ return retval;
+
+ /*
+ * initialise the old status of the modem signals
+ */
+ uap->old_status = 0;
+
+ /*
+ * Finally, enable interrupts
+ */
+ cr = UART_GET_CTRL(port);
+ UART_PUT_CTRL(port, cr | LEON_UCTRL_RE | LEON_UCTRL_TE | LEON_UCTRL_RI | LEON_UCTRL_TI );
+
+ return 0;
+}
+
+static void leonuart_shutdown(struct uart_port *port)
+{
+ unsigned int cr;
+
+ /*
+ * Free the interrupt
+ */
+ free_irq(port->irq, port);
+
+ /*
+ * disable all interrupts, disable the port
+ */
+ cr = UART_GET_CTRL(port);
+ UART_PUT_CTRL(port, cr & ~( LEON_UCTRL_RE | LEON_UCTRL_TE | LEON_UCTRL_RI | LEON_UCTRL_TI ));
+
+}
+
+static void
+leonuart_set_termios(struct uart_port *port, struct termios *termios,
+ struct termios *old)
+{
+ unsigned int cr;
+ unsigned long flags;
+ unsigned int baud, quot;
+
+ /*
+ * Ask the core to calculate the divisor for us.
+ */
+ baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
+ if (baud == 0) {
+ panic("invalid baudrate %i\n", port->uartclk/16);
+ }
+ quot = (uart_get_divisor(port, baud)) * 2; //uart_get_divisor calc a *16 uart freq, leon is *8
+ cr = UART_GET_CTRL(port);
+ cr &= ~( LEON_UCTRL_PE | LEON_UCTRL_PS );
+
+ if (termios->c_cflag & PARENB) {
+ cr |= LEON_UCTRL_PE;
+ if ((termios->c_cflag & PARODD))
+ cr |= LEON_UCTRL_PS;
+ }
+
+ spin_lock_irqsave(&port->lock, flags);
+
+ /*
+ * Update the per-port timeout.
+ */
+ uart_update_timeout(port, termios->c_cflag, baud);
+
+ port->read_status_mask = LEON_USTAT_OV;
+ if (termios->c_iflag & INPCK)
+ port->read_status_mask |= LEON_USTAT_FE | LEON_USTAT_PE ;
+
+ /*
+ * Characters to ignore
+ */
+ port->ignore_status_mask = 0;
+ if (termios->c_iflag & IGNPAR)
+ port->ignore_status_mask |= LEON_USTAT_FE | LEON_USTAT_PE;
+
+ /*
+ * Ignore all characters if CREAD is not set.
+ */
+ if ((termios->c_cflag & CREAD) == 0)
+ port->ignore_status_mask |= LEON_USTAT_OV | LEON_USTAT_FE | LEON_USTAT_PE;
+
+ /* Set baud rate */
+ quot -= 1;
+ UART_PUT_SCAL(port, quot);
+ UART_PUT_CTRL(port, cr);
+
+ spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static const char *leonuart_type(struct uart_port *port)
+{
+ return port->type == PORT_LEON ? "Leon" : NULL;
+}
+
+/*
+ * Release the memory region(s) being used by 'port'
+ */
+static void leonuart_release_port(struct uart_port *port)
+{
+}
+
+/*
+ * Request the memory region(s) being used by 'port'
+ */
+static int leonuart_request_port(struct uart_port *port)
+{
+ return 0;
+}
+
+/*
+ * Configure/autoconfigure the port.
+ */
+static void leonuart_config_port(struct uart_port *port, int flags)
+{
+ if (flags & UART_CONFIG_TYPE) {
+ port->type = PORT_LEON;
+ leonuart_request_port(port);
+ }
+}
+
+/*
+ * verify the new serial_struct (for TIOCSSERIAL).
+ */
+static int leonuart_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+ int ret = 0;
+ if (ser->type != PORT_UNKNOWN && ser->type != PORT_LEON)
+ ret = -EINVAL;
+ if (ser->irq < 0 || ser->irq >= NR_IRQS)
+ ret = -EINVAL;
+ if (ser->baud_base < 9600)
+ ret = -EINVAL;
+ return ret;
+}
+
+static struct uart_ops leon_pops = {
+ .tx_empty = leonuart_tx_empty,
+ .set_mctrl = leonuart_set_mctrl,
+ .get_mctrl = leonuart_get_mctrl,
+ .stop_tx = leonuart_stop_tx,
+ .start_tx = leonuart_start_tx,
+ .stop_rx = leonuart_stop_rx,
+ .enable_ms = leonuart_enable_ms,
+ .break_ctl = leonuart_break_ctl,
+ .startup = leonuart_startup,
+ .shutdown = leonuart_shutdown,
+ .set_termios = leonuart_set_termios,
+ .type = leonuart_type,
+ .release_port = leonuart_release_port,
+ .request_port = leonuart_request_port,
+ .config_port = leonuart_config_port,
+ .verify_port = leonuart_verify_port,
+};
+
+static struct uart_leon_port leon_ports[UART_NR] = {
+ {
+ .port = {
+ .membase = (void*) (LEON_PREGS+LEON_UART0),
+ .mapbase = (LEON_PREGS+LEON_UART0),
+ .iotype = SERIAL_IO_MEM,
+ .irq = LEON_INTERRUPT_UART_0_RX_TX,
+ .uartclk = 0,
+ .fifosize = 1,
+ .ops = &leon_pops,
+ .flags = ASYNC_BOOT_AUTOCONF,
+ .line = 0,
+ },
+ },
+ {
+ .port = {
+ .membase = (void*) (LEON_PREGS+LEON_UART1),
+ .mapbase = (LEON_PREGS+LEON_UART1),
+ .iotype = SERIAL_IO_MEM,
+ .irq = LEON_INTERRUPT_UART_1_RX_TX,
+ .uartclk = 0,
+ .fifosize = 1,
+ .ops = &leon_pops,
+ .flags = ASYNC_BOOT_AUTOCONF,
+ .line = 1,
+ },
+ }
+};
+
+#ifdef CONFIG_SERIAL_LEON_CONSOLE
+
+static void
+leonuart_console_write(struct console *co, const char *s, unsigned int count)
+{
+ struct uart_port *port = &leon_ports[co->index].port;
+ unsigned int status, old_cr;
+ int i;
+
+ /*
+ * First save the CR then disable the interrupts
+ */
+ old_cr = UART_GET_CTRL(port);
+ UART_PUT_CTRL(port, (old_cr & ~(LEON_UCTRL_RI | LEON_UCTRL_TI)) | (LEON_UCTRL_RE | LEON_UCTRL_TE) );
+
+ /*
+ * Now, do each character
+ */
+ for (i = 0; i < count; i++) {
+ do {
+ status = UART_GET_STATUS(port);
+ } while (!UART_TX_READY(status));
+ UART_PUT_CHAR(port, s[i]);
+ if (s[i] == '\n') {
+ do {
+ status = UART_GET_STATUS(port);
+ } while (!UART_TX_READY(status));
+ UART_PUT_CHAR(port, '\r');
+ }
+ }
+
+ /*
+ * Finally, wait for transmitter to become empty
+ * and restore the TCR
+ */
+ do {
+ status = UART_GET_STATUS(port);
+ } while (!UART_TX_READY(status));
+ UART_PUT_CTRL(port, old_cr);
+}
+
+static void __init
+leonuart_console_get_options(struct uart_port *port, int *baud,
+ int *parity, int *bits)
+{
+ if (UART_GET_CTRL(port) & (LEON_UCTRL_RE | LEON_UCTRL_TE)) {
+
+ unsigned int quot, status;
+ status = UART_GET_STATUS(port);
+
+ *parity = 'n';
+ if (status & LEON_UCTRL_PE) {
+ if ((status & LEON_UCTRL_PS) == 0 )
+ *parity = 'e';
+ else
+ *parity = 'o';
+ }
+
+ *bits = 8;
+ quot = UART_GET_SCAL(port) / 8;
+ *baud = port->uartclk / (16 * (quot + 1));
+ }
+}
+
+static int __init leonuart_console_setup(struct console *co, char *options)
+{
+ struct uart_port *port;
+ int baud = 38400;
+ int bits = 8;
+ int parity = 'n';
+ int flow = 'n';
+
+ /*
+ * Check whether an invalid uart number has been specified, and
+ * if so, search for the first available port that does have
+ * console support.
+ */
+ if (co->index >= UART_NR)
+ co->index = 0;
+ port = &leon_ports[co->index].port;
+
+ if (options)
+ uart_parse_options(options, &baud, &parity, &bits, &flow);
+ else
+ leonuart_console_get_options(port, &baud, &parity, &bits);
+
+ return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+static void __init leonuart_early_setup(void) {
+
+ static int first = 1;
+ int i;
+
+ if (!first)
+ return;
+ first = 0;
+
+ for (i = 0; i < UART_NR; i++) {
+ /* assuming that bootloader or the dsumon has set up LEON_SRLD,
+ * so that timer ticks on 1mhz
+ */
+ leon_ports[i].port.uartclk =
+ (LEON_REGLOAD_PA(LEON_SRLD)+1) * 1000 * 1000;
+ }
+}
+
+static struct uart_driver leon_reg;
+static struct console leon_console = {
+ .name = "ttyS",
+ .write = leonuart_console_write,
+ .device = uart_console_device,
+ .setup = leonuart_console_setup,
+ .flags = CON_PRINTBUFFER,
+ .index = -1,
+ .data = &leon_reg,
+};
+
+static int leonuart_init(void);
+static int __init leonuart_console_init(void)
+{
+ leonuart_early_setup();
+ register_console(&leon_console);
+ return 0;
+}
+console_initcall(leonuart_console_init);
+
+#define LEON_CONSOLE &leon_console
+#else
+#define LEON_CONSOLE NULL
+#endif
+
+static struct uart_driver leon_reg = {
+ .owner = THIS_MODULE,
+ .driver_name = "serial",
+ .devfs_name = "tts/",
+ .dev_name = "ttyS",
+ .major = SERIAL_LEON_MAJOR,
+ .minor = SERIAL_LEON_MINOR,
+ .nr = UART_NR,
+ .cons = LEON_CONSOLE,
+};
+
+
+static int __init leonuart_init(void)
+{
+ int ret;
+ int i;
+ int node;
+ int freq_khz;
+ int baud_rates[UART_NR];
+
+ printk(KERN_INFO "Serial: Leon driver, author: Konrad Eisele<eiselekd@web.de>\n");
+
+ node = prom_getchild(prom_root_node);
+ freq_khz = prom_getint(node, "frequency");
+ baud_rates[0] = prom_getintdefault(node, "uart1_baud", 9600);
+ baud_rates[1] = prom_getintdefault(node, "uart2_baud", 9600);
+
+ printk(KERN_INFO "Serial: system frequency: %i khz, baud rates: %i %i\n", freq_khz, baud_rates[0], baud_rates[1]);
+
+ ret = uart_register_driver(&leon_reg);
+ leon_reg.tty_driver->init_termios.c_cflag =
+ (leon_reg.tty_driver->init_termios.c_cflag & ~CBAUD) | B38400;
+
+ if (ret) return ret;
+
+ for (i = 0; i < UART_NR; i++) {
+ struct console co;
+ leon_ports[i].port.uartclk = freq_khz * 1000;
+ uart_add_one_port(&leon_reg, &leon_ports[i].port);
+ uart_set_options(&leon_ports[i].port, &co,
+ baud_rates[i], 'n', 8, 'n');
+ }
+
+ return ret;
+}
+
+static void __exit leonuart_exit(void)
+{
+ int i;
+
+ for (i = 0; i < UART_NR; i++)
+ uart_remove_one_port(&leon_reg, &leon_ports[i].port);
+
+ uart_unregister_driver(&leon_reg);
+}
+
+module_init(leonuart_init);
+module_exit(leonuart_exit);
+
+MODULE_AUTHOR("Konrad Eisele<eiselekd@web.de>, based on AMBA serial");
+MODULE_DESCRIPTION("Leon2 serial port driver");
+MODULE_LICENSE("GPL");
+
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [7/7] LEON SPARC V8 processor support for linux-2.6.10
2005-01-05 15:19 ` Jiri Gaisler
@ 2005-01-06 12:41 ` Alan Cox
0 siblings, 0 replies; 6+ messages in thread
From: Alan Cox @ 2005-01-06 12:41 UTC (permalink / raw)
To: Jiri Gaisler; +Cc: sparclinux, Linux Kernel Mailing List, wli
On Mer, 2005-01-05 at 15:19, Jiri Gaisler wrote:
> Leon2 serial+ethermac driver, updated.
Looks good to me. Fixes the serial code back up to current and removes
the problem code.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [7/7] LEON SPARC V8 processor support for linux-2.6.10
2005-01-04 19:04 [7/7] LEON SPARC V8 processor support for linux-2.6.10 Jiri Gaisler
2005-01-04 19:22 ` Roland Dreier
2005-01-05 0:01 ` Alan Cox
@ 2005-01-09 9:36 ` Clemens Buchacher
2 siblings, 0 replies; 6+ messages in thread
From: Clemens Buchacher @ 2005-01-09 9:36 UTC (permalink / raw)
To: Jiri Gaisler; +Cc: sparclinux, linux-kernel
On Tue, Jan 04, 2005 at 08:04:44PM +0100, Jiri Gaisler wrote:
> +static irqreturn_t leonuart_int(int irq, void *dev_id, struct pt_regs *regs)
> +{
> + struct uart_port *port = dev_id;
> + unsigned int status;
> +
> + spin_lock(port ->lock);
I think that should be
spin_lock(&port->lock);
[...]
> + spin_unlock(port ->lock);
and
spin_unlock(&port->lock);
> + return IRQ_HANDLED;
> +}
Regards,
Clemens
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2005-01-09 9:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-01-04 19:04 [7/7] LEON SPARC V8 processor support for linux-2.6.10 Jiri Gaisler
2005-01-04 19:22 ` Roland Dreier
2005-01-05 0:01 ` Alan Cox
2005-01-05 15:19 ` Jiri Gaisler
2005-01-06 12:41 ` Alan Cox
2005-01-09 9:36 ` Clemens Buchacher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).