From patchwork Thu Aug 23 10:32:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1365991 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 AD4DDDF2AB for ; Thu, 23 Aug 2012 10:44:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030356Ab2HWKnz (ORCPT ); Thu, 23 Aug 2012 06:43:55 -0400 Received: from na3sys009aog103.obsmtp.com ([74.125.149.71]:47376 "EHLO na3sys009aog103.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933236Ab2HWKhX (ORCPT ); Thu, 23 Aug 2012 06:37:23 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]) (using TLSv1) by na3sys009aob103.postini.com ([74.125.148.12]) with SMTP ID DSNKUDYH4gPz79SE17rLq4pt4/m+c5Nf+OIu@postini.com; Thu, 23 Aug 2012 03:37:23 PDT Received: by lbbgj3 with SMTP id gj3so360192lbb.33 for ; Thu, 23 Aug 2012 03:37:21 -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=hQefT7WeVRxXhd3FiHnpWNthsQdlmZXNuLdn+EpYkdA=; b=WkINfHaW05NBckp7EhpMwxkH3zdOT7EU5X37nbwZg+b7jGIkNH7ezQbneF+eAwbdXS IO9o/6mPcZG4hR4mejYk9bfgKrBAKol4xvbXjFydQUxGXjiCbgTgFnNhlNIiwKYn/p/s 3zFXe8yzAsc40sIVqGlMU/1hFKm5l7cK/jevrf5fc9vOUeWgKp3qSdZSRXTaiS3MpTUT 0Q7eejuWj0xblspSpZZSriiWYfZc8VWdpy6MGV7xWq9FL7zaZHJpeAcL1IBC9FlCzXY3 0s+WkhGvv3CECPXl57bknrFlO35LVBST+Gss8JY4q7CGhiQyoNwyuXjYI0sMaxiJkxkX 8zCA== Received: by 10.152.112.34 with SMTP id in2mr1241470lab.6.1345718241056; Thu, 23 Aug 2012 03:37:21 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id jj5sm7104630lab.1.2012.08.23.03.37.19 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Aug 2012 03:37:20 -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 , Sourav Poddar , Felipe Balbi Subject: [PATCH v3 06/23] serial: omap: simplify IRQ handling Date: Thu, 23 Aug 2012 13:32:46 +0300 Message-Id: <1345717983-18179-7-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1345717983-18179-1-git-send-email-balbi@ti.com> References: <1345717983-18179-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQkNYyIDd2tddF6TKz4HT8pFAuaVrkN2NDKWexWc9/Y3LURHNfblGOhzKmqBeseWbQ4sAmHg 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. Tested-by: Shubhrajyoti D Acked-by: Santosh Shilimkar Signed-off-by: Felipe Balbi --- drivers/tty/serial/omap-serial.c | 51 ++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 16808b6..1e91ca6 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -350,33 +350,58 @@ 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_NONE; + 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_NONE; - } +again: + if (iir & UART_IIR_NO_INT) + goto out; - spin_lock_irqsave(&up->port.lock, flags); + ret = IRQ_HANDLED; 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)