From patchwork Tue Jul 9 12:23:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagar Shrikant Kadam X-Patchwork-Id: 1129736 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.b="XV5viX/f"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45jhPs5DvTz9sN1 for ; Tue, 9 Jul 2019 22:26:25 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 3FD30C21E52; Tue, 9 Jul 2019 12:26:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C6D53C21E89; Tue, 9 Jul 2019 12:25:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8EEFFC21E85; Tue, 9 Jul 2019 12:25:45 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by lists.denx.de (Postfix) with ESMTPS id B20A5C21D8E for ; Tue, 9 Jul 2019 12:25:41 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id b3so6705010plr.4 for ; Tue, 09 Jul 2019 05:25:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fbxZO+4oo66Cb29/QsSG0DhgY2AnO1Q9k/jHYn6eqh8=; b=XV5viX/fojg7PQoFu4V90pycl8TlGqkPVI2AGM7XLkLAyHWnhKqWXVvwuA3KW+KQhT JSJTC/a9br8c8btKIHBhgdD6ESEhYW+70h5Z1u3njM5EGNXUN6cCy18qqHHg9HrXaZLz pHh2RzvakuoZwM5sU3hcngcZs5hXVRSGf4mZgiyYbrtZulrxbJH1vJR5FTYEoljJlHPb W3woWxkmnK154vcY32ZlZxo8A9VYYC36/h/beoO8n1Y0gdO79HrZAOLJ0GmFiwnL0nJb 5VrApP/xujSiUS/jcB/pKFqnpSw5HNaNSuXtexIuA2k1skFbAeSGGD84BBVGI0/juLVG sSbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fbxZO+4oo66Cb29/QsSG0DhgY2AnO1Q9k/jHYn6eqh8=; b=NNWm/8he/A4htprbV8EQn7nRtmdXw8htNtGYk/kY/+UBoG0w5ssoGuqN+I378hCCim MVZ5MNVpCJFV3E1GGIHuM5xvRN5BzyMtw8O7cCuxkvhPBMcwvzMcGFICBqq++MRa9p7k bq5/9tD98wf6ixpqyLSDtdiZLth247cYqSNBFb2E4NjwH4b3sPG2Cham9oBAh0Ne96be lXClcJ+fxwHxwfe6I9ZD2Qtuq9JKzjkbVG3UqIaG9zHbbqENwmTc3faHBZI3nKbXc07a zh28hhivOnl4ifF77/XQbTVJQSVQdaE5ajWH9xUzYELrVKlDtZbpVIQ9NV/TWjYB8gvv nFIA== X-Gm-Message-State: APjAAAWmgOLkSjvJdJ1K6jn3vs7qRpxCMSs4JoMnXE2QVGv3xWsByMTP taiRQJZc2iaRTs3xs4cXDCgRoDplXZk= X-Google-Smtp-Source: APXvYqzoU/b7KmiFFRNURYxeCtbZU3tO2s5ZAzSBpxogXKkMe4Go/VT/uow8ExrVAZOK3imNilDtsg== X-Received: by 2002:a17:902:3103:: with SMTP id w3mr32524275plb.84.1562675140225; Tue, 09 Jul 2019 05:25:40 -0700 (PDT) Received: from gamma07.internal.sifive.com ([64.62.193.194]) by smtp.googlemail.com with ESMTPSA id r9sm287895pjq.3.2019.07.09.05.25.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Jul 2019 05:25:39 -0700 (PDT) From: Sagar Shrikant Kadam To: u-boot@lists.denx.de Date: Tue, 9 Jul 2019 05:23:44 -0700 Message-Id: <1562675024-31648-2-git-send-email-sagar.kadam@sifive.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562675024-31648-1-git-send-email-sagar.kadam@sifive.com> References: <1562675024-31648-1-git-send-email-sagar.kadam@sifive.com> Cc: agraf@suse.de Subject: [U-Boot] [PATCH] riscv : serial: use rx watermark to indicate rx data is present X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" In y-modem transfer mode, tstc/getc fail to check if there is any data available / received in RX FIFO, and so y-modem transfer never succeeds. Using receive watermark bit within ip register fixes the issue. This patch is based on commit c7392b7bc4e1 ("Use the RX watermark interrupt pending bit for TSTC") available at[1] [1] https://github.com/sifive/HiFive_U-Boot/tree/regression Signed-off-by: Sagar Shrikant Kadam Reviewed-by: Anup Patel Tested-by: Anup Patel Reviewed-by: Padmarao Begari Tested-by: Padmarao Begari --- drivers/serial/serial_sifive.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c index fdfef69..c142ccd 100644 --- a/drivers/serial/serial_sifive.c +++ b/drivers/serial/serial_sifive.c @@ -22,6 +22,9 @@ DECLARE_GLOBAL_DATA_PTR; #define UART_TXCTRL_TXEN 0x1 #define UART_RXCTRL_RXEN 0x1 +/* IP register */ +#define UART_IP_RXWM 0x2 + struct uart_sifive { u32 txfifo; u32 rxfifo; @@ -34,7 +37,6 @@ struct uart_sifive { struct sifive_uart_platdata { unsigned long clock; - int saved_input_char; struct uart_sifive *regs; }; @@ -94,7 +96,7 @@ static int _sifive_serial_getc(struct uart_sifive *regs) return -EAGAIN; ch &= UART_RXFIFO_DATA; - return (!ch) ? -EAGAIN : ch; + return ch; } static int sifive_serial_setbrg(struct udevice *dev, int baudrate) @@ -133,7 +135,6 @@ static int sifive_serial_probe(struct udevice *dev) if (gd->flags & GD_FLG_RELOC) return 0; - platdata->saved_input_char = 0; _sifive_serial_init(platdata->regs); return 0; @@ -145,12 +146,6 @@ static int sifive_serial_getc(struct udevice *dev) struct sifive_uart_platdata *platdata = dev_get_platdata(dev); struct uart_sifive *regs = platdata->regs; - if (platdata->saved_input_char > 0) { - c = platdata->saved_input_char; - platdata->saved_input_char = 0; - return c; - } - while ((c = _sifive_serial_getc(regs)) == -EAGAIN) ; return c; @@ -171,14 +166,10 @@ static int sifive_serial_pending(struct udevice *dev, bool input) struct sifive_uart_platdata *platdata = dev_get_platdata(dev); struct uart_sifive *regs = platdata->regs; - if (input) { - if (platdata->saved_input_char > 0) - return 1; - platdata->saved_input_char = _sifive_serial_getc(regs); - return (platdata->saved_input_char > 0) ? 1 : 0; - } else { + if (input) + return (readl(®s->ip) & UART_IP_RXWM); + else return !!(readl(®s->txfifo) & UART_TXFIFO_FULL); - } } static int sifive_serial_ofdata_to_platdata(struct udevice *dev)