Commit 868a9fd9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 

Pull tty/serial driver updates from Greg KH:
 "Here is the big set of tty/serial driver updates for 6.5-rc1.

  Included in here are:

   - tty_audit code cleanups from Jiri

   - more 8250 cleanups from Ilpo

   - samsung_tty driver bugfixes

   - 8250 lock port updates

   - usual fsl_lpuart driver updates and fixes

   - other small serial driver fixes and updates, full details in the
     shortlog

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'tty-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (58 commits)
  tty_audit: make data of tty_audit_log() const
  tty_audit: make tty pointers in exposed functions const
  tty_audit: make icanon a bool
  tty_audit: invert the condition in tty_audit_log()
  tty_audit: use kzalloc() in tty_audit_buf_alloc()
  tty_audit: use TASK_COMM_LEN for task comm
  Revert "8250: add support for ASIX devices with a FIFO bug"
  serial: atmel: don't enable IRQs prematurely
  tty: serial: Add Nuvoton ma35d1 serial driver support
  tty: serial: fsl_lpuart: add earlycon for imx8ulp platform
  tty: serial: imx: fix rs485 rx after tx
  selftests: tty: add selftest for tty timestamp updates
  tty: tty_io: update timestamps on all device nodes
  tty: fix hang on tty device with no_room set
  serial: core: fix -EPROBE_DEFER handling in init
  serial: 8250_omap: Use force_suspend and resume for system suspend
  tty: serial: samsung_tty: Use abs() to simplify some code
  tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() when iterating clk
  tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() in case of error
  serial: 8250: Apply FSL workarounds also without SERIAL_8250_CONSOLE
  ...
parents db9c6d1d e534755c

arch/mips/alchemy/common/platform.c

