drop upstreamed RPi fixes
This commit is contained in:
Peter Robinson
parent
45ad967485
commit
30f2e8f650
|
|
@ -1,217 +0,0 @@
|
|||
From patchwork Wed Mar 7 21:08:24 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Subject: [U-Boot, v2,
|
||||
1/2] serial_bcm283x_mu: Flush RX queue after setting baud rate
|
||||
X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
|
||||
X-Patchwork-Id: 882789
|
||||
Message-Id: <20180307210825.50709-2-agraf@suse.de>
|
||||
To: u-boot@lists.denx.de
|
||||
Cc: Tom Rini <trini@konsulko.com>
|
||||
Date: Wed, 7 Mar 2018 22:08:24 +0100
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
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 <goran@lundberg.email>
|
||||
Reported-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
---
|
||||
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 Wed Mar 7 21:08:25 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Subject: [U-Boot, v2,
|
||||
2/2] bcm283x_pl011: Flush RX queue after setting baud rate
|
||||
X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
|
||||
X-Patchwork-Id: 882790
|
||||
Message-Id: <20180307210825.50709-3-agraf@suse.de>
|
||||
To: u-boot@lists.denx.de
|
||||
Cc: Tom Rini <trini@konsulko.com>
|
||||
Date: Wed, 7 Mar 2018 22:08:25 +0100
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
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 <goran@lundberg.email>
|
||||
Reported-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
---
|
||||
|
||||
v1 -> v2:
|
||||
|
||||
- correctly drain the queue
|
||||
---
|
||||
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..dad7236895 100644
|
||||
--- a/drivers/serial/serial_bcm283x_pl011.c
|
||||
+++ b/drivers/serial/serial_bcm283x_pl011.c
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <asm/gpio.h>
|
||||
#include <dm/pinctrl.h>
|
||||
#include <dm/platform_data/serial_pl01x.h>
|
||||
+#include <serial.h>
|
||||
#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;
|
||||
|
|
@ -21,10 +21,9 @@ Patch1: uefi-use-Fedora-specific-path-name.patch
|
|||
Patch2: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
||||
Patch3: usb-kbd-fixes.patch
|
||||
Patch4: Add-fix-for-Pine64-gigabit-throughput-issues.patch
|
||||
Patch5: rpi-Drain-RX-queue-on-setbrg.patch
|
||||
Patch6: rk33xx-make_fit_atf-fix.patch
|
||||
Patch7: rk33xx-enable-make-itb.patch
|
||||
Patch8: mx6cuboxi-add-support-for-detecting-Revision-1.5-SoM.patch
|
||||
Patch5: rk33xx-make_fit_atf-fix.patch
|
||||
Patch6: rk33xx-enable-make-itb.patch
|
||||
Patch7: mx6cuboxi-add-support-for-detecting-Revision-1.5-SoM.patch
|
||||
|
||||
# Board fixes and enablement
|
||||
Patch10: dragonboard-fixes.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue