Commit 04b90594 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 

* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  serial: bcm63xx_uart: fix irq storm after rx fifo overrun.
  amba pl011: platform data for reg lockup and glitch v2
  amba pl011: workaround for uart registers lockup
  tty: n_gsm: improper skb_pull() use was leaking framed data
  tty: n_gsm: Fixed logic to decode break signal from modem status
  TTY: ntty, add one more sanity check
  TTY: ldisc, do not close until there are readers
  8250: Fix capabilities when changing the port type
  8250_pci: Fix missing const from merges
  ARM: SAMSUNG: serial: Fix on handling of one clock source for UART
  serial: ioremap warning fix for jsm driver.
  8250_pci: add -ENODEV code for Intel EG20T PCH
parents d90ce871 3bc46b31

arch/arm/mach-exynos4/init.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ void __init exynos4_common_init_uarts(struct s3c2410_uartcfg *cfg, int no) 
			tcfg->clocks = exynos4_serial_clocks;

			tcfg->clocks_size = ARRAY_SIZE(exynos4_serial_clocks);

		}

		tcfg->flags |= NO_NEED_CHECK_CLKSRC;

	}



	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);

arch/arm/mach-ux500/board-mop500-pins.c

+12 −4
Original line number Diff line number Diff line
@@ -110,10 +110,18 @@ static pin_cfg_t mop500_pins_common[] = { 
	GPIO168_KP_O0,



	/* UART */

	GPIO0_U0_CTSn	| PIN_INPUT_PULLUP,

	GPIO1_U0_RTSn	| PIN_OUTPUT_HIGH,

	GPIO2_U0_RXD	| PIN_INPUT_PULLUP,

	GPIO3_U0_TXD	| PIN_OUTPUT_HIGH,

	/* uart-0 pins gpio configuration should be

	 * kept intact to prevent glitch in tx line

	 * when tty dev is opened. Later these pins

	 * are configured to uart mop500_pins_uart0

	 *

	 * It will be replaced with uart configuration

	 * once the issue is solved.

	 */

	GPIO0_GPIO	| PIN_INPUT_PULLUP,

	GPIO1_GPIO	| PIN_OUTPUT_HIGH,

	GPIO2_GPIO	| PIN_INPUT_PULLUP,

	GPIO3_GPIO	| PIN_OUTPUT_HIGH,



	GPIO29_U2_RXD	| PIN_INPUT_PULLUP,

	GPIO30_U2_TXD	| PIN_OUTPUT_HIGH,

arch/arm/mach-ux500/board-mop500.c

+54 −0
Original line number Diff line number Diff line
@@ -27,18 +27,21 @@ 
#include <linux/leds-lp5521.h>

#include <linux/input.h>

#include <linux/gpio_keys.h>

#include <linux/delay.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <plat/i2c.h>

#include <plat/ste_dma40.h>

#include <plat/pincfg.h>



#include <mach/hardware.h>

#include <mach/setup.h>

#include <mach/devices.h>

#include <mach/irqs.h>



#include "pins-db8500.h"

#include "ste-dma40-db8500.h"

#include "devices-db8500.h"

#include "board-mop500.h"
@@ -393,12 +396,63 @@ static struct stedma40_chan_cfg uart2_dma_cfg_tx = { 
};

#endif





static pin_cfg_t mop500_pins_uart0[] = {

	GPIO0_U0_CTSn   | PIN_INPUT_PULLUP,

	GPIO1_U0_RTSn   | PIN_OUTPUT_HIGH,

	GPIO2_U0_RXD    | PIN_INPUT_PULLUP,

	GPIO3_U0_TXD    | PIN_OUTPUT_HIGH,

};



#define PRCC_K_SOFTRST_SET      0x18

#define PRCC_K_SOFTRST_CLEAR    0x1C

static void ux500_uart0_reset(void)

{

	void __iomem *prcc_rst_set, *prcc_rst_clr;



	prcc_rst_set = (void __iomem *)IO_ADDRESS(U8500_CLKRST1_BASE +

			PRCC_K_SOFTRST_SET);

	prcc_rst_clr = (void __iomem *)IO_ADDRESS(U8500_CLKRST1_BASE +

			PRCC_K_SOFTRST_CLEAR);



	/* Activate soft reset PRCC_K_SOFTRST_CLEAR */

	writel((readl(prcc_rst_clr) | 0x1), prcc_rst_clr);

	udelay(1);



	/* Release soft reset PRCC_K_SOFTRST_SET */

	writel((readl(prcc_rst_set) | 0x1), prcc_rst_set);

	udelay(1);

}



static void ux500_uart0_init(void)

{

	int ret;



	ret = nmk_config_pins(mop500_pins_uart0,

			ARRAY_SIZE(mop500_pins_uart0));

	if (ret < 0)

		pr_err("pl011: uart pins_enable failed\n");

}



static void ux500_uart0_exit(void)

{

	int ret;



	ret = nmk_config_pins_sleep(mop500_pins_uart0,

			ARRAY_SIZE(mop500_pins_uart0));

	if (ret < 0)

		pr_err("pl011: uart pins_disable failed\n");

}



static struct amba_pl011_data uart0_plat = {

#ifdef CONFIG_STE_DMA40

	.dma_filter = stedma40_filter,

	.dma_rx_param = &uart0_dma_cfg_rx,

	.dma_tx_param = &uart0_dma_cfg_tx,

#endif

	.init = ux500_uart0_init,

	.exit = ux500_uart0_exit,

	.reset = ux500_uart0_reset,

};



static struct amba_pl011_data uart1_plat = {

arch/arm/plat-samsung/include/plat/regs-serial.h

+2 −0
Original line number Diff line number Diff line
@@ -224,6 +224,8 @@ 
#define S5PV210_UFSTAT_RXMASK	(255<<0)

#define S5PV210_UFSTAT_RXSHIFT	(0)



#define NO_NEED_CHECK_CLKSRC	1



#ifndef __ASSEMBLY__



/* struct s3c24xx_uart_clksrc

drivers/tty/n_gsm.c

+20 −6
Original line number Diff line number Diff line
@@ -875,7 +875,8 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm, 
		*dp++ = last << 7 | first << 6 | 1;	/* EA */

		len--;

	}

	memcpy(dp, skb_pull(dlci->skb, len), len);

	memcpy(dp, dlci->skb->data, len);

	skb_pull(dlci->skb, len);

	__gsm_data_queue(dlci, msg);

	if (last)

		dlci->skb = NULL;
@@ -984,10 +985,22 @@ static void gsm_control_reply(struct gsm_mux *gsm, int cmd, u8 *data, 
 */



static void gsm_process_modem(struct tty_struct *tty, struct gsm_dlci *dlci,

							u32 modem)

							u32 modem, int clen)

{

	int  mlines = 0;

	u8 brk = modem >> 6;

	u8 brk = 0;



	/* The modem status command can either contain one octet (v.24 signals)

	   or two octets (v.24 signals + break signals). The length field will

	   either be 2 or 3 respectively. This is specified in section

	   5.4.6.3.7 of the  27.010 mux spec. */



	if (clen == 2)

		modem = modem & 0x7f;

	else {

		brk = modem & 0x7f;

		modem = (modem >> 7) & 0x7f;

	};



	/* Flow control/ready to communicate */

	if (modem & MDM_FC) {
@@ -1061,7 +1074,7 @@ static void gsm_control_modem(struct gsm_mux *gsm, u8 *data, int clen) 
			return;

	}

	tty = tty_port_tty_get(&dlci->port);

	gsm_process_modem(tty, dlci, modem);

	gsm_process_modem(tty, dlci, modem, clen);

	if (tty) {

		tty_wakeup(tty);

		tty_kref_put(tty);
@@ -1482,12 +1495,13 @@ static void gsm_dlci_begin_close(struct gsm_dlci *dlci) 
 *	open we shovel the bits down it, if not we drop them.

 */



static void gsm_dlci_data(struct gsm_dlci *dlci, u8 *data, int len)

static void gsm_dlci_data(struct gsm_dlci *dlci, u8 *data, int clen)

{

	/* krefs .. */

	struct tty_port *port = &dlci->port;

	struct tty_struct *tty = tty_port_tty_get(port);

	unsigned int modem = 0;

	int len = clen;



	if (debug & 16)

		pr_debug("%d bytes for tty %p\n", len, tty);
@@ -1507,7 +1521,7 @@ static void gsm_dlci_data(struct gsm_dlci *dlci, u8 *data, int len) 
				if (len == 0)

					return;

			}

			gsm_process_modem(tty, dlci, modem);

			gsm_process_modem(tty, dlci, modem, clen);

		/* Line state will go via DLCI 0 controls only */

		case 1:

		default:

CRA Git | Maintained and supported by SUSTech CRA and CCSE