From patchwork Wed Sep 30 12:27:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ivan T. Ivanov" X-Patchwork-Id: 54319 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id CD17F22E23 for ; Wed, 30 Sep 2015 12:28:31 +0000 (UTC) Received: by wicgb1 with SMTP id gb1sf21788439wic.3 for ; Wed, 30 Sep 2015 05:28:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=fMyfms4psb4FR9hjg98/ZXJTppAF/UlXv9oF3W20nuQ=; b=IprBheGkz6eRxOucnOF4QFKkQEzK4XRBlQVFg9FJZCGgSk7lkFJS1ibTgMo3x1AM1m n6qosa9XeidyBgKyV+hhLklq2XvJSBSGWvSkXAy9Ql31RrO0EHkyVlebGwJf96bOg7Kk DKk9kSe+J6k/wT1ykdhwl22Y8UlYOuBkOQ186BbxG7xodmizPlDxHBZ0hiSOLfyXguWx 1mpmVtD9m/IMSgZxrLi5qC/LNFKGaOayy27bnapHxV1/rcy++8d2XcyWw3phFj7w5Z1I e0FaehfLvKODKPlxJ3VdhpLL3NDxlJDC3qBqHToz4jugbyiqyMkNqVWTtkzWjKYd8VVe C5JA== X-Gm-Message-State: ALoCoQk47CCltcRxKxPu6EMwFLpooNi9Mcjt+z3Mv9reoBIXPo1u7yx1C5kskmJLfx0Yzp/jpLp1 X-Received: by 10.180.149.210 with SMTP id uc18mr3570913wib.4.1443616111171; Wed, 30 Sep 2015 05:28:31 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.26.4 with SMTP id h4ls41897lag.39.gmail; Wed, 30 Sep 2015 05:28:30 -0700 (PDT) X-Received: by 10.152.237.1 with SMTP id uy1mr1043745lac.33.1443616110954; Wed, 30 Sep 2015 05:28:30 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id dr7si165765lbc.106.2015.09.30.05.28.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Sep 2015 05:28:30 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by laer8 with SMTP id r8so43765305lae.2 for ; Wed, 30 Sep 2015 05:28:30 -0700 (PDT) X-Received: by 10.152.23.97 with SMTP id l1mr1080485laf.56.1443616110818; Wed, 30 Sep 2015 05:28:30 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp2724854lbq; Wed, 30 Sep 2015 05:28:29 -0700 (PDT) X-Received: by 10.68.69.17 with SMTP id a17mr4747714pbu.10.1443616109760; Wed, 30 Sep 2015 05:28:29 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nv9si555794pbb.37.2015.09.30.05.28.29; Wed, 30 Sep 2015 05:28:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933101AbbI3M21 (ORCPT + 30 others); Wed, 30 Sep 2015 08:28:27 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:36852 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932908AbbI3M1t (ORCPT ); Wed, 30 Sep 2015 08:27:49 -0400 Received: by wicgb1 with SMTP id gb1so192786982wic.1 for ; Wed, 30 Sep 2015 05:27:48 -0700 (PDT) X-Received: by 10.180.198.142 with SMTP id jc14mr4771933wic.32.1443616067992; Wed, 30 Sep 2015 05:27:47 -0700 (PDT) Received: from localhost.localdomain ([37.157.136.206]) by smtp.googlemail.com with ESMTPSA id fs2sm493029wib.12.2015.09.30.05.27.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Sep 2015 05:27:47 -0700 (PDT) From: "Ivan T. Ivanov" To: Andy Gross Cc: David Brown , Srinivas Kandagatla , Greg Kroah-Hartman , Jiri Slaby , Frank Rowand , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v3 6/6] tty: serial: msm: Remove 115.2 Kbps maximum baud rate limitation Date: Wed, 30 Sep 2015 15:27:03 +0300 Message-Id: <1443616023-28625-7-git-send-email-ivan.ivanov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443616023-28625-1-git-send-email-ivan.ivanov@linaro.org> References: <1443616023-28625-1-git-send-email-ivan.ivanov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ivan.ivanov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , UART controller is capable to perform transfers up to 4 Mbps. Remove artificial 115.2 Kbps limitation. Signed-off-by: Ivan T. Ivanov --- drivers/tty/serial/msm_serial.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index 3efb80f511db..dcde955475dc 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -882,6 +882,7 @@ msm_find_best_baud(struct uart_port *port, unsigned int baud) { 3, 0xdd, 8 }, { 2, 0xee, 16 }, { 1, 0xff, 31 }, + { 0, 0xff, 31 }, }; divisor = uart_get_divisor(port, baud); @@ -893,16 +894,29 @@ msm_find_best_baud(struct uart_port *port, unsigned int baud) return entry; /* Default to smallest divider */ } -static int msm_set_baud_rate(struct uart_port *port, unsigned int baud) +static int msm_set_baud_rate(struct uart_port *port, unsigned int baud, + unsigned long *saved_flags) { unsigned int rxstale, watermark, mask; struct msm_port *msm_port = UART_TO_MSM(port); const struct msm_baud_map *entry; + unsigned long flags; entry = msm_find_best_baud(port, baud); msm_write(port, entry->code, UART_CSR); + if (baud > 460800) + port->uartclk = baud * 16; + + flags = *saved_flags; + spin_unlock_irqrestore(&port->lock, flags); + + clk_set_rate(msm_port->clk, port->uartclk); + + spin_lock_irqsave(&port->lock, flags); + *saved_flags = flags; + /* RX stale watermark */ rxstale = entry->rxstale; watermark = UART_IPR_STALE_LSB & rxstale; @@ -1026,8 +1040,8 @@ static void msm_set_termios(struct uart_port *port, struct ktermios *termios, msm_stop_dma(port, dma); /* calculate and set baud rate */ - baud = uart_get_baud_rate(port, termios, old, 300, 115200); - baud = msm_set_baud_rate(port, baud); + baud = uart_get_baud_rate(port, termios, old, 300, 4000000); + baud = msm_set_baud_rate(port, baud, &flags); if (tty_termios_baud_rate(termios)) tty_termios_encode_baud_rate(termios, baud, baud);