Commit 8c91723a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty and serial driver fixes from Greg KH:
 "Here are some TTY and Serial driver fixes for 5.19-rc7. They resolve a
  number of reported problems including:

   - longtime bug in pty_write() that has been reported in the past.

   - 8250 driver fixes

   - new serial device ids

   - vt overlapping data copy bugfix

   - other tiny serial driver bugfixes

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

* tag 'tty-5.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: use new tty_insert_flip_string_and_push_buffer() in pty_write()
  tty: extract tty_flip_buffer_commit() from tty_flip_buffer_push()
  serial: 8250: dw: Fix the macro RZN1_UART_xDMACR_8_WORD_BURST
  vt: fix memory overlapping when deleting chars in the buffer
  serial: mvebu-uart: correctly report configured baudrate value
  serial: 8250: Fix PM usage_count for console handover
  serial: 8250: fix return error code in serial8250_request_std_resource()
  serial: stm32: Clear prev values before setting RTS delays
  tty: Add N_CAN327 line discipline ID for ELM327 based CAN driver
  serial: 8250: Fix __stop_tx() & DMA Tx restart races
  serial: pl011: UPSTAT_AUTORTS requires .throttle/unthrottle
  tty: serial: samsung_tty: set dma burst_size to 1
  serial: 8250: dw: enable using pdata with ACPI
parents c658cabb a501ab75

drivers/tty/pty.c

+2 −12
Original line number Diff line number Diff line
@@ -111,21 +111,11 @@ static void pty_unthrottle(struct tty_struct *tty) 
static int pty_write(struct tty_struct *tty, const unsigned char *buf, int c)

{

	struct tty_struct *to = tty->link;

	unsigned long flags;



	if (tty->flow.stopped)

	if (tty->flow.stopped || !c)

		return 0;



	if (c > 0) {

		spin_lock_irqsave(&to->port->lock, flags);

		/* Stuff the data into the input queue of the other end */

		c = tty_insert_flip_string(to->port, buf, c);

		spin_unlock_irqrestore(&to->port->lock, flags);

		/* And shovel */

		if (c)

			tty_flip_buffer_push(to->port);

	}

	return c;

	return tty_insert_flip_string_and_push_buffer(to->port, buf, c);

}



/**

drivers/tty/serial/8250/8250_core.c

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/sysrq.h>

#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/tty.h>

#include <linux/ratelimit.h>

#include <linux/tty_flip.h>
@@ -559,6 +560,9 @@ serial8250_register_ports(struct uart_driver *drv, struct device *dev) 


		up->port.dev = dev;



		if (uart_console_enabled(&up->port))

			pm_runtime_get_sync(up->port.dev);



		serial8250_apply_quirks(up);

		uart_add_one_port(drv, &up->port);

	}

drivers/tty/serial/8250/8250_dma.c

+3 −3
Original line number Diff line number Diff line
@@ -106,10 +106,10 @@ int serial8250_tx_dma(struct uart_8250_port *p) 
				   UART_XMIT_SIZE, DMA_TO_DEVICE);



	dma_async_issue_pending(dma->txchan);

	if (dma->tx_err) {

		dma->tx_err = 0;

	serial8250_clear_THRI(p);

	}

	if (dma->tx_err)

		dma->tx_err = 0;



	return 0;

err:

	dma->tx_err = 1;

drivers/tty/serial/8250/8250_dw.c

+13 −13
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#define RZN1_UART_xDMACR_DMA_EN		BIT(0)

#define RZN1_UART_xDMACR_1_WORD_BURST	(0 << 1)

#define RZN1_UART_xDMACR_4_WORD_BURST	(1 << 1)

#define RZN1_UART_xDMACR_8_WORD_BURST	(3 << 1)

#define RZN1_UART_xDMACR_8_WORD_BURST	(2 << 1)

#define RZN1_UART_xDMACR_BLK_SZ(x)	((x) << 3)



/* Quirks */
@@ -773,18 +773,18 @@ static const struct of_device_id dw8250_of_match[] = { 
MODULE_DEVICE_TABLE(of, dw8250_of_match);



static const struct acpi_device_id dw8250_acpi_match[] = {

	{ "INT33C4", 0 },

	{ "INT33C5", 0 },

	{ "INT3434", 0 },

	{ "INT3435", 0 },

	{ "80860F0A", 0 },

	{ "8086228A", 0 },

	{ "APMC0D08", 0},

	{ "AMD0020", 0 },

	{ "AMDI0020", 0 },

	{ "AMDI0022", 0 },

	{ "BRCM2032", 0 },

	{ "HISI0031", 0 },

	{ "80860F0A", (kernel_ulong_t)&dw8250_dw_apb },

	{ "8086228A", (kernel_ulong_t)&dw8250_dw_apb },

	{ "AMD0020", (kernel_ulong_t)&dw8250_dw_apb },

	{ "AMDI0020", (kernel_ulong_t)&dw8250_dw_apb },

	{ "AMDI0022", (kernel_ulong_t)&dw8250_dw_apb },

	{ "APMC0D08", (kernel_ulong_t)&dw8250_dw_apb},

	{ "BRCM2032", (kernel_ulong_t)&dw8250_dw_apb },

	{ "HISI0031", (kernel_ulong_t)&dw8250_dw_apb },

	{ "INT33C4", (kernel_ulong_t)&dw8250_dw_apb },

	{ "INT33C5", (kernel_ulong_t)&dw8250_dw_apb },

	{ "INT3434", (kernel_ulong_t)&dw8250_dw_apb },

	{ "INT3435", (kernel_ulong_t)&dw8250_dw_apb },

	{ },

};

MODULE_DEVICE_TABLE(acpi, dw8250_acpi_match);

drivers/tty/serial/8250/8250_port.c

+4 −2
Original line number Diff line number Diff line
@@ -1949,7 +1949,7 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir) 
	if ((status & UART_LSR_THRE) && (up->ier & UART_IER_THRI)) {

		if (!up->dma || up->dma->tx_err)

			serial8250_tx_chars(up);

		else

		else if (!up->dma->tx_running)

			__stop_tx(up);

	}
@@ -2975,8 +2975,10 @@ static int serial8250_request_std_resource(struct uart_8250_port *up) 
	case UPIO_MEM32BE:

	case UPIO_MEM16:

	case UPIO_MEM:

		if (!port->mapbase)

		if (!port->mapbase) {

			ret = -EINVAL;

			break;

		}



		if (!request_mem_region(port->mapbase, size, "serial")) {

			ret = -EBUSY;