From patchwork Thu Sep 6 12:45:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1414821 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 008893FC71 for ; Thu, 6 Sep 2012 13:05:07 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9bhI-0001wN-MZ; Thu, 06 Sep 2012 13:00:42 +0000 Received: from na3sys009aog103.obsmtp.com ([74.125.149.71]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9bY6-00034H-3U for linux-arm-kernel@lists.infradead.org; Thu, 06 Sep 2012 12:51:12 +0000 Received: from mail-lpp01m010-f49.google.com ([209.85.215.49]) (using TLSv1) by na3sys009aob103.postini.com ([74.125.148.12]) with SMTP ID DSNKUEicO+lWqjRFe/k811iMRZZUliefhQZJ@postini.com; Thu, 06 Sep 2012 05:51:09 PDT Received: by lagu2 with SMTP id u2so1046709lag.36 for ; Thu, 06 Sep 2012 05:51:06 -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=Hr619/jvBClrJbKHMK7gTMAg/m/5CgAO2PPJbqdMP2s=; b=PwrxUurgjfdqPrA34JWwqalAMsnUZoggQMfkzvTtWNYAvdiLG3aI8Vw4QRwjnvs/Ah CWwh3tGC+WRbmw/Ye/10Aa8TF7ugpVv/cNRT+1khBu/fTVgcuxXz2Ll/dE4exPja1hhZ Q9MDmZb49K9yeNaUtORuy4dWb8FRQJp2Oh3ZqlU/7P/leM5ra+THH4NiAJKPqGz+ZoQb totIHWSXHQkWElop+Dc46PX2lfohN+sbVU7rMlA7N1a1gA2QZd+1Os0iLSXpIBYZtkmo F0CeIqz5fUT+9OesZgcvTTKRtHgqrqMpIJKqi3eQHHWgYMqWblucTt+ryOcqSUdYzvVF XTog== Received: by 10.112.51.201 with SMTP id m9mr820438lbo.2.1346935865778; Thu, 06 Sep 2012 05:51:05 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id sm7sm2069197lab.5.2012.09.06.05.51.04 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Sep 2012 05:51:05 -0700 (PDT) From: Felipe Balbi To: Greg KH Subject: [PATCH v4 18/21] serial: omap: fix software flow control Date: Thu, 6 Sep 2012 15:45:37 +0300 Message-Id: <1346935540-1792-19-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1346935540-1792-1-git-send-email-balbi@ti.com> References: <20120906122948.GC29202@arwen.pp.htv.fi> <1346935540-1792-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQmZ7WaNU6PTijhwqCeRWtfebXJEt5nUS0P5fLrwmR8XIm6eEnYQrTzDGMk4mQLMZiQtV/cd 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.71 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 , Vikram Pandita , Tony Lindgren , Linux Kernel Mailing List , stable@vger.kernel.org, Santosh Shilimkar , Felipe Balbi , linux-serial@vger.kernel.org, Sourav Poddar , Linux OMAP Mailing List , Shubhrajyoti Datta , Linux ARM Kernel Mailing List , alan@linux.intel.com 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 From: Vikram Pandita Software flow control register bits were not defined correctly. Also clarify the IXON and IXOFF logic to reflect what userspace wants. Cc: stable@vger.kernel.org Tested-by: Shubhrajyoti D Signed-off-by: Vikram Pandita Signed-off-by: Shubhrajyoti D Acked-by: Tony Lindgren Signed-off-by: Felipe Balbi --- arch/arm/plat-omap/include/plat/omap-serial.h | 4 ++-- drivers/tty/serial/omap-serial.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h index 90d2d74..a79ed8b 100644 --- a/arch/arm/plat-omap/include/plat/omap-serial.h +++ b/arch/arm/plat-omap/include/plat/omap-serial.h @@ -42,10 +42,10 @@ #define OMAP_UART_WER_MOD_WKUP 0X7F /* Enable XON/XOFF flow control on output */ -#define OMAP_UART_SW_TX 0x04 +#define OMAP_UART_SW_TX 0x8 /* Enable XON/XOFF flow control on input */ -#define OMAP_UART_SW_RX 0x04 +#define OMAP_UART_SW_RX 0x2 #define OMAP_UART_SYSC_RESET 0X07 #define OMAP_UART_TCR_TRIG 0X0F diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 6a58f4f..1ba1f43 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -617,19 +617,19 @@ serial_omap_configure_xonxoff /* * IXON Flag: - * Enable XON/XOFF flow control on output. - * Transmit XON1, XOFF1 + * Flow control for OMAP.TX + * OMAP.RX should listen for XON/XOFF */ if (termios->c_iflag & IXON) - up->efr |= OMAP_UART_SW_TX; + up->efr |= OMAP_UART_SW_RX; /* * IXOFF Flag: - * Enable XON/XOFF flow control on input. - * Receiver compares XON1, XOFF1. + * Flow control for OMAP.RX + * OMAP.TX should send XON/XOFF */ if (termios->c_iflag & IXOFF) - up->efr |= OMAP_UART_SW_RX; + up->efr |= OMAP_UART_SW_TX; serial_out(up, UART_EFR, up->efr | UART_EFR_ECB); serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);