| From 1f66dd36bb18437397ea0d7882c52f7e3c476e15 Mon Sep 17 00:00:00 2001 |
| From: Greentime Hu <green.hu@gmail.com> |
| Date: Tue, 13 Feb 2018 17:09:08 +0800 |
| Subject: earlycon: add reg-offset to physical address before mapping |
| |
| From: Greentime Hu <green.hu@gmail.com> |
| |
| commit 1f66dd36bb18437397ea0d7882c52f7e3c476e15 upstream. |
| |
| It will get the wrong virtual address because port->mapbase is not added |
| the correct reg-offset yet. We have to update it before earlycon_map() |
| is called |
| |
| Signed-off-by: Greentime Hu <greentime@andestech.com> |
| Acked-by: Arnd Bergmann <arnd@arndb.de> |
| Cc: Peter Hurley <peter@hurleysoftware.com> |
| Cc: stable@vger.kernel.org |
| Fixes: 088da2a17619 ("of: earlycon: Initialize port fields from DT properties") |
| Acked-by: Rob Herring <robh@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/tty/serial/earlycon.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/tty/serial/earlycon.c |
| +++ b/drivers/tty/serial/earlycon.c |
| @@ -253,11 +253,12 @@ int __init of_setup_earlycon(const struc |
| } |
| port->mapbase = addr; |
| port->uartclk = BASE_BAUD * 16; |
| - port->membase = earlycon_map(port->mapbase, SZ_4K); |
| |
| val = of_get_flat_dt_prop(node, "reg-offset", NULL); |
| if (val) |
| port->mapbase += be32_to_cpu(*val); |
| + port->membase = earlycon_map(port->mapbase, SZ_4K); |
| + |
| val = of_get_flat_dt_prop(node, "reg-shift", NULL); |
| if (val) |
| port->regshift = be32_to_cpu(*val); |
