| Message ID | 1474092878-30034-1-git-send-email-shawn.guo@linaro.org |
|---|---|
| State | Accepted |
| Commit | e06690bff6ab642e0ab1b22e5bec532f6faf2f5d |
| Headers | show |
On 20/09/16 14:05, Shawn Guo wrote: > On Sat, Sep 17, 2016 at 02:14:38PM +0800, Shawn Guo wrote: >> Commit 0e125a5facf8 ("tty: amba-pl011: define flag register bits for ZTE >> device") changes earlycon function pl011_putc() to use a pointer to >> uart_amba_port. This causes a regression when earlycon is enabled, >> because uart_amba_port is not available yet at earlycon time. Let's >> revert the change on pl011_putc() to fix the regression. >> >> The earlycon support for ZTE device can probably be added later by >> declaring a new earlycon setup function with a vendor specific >> compatible. >> >> Reported-by: Sudeep Holla <sudeep.holla@arm.com> >> Fixes: 0e125a5facf8 ("tty: amba-pl011: define flag register bits for ZTE device") >> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > > Hi Sudeep, > > Can you please confirm if the patch fixes your problem, so that Greg > knows whether it should be applied? Thanks. > Sorry, since it's basically what I tried first before posting some patch using private_data, I assumed it will work. Anyways I have now tested it, so you can add: Tested-by: Sudeep Holla <sudeep.holla@arm.com> -- Regards, Sudeep -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 0b78b04e895e..2d9ffab16ffe 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2330,16 +2330,13 @@ static struct console amba_console = { static void pl011_putc(struct uart_port *port, int c) { - struct uart_amba_port *uap = - container_of(port, struct uart_amba_port, port); - while (readl(port->membase + UART01x_FR) & UART01x_FR_TXFF) cpu_relax(); if (port->iotype == UPIO_MEM32) writel(c, port->membase + UART01x_DR); else writeb(c, port->membase + UART01x_DR); - while (readl(port->membase + UART01x_FR) & uap->vendor->fr_busy) + while (readl(port->membase + UART01x_FR) & UART01x_FR_BUSY) cpu_relax(); }
Commit 0e125a5facf8 ("tty: amba-pl011: define flag register bits for ZTE device") changes earlycon function pl011_putc() to use a pointer to uart_amba_port. This causes a regression when earlycon is enabled, because uart_amba_port is not available yet at earlycon time. Let's revert the change on pl011_putc() to fix the regression. The earlycon support for ZTE device can probably be added later by declaring a new earlycon setup function with a vendor specific compatible. Reported-by: Sudeep Holla <sudeep.holla@arm.com> Fixes: 0e125a5facf8 ("tty: amba-pl011: define flag register bits for ZTE device") Signed-off-by: Shawn Guo <shawn.guo@linaro.org> --- drivers/tty/serial/amba-pl011.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html