+8 −2
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ static void alchemy_8250_pm(struct uart_port *port, unsigned int state, 
#define PORT(_base, _irq)					\

	{							\

		.mapbase	= _base,			\

		.mapsize	= 0x1000,			\

		.irq		= _irq,				\

		.regshift	= 2,				\

		.iotype		= UPIO_AU,			\

		.flags		= UPF_SKIP_TEST | UPF_IOREMAP | \

				  UPF_FIXED_TYPE,		\

		.type		= PORT_16550A,			\
@@ -124,8 +124,14 @@ static void __init alchemy_setup_uarts(int ctype) 
	au1xx0_uart_device.dev.platform_data = ports;



	/* Fill up uartclk. */

	for (s = 0; s < c; s++)

	for (s = 0; s < c; s++) {

		ports[s].uartclk = uartclk;

		if (au_platform_setup(&ports[s]) < 0) {

			kfree(ports);

			printk(KERN_INFO "Alchemy: missing support for UARTs\n");

			return;

		}

	}

	if (platform_device_register(&au1xx0_uart_device))

		printk(KERN_INFO "Alchemy: failed to register UARTs\n");

}

arch/powerpc/kernel/legacy_serial.c

+9 −5
Original line number Diff line number Diff line
@@ -508,12 +508,16 @@ static void __init fixup_port_irq(int index, 


	port->irq = virq;



#ifdef CONFIG_SERIAL_8250_FSL

	if (of_device_is_compatible(np, "fsl,ns16550")) {

	if (IS_ENABLED(CONFIG_SERIAL_8250) &&

	    of_device_is_compatible(np, "fsl,ns16550")) {

		if (IS_REACHABLE(CONFIG_SERIAL_8250_FSL)) {

			port->handle_irq = fsl8250_handle_irq;

			port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_8250_CONSOLE);

		} else {

			pr_warn_once("Not activating Freescale specific workaround for device %pOFP\n",

				     np);

		}

	}

#endif

}



static void __init fixup_port_pio(int index,

drivers/tty/n_tty.c

+21 −4
Original line number Diff line number Diff line
@@ -203,8 +203,8 @@ static void n_tty_kick_worker(struct tty_struct *tty) 
	struct n_tty_data *ldata = tty->disc_data;



	/* Did the input worker stop? Restart it */

	if (unlikely(ldata->no_room)) {

		ldata->no_room = 0;

	if (unlikely(READ_ONCE(ldata->no_room))) {

		WRITE_ONCE(ldata->no_room, 0);



		WARN_RATELIMIT(tty->port->itty == NULL,

				"scheduling with invalid itty\n");
@@ -1697,7 +1697,7 @@ n_tty_receive_buf_common(struct tty_struct *tty, const unsigned char *cp, 
			if (overflow && room < 0)

				ldata->read_head--;

			room = overflow;

			ldata->no_room = flow && !room;

			WRITE_ONCE(ldata->no_room, flow && !room);

		} else

			overflow = 0;
@@ -1728,6 +1728,17 @@ n_tty_receive_buf_common(struct tty_struct *tty, const unsigned char *cp, 
	} else

		n_tty_check_throttle(tty);



	if (unlikely(ldata->no_room)) {

		/*

		 * Barrier here is to ensure to read the latest read_tail in

		 * chars_in_buffer() and to make sure that read_tail is not loaded

		 * before ldata->no_room is set.

		 */

		smp_mb();

		if (!chars_in_buffer(tty))

			n_tty_kick_worker(tty);

	}



	up_read(&tty->termios_rwsem);



	return rcvd;
@@ -2281,8 +2292,14 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file, 
		if (time)

			timeout = time;

	}

	if (old_tail != ldata->read_tail)

	if (old_tail != ldata->read_tail) {

		/*

		 * Make sure no_room is not read in n_tty_kick_worker()

		 * before setting ldata->read_tail in copy_from_read_buf().

		 */

		smp_mb();

		n_tty_kick_worker(tty);

	}

	up_read(&tty->termios_rwsem);



	remove_wait_queue(&tty->read_wait, &wait);

drivers/tty/serial/8250/8250.h

+8 −3
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ struct serial8250_config { 
#define UART_BUG_TXEN	BIT(1)	/* UART has buggy TX IIR status */

#define UART_BUG_NOMSR	BIT(2)	/* UART has buggy MSR status bits (Au1x00) */

#define UART_BUG_THRE	BIT(3)	/* UART has buggy THRE reassertion */

#define UART_BUG_PARITY	BIT(4)	/* UART mishandles parity if FIFO enabled */

#define UART_BUG_TXRACE	BIT(5)	/* UART Tx fails to set remote DR */
@@ -167,18 +166,21 @@ static unsigned int __maybe_unused serial_icr_read(struct uart_8250_port *up, 


void serial8250_clear_and_reinit_fifos(struct uart_8250_port *p);



static inline int serial_dl_read(struct uart_8250_port *up)

static inline u32 serial_dl_read(struct uart_8250_port *up)

{

	return up->dl_read(up);

}



static inline void serial_dl_write(struct uart_8250_port *up, int value)

static inline void serial_dl_write(struct uart_8250_port *up, u32 value)

{

	up->dl_write(up, value);

}



static inline bool serial8250_set_THRI(struct uart_8250_port *up)

{

	/* Port locked to synchronize UART_IER access against the console. */

	lockdep_assert_held_once(&up->port.lock);



	if (up->ier & UART_IER_THRI)

		return false;

	up->ier |= UART_IER_THRI;
@@ -188,6 +190,9 @@ static inline bool serial8250_set_THRI(struct uart_8250_port *up) 


static inline bool serial8250_clear_THRI(struct uart_8250_port *up)

{

	/* Port locked to synchronize UART_IER access against the console. */

	lockdep_assert_held_once(&up->port.lock);



	if (!(up->ier & UART_IER_THRI))

		return false;

	up->ier &= ~UART_IER_THRI;

drivers/tty/serial/8250/8250_aspeed_vuart.c

+3 −0
Original line number Diff line number Diff line
@@ -275,6 +275,9 @@ static void __aspeed_vuart_set_throttle(struct uart_8250_port *up, 
{

	unsigned char irqs = UART_IER_RLSI | UART_IER_RDI;



	/* Port locked to synchronize UART_IER access against the console. */

	lockdep_assert_held_once(&up->port.lock);



	up->ier &= ~irqs;

	if (!throttle)

		up->ier |= irqs;