From patchwork Tue Mar 6 13:13:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 130797 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp3923610lja; Tue, 6 Mar 2018 05:13:38 -0800 (PST) X-Google-Smtp-Source: AG47ELucKub1qX825ZItbfgsn/y9HefvGQL5Bk4mQB/x830NwqNnpicjqIjIAyhCNhfV/+dZgwwd X-Received: by 10.80.141.77 with SMTP id t13mr23244188edt.238.1520342018089; Tue, 06 Mar 2018 05:13:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520342018; cv=none; d=google.com; s=arc-20160816; b=e9eTluBbUWMCvPkPCu3pxJiqZ5JPFlyGYocl7LQygu4yXUHAE83zXnUjZAsyvmsFxz dlyTSiTJWkiYhYIa2UFV6Uumq6G5gZoGLBtsDBf1eN85eSAE6wl+P+E1lUIseRCDR6A/ FBgAPGgGx7b/1OBtHvQLRcVw7WzdkroBGJKFrEBHou3KFnZ/jIXeQD7GhEJ/Wvl3sCbm zeZVMl3vZjKq/4wotP4HHAxaR4x/6z8cSfdP+NmfsbKbicr1qJbkSAWrFRsELAFW7Xbd SIxwERlPQpQkjvzNRBkUsAcF+onJONX57vYp+yKkI8pUmvvHi4TbPo55qLmVjQiYk8QE nl/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :arc-authentication-results; bh=PENQuMUmpv9oM9KljqI9h9nb9W8D1FOZip7onx2SbY8=; b=yrmeB4QqSMXIloXDJB+ieFqayfxlCWUL8MM/yXPDaHlpwQQCmhh/ZGoZkqirwnPCSV 1sAvo3+E6OT4ephXvvdNs30gaC22Lm4t+P/im2WsV6+ePRV5/jhatKg160bknArTufpM 6Taj9rAMwuuJaej3tOsqUPrJbmPoIQQq3q2oKSzNdi7PNgcrdcmS+dsF4xLF/QDPstIg sQULxGHPf/F8aMS9NWQ/5UHprgnxQNh3NAUtkwpgEi7cooQorUgFqaQ1TnSwthHTsNyA YJx0AmJZSJ70wOlZBSTA/oa8RgqbXJQFMgLrKrh0vj+/ypZBU1BFxfqCuWu+VH/Et6L1 46Og== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id m28si1496652eda.226.2018.03.06.05.13.37; Tue, 06 Mar 2018 05:13:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 97BEAC21DB6; Tue, 6 Mar 2018 13:13:33 +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=none 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 E3C2EC21DB6; Tue, 6 Mar 2018 13:13:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5C27FC21E08; Tue, 6 Mar 2018 13:13:30 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by lists.denx.de (Postfix) with ESMTPS id 13023C21C38 for ; Tue, 6 Mar 2018 13:13:30 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 11948AE81; Tue, 6 Mar 2018 13:13:29 +0000 (UTC) From: Alexander Graf To: u-boot@lists.denx.de Date: Tue, 6 Mar 2018 14:13:26 +0100 Message-Id: <20180306131327.61174-2-agraf@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20180306131327.61174-1-agraf@suse.de> References: <20180306131327.61174-1-agraf@suse.de> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH 1/2] serial_bcm283x_mu: Flush RX queue after setting baud rate 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" After the UART was initialized, we may still have bogus data in the RX queue if it was enabled with incorrect pin muxing before. So let's flush the RX queue whenever we initialize baud rates. This fixes a regression with the dynamic pinmuxing code when enable_uart=1 is not set in config.txt. Fixes: caf2233b28 ("bcm283x: Add pinctrl driver") Reported-by: Göran Lundberg Reported-by: Peter Robinson Signed-off-by: Alexander Graf Tested-by: Peter Robinson --- drivers/serial/serial_bcm283x_mu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index 40029fadbc..d87b44e902 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -51,6 +51,8 @@ struct bcm283x_mu_priv { struct bcm283x_mu_regs *regs; }; +static int bcm283x_mu_serial_getc(struct udevice *dev); + static int bcm283x_mu_serial_setbrg(struct udevice *dev, int baudrate) { struct bcm283x_mu_serial_platdata *plat = dev_get_platdata(dev); @@ -59,13 +61,17 @@ static int bcm283x_mu_serial_setbrg(struct udevice *dev, int baudrate) u32 divider; if (plat->skip_init) - return 0; + goto out; divider = plat->clock / (baudrate * 8); writel(BCM283X_MU_LCR_DATA_SIZE_8, ®s->lcr); writel(divider - 1, ®s->baud); +out: + /* Flush the RX queue - all data in there is bogus */ + while (bcm283x_mu_serial_getc(dev) != -EAGAIN) ; + return 0; } From patchwork Tue Mar 6 13:13:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 130798 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp3924772lja; Tue, 6 Mar 2018 05:14:48 -0800 (PST) X-Google-Smtp-Source: AG47ELuKiF4FfW/4zjMUzQs97IwWyR7gafs+uAnztN4M6EQtIaFpYXVm5+B0/lHSc2v0SfvXTHW7 X-Received: by 10.80.243.145 with SMTP id g17mr23369512edm.6.1520342088331; Tue, 06 Mar 2018 05:14:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520342088; cv=none; d=google.com; s=arc-20160816; b=NRyKgQt4a19u3HYfW3EAOygiVN8fENxaLefb5QjBY4+kCbt2gOqvyFtFBSaQh6JqUR DLesdk9gW9kXOFrlCnKYUj/qAAPyeF/4IhSFOMAEbjZ9Q9U1+yy3mcGP7MfgtvveEv93 ZoIgKbdHsSUDHHHg5T/obIsaNJF5X0yMbT6DGZ4dJ3oz28CKsE7EdTy6t4vUzqwNkUJd GQ8JDsEVhVjaIzJ7QWk7ChU3lIzeYw681MQZybUtsaG8ghZYrFFuTY45/LLriVH+IXel ldkoUHzLWgESQO+E23Baz0TjMnJfCc8h8a2uLFQPMjr35j39/F6No1QN5AoiZE1PFbby HCBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :arc-authentication-results; bh=/AREZZlQS2OmVwMSE9lMOkaObi5qUoJn7Xv8J/dA86w=; b=Ue+DDxVYNjNPxKLxmg6I/QQ748Tac2AHt1IPR9V0QL3FmHTd6zwl4AxF+B7ggWqaZ5 H1AjDWrhPs+M9sETqz5gZqqBBGm1y1g1A/lHyp16Fu1No/1DMVD4vLAZZg/uJY0hMCem KZhHGbmzEcwxejSWe70f5Bqt4DHcHDToribW16mGW8ZIPwpS7Na31d72jTVF3wIKRSic 6XwpVSukAI09ZFaJgChaDMVws73Vt64yZcSye3oW7LSD/y9EMOIPkkV5VsoqxlG3809l A/Dy/EKsQTKzQW46kwnpVbgpw3Sjok7sXw3irN/jnw2TGoFg1Jsj7frRAlPptgPlzti/ MISA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id i9si2946244eda.318.2018.03.06.05.14.48; Tue, 06 Mar 2018 05:14:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id D9205C21F7E; Tue, 6 Mar 2018 13:13:52 +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=none 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 924E8C21C38; Tue, 6 Mar 2018 13:13:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 65D10C21C38; Tue, 6 Mar 2018 13:13:30 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by lists.denx.de (Postfix) with ESMTPS id 135D2C21DB6 for ; Tue, 6 Mar 2018 13:13:30 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 464A2AE94; Tue, 6 Mar 2018 13:13:29 +0000 (UTC) From: Alexander Graf To: u-boot@lists.denx.de Date: Tue, 6 Mar 2018 14:13:27 +0100 Message-Id: <20180306131327.61174-3-agraf@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20180306131327.61174-1-agraf@suse.de> References: <20180306131327.61174-1-agraf@suse.de> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH 2/2] bcm283x_pl011: Flush RX queue after setting baud rate 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" After the UART was initialized, we may still have bogus data in the RX queue if it was enabled with incorrect pin muxing before. So let's flush the RX queue whenever we initialize baud rates. This fixes a regression with the dynamic pinmuxing code when enable_uart=1 is not set in config.txt on Raspberry Pis that use pl011 for serial. Fixes: caf2233b28 ("bcm283x: Add pinctrl driver") Reported-by: Göran Lundberg Reported-by: Peter Robinson Signed-off-by: Alexander Graf --- drivers/serial/serial_bcm283x_pl011.c | 25 ++++++++++++++++++++++++- drivers/serial/serial_pl01x.c | 10 +++++----- drivers/serial/serial_pl01x_internal.h | 7 ++++++- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index bfd39f84f3..2c6fb267ff 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "serial_pl01x_internal.h" /* @@ -55,6 +56,28 @@ static int bcm283x_pl011_serial_ofdata_to_platdata(struct udevice *dev) return 0; } +static int bcm283x_pl011_serial_setbrg(struct udevice *dev, int baudrate) +{ + int r; + + r = pl01x_serial_setbrg(dev, baudrate); + + /* + * We may have been muxed to a bogus line before. Drain the RX + * queue so we start at a clean slate. + */ + while (pl01x_serial_getc(dev) == -EAGAIN) ; + + return r; +} + +static const struct dm_serial_ops bcm283x_pl011_serial_ops = { + .putc = pl01x_serial_putc, + .pending = pl01x_serial_pending, + .getc = pl01x_serial_getc, + .setbrg = bcm283x_pl011_serial_setbrg, +}; + static const struct udevice_id bcm283x_pl011_serial_id[] = { {.compatible = "brcm,bcm2835-pl011", .data = TYPE_PL011}, {} @@ -67,7 +90,7 @@ U_BOOT_DRIVER(bcm283x_pl011_uart) = { .ofdata_to_platdata = of_match_ptr(bcm283x_pl011_serial_ofdata_to_platdata), .platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata), .probe = pl01x_serial_probe, - .ops = &pl01x_serial_ops, + .ops = &bcm283x_pl011_serial_ops, .flags = DM_FLAG_PRE_RELOC, .priv_auto_alloc_size = sizeof(struct pl01x_priv), }; diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 23d9d839cb..45f1282770 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -273,7 +273,7 @@ __weak struct serial_device *default_serial_console(void) #ifdef CONFIG_DM_SERIAL -static int pl01x_serial_setbrg(struct udevice *dev, int baudrate) +int pl01x_serial_setbrg(struct udevice *dev, int baudrate) { struct pl01x_serial_platdata *plat = dev_get_platdata(dev); struct pl01x_priv *priv = dev_get_priv(dev); @@ -299,21 +299,21 @@ int pl01x_serial_probe(struct udevice *dev) return 0; } -static int pl01x_serial_getc(struct udevice *dev) +int pl01x_serial_getc(struct udevice *dev) { struct pl01x_priv *priv = dev_get_priv(dev); return pl01x_getc(priv->regs); } -static int pl01x_serial_putc(struct udevice *dev, const char ch) +int pl01x_serial_putc(struct udevice *dev, const char ch) { struct pl01x_priv *priv = dev_get_priv(dev); return pl01x_putc(priv->regs, ch); } -static int pl01x_serial_pending(struct udevice *dev, bool input) +int pl01x_serial_pending(struct udevice *dev, bool input) { struct pl01x_priv *priv = dev_get_priv(dev); unsigned int fr = readl(&priv->regs->fr); @@ -324,7 +324,7 @@ static int pl01x_serial_pending(struct udevice *dev, bool input) return fr & UART_PL01x_FR_TXFF ? 0 : 1; } -const struct dm_serial_ops pl01x_serial_ops = { +static const struct dm_serial_ops pl01x_serial_ops = { .putc = pl01x_serial_putc, .pending = pl01x_serial_pending, .getc = pl01x_serial_getc, diff --git a/drivers/serial/serial_pl01x_internal.h b/drivers/serial/serial_pl01x_internal.h index c56dd54c7b..d4605f24a3 100644 --- a/drivers/serial/serial_pl01x_internal.h +++ b/drivers/serial/serial_pl01x_internal.h @@ -43,7 +43,12 @@ struct pl01x_regs { int pl01x_serial_ofdata_to_platdata(struct udevice *dev); int pl01x_serial_probe(struct udevice *dev); -extern const struct dm_serial_ops pl01x_serial_ops; + +/* Needed for external pl01x_serial_ops drivers */ +int pl01x_serial_putc(struct udevice *dev, const char ch); +int pl01x_serial_pending(struct udevice *dev, bool input); +int pl01x_serial_getc(struct udevice *dev); +int pl01x_serial_setbrg(struct udevice *dev, int baudrate); struct pl01x_priv { struct pl01x_regs *regs;