From patchwork Tue Aug 21 12:16:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1354541 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 9E978DFB34 for ; Tue, 21 Aug 2012 12:20:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757265Ab2HUMUg (ORCPT ); Tue, 21 Aug 2012 08:20:36 -0400 Received: from na3sys009aog113.obsmtp.com ([74.125.149.209]:56255 "EHLO na3sys009aog113.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756217Ab2HUMU2 (ORCPT ); Tue, 21 Aug 2012 08:20:28 -0400 Received: from mail-lb0-f178.google.com ([209.85.217.178]) (using TLSv1) by na3sys009aob113.postini.com ([74.125.148.12]) with SMTP ID DSNKUDN9CybPBe76Uuae3s5vOUVv91JI0FrM@postini.com; Tue, 21 Aug 2012 05:20:27 PDT Received: by lbok6 with SMTP id k6so3623011lbo.9 for ; Tue, 21 Aug 2012 05:20:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=EV+QHWekNjLgzpMKLPJPQ8iEElqBnRx/z4c3M8ZiBbo=; b=f19CyjnCsFabaCURy0AQuTZO4LY6Eoql3M0u8MzJTb8eYZK44sMyaY3mbhm38ecY42 g8mQWc8IEqklTbxBrG9sRmVCbTKHqn8kcIRWB40tK8mSePvr1A6F4nBK7nH3mJwv0dBz DC+isKC1IxitRXX36TY+SrhNWm08H8ptsNE360hzVYg/GWAIoiiAlmTh5/UiXzYSnuf2 osy94yvCGbYj+BMADlXBlWr7Dyt0C5QWUBoUBSYmmzZrt4d9X+1wu4aQAy3lsyZ1uOVx k0hBu36yX3Y/7PHnETmi3wvOWdHTtqjQHKeWnfgjMRaXsDRJbqrCY0qagR9ncczot3HC 6FzQ== Received: by 10.112.46.135 with SMTP id v7mr7706969lbm.3.1345551625716; Tue, 21 Aug 2012 05:20:25 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id jj5sm1398860lab.1.2012.08.21.05.20.24 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Aug 2012 05:20:24 -0700 (PDT) From: Felipe Balbi To: alan@linux.intel.com Cc: Tony Lindgren , Kevin Hilman , Linux OMAP Mailing List , Linux ARM Kernel Mailing List , linux-serial@vger.kernel.org, Linux Kernel Mailing List , Santosh Shilimkar , Shubhrajyoti Datta , Felipe Balbi Subject: [PATCH v2 06/13] serial: omap: simplify IRQ handling Date: Tue, 21 Aug 2012 15:16:04 +0300 Message-Id: <1345551371-18862-7-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1345551371-18862-1-git-send-email-balbi@ti.com> References: <1345540555-24359-1-git-send-email-balbi@ti.com> <1345551371-18862-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQnJdnYhSwX7/b0E0eRiS7hu9WoYv+60eLdlTYrUWre1oagGzbA59pU5Z2zOQY/atwkSS6/I Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org 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. Acked-by: Santosh Shilimkar Signed-off-by: Felipe Balbi --- drivers/tty/serial/omap-serial.c | 48 +++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 16808b6..2d3e64e 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -350,33 +350,59 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id) { struct uart_omap_port *up = dev_id; unsigned int iir, lsr; + unsigned int type; unsigned long flags; + irqreturn_t ret = IRQ_HANDLED; + spin_lock_irqsave(&up->port.lock, flags); pm_runtime_get_sync(up->dev); iir = serial_in(up, UART_IIR); +again: if (iir & UART_IIR_NO_INT) { - pm_runtime_mark_last_busy(up->dev); - pm_runtime_put_autosuspend(up->dev); - return IRQ_NONE; + ret = IRQ_NONE; + goto out; } - spin_lock_irqsave(&up->port.lock, flags); lsr = serial_in(up, UART_LSR); - if (iir & UART_IIR_RLSI) { + + /* extract IRQ type from IIR register */ + type = iir & 0x3e; + + switch (type) { + case UART_IIR_MSI: + check_modem_status(up); + break; + case UART_IIR_THRI: + if (lsr & UART_LSR_THRE) + 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; } - check_modem_status(up); - if ((lsr & UART_LSR_THRE) && (iir & UART_IIR_THRI)) - transmit_chars(up); - +out: spin_unlock_irqrestore(&up->port.lock, flags); pm_runtime_mark_last_busy(up->dev); pm_runtime_put_autosuspend(up->dev); - up->port_activity = jiffies; - return IRQ_HANDLED; + + return ret; } static unsigned int serial_omap_tx_empty(struct uart_port *port)