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

Commit 81b75aef authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman
Browse files

serial: omap: simplify IRQ handling 



quite a few changes here, though they are
pretty obvious. In summary we're making sure
to detect which interrupt type we need to
handle before calling the underlying interrupt
handling procedure.

Tested-by: default avatarShubhrajyoti D <shubhrajyoti@ti.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0f38b87

drivers/tty/serial/omap-serial.c

+38 −13
Original line number Original line Diff line number Diff line
@@ -351,33 +351,58 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id) 
{

{

	struct uart_omap_port *up = dev_id;

	struct uart_omap_port *up = dev_id;

	unsigned int iir, lsr;

	unsigned int iir, lsr;

	unsigned int type;

	unsigned long flags;

	unsigned long flags;

	irqreturn_t ret = IRQ_NONE;





	spin_lock_irqsave(&up->port.lock, flags);

	pm_runtime_get_sync(up->dev);

	pm_runtime_get_sync(up->dev);

	iir = serial_in(up, UART_IIR);

	iir = serial_in(up, UART_IIR);

	if (iir & UART_IIR_NO_INT) {

again:

		pm_runtime_mark_last_busy(up->dev);

	if (iir & UART_IIR_NO_INT)

		pm_runtime_put_autosuspend(up->dev);

		goto out;

		return IRQ_NONE;

	}





	spin_lock_irqsave(&up->port.lock, flags);

	ret = IRQ_HANDLED;

	lsr = serial_in(up, UART_LSR);

	lsr = serial_in(up, UART_LSR);

	if (iir & UART_IIR_RLSI) {

		if (lsr & UART_LSR_DR)

			receive_chars(up, &lsr);

	}





	/* extract IRQ type from IIR register */

	type = iir & 0x3e;



	switch (type) {

	case UART_IIR_MSI:

		check_modem_status(up);

		check_modem_status(up);

	if ((lsr & UART_LSR_THRE) && (iir & UART_IIR_THRI))

		break;

	case UART_IIR_THRI:

		if (lsr & UART_LSR_THRE)

			transmit_chars(up);

			transmit_chars(up);

		break;

	case UART_IIR_RDI:

		if (lsr & UART_LSR_DR)

			receive_chars(up, &lsr);

		break;

	case UART_IIR_RLSI:

		if (lsr & UART_LSR_BRK_ERROR_BITS)

			receive_chars(up, &lsr);

		break;

	case UART_IIR_RX_TIMEOUT:

		receive_chars(up, &lsr);

		break;

	case UART_IIR_CTS_RTS_DSR:

		iir = serial_in(up, UART_IIR);

		goto again;

	case UART_IIR_XOFF:

		/* FALLTHROUGH */

	default:

		break;

	}





out:

	spin_unlock_irqrestore(&up->port.lock, flags);

	spin_unlock_irqrestore(&up->port.lock, flags);

	pm_runtime_mark_last_busy(up->dev);

	pm_runtime_mark_last_busy(up->dev);

	pm_runtime_put_autosuspend(up->dev);

	pm_runtime_put_autosuspend(up->dev);



	up->port_activity = jiffies;

	up->port_activity = jiffies;

	return IRQ_HANDLED;



	return ret;

}

}





static unsigned int serial_omap_tx_empty(struct uart_port *port)

static unsigned int serial_omap_tx_empty(struct uart_port *port)