Message ID | 20221108113933.1437745-1-festevam@gmail.com |
---|---|
State | Accepted |
Commit | fc1c1760de38823edbdc2cdd9606dff938a07f6e |
Delegated to: | Stefano Babic |
Headers | show |
Series | Revert "serial: mxc: have putc use the TXFIFO" | expand |
On Tue, Nov 8, 2022 at 3:39 AM Fabio Estevam <festevam@gmail.com> wrote: > > From: Fabio Estevam <festevam@denx.de> > > This reverts commit c7878a0483c59c48a730123bc0f4659fd40921bf. > > Since commit c7878a0483c5 ("serial: mxc: have putc use the TXFIFO"), > serial console corruption can be seen when priting inside board_init(). > > Revert it to avoid the regression. > > Reported-by: Tim Harvey <tharvey@gateworks.com> > Signed-off-by: Fabio Estevam <festevam@denx.de> > --- > drivers/serial/serial_mxc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c > index 4cf79c1ca24f..82c0d84628d5 100644 > --- a/drivers/serial/serial_mxc.c > +++ b/drivers/serial/serial_mxc.c > @@ -311,7 +311,7 @@ static int mxc_serial_putc(struct udevice *dev, const char ch) > struct mxc_serial_plat *plat = dev_get_plat(dev); > struct mxc_uart *const uart = plat->reg; > > - if (readl(&uart->ts) & UTS_TXFULL) > + if (!(readl(&uart->ts) & UTS_TXEMPTY)) > return -EAGAIN; > > writel(ch, &uart->txd); > -- > 2.25.1 > Fabio, Thanks - yes please let's get this revert in. Acked-by: Tim Harvey <tharvey@gateworks.com> Tim
> From: Fabio Estevam <festevam@denx.de> > This reverts commit c7878a0483c59c48a730123bc0f4659fd40921bf. > Since commit c7878a0483c5 ("serial: mxc: have putc use the TXFIFO"), > serial console corruption can be seen when priting inside board_init(). > Revert it to avoid the regression. > Reported-by: Tim Harvey <tharvey@gateworks.com> > Signed-off-by: Fabio Estevam <festevam@denx.de> > Acked-by: Tim Harvey <tharvey@gateworks.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index 4cf79c1ca24f..82c0d84628d5 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -311,7 +311,7 @@ static int mxc_serial_putc(struct udevice *dev, const char ch) struct mxc_serial_plat *plat = dev_get_plat(dev); struct mxc_uart *const uart = plat->reg; - if (readl(&uart->ts) & UTS_TXFULL) + if (!(readl(&uart->ts) & UTS_TXEMPTY)) return -EAGAIN; writel(ch, &uart->txd);