MMC: OMAP: New release dma and abort xfer functions

[linux-2.6] / drivers / mmc / card / sdio_uart.c

diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index e4d9e85ff5846e599b40bbd6ab8738614056be38..eeea84c309e691c8a7c838b527b95c7ce50c296c 100644 (file)
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -79,6 +79,7 @@ struct sdio_uart_port {
        struct mutex            open_lock;
        struct sdio_func        *func;
        struct mutex            func_lock;
+       struct task_struct      *in_sdio_uart_irq;
        unsigned int            regs_offset;
        struct circ_buf         xmit;
        spinlock_t              write_lock;
@@ -186,14 +187,16 @@ static int sdio_uart_claim_func(struct sdio_uart_port *port)
                mutex_unlock(&port->func_lock);
                return -ENODEV;
        }
-       sdio_claim_host(port->func);
+       if (likely(port->in_sdio_uart_irq != current))
+               sdio_claim_host(port->func);
        mutex_unlock(&port->func_lock);
        return 0;
 }
 
 static inline void sdio_uart_release_func(struct sdio_uart_port *port)
 {
-       sdio_release_host(port->func);
+       if (likely(port->in_sdio_uart_irq != current))
+               sdio_release_host(port->func);
 }
 
 static inline unsigned int sdio_in(struct sdio_uart_port *port, int offset)
@@ -383,7 +386,7 @@ static void sdio_uart_stop_rx(struct sdio_uart_port *port)
        sdio_out(port, UART_IER, port->ier);
 }
 
-static void sdio_uart_receive_chars(struct sdio_uart_port *port, int *status)
+static void sdio_uart_receive_chars(struct sdio_uart_port *port, unsigned int *status)
 {
        struct tty_struct *tty = port->tty;
        unsigned int ch, flag;
@@ -511,15 +514,29 @@ static void sdio_uart_irq(struct sdio_func *func)
        struct sdio_uart_port *port = sdio_get_drvdata(func);
        unsigned int iir, lsr;
 
+       /*
+        * In a few places sdio_uart_irq() is called directly instead of
+        * waiting for the actual interrupt to be raised and the SDIO IRQ
+        * thread scheduled in order to reduce latency.  However, some
+        * interaction with the tty core may end up calling us back
+        * (serial echo, flow control, etc.) through those same places
+        * causing undesirable effects.  Let's stop the recursion here.
+        */
+       if (unlikely(port->in_sdio_uart_irq == current))
+               return;
+
        iir = sdio_in(port, UART_IIR);
        if (iir & UART_IIR_NO_INT)
                return;
+
+       port->in_sdio_uart_irq = current;
        lsr = sdio_in(port, UART_LSR);
        if (lsr & UART_LSR_DR)
                sdio_uart_receive_chars(port, &lsr);
        sdio_uart_check_modem_status(port);
        if (lsr & UART_LSR_THRE)
                sdio_uart_transmit_chars(port);
+       port->in_sdio_uart_irq = NULL;
 }
 
 static int sdio_uart_startup(struct sdio_uart_port *port)
@@ -913,6 +930,67 @@ static int sdio_uart_tiocmset(struct tty_struct *tty, struct file *file,
        return result;
 }
 
+static int sdio_uart_read_proc(char *page, char **start, off_t off,
+                              int count, int *eof, void *data)
+{
+       int i, len = 0;
+       off_t begin = 0;
+
+       len += sprintf(page, "serinfo:1.0 driver%s%s revision:%s\n",
+                      "", "", "");
+       for (i = 0; i < UART_NR && len < PAGE_SIZE - 96; i++) {
+               struct sdio_uart_port *port = sdio_uart_port_get(i);
+               if (port) {
+                       len += sprintf(page+len, "%d: uart:SDIO", i);
+                       if(capable(CAP_SYS_ADMIN)) {
+                               len += sprintf(page + len, " tx:%d rx:%d",
+                                              port->icount.tx, port->icount.rx);
+                               if (port->icount.frame)
+                                       len += sprintf(page + len, " fe:%d",
+                                                      port->icount.frame);
+                               if (port->icount.parity)
+                                       len += sprintf(page + len, " pe:%d",
+                                                      port->icount.parity);
+                               if (port->icount.brk)
+                                       len += sprintf(page + len, " brk:%d",
+                                                      port->icount.brk);
+                               if (port->icount.overrun)
+                                       len += sprintf(page + len, " oe:%d",
+                                                      port->icount.overrun);
+                               if (port->icount.cts)
+                                       len += sprintf(page + len, " cts:%d",
+                                                      port->icount.cts);
+                               if (port->icount.dsr)
+                                       len += sprintf(page + len, " dsr:%d",
+                                                      port->icount.dsr);
+                               if (port->icount.rng)
+                                       len += sprintf(page + len, " rng:%d",
+                                                      port->icount.rng);
+                               if (port->icount.dcd)
+                                       len += sprintf(page + len, " dcd:%d",
+                                                      port->icount.dcd);
+                       }
+                       strcat(page, "\n");
+                       len++;
+                       sdio_uart_port_put(port);
+               }
+
+               if (len + begin > off + count)
+                       goto done;
+               if (len + begin < off) {
+                       begin += len;
+                       len = 0;
+               }
+       }
+       *eof = 1;
+
+done:
+       if (off >= len + begin)
+               return 0;
+       *start = page + (off - begin);
+       return (count < begin + len - off) ? count : (begin + len - off);
+}
+
 static const struct tty_operations sdio_uart_ops = {
        .open                   = sdio_uart_open,
        .close                  = sdio_uart_close,
@@ -926,6 +1004,7 @@ static const struct tty_operations sdio_uart_ops = {
        .break_ctl              = sdio_uart_break_ctl,
        .tiocmget               = sdio_uart_tiocmget,
        .tiocmset               = sdio_uart_tiocmset,
+       .read_proc              = sdio_uart_read_proc,
 };
 
 static struct tty_driver *sdio_uart_tty_driver;
@@ -1044,6 +1123,8 @@ static int __init sdio_uart_init(void)
        tty_drv->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
        tty_drv->init_termios = tty_std_termios;
        tty_drv->init_termios.c_cflag = B4800 | CS8 | CREAD | HUPCL | CLOCAL;
+       tty_drv->init_termios.c_ispeed = 4800;
+       tty_drv->init_termios.c_ospeed = 4800;
        tty_set_operations(tty_drv, &sdio_uart_ops);
 
        ret = tty_register_driver(tty_drv);