2005-04-17 00:20:36 +02:00
|
|
|
/*
|
|
|
|
* drivers/serial/sh-sci.c
|
|
|
|
*
|
|
|
|
* SuperH on-chip serial module support. (SCI with no FIFO / with FIFO)
|
|
|
|
*
|
2006-09-27 09:32:13 +02:00
|
|
|
* Copyright (C) 2002 - 2006 Paul Mundt
|
2005-04-17 00:20:36 +02:00
|
|
|
*
|
|
|
|
* based off of the old drivers/char/sh-sci.c by:
|
|
|
|
*
|
|
|
|
* Copyright (C) 1999, 2000 Niibe Yutaka
|
|
|
|
* Copyright (C) 2000 Sugioka Toshinobu
|
|
|
|
* Modified to support multiple serial ports. Stuart Menefy (May 2000).
|
|
|
|
* Modified to support SecureEdge. David McCullough (2002)
|
|
|
|
* Modified to support SH7300 SCIF. Takashi Kusuda (Jun 2003).
|
|
|
|
*
|
|
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
|
|
* for more details.
|
|
|
|
*/
|
2007-03-14 05:22:37 +01:00
|
|
|
#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
|
|
|
|
#define SUPPORT_SYSRQ
|
|
|
|
#endif
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
#undef DEBUG
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/timer.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/tty.h>
|
|
|
|
#include <linux/tty_flip.h>
|
|
|
|
#include <linux/serial.h>
|
|
|
|
#include <linux/major.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/sysrq.h>
|
|
|
|
#include <linux/ioport.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/console.h>
|
2006-09-27 09:32:13 +02:00
|
|
|
#include <linux/platform_device.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
#ifdef CONFIG_CPU_FREQ
|
|
|
|
#include <linux/notifier.h>
|
|
|
|
#include <linux/cpufreq.h>
|
|
|
|
#endif
|
|
|
|
|
2006-02-01 12:06:06 +01:00
|
|
|
#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
|
2007-03-08 09:27:37 +01:00
|
|
|
#include <linux/ctype.h>
|
2006-02-01 12:06:06 +01:00
|
|
|
#include <asm/clock.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <asm/sh_bios.h>
|
2006-09-27 09:32:13 +02:00
|
|
|
#include <asm/kgdb.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#endif
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
#include <asm/sci.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include "sh-sci.h"
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
struct sci_port {
|
|
|
|
struct uart_port port;
|
|
|
|
|
|
|
|
/* Port type */
|
|
|
|
unsigned int type;
|
|
|
|
|
|
|
|
/* Port IRQs: ERI, RXI, TXI, BRI (optional) */
|
2007-03-12 06:38:59 +01:00
|
|
|
unsigned int irqs[SCIx_NR_IRQS];
|
2006-09-27 09:32:13 +02:00
|
|
|
|
|
|
|
/* Port pin configuration */
|
|
|
|
void (*init_pins)(struct uart_port *port,
|
|
|
|
unsigned int cflag);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
/* Port enable callback */
|
|
|
|
void (*enable)(struct uart_port *port);
|
|
|
|
|
|
|
|
/* Port disable callback */
|
|
|
|
void (*disable)(struct uart_port *port);
|
|
|
|
|
|
|
|
/* Break timer */
|
|
|
|
struct timer_list break_timer;
|
|
|
|
int break_flag;
|
2007-04-24 06:41:12 +02:00
|
|
|
|
2007-04-26 04:45:32 +02:00
|
|
|
#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
|
2007-04-24 06:41:12 +02:00
|
|
|
/* Port clock */
|
|
|
|
struct clk *clk;
|
2007-04-26 04:45:32 +02:00
|
|
|
#endif
|
2006-09-27 09:32:13 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef CONFIG_SH_KGDB
|
2005-04-17 00:20:36 +02:00
|
|
|
static struct sci_port *kgdb_sci_port;
|
2006-09-27 09:32:13 +02:00
|
|
|
#endif
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
#ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
|
2006-09-27 09:32:13 +02:00
|
|
|
static struct sci_port *serial_console_port;
|
|
|
|
#endif
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* Function prototypes */
|
2005-08-31 11:12:14 +02:00
|
|
|
static void sci_stop_tx(struct uart_port *port);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
#define SCI_NPORTS CONFIG_SERIAL_SH_SCI_NR_UARTS
|
2006-02-01 12:06:06 +01:00
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
static struct sci_port sci_ports[SCI_NPORTS];
|
|
|
|
static struct uart_driver sci_uart_driver;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) && \
|
|
|
|
defined(CONFIG_SH_STANDARD_BIOS) || defined(CONFIG_SH_KGDB)
|
|
|
|
static inline void handle_error(struct uart_port *port)
|
|
|
|
{
|
|
|
|
/* Clear error flags */
|
2005-04-17 00:20:36 +02:00
|
|
|
sci_out(port, SCxSR, SCxSR_ERROR_CLEAR(port));
|
|
|
|
}
|
|
|
|
|
|
|
|
static int get_char(struct uart_port *port)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
unsigned short status;
|
|
|
|
int c;
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
spin_lock_irqsave(&port->lock, flags);
|
|
|
|
do {
|
2005-04-17 00:20:36 +02:00
|
|
|
status = sci_in(port, SCxSR);
|
|
|
|
if (status & SCxSR_ERRORS(port)) {
|
|
|
|
handle_error(port);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
} while (!(status & SCxSR_RDxF(port)));
|
|
|
|
c = sci_in(port, SCxRDR);
|
|
|
|
sci_in(port, SCxSR); /* Dummy read */
|
|
|
|
sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
|
2006-09-27 09:32:13 +02:00
|
|
|
spin_unlock_irqrestore(&port->lock, flags);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_SH_STANDARD_BIOS || CONFIG_SH_KGDB */
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) || defined(CONFIG_SH_KGDB)
|
2005-04-17 00:20:36 +02:00
|
|
|
static void put_char(struct uart_port *port, char c)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
unsigned short status;
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
spin_lock_irqsave(&port->lock, flags);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
do {
|
|
|
|
status = sci_in(port, SCxSR);
|
|
|
|
} while (!(status & SCxSR_TDxE(port)));
|
|
|
|
|
|
|
|
sci_out(port, SCxTDR, c);
|
|
|
|
sci_in(port, SCxSR); /* Dummy read */
|
|
|
|
sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
spin_unlock_irqrestore(&port->lock, flags);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
2006-09-27 09:32:13 +02:00
|
|
|
#endif
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
#ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
|
2005-04-17 00:20:36 +02:00
|
|
|
static void put_string(struct sci_port *sci_port, const char *buffer, int count)
|
|
|
|
{
|
|
|
|
struct uart_port *port = &sci_port->port;
|
|
|
|
const unsigned char *p = buffer;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
#if defined(CONFIG_SH_STANDARD_BIOS) || defined(CONFIG_SH_KGDB)
|
|
|
|
int checksum;
|
|
|
|
int usegdb=0;
|
|
|
|
|
|
|
|
#ifdef CONFIG_SH_STANDARD_BIOS
|
2006-02-01 12:06:06 +01:00
|
|
|
/* This call only does a trap the first time it is
|
2005-04-17 00:20:36 +02:00
|
|
|
* called, and so is safe to do here unconditionally
|
|
|
|
*/
|
|
|
|
usegdb |= sh_bios_in_gdb_mode();
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SH_KGDB
|
2007-03-08 09:27:37 +01:00
|
|
|
usegdb |= (kgdb_in_gdb_mode && (sci_port == kgdb_sci_port));
|
2005-04-17 00:20:36 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
if (usegdb) {
|
|
|
|
/* $<packet info>#<checksum>. */
|
|
|
|
do {
|
|
|
|
unsigned char c;
|
|
|
|
put_char(port, '$');
|
|
|
|
put_char(port, 'O'); /* 'O'utput to console */
|
|
|
|
checksum = 'O';
|
|
|
|
|
|
|
|
for (i=0; i<count; i++) { /* Don't use run length encoding */
|
|
|
|
int h, l;
|
|
|
|
|
|
|
|
c = *p++;
|
|
|
|
h = highhex(c);
|
|
|
|
l = lowhex(c);
|
|
|
|
put_char(port, h);
|
|
|
|
put_char(port, l);
|
|
|
|
checksum += h + l;
|
|
|
|
}
|
|
|
|
put_char(port, '#');
|
|
|
|
put_char(port, highhex(checksum));
|
|
|
|
put_char(port, lowhex(checksum));
|
|
|
|
} while (get_char(port) != '+');
|
|
|
|
} else
|
|
|
|
#endif /* CONFIG_SH_STANDARD_BIOS || CONFIG_SH_KGDB */
|
|
|
|
for (i=0; i<count; i++) {
|
|
|
|
if (*p == 10)
|
|
|
|
put_char(port, '\r');
|
|
|
|
put_char(port, *p++);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
|
|
|
|
|
|
|
|
#ifdef CONFIG_SH_KGDB
|
|
|
|
static int kgdb_sci_getchar(void)
|
|
|
|
{
|
2006-09-27 09:32:13 +02:00
|
|
|
int c;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* Keep trying to read a character, this could be neater */
|
2007-03-08 09:27:37 +01:00
|
|
|
while ((c = get_char(&kgdb_sci_port->port)) < 0)
|
2006-09-27 09:32:13 +02:00
|
|
|
cpu_relax();
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
static inline void kgdb_sci_putchar(int c)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2007-03-08 09:27:37 +01:00
|
|
|
put_char(&kgdb_sci_port->port, c);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
#endif /* CONFIG_SH_KGDB */
|
|
|
|
|
|
|
|
#if defined(__H8300S__)
|
|
|
|
enum { sci_disable, sci_enable };
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
static void h8300_sci_config(struct uart_port* port, unsigned int ctrl)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
volatile unsigned char *mstpcrl=(volatile unsigned char *)MSTPCRL;
|
|
|
|
int ch = (port->mapbase - SMR0) >> 3;
|
|
|
|
unsigned char mask = 1 << (ch+1);
|
|
|
|
|
|
|
|
if (ctrl == sci_disable) {
|
|
|
|
*mstpcrl |= mask;
|
|
|
|
} else {
|
|
|
|
*mstpcrl &= ~mask;
|
|
|
|
}
|
|
|
|
}
|
2006-09-27 09:32:13 +02:00
|
|
|
|
|
|
|
static inline void h8300_sci_enable(struct uart_port *port)
|
|
|
|
{
|
|
|
|
h8300_sci_config(port, sci_enable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void h8300_sci_disable(struct uart_port *port)
|
|
|
|
{
|
|
|
|
h8300_sci_config(port, sci_disable);
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
#endif
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
#if defined(SCI_ONLY) || defined(SCI_AND_SCIF) && \
|
|
|
|
defined(__H8300H__) || defined(__H8300S__)
|
2005-04-17 00:20:36 +02:00
|
|
|
static void sci_init_pins_sci(struct uart_port* port, unsigned int cflag)
|
|
|
|
{
|
|
|
|
int ch = (port->mapbase - SMR0) >> 3;
|
|
|
|
|
|
|
|
/* set DDR regs */
|
2006-09-27 09:32:13 +02:00
|
|
|
H8300_GPIO_DDR(h8300_sci_pins[ch].port,
|
|
|
|
h8300_sci_pins[ch].rx,
|
|
|
|
H8300_GPIO_INPUT);
|
|
|
|
H8300_GPIO_DDR(h8300_sci_pins[ch].port,
|
|
|
|
h8300_sci_pins[ch].tx,
|
|
|
|
H8300_GPIO_OUTPUT);
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
/* tx mark output*/
|
|
|
|
H8300_SCI_DR(ch) |= h8300_sci_pins[ch].tx;
|
|
|
|
}
|
2006-09-27 09:32:13 +02:00
|
|
|
#else
|
|
|
|
#define sci_init_pins_sci NULL
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709)
|
|
|
|
static void sci_init_pins_irda(struct uart_port *port, unsigned int cflag)
|
|
|
|
{
|
|
|
|
unsigned int fcr_val = 0;
|
|
|
|
|
|
|
|
if (cflag & CRTSCTS)
|
|
|
|
fcr_val |= SCFCR_MCE;
|
|
|
|
|
|
|
|
sci_out(port, SCFCR, fcr_val);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
#define sci_init_pins_irda NULL
|
2005-04-17 00:20:36 +02:00
|
|
|
#endif
|
2006-09-27 09:32:13 +02:00
|
|
|
|
|
|
|
#ifdef SCI_ONLY
|
|
|
|
#define sci_init_pins_scif NULL
|
2005-04-17 00:20:36 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(SCIF_ONLY) || defined(SCI_AND_SCIF)
|
2007-03-27 11:13:51 +02:00
|
|
|
#if defined(CONFIG_CPU_SUBTYPE_SH7300)
|
2006-02-01 12:06:06 +01:00
|
|
|
/* SH7300 doesn't use RTS/CTS */
|
|
|
|
static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
|
|
|
|
{
|
|
|
|
sci_out(port, SCFCR, 0);
|
|
|
|
}
|
2007-03-27 11:13:51 +02:00
|
|
|
#elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)
|
|
|
|
static void sci_init_pins_scif(struct uart_port* port, unsigned int cflag)
|
|
|
|
{
|
|
|
|
unsigned int fcr_val = 0;
|
|
|
|
|
|
|
|
set_sh771x_scif_pfc(port);
|
|
|
|
if (cflag & CRTSCTS) {
|
|
|
|
fcr_val |= SCFCR_MCE;
|
|
|
|
}
|
|
|
|
sci_out(port, SCFCR, fcr_val);
|
|
|
|
}
|
2006-02-01 12:06:06 +01:00
|
|
|
#elif defined(CONFIG_CPU_SH3)
|
2006-09-27 09:32:13 +02:00
|
|
|
/* For SH7705, SH7706, SH7707, SH7709, SH7709A, SH7729 */
|
2005-04-17 00:20:36 +02:00
|
|
|
static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
|
|
|
|
{
|
|
|
|
unsigned int fcr_val = 0;
|
2006-02-01 12:06:06 +01:00
|
|
|
unsigned short data;
|
|
|
|
|
|
|
|
/* We need to set SCPCR to enable RTS/CTS */
|
|
|
|
data = ctrl_inw(SCPCR);
|
|
|
|
/* Clear out SCP7MD1,0, SCP6MD1,0, SCP4MD1,0*/
|
|
|
|
ctrl_outw(data & 0x0fcf, SCPCR);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (cflag & CRTSCTS)
|
|
|
|
fcr_val |= SCFCR_MCE;
|
|
|
|
else {
|
|
|
|
/* We need to set SCPCR to enable RTS/CTS */
|
|
|
|
data = ctrl_inw(SCPCR);
|
|
|
|
/* Clear out SCP7MD1,0, SCP4MD1,0,
|
|
|
|
Set SCP6MD1,0 = {01} (output) */
|
2006-02-01 12:06:06 +01:00
|
|
|
ctrl_outw((data & 0x0fcf) | 0x1000, SCPCR);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
data = ctrl_inb(SCPDR);
|
|
|
|
/* Set /RTS2 (bit6) = 0 */
|
2006-02-01 12:06:06 +01:00
|
|
|
ctrl_outb(data & 0xbf, SCPDR);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
2006-02-01 12:06:06 +01:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
sci_out(port, SCFCR, fcr_val);
|
|
|
|
}
|
2006-12-11 12:28:03 +01:00
|
|
|
#elif defined(CONFIG_CPU_SUBTYPE_SH7722)
|
|
|
|
static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
|
|
|
|
{
|
|
|
|
unsigned int fcr_val = 0;
|
|
|
|
|
|
|
|
if (cflag & CRTSCTS) {
|
|
|
|
fcr_val |= SCFCR_MCE;
|
|
|
|
|
|
|
|
ctrl_outw(0x0000, PORT_PSCR);
|
|
|
|
} else {
|
|
|
|
unsigned short data;
|
|
|
|
|
|
|
|
data = ctrl_inw(PORT_PSCR);
|
|
|
|
data &= 0x033f;
|
|
|
|
data |= 0x0400;
|
|
|
|
ctrl_outw(data, PORT_PSCR);
|
|
|
|
|
|
|
|
ctrl_outw(ctrl_inw(SCSPTR0) & 0x17, SCSPTR0);
|
|
|
|
}
|
|
|
|
|
|
|
|
sci_out(port, SCFCR, fcr_val);
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
#else
|
|
|
|
/* For SH7750 */
|
|
|
|
static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
|
|
|
|
{
|
|
|
|
unsigned int fcr_val = 0;
|
|
|
|
|
|
|
|
if (cflag & CRTSCTS) {
|
|
|
|
fcr_val |= SCFCR_MCE;
|
|
|
|
} else {
|
2006-09-27 09:32:13 +02:00
|
|
|
#ifdef CONFIG_CPU_SUBTYPE_SH7343
|
|
|
|
/* Nothing */
|
2007-06-20 11:27:10 +02:00
|
|
|
#elif defined(CONFIG_CPU_SUBTYPE_SH7780) || \
|
|
|
|
defined(CONFIG_CPU_SUBTYPE_SH7785) || \
|
|
|
|
defined(CONFIG_CPU_SUBTYPE_SHX3)
|
2006-02-01 12:06:06 +01:00
|
|
|
ctrl_outw(0x0080, SCSPTR0); /* Set RTS = 1 */
|
|
|
|
#else
|
2005-04-17 00:20:36 +02:00
|
|
|
ctrl_outw(0x0080, SCSPTR2); /* Set RTS = 1 */
|
2006-02-01 12:06:06 +01:00
|
|
|
#endif
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
sci_out(port, SCFCR, fcr_val);
|
|
|
|
}
|
2006-09-27 09:32:13 +02:00
|
|
|
#endif
|
|
|
|
|
2007-03-12 06:38:59 +01:00
|
|
|
#if defined(CONFIG_CPU_SUBTYPE_SH7760) || \
|
|
|
|
defined(CONFIG_CPU_SUBTYPE_SH7780) || \
|
|
|
|
defined(CONFIG_CPU_SUBTYPE_SH7785)
|
2006-09-27 09:32:13 +02:00
|
|
|
static inline int scif_txroom(struct uart_port *port)
|
|
|
|
{
|
|
|
|
return SCIF_TXROOM_MAX - (sci_in(port, SCTFDR) & 0x7f);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int scif_rxroom(struct uart_port *port)
|
|
|
|
{
|
|
|
|
return sci_in(port, SCRFDR) & 0x7f;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline int scif_txroom(struct uart_port *port)
|
|
|
|
{
|
|
|
|
return SCIF_TXROOM_MAX - (sci_in(port, SCFDR) >> 8);
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
static inline int scif_rxroom(struct uart_port *port)
|
|
|
|
{
|
|
|
|
return sci_in(port, SCFDR) & SCIF_RFDC_MASK;
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
#endif
|
|
|
|
#endif /* SCIF_ONLY || SCI_AND_SCIF */
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
static inline int sci_txroom(struct uart_port *port)
|
|
|
|
{
|
|
|
|
return ((sci_in(port, SCxSR) & SCI_TDRE) != 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int sci_rxroom(struct uart_port *port)
|
|
|
|
{
|
|
|
|
return ((sci_in(port, SCxSR) & SCxSR_RDxF(port)) != 0);
|
|
|
|
}
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
/* ********************************************************************** *
|
|
|
|
* the interrupt related routines *
|
|
|
|
* ********************************************************************** */
|
|
|
|
|
|
|
|
static void sci_transmit_chars(struct uart_port *port)
|
|
|
|
{
|
|
|
|
struct circ_buf *xmit = &port->info->xmit;
|
|
|
|
unsigned int stopped = uart_tx_stopped(port);
|
|
|
|
unsigned short status;
|
|
|
|
unsigned short ctrl;
|
2006-09-27 09:32:13 +02:00
|
|
|
int count;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
status = sci_in(port, SCxSR);
|
|
|
|
if (!(status & SCxSR_TDxE(port))) {
|
|
|
|
ctrl = sci_in(port, SCSCR);
|
|
|
|
if (uart_circ_empty(xmit)) {
|
|
|
|
ctrl &= ~SCI_CTRL_FLAGS_TIE;
|
|
|
|
} else {
|
|
|
|
ctrl |= SCI_CTRL_FLAGS_TIE;
|
|
|
|
}
|
|
|
|
sci_out(port, SCSCR, ctrl);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
#ifndef SCI_ONLY
|
|
|
|
if (port->type == PORT_SCIF)
|
|
|
|
count = scif_txroom(port);
|
|
|
|
else
|
2005-04-17 00:20:36 +02:00
|
|
|
#endif
|
2006-09-27 09:32:13 +02:00
|
|
|
count = sci_txroom(port);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
do {
|
|
|
|
unsigned char c;
|
|
|
|
|
|
|
|
if (port->x_char) {
|
|
|
|
c = port->x_char;
|
|
|
|
port->x_char = 0;
|
|
|
|
} else if (!uart_circ_empty(xmit) && !stopped) {
|
|
|
|
c = xmit->buf[xmit->tail];
|
|
|
|
xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
sci_out(port, SCxTDR, c);
|
|
|
|
|
|
|
|
port->icount.tx++;
|
|
|
|
} while (--count > 0);
|
|
|
|
|
|
|
|
sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
|
|
|
|
|
|
|
|
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
|
|
|
|
uart_write_wakeup(port);
|
|
|
|
if (uart_circ_empty(xmit)) {
|
2005-08-31 11:12:14 +02:00
|
|
|
sci_stop_tx(port);
|
2005-04-17 00:20:36 +02:00
|
|
|
} else {
|
|
|
|
ctrl = sci_in(port, SCSCR);
|
|
|
|
|
|
|
|
#if !defined(SCI_ONLY)
|
|
|
|
if (port->type == PORT_SCIF) {
|
|
|
|
sci_in(port, SCxSR); /* Dummy read */
|
|
|
|
sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
ctrl |= SCI_CTRL_FLAGS_TIE;
|
|
|
|
sci_out(port, SCSCR, ctrl);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* On SH3, SCIF may read end-of-break as a space->mark char */
|
|
|
|
#define STEPFN(c) ({int __c=(c); (((__c-1)|(__c)) == -1); })
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
static inline void sci_receive_chars(struct uart_port *port)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2006-09-27 09:32:13 +02:00
|
|
|
struct sci_port *sci_port = (struct sci_port *)port;
|
2005-04-17 00:20:36 +02:00
|
|
|
struct tty_struct *tty = port->info->tty;
|
|
|
|
int i, count, copied = 0;
|
|
|
|
unsigned short status;
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 05:54:13 +01:00
|
|
|
unsigned char flag;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
status = sci_in(port, SCxSR);
|
|
|
|
if (!(status & SCxSR_RDxF(port)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
#if !defined(SCI_ONLY)
|
2006-09-27 09:32:13 +02:00
|
|
|
if (port->type == PORT_SCIF)
|
|
|
|
count = scif_rxroom(port);
|
|
|
|
else
|
2005-04-17 00:20:36 +02:00
|
|
|
#endif
|
2006-09-27 09:32:13 +02:00
|
|
|
count = sci_rxroom(port);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* Don't copy more bytes than there is room for in the buffer */
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 05:54:13 +01:00
|
|
|
count = tty_buffer_request_room(tty, count);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* If for any reason we can't copy more data, we're done! */
|
|
|
|
if (count == 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (port->type == PORT_SCI) {
|
|
|
|
char c = sci_in(port, SCxRDR);
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
if (uart_handle_sysrq_char(port, c) || sci_port->break_flag)
|
2005-04-17 00:20:36 +02:00
|
|
|
count = 0;
|
2006-09-27 09:32:13 +02:00
|
|
|
else {
|
|
|
|
tty_insert_flip_char(tty, c, TTY_NORMAL);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (i=0; i<count; i++) {
|
|
|
|
char c = sci_in(port, SCxRDR);
|
|
|
|
status = sci_in(port, SCxSR);
|
|
|
|
#if defined(CONFIG_CPU_SH3)
|
|
|
|
/* Skip "chars" during break */
|
2006-09-27 09:32:13 +02:00
|
|
|
if (sci_port->break_flag) {
|
2005-04-17 00:20:36 +02:00
|
|
|
if ((c == 0) &&
|
|
|
|
(status & SCxSR_FER(port))) {
|
|
|
|
count--; i--;
|
|
|
|
continue;
|
|
|
|
}
|
2006-09-27 09:32:13 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
/* Nonzero => end-of-break */
|
|
|
|
pr_debug("scif: debounce<%02x>\n", c);
|
2006-09-27 09:32:13 +02:00
|
|
|
sci_port->break_flag = 0;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (STEPFN(c)) {
|
|
|
|
count--; i--;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_CPU_SH3 */
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
if (uart_handle_sysrq_char(port, c)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
count--; i--;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Store data and status */
|
|
|
|
if (status&SCxSR_FER(port)) {
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 05:54:13 +01:00
|
|
|
flag = TTY_FRAME;
|
2005-04-17 00:20:36 +02:00
|
|
|
pr_debug("sci: frame error\n");
|
|
|
|
} else if (status&SCxSR_PER(port)) {
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 05:54:13 +01:00
|
|
|
flag = TTY_PARITY;
|
2005-04-17 00:20:36 +02:00
|
|
|
pr_debug("sci: parity error\n");
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 05:54:13 +01:00
|
|
|
} else
|
|
|
|
flag = TTY_NORMAL;
|
|
|
|
tty_insert_flip_char(tty, c, flag);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sci_in(port, SCxSR); /* dummy read */
|
|
|
|
sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
|
|
|
|
|
|
|
|
copied += count;
|
|
|
|
port->icount.rx += count;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (copied) {
|
|
|
|
/* Tell the rest of the system the news. New characters! */
|
|
|
|
tty_flip_buffer_push(tty);
|
|
|
|
} else {
|
|
|
|
sci_in(port, SCxSR); /* dummy read */
|
|
|
|
sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#define SCI_BREAK_JIFFIES (HZ/20)
|
|
|
|
/* The sci generates interrupts during the break,
|
|
|
|
* 1 per millisecond or so during the break period, for 9600 baud.
|
|
|
|
* So dont bother disabling interrupts.
|
|
|
|
* But dont want more than 1 break event.
|
|
|
|
* Use a kernel timer to periodically poll the rx line until
|
|
|
|
* the break is finished.
|
|
|
|
*/
|
|
|
|
static void sci_schedule_break_timer(struct sci_port *port)
|
|
|
|
{
|
|
|
|
port->break_timer.expires = jiffies + SCI_BREAK_JIFFIES;
|
|
|
|
add_timer(&port->break_timer);
|
|
|
|
}
|
|
|
|
/* Ensure that two consecutive samples find the break over. */
|
|
|
|
static void sci_break_timer(unsigned long data)
|
|
|
|
{
|
2006-09-27 09:32:13 +02:00
|
|
|
struct sci_port *port = (struct sci_port *)data;
|
|
|
|
|
|
|
|
if (sci_rxd_in(&port->port) == 0) {
|
2005-04-17 00:20:36 +02:00
|
|
|
port->break_flag = 1;
|
2006-09-27 09:32:13 +02:00
|
|
|
sci_schedule_break_timer(port);
|
|
|
|
} else if (port->break_flag == 1) {
|
2005-04-17 00:20:36 +02:00
|
|
|
/* break is over. */
|
|
|
|
port->break_flag = 2;
|
2006-09-27 09:32:13 +02:00
|
|
|
sci_schedule_break_timer(port);
|
|
|
|
} else
|
|
|
|
port->break_flag = 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int sci_handle_errors(struct uart_port *port)
|
|
|
|
{
|
|
|
|
int copied = 0;
|
|
|
|
unsigned short status = sci_in(port, SCxSR);
|
|
|
|
struct tty_struct *tty = port->info->tty;
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
if (status & SCxSR_ORER(port)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
/* overrun error */
|
2006-09-27 09:32:13 +02:00
|
|
|
if (tty_insert_flip_char(tty, 0, TTY_OVERRUN))
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 05:54:13 +01:00
|
|
|
copied++;
|
2005-04-17 00:20:36 +02:00
|
|
|
pr_debug("sci: overrun error\n");
|
|
|
|
}
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
if (status & SCxSR_FER(port)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
if (sci_rxd_in(port) == 0) {
|
|
|
|
/* Notify of BREAK */
|
2006-09-27 09:32:13 +02:00
|
|
|
struct sci_port *sci_port = (struct sci_port *)port;
|
|
|
|
|
|
|
|
if (!sci_port->break_flag) {
|
|
|
|
sci_port->break_flag = 1;
|
|
|
|
sci_schedule_break_timer(sci_port);
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
/* Do sysrq handling. */
|
2006-09-27 09:32:13 +02:00
|
|
|
if (uart_handle_break(port))
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
|
|
|
pr_debug("sci: BREAK detected\n");
|
2006-09-27 09:32:13 +02:00
|
|
|
if (tty_insert_flip_char(tty, 0, TTY_BREAK))
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 05:54:13 +01:00
|
|
|
copied++;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
2006-09-27 09:32:13 +02:00
|
|
|
} else {
|
2005-04-17 00:20:36 +02:00
|
|
|
/* frame error */
|
2006-09-27 09:32:13 +02:00
|
|
|
if (tty_insert_flip_char(tty, 0, TTY_FRAME))
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 05:54:13 +01:00
|
|
|
copied++;
|
2005-04-17 00:20:36 +02:00
|
|
|
pr_debug("sci: frame error\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
if (status & SCxSR_PER(port)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
/* parity error */
|
2006-09-27 09:32:13 +02:00
|
|
|
if (tty_insert_flip_char(tty, 0, TTY_PARITY))
|
|
|
|
copied++;
|
2005-04-17 00:20:36 +02:00
|
|
|
pr_debug("sci: parity error\n");
|
|
|
|
}
|
|
|
|
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 05:54:13 +01:00
|
|
|
if (copied)
|
2005-04-17 00:20:36 +02:00
|
|
|
tty_flip_buffer_push(tty);
|
|
|
|
|
|
|
|
return copied;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int sci_handle_breaks(struct uart_port *port)
|
|
|
|
{
|
|
|
|
int copied = 0;
|
|
|
|
unsigned short status = sci_in(port, SCxSR);
|
|
|
|
struct tty_struct *tty = port->info->tty;
|
|
|
|
struct sci_port *s = &sci_ports[port->line];
|
|
|
|
|
2007-03-14 05:22:37 +01:00
|
|
|
if (uart_handle_break(port))
|
|
|
|
return 0;
|
|
|
|
|
2006-02-01 12:06:06 +01:00
|
|
|
if (!s->break_flag && status & SCxSR_BRK(port)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
#if defined(CONFIG_CPU_SH3)
|
|
|
|
/* Debounce break */
|
|
|
|
s->break_flag = 1;
|
|
|
|
#endif
|
|
|
|
/* Notify of BREAK */
|
2006-09-27 09:32:13 +02:00
|
|
|
if (tty_insert_flip_char(tty, 0, TTY_BREAK))
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 05:54:13 +01:00
|
|
|
copied++;
|
2005-04-17 00:20:36 +02:00
|
|
|
pr_debug("sci: BREAK detected\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
#if defined(SCIF_ORER)
|
|
|
|
/* XXX: Handle SCIF overrun error */
|
|
|
|
if (port->type == PORT_SCIF && (sci_in(port, SCLSR) & SCIF_ORER) != 0) {
|
|
|
|
sci_out(port, SCLSR, 0);
|
2006-09-27 09:32:13 +02:00
|
|
|
if (tty_insert_flip_char(tty, 0, TTY_OVERRUN)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
copied++;
|
|
|
|
pr_debug("sci: overrun error\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 05:54:13 +01:00
|
|
|
if (copied)
|
2005-04-17 00:20:36 +02:00
|
|
|
tty_flip_buffer_push(tty);
|
2006-09-27 09:32:13 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
return copied;
|
|
|
|
}
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
static irqreturn_t sci_rx_interrupt(int irq, void *port)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
/* I think sci_receive_chars has to be called irrespective
|
|
|
|
* of whether the I_IXOFF is set, otherwise, how is the interrupt
|
|
|
|
* to be disabled?
|
|
|
|
*/
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
sci_receive_chars(port);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
static irqreturn_t sci_tx_interrupt(int irq, void *ptr)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct uart_port *port = ptr;
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
spin_lock_irq(&port->lock);
|
2005-04-17 00:20:36 +02:00
|
|
|
sci_transmit_chars(port);
|
2006-09-27 09:32:13 +02:00
|
|
|
spin_unlock_irq(&port->lock);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
static irqreturn_t sci_er_interrupt(int irq, void *ptr)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct uart_port *port = ptr;
|
|
|
|
|
|
|
|
/* Handle errors */
|
|
|
|
if (port->type == PORT_SCI) {
|
|
|
|
if (sci_handle_errors(port)) {
|
|
|
|
/* discard character in rx buffer */
|
|
|
|
sci_in(port, SCxSR);
|
|
|
|
sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
#if defined(SCIF_ORER)
|
|
|
|
if((sci_in(port, SCLSR) & SCIF_ORER) != 0) {
|
|
|
|
struct tty_struct *tty = port->info->tty;
|
|
|
|
|
|
|
|
sci_out(port, SCLSR, 0);
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 05:54:13 +01:00
|
|
|
tty_insert_flip_char(tty, 0, TTY_OVERRUN);
|
|
|
|
tty_flip_buffer_push(tty);
|
|
|
|
pr_debug("scif: overrun error\n");
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
#endif
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
sci_rx_interrupt(irq, ptr);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
sci_out(port, SCxSR, SCxSR_ERROR_CLEAR(port));
|
|
|
|
|
|
|
|
/* Kick the transmission */
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
sci_tx_interrupt(irq, ptr);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
static irqreturn_t sci_br_interrupt(int irq, void *ptr)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct uart_port *port = ptr;
|
|
|
|
|
|
|
|
/* Handle BREAKs */
|
|
|
|
sci_handle_breaks(port);
|
|
|
|
sci_out(port, SCxSR, SCxSR_BREAK_CLEAR(port));
|
|
|
|
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
unsigned short ssr_status, scr_status;
|
|
|
|
struct uart_port *port = ptr;
|
|
|
|
|
|
|
|
ssr_status = sci_in(port,SCxSR);
|
|
|
|
scr_status = sci_in(port,SCSCR);
|
|
|
|
|
|
|
|
/* Tx Interrupt */
|
2006-09-27 09:32:13 +02:00
|
|
|
if ((ssr_status & 0x0020) && (scr_status & 0x0080))
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
sci_tx_interrupt(irq, ptr);
|
2005-04-17 00:20:36 +02:00
|
|
|
/* Rx Interrupt */
|
2006-09-27 09:32:13 +02:00
|
|
|
if ((ssr_status & 0x0002) && (scr_status & 0x0040))
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
sci_rx_interrupt(irq, ptr);
|
2005-04-17 00:20:36 +02:00
|
|
|
/* Error Interrupt */
|
2006-09-27 09:32:13 +02:00
|
|
|
if ((ssr_status & 0x0080) && (scr_status & 0x0400))
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
sci_er_interrupt(irq, ptr);
|
2005-04-17 00:20:36 +02:00
|
|
|
/* Break Interrupt */
|
2006-09-27 09:32:13 +02:00
|
|
|
if ((ssr_status & 0x0010) && (scr_status & 0x0200))
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
sci_br_interrupt(irq, ptr);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_CPU_FREQ
|
|
|
|
/*
|
|
|
|
* Here we define a transistion notifier so that we can update all of our
|
|
|
|
* ports' baud rate when the peripheral clock changes.
|
|
|
|
*/
|
2006-09-27 09:32:13 +02:00
|
|
|
static int sci_notifier(struct notifier_block *self,
|
|
|
|
unsigned long phase, void *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct cpufreq_freqs *freqs = p;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if ((phase == CPUFREQ_POSTCHANGE) ||
|
|
|
|
(phase == CPUFREQ_RESUMECHANGE)){
|
|
|
|
for (i = 0; i < SCI_NPORTS; i++) {
|
|
|
|
struct uart_port *port = &sci_ports[i].port;
|
2006-02-01 12:06:06 +01:00
|
|
|
struct clk *clk;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Update the uartclk per-port if frequency has
|
|
|
|
* changed, since it will no longer necessarily be
|
|
|
|
* consistent with the old frequency.
|
|
|
|
*
|
|
|
|
* Really we want to be able to do something like
|
|
|
|
* uart_change_speed() or something along those lines
|
|
|
|
* here to implicitly reset the per-port baud rate..
|
|
|
|
*
|
|
|
|
* Clean this up later..
|
|
|
|
*/
|
2006-12-01 05:15:14 +01:00
|
|
|
clk = clk_get(NULL, "module_clk");
|
2006-02-01 12:06:06 +01:00
|
|
|
port->uartclk = clk_get_rate(clk) * 16;
|
|
|
|
clk_put(clk);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
printk(KERN_INFO "%s: got a postchange notification "
|
|
|
|
"for cpu %d (old %d, new %d)\n",
|
|
|
|
__FUNCTION__, freqs->cpu, freqs->old, freqs->new);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return NOTIFY_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct notifier_block sci_nb = { &sci_notifier, NULL, 0 };
|
|
|
|
#endif /* CONFIG_CPU_FREQ */
|
|
|
|
|
|
|
|
static int sci_request_irq(struct sci_port *port)
|
|
|
|
{
|
|
|
|
int i;
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
irqreturn_t (*handlers[4])(int irq, void *ptr) = {
|
2005-04-17 00:20:36 +02:00
|
|
|
sci_er_interrupt, sci_rx_interrupt, sci_tx_interrupt,
|
|
|
|
sci_br_interrupt,
|
|
|
|
};
|
|
|
|
const char *desc[] = { "SCI Receive Error", "SCI Receive Data Full",
|
|
|
|
"SCI Transmit Data Empty", "SCI Break" };
|
|
|
|
|
|
|
|
if (port->irqs[0] == port->irqs[1]) {
|
|
|
|
if (!port->irqs[0]) {
|
|
|
|
printk(KERN_ERR "sci: Cannot allocate irq.(IRQ=0)\n");
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
2006-09-27 09:32:13 +02:00
|
|
|
|
|
|
|
if (request_irq(port->irqs[0], sci_mpxed_interrupt,
|
2006-10-06 08:31:16 +02:00
|
|
|
IRQF_DISABLED, "sci", port)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
printk(KERN_ERR "sci: Cannot allocate irq.\n");
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (i = 0; i < ARRAY_SIZE(handlers); i++) {
|
|
|
|
if (!port->irqs[i])
|
|
|
|
continue;
|
2006-09-27 09:32:13 +02:00
|
|
|
if (request_irq(port->irqs[i], handlers[i],
|
2006-10-06 08:31:16 +02:00
|
|
|
IRQF_DISABLED, desc[i], port)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
printk(KERN_ERR "sci: Cannot allocate irq.\n");
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sci_free_irq(struct sci_port *port)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (port->irqs[0] == port->irqs[1]) {
|
|
|
|
if (!port->irqs[0])
|
|
|
|
printk("sci: sci_free_irq error\n");
|
|
|
|
else
|
|
|
|
free_irq(port->irqs[0], port);
|
|
|
|
} else {
|
|
|
|
for (i = 0; i < ARRAY_SIZE(port->irqs); i++) {
|
|
|
|
if (!port->irqs[i])
|
|
|
|
continue;
|
|
|
|
|
|
|
|
free_irq(port->irqs[i], port);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned int sci_tx_empty(struct uart_port *port)
|
|
|
|
{
|
|
|
|
/* Can't detect */
|
|
|
|
return TIOCSER_TEMT;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sci_set_mctrl(struct uart_port *port, unsigned int mctrl)
|
|
|
|
{
|
|
|
|
/* This routine is used for seting signals of: DTR, DCD, CTS/RTS */
|
|
|
|
/* We use SCIF's hardware for CTS/RTS, so don't need any for that. */
|
|
|
|
/* If you have signals for DTR and DCD, please implement here. */
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned int sci_get_mctrl(struct uart_port *port)
|
|
|
|
{
|
|
|
|
/* This routine is used for geting signals of: DTR, DCD, DSR, RI,
|
|
|
|
and CTS/RTS */
|
|
|
|
|
|
|
|
return TIOCM_DTR | TIOCM_RTS | TIOCM_DSR;
|
|
|
|
}
|
|
|
|
|
2005-08-31 11:12:14 +02:00
|
|
|
static void sci_start_tx(struct uart_port *port)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2006-09-27 09:32:13 +02:00
|
|
|
unsigned short ctrl;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
/* Set TIE (Transmit Interrupt Enable) bit in SCSCR */
|
|
|
|
ctrl = sci_in(port, SCSCR);
|
|
|
|
ctrl |= SCI_CTRL_FLAGS_TIE;
|
|
|
|
sci_out(port, SCSCR, ctrl);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2005-08-31 11:12:14 +02:00
|
|
|
static void sci_stop_tx(struct uart_port *port)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
unsigned short ctrl;
|
|
|
|
|
|
|
|
/* Clear TIE (Transmit Interrupt Enable) bit in SCSCR */
|
|
|
|
ctrl = sci_in(port, SCSCR);
|
|
|
|
ctrl &= ~SCI_CTRL_FLAGS_TIE;
|
|
|
|
sci_out(port, SCSCR, ctrl);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sci_start_rx(struct uart_port *port, unsigned int tty_start)
|
|
|
|
{
|
|
|
|
unsigned short ctrl;
|
|
|
|
|
|
|
|
/* Set RIE (Receive Interrupt Enable) bit in SCSCR */
|
|
|
|
ctrl = sci_in(port, SCSCR);
|
|
|
|
ctrl |= SCI_CTRL_FLAGS_RIE | SCI_CTRL_FLAGS_REIE;
|
|
|
|
sci_out(port, SCSCR, ctrl);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sci_stop_rx(struct uart_port *port)
|
|
|
|
{
|
|
|
|
unsigned short ctrl;
|
|
|
|
|
|
|
|
/* Clear RIE (Receive Interrupt Enable) bit in SCSCR */
|
|
|
|
ctrl = sci_in(port, SCSCR);
|
|
|
|
ctrl &= ~(SCI_CTRL_FLAGS_RIE | SCI_CTRL_FLAGS_REIE);
|
|
|
|
sci_out(port, SCSCR, ctrl);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sci_enable_ms(struct uart_port *port)
|
|
|
|
{
|
|
|
|
/* Nothing here yet .. */
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sci_break_ctl(struct uart_port *port, int break_state)
|
|
|
|
{
|
|
|
|
/* Nothing here yet .. */
|
|
|
|
}
|
|
|
|
|
|
|
|
static int sci_startup(struct uart_port *port)
|
|
|
|
{
|
|
|
|
struct sci_port *s = &sci_ports[port->line];
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
if (s->enable)
|
|
|
|
s->enable(port);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-04-26 04:45:32 +02:00
|
|
|
#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
|
2007-04-24 06:41:12 +02:00
|
|
|
s->clk = clk_get(NULL, "module_clk");
|
2007-04-26 04:45:32 +02:00
|
|
|
#endif
|
2007-04-24 06:41:12 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
sci_request_irq(s);
|
2005-10-15 00:59:12 +02:00
|
|
|
sci_start_tx(port);
|
2005-04-17 00:20:36 +02:00
|
|
|
sci_start_rx(port, 1);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sci_shutdown(struct uart_port *port)
|
|
|
|
{
|
|
|
|
struct sci_port *s = &sci_ports[port->line];
|
|
|
|
|
|
|
|
sci_stop_rx(port);
|
2005-08-31 11:12:14 +02:00
|
|
|
sci_stop_tx(port);
|
2005-04-17 00:20:36 +02:00
|
|
|
sci_free_irq(s);
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
if (s->disable)
|
|
|
|
s->disable(port);
|
2007-04-24 06:41:12 +02:00
|
|
|
|
2007-04-26 04:45:32 +02:00
|
|
|
#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
|
2007-04-24 06:41:12 +02:00
|
|
|
clk_put(s->clk);
|
|
|
|
s->clk = NULL;
|
2007-04-26 04:45:32 +02:00
|
|
|
#endif
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2006-12-08 11:38:45 +01:00
|
|
|
static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
|
|
|
|
struct ktermios *old)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct sci_port *s = &sci_ports[port->line];
|
|
|
|
unsigned int status, baud, smr_val;
|
|
|
|
int t;
|
|
|
|
|
|
|
|
baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
switch (baud) {
|
|
|
|
case 0:
|
|
|
|
t = -1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
{
|
|
|
|
#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
|
2007-04-24 06:41:12 +02:00
|
|
|
t = SCBRR_VALUE(baud, clk_get_rate(s->clk));
|
2006-09-27 09:32:13 +02:00
|
|
|
#else
|
|
|
|
t = SCBRR_VALUE(baud);
|
|
|
|
#endif
|
|
|
|
break;
|
2007-03-08 09:27:37 +01:00
|
|
|
}
|
2006-09-27 09:32:13 +02:00
|
|
|
}
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
do {
|
|
|
|
status = sci_in(port, SCxSR);
|
|
|
|
} while (!(status & SCxSR_TEND(port)));
|
|
|
|
|
|
|
|
sci_out(port, SCSCR, 0x00); /* TE=0, RE=0, CKE1=0 */
|
|
|
|
|
|
|
|
#if !defined(SCI_ONLY)
|
2006-09-27 09:32:13 +02:00
|
|
|
if (port->type == PORT_SCIF)
|
2005-04-17 00:20:36 +02:00
|
|
|
sci_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
smr_val = sci_in(port, SCSMR) & 3;
|
|
|
|
if ((termios->c_cflag & CSIZE) == CS7)
|
|
|
|
smr_val |= 0x40;
|
|
|
|
if (termios->c_cflag & PARENB)
|
|
|
|
smr_val |= 0x20;
|
|
|
|
if (termios->c_cflag & PARODD)
|
|
|
|
smr_val |= 0x30;
|
|
|
|
if (termios->c_cflag & CSTOPB)
|
|
|
|
smr_val |= 0x08;
|
|
|
|
|
|
|
|
uart_update_timeout(port, termios->c_cflag, baud);
|
|
|
|
|
|
|
|
sci_out(port, SCSMR, smr_val);
|
|
|
|
|
|
|
|
if (t > 0) {
|
|
|
|
if(t >= 256) {
|
|
|
|
sci_out(port, SCSMR, (sci_in(port, SCSMR) & ~3) | 1);
|
|
|
|
t >>= 2;
|
|
|
|
} else {
|
|
|
|
sci_out(port, SCSMR, sci_in(port, SCSMR) & ~3);
|
|
|
|
}
|
|
|
|
sci_out(port, SCBRR, t);
|
|
|
|
udelay((1000000+(baud-1)) / baud); /* Wait one bit interval */
|
|
|
|
}
|
|
|
|
|
2006-02-01 12:06:06 +01:00
|
|
|
if (likely(s->init_pins))
|
|
|
|
s->init_pins(port, termios->c_cflag);
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
sci_out(port, SCSCR, SCSCR_INIT(port));
|
|
|
|
|
|
|
|
if ((termios->c_cflag & CREAD) != 0)
|
|
|
|
sci_start_rx(port,0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *sci_type(struct uart_port *port)
|
|
|
|
{
|
|
|
|
switch (port->type) {
|
|
|
|
case PORT_SCI: return "sci";
|
|
|
|
case PORT_SCIF: return "scif";
|
|
|
|
case PORT_IRDA: return "irda";
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sci_release_port(struct uart_port *port)
|
|
|
|
{
|
|
|
|
/* Nothing here yet .. */
|
|
|
|
}
|
|
|
|
|
|
|
|
static int sci_request_port(struct uart_port *port)
|
|
|
|
{
|
|
|
|
/* Nothing here yet .. */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sci_config_port(struct uart_port *port, int flags)
|
|
|
|
{
|
|
|
|
struct sci_port *s = &sci_ports[port->line];
|
|
|
|
|
|
|
|
port->type = s->type;
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
switch (port->type) {
|
|
|
|
case PORT_SCI:
|
|
|
|
s->init_pins = sci_init_pins_sci;
|
|
|
|
break;
|
|
|
|
case PORT_SCIF:
|
|
|
|
s->init_pins = sci_init_pins_scif;
|
|
|
|
break;
|
|
|
|
case PORT_IRDA:
|
|
|
|
s->init_pins = sci_init_pins_irda;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
#if defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103)
|
|
|
|
if (port->mapbase == 0)
|
|
|
|
port->mapbase = onchip_remap(SCIF_ADDR_SH5, 1024, "SCIF");
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
port->membase = (void __iomem *)port->mapbase;
|
2005-04-17 00:20:36 +02:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static int sci_verify_port(struct uart_port *port, struct serial_struct *ser)
|
|
|
|
{
|
|
|
|
struct sci_port *s = &sci_ports[port->line];
|
|
|
|
|
|
|
|
if (ser->irq != s->irqs[SCIx_TXI_IRQ] || ser->irq > NR_IRQS)
|
|
|
|
return -EINVAL;
|
|
|
|
if (ser->baud_base < 2400)
|
|
|
|
/* No paper tape reader for Mitch.. */
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct uart_ops sci_uart_ops = {
|
|
|
|
.tx_empty = sci_tx_empty,
|
|
|
|
.set_mctrl = sci_set_mctrl,
|
|
|
|
.get_mctrl = sci_get_mctrl,
|
|
|
|
.start_tx = sci_start_tx,
|
|
|
|
.stop_tx = sci_stop_tx,
|
|
|
|
.stop_rx = sci_stop_rx,
|
|
|
|
.enable_ms = sci_enable_ms,
|
|
|
|
.break_ctl = sci_break_ctl,
|
|
|
|
.startup = sci_startup,
|
|
|
|
.shutdown = sci_shutdown,
|
|
|
|
.set_termios = sci_set_termios,
|
|
|
|
.type = sci_type,
|
|
|
|
.release_port = sci_release_port,
|
|
|
|
.request_port = sci_request_port,
|
|
|
|
.config_port = sci_config_port,
|
|
|
|
.verify_port = sci_verify_port,
|
|
|
|
};
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
static void __init sci_init_ports(void)
|
|
|
|
{
|
|
|
|
static int first = 1;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!first)
|
|
|
|
return;
|
|
|
|
|
|
|
|
first = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < SCI_NPORTS; i++) {
|
|
|
|
sci_ports[i].port.ops = &sci_uart_ops;
|
|
|
|
sci_ports[i].port.iotype = UPIO_MEM;
|
|
|
|
sci_ports[i].port.line = i;
|
|
|
|
sci_ports[i].port.fifosize = 1;
|
|
|
|
|
|
|
|
#if defined(__H8300H__) || defined(__H8300S__)
|
|
|
|
#ifdef __H8300S__
|
|
|
|
sci_ports[i].enable = h8300_sci_enable;
|
|
|
|
sci_ports[i].disable = h8300_sci_disable;
|
|
|
|
#endif
|
|
|
|
sci_ports[i].port.uartclk = CONFIG_CPU_CLOCK;
|
|
|
|
#elif defined(CONFIG_SUPERH64)
|
|
|
|
sci_ports[i].port.uartclk = current_cpu_data.module_clock * 16;
|
2005-04-17 00:20:36 +02:00
|
|
|
#else
|
2006-09-27 09:32:13 +02:00
|
|
|
/*
|
|
|
|
* XXX: We should use a proper SCI/SCIF clock
|
|
|
|
*/
|
|
|
|
{
|
2006-12-01 05:15:14 +01:00
|
|
|
struct clk *clk = clk_get(NULL, "module_clk");
|
2006-09-27 09:32:13 +02:00
|
|
|
sci_ports[i].port.uartclk = clk_get_rate(clk) * 16;
|
|
|
|
clk_put(clk);
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
#endif
|
2006-09-27 09:32:13 +02:00
|
|
|
|
|
|
|
sci_ports[i].break_timer.data = (unsigned long)&sci_ports[i];
|
|
|
|
sci_ports[i].break_timer.function = sci_break_timer;
|
|
|
|
|
|
|
|
init_timer(&sci_ports[i].break_timer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int __init early_sci_setup(struct uart_port *port)
|
|
|
|
{
|
|
|
|
if (unlikely(port->line > SCI_NPORTS))
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
sci_init_ports();
|
|
|
|
|
|
|
|
sci_ports[port->line].port.membase = port->membase;
|
|
|
|
sci_ports[port->line].port.mapbase = port->mapbase;
|
|
|
|
sci_ports[port->line].port.type = port->type;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
#ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
|
|
|
|
/*
|
|
|
|
* Print a string to the serial port trying not to disturb
|
|
|
|
* any possible real use of the port...
|
|
|
|
*/
|
|
|
|
static void serial_console_write(struct console *co, const char *s,
|
|
|
|
unsigned count)
|
|
|
|
{
|
|
|
|
put_string(serial_console_port, s, count);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __init serial_console_setup(struct console *co, char *options)
|
|
|
|
{
|
|
|
|
struct uart_port *port;
|
|
|
|
int baud = 115200;
|
|
|
|
int bits = 8;
|
|
|
|
int parity = 'n';
|
|
|
|
int flow = 'n';
|
|
|
|
int ret;
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
/*
|
|
|
|
* 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 >= SCI_NPORTS)
|
|
|
|
co->index = 0;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
serial_console_port = &sci_ports[co->index];
|
|
|
|
port = &serial_console_port->port;
|
|
|
|
|
|
|
|
/*
|
2006-09-27 09:32:13 +02:00
|
|
|
* Also need to check port->type, we don't actually have any
|
|
|
|
* UPIO_PORT ports, but uart_report_port() handily misreports
|
|
|
|
* it anyways if we don't have a port available by the time this is
|
|
|
|
* called.
|
2005-04-17 00:20:36 +02:00
|
|
|
*/
|
2006-09-27 09:32:13 +02:00
|
|
|
if (!port->type)
|
|
|
|
return -ENODEV;
|
|
|
|
if (!port->membase || !port->mapbase)
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
port->type = serial_console_port->type;
|
|
|
|
|
2007-04-26 04:45:32 +02:00
|
|
|
#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
|
|
|
|
if (!serial_console_port->clk)
|
|
|
|
serial_console_port->clk = clk_get(NULL, "module_clk");
|
|
|
|
#endif
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
if (port->flags & UPF_IOREMAP)
|
|
|
|
sci_config_port(port, 0);
|
|
|
|
|
|
|
|
if (serial_console_port->enable)
|
|
|
|
serial_console_port->enable(port);
|
2006-02-01 12:06:06 +01:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (options)
|
|
|
|
uart_parse_options(options, &baud, &parity, &bits, &flow);
|
|
|
|
|
|
|
|
ret = uart_set_options(port, co, baud, parity, bits, flow);
|
|
|
|
#if defined(__H8300H__) || defined(__H8300S__)
|
|
|
|
/* disable rx interrupt */
|
|
|
|
if (ret == 0)
|
|
|
|
sci_stop_rx(port);
|
|
|
|
#endif
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct console serial_console = {
|
|
|
|
.name = "ttySC",
|
|
|
|
.device = uart_console_device,
|
|
|
|
.write = serial_console_write,
|
|
|
|
.setup = serial_console_setup,
|
2007-03-08 09:27:37 +01:00
|
|
|
.flags = CON_PRINTBUFFER,
|
2005-04-17 00:20:36 +02:00
|
|
|
.index = -1,
|
|
|
|
.data = &sci_uart_driver,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init sci_console_init(void)
|
|
|
|
{
|
2006-09-27 09:32:13 +02:00
|
|
|
sci_init_ports();
|
2005-04-17 00:20:36 +02:00
|
|
|
register_console(&serial_console);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
console_initcall(sci_console_init);
|
|
|
|
#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
|
|
|
|
|
|
|
|
#ifdef CONFIG_SH_KGDB
|
|
|
|
/*
|
|
|
|
* FIXME: Most of this can go away.. at the moment, we rely on
|
|
|
|
* arch/sh/kernel/setup.c to do the command line parsing for kgdb, though
|
|
|
|
* most of that can easily be done here instead.
|
|
|
|
*
|
|
|
|
* For the time being, just accept the values that were parsed earlier..
|
|
|
|
*/
|
|
|
|
static void __init kgdb_console_get_options(struct uart_port *port, int *baud,
|
|
|
|
int *parity, int *bits)
|
|
|
|
{
|
|
|
|
*baud = kgdb_baud;
|
|
|
|
*parity = tolower(kgdb_parity);
|
|
|
|
*bits = kgdb_bits - '0';
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The naming here is somewhat misleading, since kgdb_console_setup() takes
|
|
|
|
* care of the early-on initialization for kgdb, regardless of whether we
|
|
|
|
* actually use kgdb as a console or not.
|
|
|
|
*
|
|
|
|
* On the plus side, this lets us kill off the old kgdb_sci_setup() nonsense.
|
|
|
|
*/
|
|
|
|
int __init kgdb_console_setup(struct console *co, char *options)
|
|
|
|
{
|
|
|
|
struct uart_port *port = &sci_ports[kgdb_portnum].port;
|
|
|
|
int baud = 38400;
|
|
|
|
int bits = 8;
|
|
|
|
int parity = 'n';
|
|
|
|
int flow = 'n';
|
|
|
|
|
2006-02-01 12:06:06 +01:00
|
|
|
if (co->index != kgdb_portnum)
|
2005-04-17 00:20:36 +02:00
|
|
|
co->index = kgdb_portnum;
|
|
|
|
|
2007-03-08 09:27:37 +01:00
|
|
|
kgdb_sci_port = &sci_ports[co->index];
|
|
|
|
port = &kgdb_sci_port->port;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Also need to check port->type, we don't actually have any
|
|
|
|
* UPIO_PORT ports, but uart_report_port() handily misreports
|
|
|
|
* it anyways if we don't have a port available by the time this is
|
|
|
|
* called.
|
|
|
|
*/
|
|
|
|
if (!port->type)
|
|
|
|
return -ENODEV;
|
|
|
|
if (!port->membase || !port->mapbase)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (options)
|
|
|
|
uart_parse_options(options, &baud, &parity, &bits, &flow);
|
|
|
|
else
|
|
|
|
kgdb_console_get_options(port, &baud, &parity, &bits);
|
|
|
|
|
|
|
|
kgdb_getchar = kgdb_sci_getchar;
|
|
|
|
kgdb_putchar = kgdb_sci_putchar;
|
|
|
|
|
|
|
|
return uart_set_options(port, co, baud, parity, bits, flow);
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_SH_KGDB */
|
|
|
|
|
|
|
|
#ifdef CONFIG_SH_KGDB_CONSOLE
|
|
|
|
static struct console kgdb_console = {
|
2007-03-08 09:27:37 +01:00
|
|
|
.name = "ttySC",
|
|
|
|
.device = uart_console_device,
|
|
|
|
.write = kgdb_console_write,
|
|
|
|
.setup = kgdb_console_setup,
|
|
|
|
.flags = CON_PRINTBUFFER,
|
|
|
|
.index = -1,
|
2005-04-17 00:20:36 +02:00
|
|
|
.data = &sci_uart_driver,
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Register the KGDB console so we get messages (d'oh!) */
|
|
|
|
static int __init kgdb_console_init(void)
|
|
|
|
{
|
2006-09-27 09:32:13 +02:00
|
|
|
sci_init_ports();
|
2005-04-17 00:20:36 +02:00
|
|
|
register_console(&kgdb_console);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
console_initcall(kgdb_console_init);
|
|
|
|
#endif /* CONFIG_SH_KGDB_CONSOLE */
|
|
|
|
|
|
|
|
#if defined(CONFIG_SH_KGDB_CONSOLE)
|
|
|
|
#define SCI_CONSOLE &kgdb_console
|
|
|
|
#elif defined(CONFIG_SERIAL_SH_SCI_CONSOLE)
|
|
|
|
#define SCI_CONSOLE &serial_console
|
|
|
|
#else
|
2006-02-01 12:06:06 +01:00
|
|
|
#define SCI_CONSOLE 0
|
2005-04-17 00:20:36 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
static char banner[] __initdata =
|
|
|
|
KERN_INFO "SuperH SCI(F) driver initialized\n";
|
|
|
|
|
|
|
|
static struct uart_driver sci_uart_driver = {
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.driver_name = "sci",
|
|
|
|
.dev_name = "ttySC",
|
|
|
|
.major = SCI_MAJOR,
|
|
|
|
.minor = SCI_MINOR_START,
|
2006-09-27 09:32:13 +02:00
|
|
|
.nr = SCI_NPORTS,
|
2005-04-17 00:20:36 +02:00
|
|
|
.cons = SCI_CONSOLE,
|
|
|
|
};
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
/*
|
|
|
|
* Register a set of serial devices attached to a platform device. The
|
|
|
|
* list is terminated with a zero flags entry, which means we expect
|
|
|
|
* all entries to have at least UPF_BOOT_AUTOCONF set. Platforms that need
|
|
|
|
* remapping (such as sh64) should also set UPF_IOREMAP.
|
|
|
|
*/
|
|
|
|
static int __devinit sci_probe(struct platform_device *dev)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2006-09-27 09:32:13 +02:00
|
|
|
struct plat_sci_port *p = dev->dev.platform_data;
|
|
|
|
int i;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-03-12 06:38:59 +01:00
|
|
|
for (i = 0; p && p->flags != 0; p++, i++) {
|
2006-09-27 09:32:13 +02:00
|
|
|
struct sci_port *sciport = &sci_ports[i];
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-03-12 06:38:59 +01:00
|
|
|
/* Sanity check */
|
|
|
|
if (unlikely(i == SCI_NPORTS)) {
|
|
|
|
dev_notice(&dev->dev, "Attempting to register port "
|
|
|
|
"%d when only %d are available.\n",
|
|
|
|
i+1, SCI_NPORTS);
|
|
|
|
dev_notice(&dev->dev, "Consider bumping "
|
|
|
|
"CONFIG_SERIAL_SH_SCI_NR_UARTS!\n");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
sciport->port.mapbase = p->mapbase;
|
2006-02-01 12:06:06 +01:00
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
/*
|
|
|
|
* For the simple (and majority of) cases where we don't need
|
|
|
|
* to do any remapping, just cast the cookie directly.
|
|
|
|
*/
|
|
|
|
if (p->mapbase && !p->membase && !(p->flags & UPF_IOREMAP))
|
|
|
|
p->membase = (void __iomem *)p->mapbase;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
sciport->port.membase = p->membase;
|
|
|
|
|
|
|
|
sciport->port.irq = p->irqs[SCIx_TXI_IRQ];
|
|
|
|
sciport->port.flags = p->flags;
|
|
|
|
sciport->port.dev = &dev->dev;
|
|
|
|
|
|
|
|
sciport->type = sciport->port.type = p->type;
|
|
|
|
|
|
|
|
memcpy(&sciport->irqs, &p->irqs, sizeof(p->irqs));
|
|
|
|
|
|
|
|
uart_add_one_port(&sci_uart_driver, &sciport->port);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2007-03-08 09:27:37 +01:00
|
|
|
#if defined(CONFIG_SH_KGDB) && !defined(CONFIG_SH_KGDB_CONSOLE)
|
|
|
|
kgdb_sci_port = &sci_ports[kgdb_portnum];
|
|
|
|
kgdb_getchar = kgdb_sci_getchar;
|
|
|
|
kgdb_putchar = kgdb_sci_putchar;
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
#ifdef CONFIG_CPU_FREQ
|
|
|
|
cpufreq_register_notifier(&sci_nb, CPUFREQ_TRANSITION_NOTIFIER);
|
2006-09-27 09:32:13 +02:00
|
|
|
dev_info(&dev->dev, "sci: CPU frequency notifier registered\n");
|
2005-04-17 00:20:36 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_SH_STANDARD_BIOS
|
|
|
|
sh_bios_gdb_detach();
|
|
|
|
#endif
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
return 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
static int __devexit sci_remove(struct platform_device *dev)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < SCI_NPORTS; i++)
|
|
|
|
uart_remove_one_port(&sci_uart_driver, &sci_ports[i].port);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int sci_suspend(struct platform_device *dev, pm_message_t state)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2006-09-27 09:32:13 +02:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < SCI_NPORTS; i++) {
|
|
|
|
struct sci_port *p = &sci_ports[i];
|
|
|
|
|
|
|
|
if (p->type != PORT_UNKNOWN && p->port.dev == &dev->dev)
|
|
|
|
uart_suspend_port(&sci_uart_driver, &p->port);
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
static int sci_resume(struct platform_device *dev)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < SCI_NPORTS; i++) {
|
|
|
|
struct sci_port *p = &sci_ports[i];
|
|
|
|
|
|
|
|
if (p->type != PORT_UNKNOWN && p->port.dev == &dev->dev)
|
|
|
|
uart_resume_port(&sci_uart_driver, &p->port);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct platform_driver sci_driver = {
|
|
|
|
.probe = sci_probe,
|
|
|
|
.remove = __devexit_p(sci_remove),
|
|
|
|
.suspend = sci_suspend,
|
|
|
|
.resume = sci_resume,
|
|
|
|
.driver = {
|
|
|
|
.name = "sh-sci",
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init sci_init(void)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
printk(banner);
|
|
|
|
|
|
|
|
sci_init_ports();
|
|
|
|
|
|
|
|
ret = uart_register_driver(&sci_uart_driver);
|
|
|
|
if (likely(ret == 0)) {
|
|
|
|
ret = platform_driver_register(&sci_driver);
|
|
|
|
if (unlikely(ret))
|
|
|
|
uart_unregister_driver(&sci_uart_driver);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit sci_exit(void)
|
|
|
|
{
|
|
|
|
platform_driver_unregister(&sci_driver);
|
2005-04-17 00:20:36 +02:00
|
|
|
uart_unregister_driver(&sci_uart_driver);
|
|
|
|
}
|
|
|
|
|
|
|
|
module_init(sci_init);
|
|
|
|
module_exit(sci_exit);
|
|
|
|
|
2006-09-27 09:32:13 +02:00
|
|
|
MODULE_LICENSE("GPL");
|