Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf4282cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  serial: add support for various Titan PCI cards
  vt_ioctl: return -EFAULT on copy_from_user errors
  serial: altera_uart: Proper section for altera_uart_remove
  tty: fix a little bug in scrup, vt.c
  altera_uart: Simplify altera_uart_console_putc
  altera_uart: Don't take spinlock in already protected functions
  TTY/n_gsm: potential double lock
  serial: bfin_5xx: fix typo in IER check
  serial: bfin_5xx: IRDA is not affected by anomaly 05000230
  serial_cs: add and sort IDs for serial and modem cards
  msm_serial: fix serial on trout
parents d7940b04 66169ad1

drivers/char/n_gsm.c

+5 −4
Original line number Diff line number Diff line
@@ -904,9 +904,7 @@ static void gsm_dlci_data_sweep(struct gsm_mux *gsm) 
	int len;

	/* Priority ordering: We should do priority with RR of the groups */

	int i = 1;

	unsigned long flags;



	spin_lock_irqsave(&gsm->tx_lock, flags);

	while (i < NUM_DLCI) {

		struct gsm_dlci *dlci;
@@ -927,7 +925,6 @@ static void gsm_dlci_data_sweep(struct gsm_mux *gsm) 
		if (len == 0)

			i++;

	}

	spin_unlock_irqrestore(&gsm->tx_lock, flags);

}



/**
@@ -2230,12 +2227,16 @@ static int gsmld_open(struct tty_struct *tty) 
static void gsmld_write_wakeup(struct tty_struct *tty)

{

	struct gsm_mux *gsm = tty->disc_data;

	unsigned long flags;



	/* Queue poll */

	clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);

	gsm_data_kick(gsm);

	if (gsm->tx_bytes < TX_THRESH_LO)

	if (gsm->tx_bytes < TX_THRESH_LO) {

		spin_lock_irqsave(&gsm->tx_lock, flags);

		gsm_dlci_data_sweep(gsm);

		spin_unlock_irqrestore(&gsm->tx_lock, flags);

	}

}



/**

drivers/char/vt.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static void scrup(struct vc_data *vc, unsigned int t, unsigned int b, int nr) 
	d = (unsigned short *)(vc->vc_origin + vc->vc_size_row * t);

	s = (unsigned short *)(vc->vc_origin + vc->vc_size_row * (t + nr));

	scr_memmovew(d, s, (b - t - nr) * vc->vc_size_row);

	scr_memsetw(d + (b - t - nr) * vc->vc_cols, vc->vc_video_erase_char,

	scr_memsetw(d + (b - t - nr) * vc->vc_size_row, vc->vc_video_erase_char,

		    vc->vc_size_row * nr);

}

drivers/char/vt_ioctl.c

+3 −1
Original line number Diff line number Diff line
@@ -1303,7 +1303,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, 
		if (!perm)

			goto eperm;

		ret = copy_from_user(&ui, up, sizeof(struct unimapinit));

		if (!ret)

		if (ret)

			ret = -EFAULT;

		else

			con_clear_unimap(vc, &ui);

		break;

	      }

drivers/serial/8250_pci.c

+71 −0
Original line number Diff line number Diff line
@@ -982,6 +982,18 @@ static int skip_tx_en_setup(struct serial_private *priv, 
#define PCI_SUBDEVICE_ID_POCTAL422	0x0408

#define PCI_VENDOR_ID_ADVANTECH		0x13fe

#define PCI_DEVICE_ID_ADVANTECH_PCI3620	0x3620

#define PCI_DEVICE_ID_TITAN_200I	0x8028

#define PCI_DEVICE_ID_TITAN_400I	0x8048

#define PCI_DEVICE_ID_TITAN_800I	0x8088

#define PCI_DEVICE_ID_TITAN_800EH	0xA007

#define PCI_DEVICE_ID_TITAN_800EHB	0xA008

#define PCI_DEVICE_ID_TITAN_400EH	0xA009

#define PCI_DEVICE_ID_TITAN_100E	0xA010

#define PCI_DEVICE_ID_TITAN_200E	0xA012

#define PCI_DEVICE_ID_TITAN_400E	0xA013

#define PCI_DEVICE_ID_TITAN_800E	0xA014

#define PCI_DEVICE_ID_TITAN_200EI	0xA016

#define PCI_DEVICE_ID_TITAN_200EISI	0xA017



/* Unknown vendors/cards - this should not be in linux/pci_ids.h */

