From patchwork Tue Aug 21 09:15:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1353331 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 25788DFB34 for ; Tue, 21 Aug 2012 09:26:27 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T3kej-0002cJ-Od; Tue, 21 Aug 2012 09:21:52 +0000 Received: from na3sys009aog132.obsmtp.com ([74.125.149.250]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T3kdH-00022d-Os for linux-arm-kernel@lists.infradead.org; Tue, 21 Aug 2012 09:20:22 +0000 Received: from mail-lb0-f171.google.com ([209.85.217.171]) (using TLSv1) by na3sys009aob132.postini.com ([74.125.148.12]) with SMTP ID DSNKUDNS0V2Xe0heEQKYXz05LZPP4DhhCRoy@postini.com; Tue, 21 Aug 2012 02:20:19 PDT Received: by lbol12 with SMTP id l12so8741426lbo.16 for ; Tue, 21 Aug 2012 02:20:16 -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=W73F57C1fzJILsz2tBOEGu4gkXn0ERj/9KZZf8k7Oxo=; b=j54QZ1CsA1ExIZeahdTy3R8/u9txH9Sge+9iGHoIWXMDCRB8FW2uRT1V0QtCLvD82I 8Cys7nDJqs7+JcBENOtozbC9U1b/7AOv3q5hOmWG8qVVQPmzkfh9eFiekgyxQ+JnK8rW aIGwDwSX+PAReJwZmRHf4HTsZoCEgVQvOAOmd1v7JLIwEX4WlzAU9fJJ7HcOajdLzmVr BPaVmpBYOjvIOYzTi28emKZK1ZyGTfgLmWm6aUDXH/Q0+u/T73c8Ek8Qa4B2QxdUK715 iEPx9XRvVUspgXUvbIDg0PkrsndygdgZUv3eIFoXZd0QM/IkzLCvAAkgvuGAr7q0yEJW qA0A== Received: by 10.112.43.135 with SMTP id w7mr7490135lbl.48.1345540816317; Tue, 21 Aug 2012 02:20:16 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id lx11sm1002053lab.4.2012.08.21.02.20.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Aug 2012 02:20:15 -0700 (PDT) From: Felipe Balbi To: alan@linux.intel.com Subject: [RFC/PATCH 07/13] serial: omap: simplify IRQ handling Date: Tue, 21 Aug 2012 12:15:49 +0300 Message-Id: <1345540555-24359-8-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1345540555-24359-1-git-send-email-balbi@ti.com> References: <1345540555-24359-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQmAqJx2wtzBE5uy549jds79e9Me75oAKU3bkPPmvWNNL2yMuX1AG8jnh9iW2XrEwvC+2onH X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.250 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Kevin Hilman , Tony Lindgren , Linux Kernel Mailing List , Felipe Balbi , Santosh Shilimkar , linux-serial@vger.kernel.org, Linux OMAP Mailing List , Shubhrajyoti Datta , Linux ARM Kernel Mailing List X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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. Signed-off-by: Felipe Balbi --- drivers/tty/serial/omap-serial.c | 47 ++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 4d74a9b..1ca08b8 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -350,32 +350,55 @@ 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; + spin_lock_irqsave(&up->port.lock, flags); pm_runtime_get_sync(up->dev); iir = serial_in(up, UART_IIR); - if (iir & UART_IIR_NO_INT) { - pm_runtime_mark_last_busy(up->dev); - pm_runtime_put_autosuspend(up->dev); - return IRQ_HANDLED; - } +again: + if (iir & UART_IIR_NO_INT) + 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; }