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

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

Pull serial driver fixes from Greg KH:
 "Here are some small serial driver fixes for some reported problems.
  Nothing major, just:

   - sc16is7xx irq check fix

   - 8250 fifo underflow fix

   - serial_port and 8250 iotype fixes

  Most of these have been in linux-next already, and all have passed
  0-day testing"

* tag 'tty-6.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  serial: 8250: Fix fifo underflow on flush
  serial: 8250_pnp: Remove unneeded ->iotype assignment
  serial: 8250_platform: Remove unneeded ->iotype assignment
  serial: 8250_of: Remove unneeded ->iotype assignment
  serial: port: Make ->iotype validation global in __uart_read_properties()
  serial: port: Always update ->iotype in __uart_read_properties()
  serial: port: Assign ->iotype correctly when ->iobase is set
  serial: sc16is7xx: Fix IRQ number check behavior
parents 6bfcc5fb 9e512eaa

drivers/tty/serial/8250/8250.h

+2 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ static inline int is_omap1510_8250(struct uart_8250_port *pt) 


#ifdef CONFIG_SERIAL_8250_DMA

extern int serial8250_tx_dma(struct uart_8250_port *);

extern void serial8250_tx_dma_flush(struct uart_8250_port *);

extern int serial8250_rx_dma(struct uart_8250_port *);

extern void serial8250_rx_dma_flush(struct uart_8250_port *);

extern int serial8250_request_dma(struct uart_8250_port *);
@@ -406,6 +407,7 @@ static inline int serial8250_tx_dma(struct uart_8250_port *p) 
{

	return -1;

}

static inline void serial8250_tx_dma_flush(struct uart_8250_port *p) { }

static inline int serial8250_rx_dma(struct uart_8250_port *p)

{

	return -1;

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

+16 −0
Original line number Diff line number Diff line
@@ -149,6 +149,22 @@ int serial8250_tx_dma(struct uart_8250_port *p) 
	return ret;

}



void serial8250_tx_dma_flush(struct uart_8250_port *p)

{

	struct uart_8250_dma *dma = p->dma;



	if (!dma->tx_running)

		return;



	/*

	 * kfifo_reset() has been called by the serial core, avoid

	 * advancing and underflowing in __dma_tx_complete().

	 */

	dma->tx_size = 0;



	dmaengine_terminate_async(dma->rxchan);

}



int serial8250_rx_dma(struct uart_8250_port *p)

{

	struct uart_8250_dma		*dma = p->dma;

drivers/tty/serial/8250/8250_of.c

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ static int of_platform_serial_setup(struct platform_device *ofdev, 
	spin_lock_init(&port->lock);



	if (resource_type(&resource) == IORESOURCE_IO) {

		port->iotype = UPIO_PORT;

		port->iobase = resource.start;

	} else {

		port->mapbase = resource.start;

drivers/tty/serial/8250/8250_platform.c

+0 −9
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ static int serial8250_probe_acpi(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct uart_8250_port uart = { };

	struct resource *regs;

	unsigned char iotype;

	int ret, line;



	regs = platform_get_mem_or_io(pdev, 0);
@@ -122,13 +121,11 @@ static int serial8250_probe_acpi(struct platform_device *pdev) 
	switch (resource_type(regs)) {

	case IORESOURCE_IO:

		uart.port.iobase = regs->start;

		iotype = UPIO_PORT;

		break;

	case IORESOURCE_MEM:

		uart.port.mapbase = regs->start;

		uart.port.mapsize = resource_size(regs);

		uart.port.flags = UPF_IOREMAP;

		iotype = UPIO_MEM;

		break;

	default:

		return -EINVAL;
@@ -147,12 +144,6 @@ static int serial8250_probe_acpi(struct platform_device *pdev) 
	if (ret)

		return ret;



	/*

	 * The previous call may not set iotype correctly when reg-io-width

	 * property is absent and it doesn't support IO port resource.

	 */

	uart.port.iotype = iotype;



	line = serial8250_register_8250_port(&uart);

	if (line < 0)

		return line;

drivers/tty/serial/8250/8250_pnp.c

+0 −10
Original line number Diff line number Diff line
@@ -436,7 +436,6 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) 
{

	struct uart_8250_port uart, *port;

	int ret, flags = dev_id->driver_data;

	unsigned char iotype;

	long line;



	if (flags & UNKNOWN_DEV) {
@@ -448,14 +447,11 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) 
	memset(&uart, 0, sizeof(uart));

	if ((flags & CIR_PORT) && pnp_port_valid(dev, 2)) {

		uart.port.iobase = pnp_port_start(dev, 2);

		iotype = UPIO_PORT;

	} else if (pnp_port_valid(dev, 0)) {

		uart.port.iobase = pnp_port_start(dev, 0);

		iotype = UPIO_PORT;

	} else if (pnp_mem_valid(dev, 0)) {

		uart.port.mapbase = pnp_mem_start(dev, 0);

		uart.port.mapsize = pnp_mem_len(dev, 0);

		iotype = UPIO_MEM;

		uart.port.flags = UPF_IOREMAP;

	} else

		return -ENODEV;
@@ -471,12 +467,6 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) 
	if (ret)

		return ret;



	/*

	 * The previous call may not set iotype correctly when reg-io-width

	 * property is absent and it doesn't support IO port resource.

	 */

	uart.port.iotype = iotype;



	if (flags & CIR_PORT) {

		uart.port.flags |= UPF_FIXED_PORT | UPF_FIXED_TYPE;

		uart.port.type = PORT_8250_CIR;