#define PCI_SUBDEVICE_ID_UNKNOWN_0x1584	0x1584
@@ -1541,6 +1553,10 @@ enum pci_board_num_t { 
	pbn_b3_4_115200,

	pbn_b3_8_115200,



	pbn_b4_bt_2_921600,

	pbn_b4_bt_4_921600,

	pbn_b4_bt_8_921600,



	/*

	 * Board-specific versions.

	 */
@@ -1995,6 +2011,25 @@ static struct pciserial_board pci_boards[] __devinitdata = { 
		.uart_offset	= 8,

	},



	[pbn_b4_bt_2_921600] = {

		.flags		= FL_BASE4,

		.num_ports	= 2,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[pbn_b4_bt_4_921600] = {

		.flags		= FL_BASE4,

		.num_ports	= 4,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[pbn_b4_bt_8_921600] = {

		.flags		= FL_BASE4,

		.num_ports	= 8,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},



	/*

	 * Entries following this are board-specific.

	 */
@@ -3043,6 +3078,42 @@ static struct pci_device_id serial_pci_tbl[] = { 
	{	PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800L,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_b0_bt_8_921600 },

	{	PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200I,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_b4_bt_2_921600 },

	{	PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400I,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_b4_bt_4_921600 },

	{	PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800I,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_b4_bt_8_921600 },

	{	PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400EH,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_b0_4_921600 },

	{	PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800EH,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_b0_4_921600 },

	{	PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800EHB,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_b0_4_921600 },

	{	PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_100E,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_oxsemi_1_4000000 },

	{	PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200E,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_oxsemi_2_4000000 },

	{	PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400E,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_oxsemi_4_4000000 },

	{	PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800E,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_oxsemi_8_4000000 },

	{	PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200EI,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_oxsemi_2_4000000 },

	{	PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200EISI,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_oxsemi_2_4000000 },



	{	PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_10x_550,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

drivers/serial/altera_uart.c

+13 −31
Original line number Diff line number Diff line
@@ -89,15 +89,12 @@ static unsigned int altera_uart_tx_empty(struct uart_port *port) 
static unsigned int altera_uart_get_mctrl(struct uart_port *port)

{

	struct altera_uart *pp = container_of(port, struct altera_uart, port);

	unsigned long flags;

	unsigned int sigs;



	spin_lock_irqsave(&port->lock, flags);

	sigs =

	    (readl(port->membase + ALTERA_UART_STATUS_REG) &

	     ALTERA_UART_STATUS_CTS_MSK) ? TIOCM_CTS : 0;

	sigs |= (pp->sigs & TIOCM_RTS);

	spin_unlock_irqrestore(&port->lock, flags);



	return sigs;

}
@@ -105,49 +102,37 @@ static unsigned int altera_uart_get_mctrl(struct uart_port *port) 
static void altera_uart_set_mctrl(struct uart_port *port, unsigned int sigs)

{

	struct altera_uart *pp = container_of(port, struct altera_uart, port);

	unsigned long flags;



	spin_lock_irqsave(&port->lock, flags);

	pp->sigs = sigs;

	if (sigs & TIOCM_RTS)

		pp->imr |= ALTERA_UART_CONTROL_RTS_MSK;

	else

		pp->imr &= ~ALTERA_UART_CONTROL_RTS_MSK;

	writel(pp->imr, port->membase + ALTERA_UART_CONTROL_REG);

	spin_unlock_irqrestore(&port->lock, flags);

}



static void altera_uart_start_tx(struct uart_port *port)

{

	struct altera_uart *pp = container_of(port, struct altera_uart, port);

	unsigned long flags;



	spin_lock_irqsave(&port->lock, flags);

	pp->imr |= ALTERA_UART_CONTROL_TRDY_MSK;

	writel(pp->imr, port->membase + ALTERA_UART_CONTROL_REG);

	spin_unlock_irqrestore(&port->lock, flags);

}



static void altera_uart_stop_tx(struct uart_port *port)

{

	struct altera_uart *pp = container_of(port, struct altera_uart, port);

	unsigned long flags;



	spin_lock_irqsave(&port->lock, flags);

	pp->imr &= ~ALTERA_UART_CONTROL_TRDY_MSK;

	writel(pp->imr, port->membase + ALTERA_UART_CONTROL_REG);

	spin_unlock_irqrestore(&port->lock, flags);

}



static void altera_uart_stop_rx(struct uart_port *port)

{

	struct altera_uart *pp = container_of(port, struct altera_uart, port);

	unsigned long flags;



	spin_lock_irqsave(&port->lock, flags);

	pp->imr &= ~ALTERA_UART_CONTROL_RRDY_MSK;

	writel(pp->imr, port->membase + ALTERA_UART_CONTROL_REG);

	spin_unlock_irqrestore(&port->lock, flags);

}



static void altera_uart_break_ctl(struct uart_port *port, int break_state)
@@ -272,10 +257,14 @@ static irqreturn_t altera_uart_interrupt(int irq, void *data) 
	unsigned int isr;



	isr = readl(port->membase + ALTERA_UART_STATUS_REG) & pp->imr;



	spin_lock(&port->lock);

	if (isr & ALTERA_UART_STATUS_RRDY_MSK)

		altera_uart_rx_chars(pp);

	if (isr & ALTERA_UART_STATUS_TRDY_MSK)

		altera_uart_tx_chars(pp);

	spin_unlock(&port->lock);



	return IRQ_RETVAL(isr);

}
@@ -402,31 +391,24 @@ int __init early_altera_uart_setup(struct altera_uart_platform_uart *platp) 
	return 0;

}



static void altera_uart_console_putc(struct console *co, const char c)

static void altera_uart_console_putc(struct uart_port *port, const char c)

{

	struct uart_port *port = &(altera_uart_ports + co->index)->port;

	int i;

	while (!(readl(port->membase + ALTERA_UART_STATUS_REG) &

	         ALTERA_UART_STATUS_TRDY_MSK))

		cpu_relax();



	for (i = 0; i < 0x10000; i++) {

		if (readl(port->membase + ALTERA_UART_STATUS_REG) &

		    ALTERA_UART_STATUS_TRDY_MSK)

			break;

	}

	writel(c, port->membase + ALTERA_UART_TXDATA_REG);

	for (i = 0; i < 0x10000; i++) {

		if (readl(port->membase + ALTERA_UART_STATUS_REG) &

		    ALTERA_UART_STATUS_TRDY_MSK)

			break;

	}

}



static void altera_uart_console_write(struct console *co, const char *s,

				      unsigned int count)

{

	struct uart_port *port = &(altera_uart_ports + co->index)->port;



	for (; count; count--, s++) {

		altera_uart_console_putc(co, *s);

		altera_uart_console_putc(port, *s);

		if (*s == '\n')

			altera_uart_console_putc(co, '\r');

			altera_uart_console_putc(port, '\r');

	}

}
@@ -516,7 +498,7 @@ static int __devinit altera_uart_probe(struct platform_device *pdev) 
	return 0;

}



static int altera_uart_remove(struct platform_device *pdev)

static int __devexit altera_uart_remove(struct platform_device *pdev)

{

	struct uart_port *port;

	int i;