korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-22 22:11:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

earlycon: add reg-offset to physical address before mapping

Browse Source 
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: 088da2a176 ("of: earlycon: Initialize port fields from DT properties")
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greentime Hu 2018-02-13 17:09:08 +08:00 committed by Greg Kroah-Hartman
parent 714569064a
commit 1f66dd36bb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/tty/serial/earlycon.c
View File

@ -245,11 +245,12 @@ int __init of_setup_earlycon(const struct earlycon_id *match,
} }
port->mapbase = addr; port->mapbase = addr;
port->uartclk = BASE_BAUD * 16; port->uartclk = BASE_BAUD * 16;
port->membase = earlycon_map(port->mapbase, SZ_4K);
val = of_get_flat_dt_prop(node, "reg-offset", NULL); val = of_get_flat_dt_prop(node, "reg-offset", NULL);
if (val) if (val)
port->mapbase += be32_to_cpu(*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); val = of_get_flat_dt_prop(node, "reg-shift", NULL);
if (val) if (val)
port->regshift = be32_to_cpu(*val); port->regshift = be32_to_cpu(*val);